cnhis-design-vue 3.4.0-beta.4 → 3.4.0-beta.7

package/es/components/form-render/src/hooks/useBusinessBinding.js

@@ -50,18 +50,14 @@ class BusinessCollector {
   setValueByType(formModel, type, value, from) {
     const field = this.getField(type);
     field && formModel.setFieldState(field.val_key, (state) => {
-      if (state.value === value)
+      const newValue = this.formatter({ value, type, fieldKey: field.val_key, from });
+      if (state.value === newValue)
         return;
       !this.typeLockMap.get(type) && this.typeLockMap.set(type, 1);
       if (this.triggerDisabled && isString(this.triggerDisabled) && Path.parse(this.triggerDisabled).match(field.val_key)) {
         return;
       }
-      state.value = this.formatter({
-        value,
-        type,
-        fieldKey: field.val_key,
-        from
-      });
+      state.value = newValue;
     });
   }
   registerChangeBusiness(type, handler) {
@@ -96,23 +92,22 @@ function useBusinessBinding() {
       return;
     }
     const info = parseIdCard(idCard);
-    const {
-      age,
-      ageUnit
-    } = parseAgeFromContext(info, this.options.nominalAge);
+    const { age, ageUnit } = parseAgeFromContext(info, this.options.nominalAge);
     ageUnit != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit, FIELD_BUSINESS_TYPE.ID_CARD);
     age != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE, age, FIELD_BUSINESS_TYPE.ID_CARD);
     info.sex != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.SEX, info.sex, FIELD_BUSINESS_TYPE.ID_CARD);
-    info.birthday != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.BIRTHDAY, format(new Date(info.birthday), getBirthdayFormat.call(this)), FIELD_BUSINESS_TYPE.ID_CARD);
+    info.birthday != null && this.setValueByType(
+      formModel,
+      FIELD_BUSINESS_TYPE.BIRTHDAY,
+      format(new Date(info.birthday), getBirthdayFormat.call(this)),
+      FIELD_BUSINESS_TYPE.ID_CARD
+    );
   }
   function handlerBirthdayType(formModel) {
     const birthday = this.getValueByType(formModel, FIELD_BUSINESS_TYPE.BIRTHDAY);
     if (!isString(birthday))
       return;
-    const {
-      age,
-      ageUnit
-    } = parseAgeFromContext(parseBirthday(birthday), this.options.nominalAge);
+    const { age, ageUnit } = parseAgeFromContext(parseBirthday(birthday), this.options.nominalAge);
     this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit, FIELD_BUSINESS_TYPE.BIRTHDAY);
     this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE, age, FIELD_BUSINESS_TYPE.BIRTHDAY);
   }
@@ -124,15 +119,18 @@ function useBusinessBinding() {
         return;
       if (!isString(ageUnit) || ageUnit === "")
         return;
-      this.setValueByType(formModel, FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit, getBirthdayFormat.call(this)), from);
+      this.setValueByType(
+        formModel,
+        FIELD_BUSINESS_TYPE.BIRTHDAY,
+        parseAge2Birthday(+age, ageUnit, getBirthdayFormat.call(this)),
+        from
+      );
     };
   }
   function create(options) {
     return new BusinessCollector(options).registerChangeBusiness(FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE_UNIT, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE_UNIT)).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE)).registerChangeBusiness(FIELD_BUSINESS_TYPE.BIRTHDAY, handlerBirthdayType);
   }
-  return {
-    create
-  };
+  return { create };
 }
 
 export { BusinessCollector, useBusinessBinding };

package/es/components/form-render/src/hooks/useChangeContext.js

@@ -14,9 +14,7 @@ function useChangeContext() {
   function create() {
     return new ContextCollector();
   }
-  return {
-    create
-  };
+  return { create };
 }
 
 export { ContextCollector, useChangeContext };

package/es/components/form-render/src/hooks/useCommonInjection.d.ts

