Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

src/modules/editor/components/CompUI/basicUI/Text/TextToolComp.tsx

@@ -29,6 +29,7 @@ import {
 } from "vue";
 import { any, bool, func, number, object, string } from "vue-types";
 import NewColorPicker from "../../formItems/NewColorPicker";
+import { isNumber } from "lodash";
 interface ColumnItem {
   label?: string;
   component?: ((...args: any[]) => any) | Record<string, any>;
@@ -122,8 +123,9 @@ export const LetterSpacingComp = defineComponent({
   emits: ["change"],
   setup(props, { emit }) {
     return () => {
-      const value =
+      let value =
         typeof props.value === "string" ? parseInt(props.value) : props.value;
+      value = isNumber(value) ? value : 0;
 
       return (
         <InputNumber
@@ -153,8 +155,9 @@ export const LineHeightComp = defineComponent({
   emits: ["change"],
   setup(props, { emit }) {
     return () => {
-      const value =
+      let value =
         typeof props.value === "string" ? parseFloat(props.value) : props.value;
+      value = isNumber(value) ? value : 1.5;
       return (
         <InputNumber
           prefix={<IconTextLineHeight class="text-22px mr-6px" />}
@@ -261,10 +264,14 @@ export const FontFamily = defineComponent({
       { label: "楷体", value: "楷体,KaiTi,STKaiti,sans-serif" },
     ];
     return () => {
+      let item = options.find((e) => {
+        return e.value.indexOf(props.value) != -1;
+      });
+      const value = item ? item.value : "";
       return (
         <Select
           options={options}
-          value={props.value || ""}
+          value={value || ""}
           onChange={(v) => {
             emit("change", v);
           }}
@@ -280,13 +287,16 @@ export const FontSize = defineComponent({
   emits: ["change"],
   setup(props, { emit }) {
     return () => {
+      let value =
+        typeof props.value === "string" ? parseInt(props.value) : props.value;
+      value = isNumber(value) ? value : 12;
       return (
         <InputNumber
           prefix={<IconTextSize class="text-22px mr-6px" />}
           defaultValue={12}
           min={12}
           max={60}
-          value={parseInt(props.value) || 12}
+          value={value}
           onChange={(value: any) => {
             if (!value) {
               emit("change", "12px");