@@ -3,7 +3,7 @@ import { WatchSource } from '@vue/runtime-core';
 export declare function useCommonInjection(): {
     injectValueValidate: (traverser: WatchSource) => void;
     injectValueWatchFromEmpty: (traverser: WatchSource, trigger: AnyFn) => void;
-    injectValueBindKey: (traverser: WatchSource) => import("vue").Ref<number, number>;
+    injectValueBindKey: (traverser: WatchSource) => import("vue").Ref<number>;
 };
 export declare function useSelectOptionProps(): {
     nodeProps: () => {

package/es/components/form-render/src/hooks/useCommonInjection.js

@@ -5,9 +5,7 @@ import { useFormField } from './useFormField.js';
 
 function useCommonInjection() {
   function injectValueValidate(traverser) {
-    const {
-      field
-    } = useFormField();
+    const { field } = useFormField();
     watch(traverser, () => {
       var _a, _b, _c;
       try {
@@ -21,9 +19,7 @@ function useCommonInjection() {
     });
   }
   function injectValueWatchFromEmpty(traverser, trigger) {
-    watch(traverser, (n, o) => n != null && o == null && trigger(), {
-      immediate: true
-    });
+    watch(traverser, (n, o) => n != null && o == null && trigger(), { immediate: true });
   }
   function injectValueBindKey(traverser) {
     const key = ref(1);
@@ -34,25 +30,14 @@ function useCommonInjection() {
     });
     return key;
   }
-  return {
-    injectValueValidate,
-    injectValueWatchFromEmpty,
-    injectValueBindKey
-  };
+  return { injectValueValidate, injectValueWatchFromEmpty, injectValueBindKey };
 }
 function useSelectOptionProps() {
   const nodeProps = () => {
-    return {
-      class: "form-render__selectOption"
-    };
-  };
-  const menuProps = {
-    class: "form-render__selectMenu"
-  };
-  return {
-    nodeProps,
-    menuProps
+    return { class: "form-render__selectOption" };
   };
+  const menuProps = { class: "form-render__selectMenu" };
+  return { nodeProps, menuProps };
 }
 
 export { useCommonInjection, useSelectOptionProps };

package/es/components/form-render/src/hooks/useCommonLog.js

@@ -2,11 +2,11 @@ import { formRenderLog } from '../utils/index.js';
 
 function useCommonLog() {
   function invalidHttpInstanceLog() {
-    formRenderLog("before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()");
+    formRenderLog(
+      "before use http feature, you should regist http instance by useFormilyRequest.registGlobHttpInstance()"
+    );
   }
-  return {
-    invalidHttpInstanceLog
-  };
+  return { invalidHttpInstanceLog };
 }
 
 export { useCommonLog };

package/es/components/form-render/src/hooks/useComplexOptions.d.ts

@@ -16,11 +16,11 @@ export declare function useComplexOptions(props: {
         valueKey?: string | undefined;
         labelKey?: string | undefined;
         childFieldStrategy: 'checked' | 'all';
-        childWidthMode?: "outer" | "inner" | undefined;
+        childWidthMode?: "inner" | "outer" | undefined;
         renderLabel?: boolean | undefined;
         attrs?: AnyObject | undefined;
-    }) => any[];
-    valueRef: Ref<any, any>;
+    }) => (JSX.Element | null)[];
+    valueRef: Ref<any>;
     hasComplexOption: import("vue").ComputedRef<boolean>;
 };
 export declare function useComplexOptionsSpan(): {

package/es/components/form-render/src/hooks/useFieldListAdaptor.js

@@ -18,9 +18,7 @@ function bindUrlProps(schema, item) {
   });
 }
 function useFieldListAdaptor(collector, globProps) {
-  const {
-    createValidatorSchema
-  } = useFormValidator();
+  const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
     var _a, _b;
     const result = {
@@ -43,10 +41,7 @@ function useFieldListAdaptor(collector, globProps) {
       result["x-reactions"] = arrayed(item.reactions).map((item2) => {
         var _a2;
         if (item2.target) {
-          return {
-            ...item2,
-            effects: (_a2 = item2.effects) != null ? _a2 : ["onFieldInit", "onFieldValueChange"]
-          };
+          return { ...item2, effects: (_a2 = item2.effects) != null ? _a2 : ["onFieldInit", "onFieldValueChange"] };
         } else {
           return item2;
         }
@@ -202,11 +197,7 @@ function useFieldListAdaptor(collector, globProps) {
   };
   const createInputNumberSchema = (item) => {
     const schema = createStandardSchema(item);
-    const {
-      decimal_length,
-      validate,
-      allowSlash
-    } = item;
+    const { decimal_length, validate, allowSlash } = item;
     if (isPositive(allowSlash)) {
       schema["x-component"] = "INPUT_NUMBER_SLASH";
       schema.type = "string";
@@ -258,14 +249,14 @@ function useFieldListAdaptor(collector, globProps) {
   const createComplexSchema = (item) => {
     const schema = createStandardSchema(item);
     if (Array.isArray(item.properties)) {
-      formRenderLog("COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301");
+      formRenderLog(
+        "COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301"
+      );
     }
     const properties = Array.isArray(item.properties || item.children) ? schemaAdaptor(item.properties || item.children) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
-    Object.assign(schema["x-decorator-props"], {
-      showFeedback: false
-    });
+    Object.assign(schema["x-decorator-props"], { showFeedback: false });
     Object.assign(schema["x-component-props"], pick(item, ["wrapperStyle", "display"]));
     return schema;
   };
@@ -275,9 +266,7 @@ function useFieldListAdaptor(collector, globProps) {
       type: "void",
       title: item.alias || item.name,
       "x-component": "LINE_BREAKS",
-      "x-component-props": {
-        border: item.lineBreaksBorder
-      },
+      "x-component-props": { border: item.lineBreaksBorder },
       "x-display": isNegative(item.is_show) ? "hidden" : "visible"
     };
   };
@@ -288,7 +277,25 @@ function useFieldListAdaptor(collector, globProps) {
     });
     return schema;
   };
-  const creatorMap = /* @__PURE__ */ new Map([["LINEBAR", createLinebarSchema], ["LINE_BREAKS", createLinebreaksSchema], ["INPUT", createInputSchema], ["TEXTAREA", createTextareaSchema], ["INPUT_NUMBER", createInputNumberSchema], ["SELECT", createSelectSchema], ["REMOTE_SEARCH", createSelectSchema], ["DATE", createDateSchema], ["TIME", createTimeSchema], ["LEVEL_SEARCH_CASCADER", createLevelSearchCascadeSchema], ["SEARCH_CASCADER", createSearchCascadeSchema], ["COMBINATION", createCombinationSchema], ["RADIO", createRadioSchema], ["CHECKBOX", createRadioSchema], ["SWITCH", createSwitchSchema], ["SLIDER", createSliderSchema], ["COMPLEX", createComplexSchema]]);
+  const creatorMap = /* @__PURE__ */ new Map([
+    ["LINEBAR", createLinebarSchema],
+    ["LINE_BREAKS", createLinebreaksSchema],
+    ["INPUT", createInputSchema],
+    ["TEXTAREA", createTextareaSchema],
+    ["INPUT_NUMBER", createInputNumberSchema],
+    ["SELECT", createSelectSchema],
+    ["REMOTE_SEARCH", createSelectSchema],
+    ["DATE", createDateSchema],
+    ["TIME", createTimeSchema],
+    ["LEVEL_SEARCH_CASCADER", createLevelSearchCascadeSchema],
+    ["SEARCH_CASCADER", createSearchCascadeSchema],
+    ["COMBINATION", createCombinationSchema],
+    ["RADIO", createRadioSchema],
+    ["CHECKBOX", createRadioSchema],
+    ["SWITCH", createSwitchSchema],
+    ["SLIDER", createSliderSchema],
+    ["COMPLEX", createComplexSchema]
+  ]);
   const createWidgetSchema = (item) => {
     if (isValidWidgetCombination(item.suffixConfig) || isValidWidgetCombination(item.prefixConfig))
       return createWidgetCombinationSchema(item);
@@ -299,26 +306,30 @@ function useFieldListAdaptor(collector, globProps) {
     const schema = createStandardSchema(item);
     const suffixList = item.suffixConfig ? arrayed(item.suffixConfig) : [];
     const prefixList = item.prefixConfig ? arrayed(item.prefixConfig) : [];
-    const fieldList = [...prefixList.map((prefix) => {
-      return {
-        elem_width: item.elem_width,
-        ...prefix,
-        hide_title: "1",
-        is_show: isNegative(prefix.is_show) ? "0" : item.is_show
-      };
-    }), {
-      ...item,
-      hide_title: "1",
-      suffixConfig: void 0,
-      prefixConfig: void 0
-    }, ...suffixList.map((suffix) => {
-      return {
-        elem_width: item.elem_width,
-        ...suffix,
+    const fieldList = [
+      ...prefixList.map((prefix) => {
+        return {
+          elem_width: item.elem_width,
+          ...prefix,
+          hide_title: "1",
+          is_show: isNegative(prefix.is_show) ? "0" : item.is_show
+        };
+      }),
+      {
+        ...item,
         hide_title: "1",
-        is_show: isNegative(suffix.is_show) ? "0" : item.is_show
-      };
-    })].map((item2) => {
+        suffixConfig: void 0,
+        prefixConfig: void 0
+      },
+      ...suffixList.map((suffix) => {
+        return {
+          elem_width: item.elem_width,
+          ...suffix,
+          hide_title: "1",
+          is_show: isNegative(suffix.is_show) ? "0" : item.is_show
+        };
+      })
+    ].map((item2) => {
       item2.decoratorProps = omit(item2.decoratorProps, ["onClickOutside"]);
       return item2;
     });
@@ -330,9 +341,7 @@ function useFieldListAdaptor(collector, globProps) {
       name: fieldKeyEscape(fieldList),
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
-      "x-component-props": {
-        span: groupSpan
-      },
+      "x-component-props": { span: groupSpan },
       "x-decorator-props": {
         ...schema["x-decorator-props"],
         showFeedback: false,
@@ -342,13 +351,8 @@ function useFieldListAdaptor(collector, globProps) {
     });
     return schema;
   };
-  const {
-    FieldNormalizeWaterfallHook,
-    FieldListNormalizeWaterfallHook
-  } = useFieldNormalize();
-  function schemaAdaptor(fieldList, options = {
-    column: 9999
-  }) {
+  const { FieldNormalizeWaterfallHook, FieldListNormalizeWaterfallHook } = useFieldNormalize();
+  function schemaAdaptor(fieldList, options = { column: 9999 }) {
     let prevLinebar = null;
     const result = FieldListNormalizeWaterfallHook.call(cloneDeep(fieldList), options).reduce((fin, cur, idx) => {
       var _a;
@@ -371,10 +375,7 @@ function useFieldListAdaptor(collector, globProps) {
         return;
       handlerAutoHiddenSchema(schema);
     });
-    traverseSchema({
-      properties: result,
-      ["x-root"]: true
-    }, (_s, parent) => {
+    traverseSchema({ properties: result, ["x-root"]: true }, (_s, parent) => {
       if (_s["x-component"] !== "INPUT_GROUP")
         return;
       handlerAutoHiddenSchema(_s, !!parent && !parent["x-root"]);
@@ -382,23 +383,20 @@ function useFieldListAdaptor(collector, globProps) {
     return result;
     function bindIndex(schema, idx) {
       schema["x-index"] = idx;
-      schema["x-decorator-props"] = {
-        _index: idx,
-        ...schema["x-decorator-props"]
-      };
+      schema["x-decorator-props"] = { _index: idx, ...schema["x-decorator-props"] };
       return schema;
     }
     function createFieldName(fieldItem) {
       if (fieldItem.suffixConfig || fieldItem.prefixConfig) {
-        const fieldList2 = [...arrayed(fieldItem.prefixConfig), fieldItem, ...arrayed(fieldItem.suffixConfig)].filter(Boolean);
+        const fieldList2 = [...arrayed(fieldItem.prefixConfig), fieldItem, ...arrayed(fieldItem.suffixConfig)].filter(
+          Boolean
+        );
         return fieldKeyEscape(fieldList2);
       }
       return fieldItem.val_key;
     }
   }
-  return {
-    schemaAdaptor
-  };
+  return { schemaAdaptor };
 }
 function handlerAutoHiddenSchema(schema, hasParent = false) {
   if (!schema["x-reactions"]) {
@@ -409,11 +407,7 @@ function handlerAutoHiddenSchema(schema, hasParent = false) {
   const childFields = Object.keys(schema.properties || {}).map((f) => `${hasParent ? "*." : "."}${schema.name}.${f}#selfDisplay`).concat(Object.keys(schema.properties || {}).map((f) => `${hasParent ? "*." : "."}${schema.name}.${f}#component`));
   schema["x-reactions"].push({
     dependencies: childFields,
-    fulfill: {
-      state: {
-        visible: `{{hasVisible($deps)}}`
-      }
-    }
+    fulfill: { state: { visible: `{{hasVisible($deps)}}` } }
   });
 }
 

package/es/components/form-render/src/hooks/useFieldNormalize.d.ts

@@ -66,7 +66,7 @@ export declare function useFieldNormalize(): {
             "x-read-pretty"?: boolean | undefined;
             "x-compile-omitted"?: string[] | undefined;
         }>;
-        components: Record<string, import("vue").Component | import("vue").FunctionalComponent<{}, {}, any, {}>>;
+        components: Record<string, import("vue").Component | import("vue").FunctionalComponent<{}, {}>>;
         scope: import("../../../../shared/types").AnyObject;
         annotation: Record<string, import("../../../annotation-edit/src/type").AnnotationItem>;
         annotationShortcuts: (string | {
@@ -101,8 +101,8 @@ export declare function useFieldNormalize(): {
         selectMode: boolean;
         selectedFields: string[];
         linebarWidth: string | number;
-        linebarDirection: "vertical" | "horizontal";
-        linebarTextDirection: "vertical" | "horizontal";
+        linebarDirection: "horizontal" | "vertical";
+        linebarTextDirection: "horizontal" | "vertical";
         autoWidth: number | boolean;
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
@@ -175,7 +175,7 @@ export declare function useFieldNormalize(): {
             "x-read-pretty"?: boolean | undefined;
             "x-compile-omitted"?: string[] | undefined;
         }>;
-        components: Record<string, import("vue").Component | import("vue").FunctionalComponent<{}, {}, any, {}>>;
+        components: Record<string, import("vue").Component | import("vue").FunctionalComponent<{}, {}>>;
         scope: import("../../../../shared/types").AnyObject;
         annotation: Record<string, import("../../../annotation-edit/src/type").AnnotationItem>;
         annotationShortcuts: (string | {
@@ -210,8 +210,8 @@ export declare function useFieldNormalize(): {
         selectMode: boolean;
         selectedFields: string[];
         linebarWidth: string | number;
-        linebarDirection: "vertical" | "horizontal";
-        linebarTextDirection: "vertical" | "horizontal";
+        linebarDirection: "horizontal" | "vertical";
+        linebarTextDirection: "horizontal" | "vertical";
         autoWidth: number | boolean;
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;