cnhis-design-vue 3.1.16-beta.12 → 3.1.16-beta.15

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1126,7 +1126,12 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
-                textColorGhostDisabledWarning: string;
+                textColorGhostDisabledWarning: string; /**
+                 * 判断是否渲染EditForm
+                 * @param {*} row
+                 * @param {*} column
+                 * @returns
+                 */
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -354,10 +354,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         showSeq = true
       } = map;
       if (isEdit) {
-        state.editConfig = Object.assign(state.editConfig, editConfig);
+        Object.assign(state.editConfig, editConfig);
         state.rowConfig.height = 48;
       }
-      state.rowConfig = Object.assign(state.rowConfig, rowConfig);
+      Object.assign(state.rowConfig, rowConfig);
       state.rowConfig.keyField = handleRowId.value;
       if (selectType) {
         isBatchSelect = 1;

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -1,4 +1,5 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
+import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { generateTimeFormat } from '../../../../../src/utils';
 import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
 
@@ -25,7 +26,6 @@ var EditDate = defineComponent({
   emits: ["formChange"],
   setup(props, {
     attrs,
-    slots,
     emit
   }) {
     const onConfirm = (value) => {
@@ -102,11 +102,21 @@ var EditDate = defineComponent({
         return customDateDisabled(ts, props.row);
       };
     }
+    const formatConfig = computed(() => {
+      const valueFormat = props.col.valueFormat || "yyyy-MM-dd HH:mm:ss";
+      return {
+        valueFormat,
+        format: valueFormat,
+        timePickerProps: {
+          format: generateTimeFormat(valueFormat)
+        }
+      };
+    });
     const config = {
       type: props.col.type || props.col.dateType || "datetime",
       clearable: props.col.clearable || true,
       disabled: props.col.disabled || false,
-      valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
+      ...formatConfig.value,
       isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
       ...props.col.componentProps || {}

package/es/packages/big-table/src/components/edit-form/edit-time.js

@@ -41,6 +41,7 @@ var editTime = defineComponent({
     const config = {
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
       valueFormat: props.col.valueFormat || "HH:mm",
+      format: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
       ...props.col.componentProps || {}
     };
     return () => createVNode(NTimePicker, mergeProps(attrs, config, {

package/es/packages/big-table/src/hooks/useSeparateRow.js

@@ -84,13 +84,15 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
         });
       }
       (await res).push(...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
+        const separateData = getSeparateRowData(parsedRowData, index);
         if (index === 0) {
           separateDataMap.value.set(row, {
             row,
             rawRow: rawData[dataIndex],
             index,
-            separateData: getSeparateRowData(parsedRowData, index)
+            separateData
           });
+          row.$__SEPARATE_DATA = [separateData];
           return row;
         }
         const data2 = { $__SEPARATE: true };
@@ -98,8 +100,9 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
           row: data2,
           rawRow: rawData[dataIndex],
           index,
-          separateData: getSeparateRowData(parsedRowData, index)
+          separateData
         });
+        row.$__SEPARATE_DATA.push(separateData);
         return data2;
       }));
       return res;

package/es/packages/button-print/index.d.ts

@@ -161,7 +161,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     init: () => Promise<boolean>;
     handleClickBtn: () => Promise<false | undefined>;
     reformatPrintParams: () => void;
-    verifiySuccess: () => void;
+    verifiySuccess: (token: any) => void;
     NDropdown: import("vue").DefineComponent<{
         readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Dropdown", {
             optionHeightSmall: string;

package/es/packages/button-print/src/ButtonPrint.vue.d.ts

@@ -165,7 +165,7 @@ declare const _default: import("vue").DefineComponent<{
     init: () => Promise<boolean>;
     handleClickBtn: () => Promise<false | undefined>;
     reformatPrintParams: () => void;
-    verifiySuccess: () => void;
+    verifiySuccess: (token: any) => void;
     NDropdown: import("vue").DefineComponent<{
         readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Dropdown", {
             optionHeightSmall: string;

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -240,6 +240,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         state.visible = false;
       });
     };
+    const handleClickEdit = () => {
+      props.prevFn().catch(() => {
+        prevFnError();
+        return Promise.reject();
+      }).then(() => {
+        state.identityVerification.visible = true;
+      }).finally(() => {
+        state.visible = false;
+      });
+    };
     const handleSelect = (key) => {
       switch (key) {
         case "printText":
@@ -249,7 +259,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           handleClickPreview();
           break;
         case "formatEditText":
-          verifiySuccess();
+          handleClickEdit();
           break;
         case "downloadPdf":
           handleClickPdf();
@@ -406,11 +416,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
       state.printParams = formatParams(state.templateParams, props.params);
     };
-    const verifiySuccess = () => {
+    const verifiySuccess = (token) => {
+      state.identityVerification.visible = false;
       const queryParams = {
         formatId: state.currentFormatId,
         templateId: getTemplateIdByFormatId(state.currentFormatId),
-        params: getPrintParams()
+        params: getPrintParams(),
+        token
       };
       printInstance.editPrintFormat(queryParams, (res) => {
         callLocalServicesSuccessCb(res, "edit");

package/es/packages/fabric-chart/src/components/PopupTip.js

@@ -20,8 +20,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           style: normalizeStyle(unref(pointStyle))
         }, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(__props.list, (item) => {
-            return openBlock(), createElementBlock("li", null, toDisplayString(item), 1);
-          }), 256))
+            return openBlock(), createElementBlock("li", { key: item }, toDisplayString(item), 1);
+          }), 128))
         ], 4), [
           [vShow, __props.show]
         ])

package/es/packages/fabric-chart/src/hooks/useCenter.js

@@ -430,9 +430,18 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       x: point.left,
       y: point.top
     };
-    const yValue = getYValue(type, point.top);
-    pointTipProps.list = [`${title} ${yValue}${unit || ""}`, `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
+    pointTipProps.list = [getListValue(), `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`];
     pointTipProps.show = true;
+    function getListValue() {
+      const { value, drugReduce, physicsReduce } = data;
+      if (drugReduce) {
+        return `\u836F\u7269\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${drugReduce}${unit || ""}`;
+      }
+      if (physicsReduce) {
+        return `\u7269\u7406\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${physicsReduce}${unit || ""}`;
+      }
+      return `${title} ${value}${unit || ""}`;
+    }
   }
   function moveLimit(point) {
     point.setCoords();

package/es/packages/form-config/index.d.ts

@@ -229,6 +229,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;
             maxGroupNum?: number | undefined;
+            jsonCombination?: boolean | undefined;
             children?: any[] | undefined;
             properties?: any[] | undefined;
             componentProps?: import("../../../es/src/types").AnyObject | undefined;
@@ -3988,7 +3989,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<any>;
+            formModel: import("@formily/core").Form<{
+                [x: string]: any;
+            }>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;
@@ -9074,7 +9077,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<any>;
+            formModel: import("@formily/core").Form<{
+                [x: string]: any;
+            }>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;

package/es/packages/form-config/src/FormConfig.vue.d.ts

@@ -231,6 +231,7 @@ declare const _default: import("vue").DefineComponent<{
             content?: string | import("../..").FormRenderer | Record<string, import("../..").FormRenderer> | undefined;
             lazyRequest?: boolean | undefined;
             maxGroupNum?: number | undefined;
+            jsonCombination?: boolean | undefined;
             children?: any[] | undefined;
             properties?: any[] | undefined;
             componentProps?: import("../../../../es/src/types").AnyObject | undefined;
@@ -3990,7 +3991,9 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<any>;
+            formModel: import("@formily/core").Form<{
+                [x: string]: any;
+            }>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../..").BusinessCollector;
             formItemDepsCollector: import("../..").FormItemDepsCollector;
@@ -9076,7 +9079,9 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<any>;
+            formModel: import("@formily/core").Form<{
+                [x: string]: any;
+            }>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../..").BusinessCollector;
             formItemDepsCollector: import("../..").FormItemDepsCollector;

package/es/packages/form-config/src/components/FormConfigCreator.vue.d.ts

@@ -3580,7 +3580,9 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

package/es/packages/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -92,6 +92,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         content?: string | import("../../../../../es/packages/form-render").FormRenderer | Record<string, import("../../../../../es/packages/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../../../es/src/types").AnyObject | undefined;
@@ -3851,7 +3852,9 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

package/es/packages/form-render/index.d.ts

@@ -236,7 +236,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<any>;
+    formModel: import("@formily/core").Form<{
+        [x: string]: any;
+    }>;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./src/hooks").BusinessCollector;
     formItemDepsCollector: import("./src/hooks").FormItemDepsCollector;

package/es/packages/form-render/index.js

@@ -12,7 +12,6 @@ export { useFormValidator } from './src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';
-export { useInitialData } from './src/hooks/useInitialData.js';
 export { useAnchor } from './src/hooks/useAnchor.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 

package/es/packages/form-render/src/FormRender.js

@@ -6,10 +6,9 @@ import { cloneDeep, isArray } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
 import { useFormRenderLifeCycle } from '../../../packages/form-render/src/hooks/useFormRenderLifeCycle';
-import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { createObjSchema, arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
 import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
-import { useInitialData } from './hooks/useInitialData.js';
 import { useFormContext } from './hooks/useFormContext.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
@@ -50,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { nuiThemeOverrides } = useNuiThemeOverrides();
     useFormRenderLifeCycle(props).callLifeCycle("onSetup");
     const formModel = createForm({
-      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
+      initialValues: props.initialData,
       effects() {
         onFieldValueChange("*", async (field) => {
           const fieldKey = field.props.name.toString();
@@ -68,16 +67,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props, formModel);
     const scrollbarRef = ref();
-    const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
+    const { schemaAdaptor } = useFieldListAdaptor(businessCollector);
     const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
       if (props.fieldList) {
         const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
-        return { type: "object", properties: schemaAdaptor(_fieldList) };
+        return createObjSchema(schemaAdaptor(_fieldList));
       }
-      return { type: "object", properties: {} };
+      return createObjSchema({});
     });
     const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, scrollbarRef, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -236,7 +236,9 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<any>;
+    formModel: import("@formily/core").Form<{
+        [x: string]: any;
+    }>;
     SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;

package/es/packages/form-render/src/components/renderer/{combination/index.d.ts → combination.d.ts}

@@ -1,4 +1,4 @@
-import { FieldItem } from '../../../../../../../es/packages/form-render';
+import { FieldItem } from '../../../../../../es/packages/form-render';
 import { PropType } from 'vue';
 export declare const COMBINATION: import("vue").DefineComponent<{
     title: {
@@ -6,7 +6,7 @@ export declare const COMBINATION: import("vue").DefineComponent<{
         default: string;
     };
     value: {
-        type: StringConstructor;
+        type: ArrayConstructor;
     };
     maxGroupNum: {
         type: NumberConstructor;
@@ -24,7 +24,7 @@ export declare const COMBINATION: import("vue").DefineComponent<{
         default: string;
     };
     value: {
-        type: StringConstructor;
+        type: ArrayConstructor;
     };
     maxGroupNum: {
         type: NumberConstructor;

package/es/packages/form-render/src/components/renderer/combination.js

@@ -0,0 +1,82 @@
+import { defineComponent, ref, computed, inject, createVNode, createTextVNode } from 'vue';
+import { isNumber } from 'lodash-es';
+import { useFieldListAdaptor } from '../../../../../packages/form-render';
+import { useField, RecursionField, connect } from '@formily/vue';
+import { NButton } from 'naive-ui';
+import { InjectionBusinessCollector } from '../../../../../packages/form-render/src/constants';
+import { createObjSchema } from '../../../../../packages/form-render/src/utils';
+
+const script = defineComponent({
+  name: "FormCombination",
+  props: {
+    title: {
+      type: String,
+      default: ""
+    },
+    value: {
+      type: Array
+    },
+    maxGroupNum: {
+      type: Number
+    },
+    getProperties: {
+      type: Function,
+      default: () => []
+    },
+    onInput: {},
+    onBlur: {},
+    onChange: {}
+  },
+  emits: ["update:value"],
+  setup(props) {
+    const field = useField();
+    const currentGroupNum = ref(1);
+    const maxGroupNum = computed(() => {
+      if (!isNumber(props.maxGroupNum))
+        return Infinity;
+      if (props.maxGroupNum < 1)
+        return 0;
+      return ~~props.maxGroupNum;
+    });
+    function addGroup() {
+      currentGroupNum.value++;
+    }
+    async function removeGroup(idx) {
+      currentGroupNum.value--;
+      await field.value.remove(idx);
+    }
+    const collector = inject(InjectionBusinessCollector);
+    const {
+      schemaAdaptor
+    } = useFieldListAdaptor(collector);
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__combination"
+      }, [createVNode("header", {
+        "class": "form-render__combinationHeader"
+      }, [createVNode("div", {
+        "class": "form-render__combinationHeaderText"
+      }, [props.title]), createVNode(NButton, {
+        "onClick": addGroup,
+        "type": "info",
+        "text": true,
+        "disabled": currentGroupNum.value >= maxGroupNum.value
+      }, {
+        default: () => [createTextVNode("\u65B0\u589E")]
+      })]), Array.from({
+        length: currentGroupNum.value
+      }).map((_, idx) => createVNode("section", {
+        "class": "form-render__combinationContent"
+      }, [createVNode(RecursionField, {
+        "schema": createObjSchema(schemaAdaptor(props.getProperties())),
+        "name": idx
+      }, null), idx === 0 ? null : createVNode("i", {
+        "class": "form-render__combinationClose",
+        "onClick": () => removeGroup(idx)
+      }, ["-"])]))]);
+    };
+  }
+});
+const COMBINATION = connect(script);
+
+export { COMBINATION };

package/es/packages/form-render/src/components/renderer/date.js

@@ -1,4 +1,5 @@
 import { defineComponent, computed, watch, createVNode, mergeProps } from 'vue';
+import { generateTimeFormat } from '../../../../../src/utils';
 import { connect, mapProps } from '@formily/vue';
 import { isObject } from '@vueuse/core';
 import { format } from 'date-fns';
@@ -66,9 +67,7 @@ const script = defineComponent({
       }
     }
     const validateConfig = computed(() => {
-      const result = {
-        valueFormat: props.valueFormat
-      };
+      const result = {};
       if (isObject(props.validate)) {
         const {
           min_date,
@@ -81,6 +80,15 @@ const script = defineComponent({
       }
       return result;
     });
+    const formatConfig = computed(() => {
+      return {
+        valueFormat: props.valueFormat,
+        format: props.valueFormat,
+        timePickerProps: {
+          format: generateTimeFormat(props.valueFormat)
+        }
+      };
+    });
     function formatDate(value) {
       if (!value)
         return value;
@@ -95,7 +103,7 @@ const script = defineComponent({
       get: () => formatDate(props.value),
       set: (value) => emit("update:value", value)
     });
-    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, {
+    return () => createVNode(NDatePicker, mergeProps(validateConfig.value, formatConfig.value, {
       "formatted-value": valueRef.value,
       "onUpdate:formatted-value": ($event) => valueRef.value = $event
     }), null);

package/es/packages/form-render/src/components/renderer/formItem.js

@@ -1,9 +1,10 @@
 import { defineComponent, inject, computed, createVNode } from 'vue';
 import { isVoidField } from '@formily/core';
-import { connect, mapProps } from '@formily/vue';
+import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
 import AnnotationEdit from '../../../../../packages/annotation-edit';
-import { InjectionAnnotation } from '../../../../../packages/form-render/src/constants';
+import { InjectionAnnotation, InjectionFormUUID } from '../../../../../packages/form-render/src/constants';
+import { elementIdEscape } from '../../../../../packages/form-render/src/utils';
 
 const script = defineComponent({
   props: {
@@ -38,6 +39,11 @@ const script = defineComponent({
       return annotation.value && props.annotation !== false;
     });
     const showLabel = computed(() => props.label && props.label !== " ");
+    const field = useField();
+    const uuid = inject(InjectionFormUUID);
+    const id = computed(() => {
+      return elementIdEscape(`${uuid}-${field.value.path.toString()}`);
+    });
     function renderLabel() {
       return showLabel.value ? createVNode("section", {
         "class": "form-render__formItemLabel"
@@ -47,7 +53,9 @@ const script = defineComponent({
         }]
       }, [props.label]), showAnnotation.value ? renderAnnotation() : null]) : null;
     }
-    return () => createVNode(NFormItem, null, {
+    return () => createVNode(NFormItem, {
+      id: id.value
+    }, {
       ...slots,
       label: renderLabel
     });

package/es/packages/form-render/src/components/renderer/index.d.ts

@@ -7,6 +7,7 @@ export * from './linebar';
 export * from './inputGroup';
 export * from './date';
 export * from './cascader';
+export * from './jsonCombination';
 export * from './combination';
 export * from './checkbox';
 export * from './switch';

package/es/packages/form-render/src/components/renderer/index.js

@@ -7,7 +7,8 @@ export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup.js';
 export { DATE } from './date.js';
 export { SEARCH_CASCADE } from './cascader.js';
-export { COMBINATION } from './combination/index.js';
+export { JSON_COMBINATION } from './jsonCombination/index.js';
+export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
 export { SWITCH } from './switch.js';
 export { RADIO } from './radio.js';

package/es/packages/form-render/src/components/renderer/jsonCombination/index.d.ts

@@ -0,0 +1,44 @@
+import { FieldItem } from '../../../../../../../es/packages/form-render';
+import { PropType } from 'vue';
+export declare const JSON_COMBINATION: import("vue").DefineComponent<{
+    title: {
+        type: StringConstructor;
+        default: string;
+    };
+    value: {
+        type: (ArrayConstructor | StringConstructor)[];
+    };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
+    };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: {
+        type: StringConstructor;
+        default: string;
+    };
+    value: {
+        type: (ArrayConstructor | StringConstructor)[];
+    };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
+    getProperties: {
+        type: PropType<() => FieldItem[]>;
+        default: () => never[];
+    };
+    onInput: {};
+    onBlur: {};
+    onChange: {};
+}>> & {
+    "onUpdate:value"?: ((...args: any[]) => any) | undefined;
+}, {
+    title: string;
+    getProperties: () => FieldItem[];
+}>;

package/es/packages/form-render/src/components/renderer/{combination → jsonCombination}/index.js

@@ -1,9 +1,9 @@
 import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
 import { isField } from '@formily/core';
 import { Path } from '@formily/path';
-import { isNumber, isEqual } from 'lodash-es';
-import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/combination/hooks/useDeepValidate';
-import { mergeDeepProperties, formRenderLog } from '../../../utils/index.js';
+import { isNumber, isArray, isEqual } from 'lodash-es';
+import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate';
+import { formRenderLog, mergeDeepProperties } from '../../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
@@ -11,14 +11,14 @@ import FormRender from '../../../FormRender.js';
 import { assignUpdateValue } from '../../../utils/schema.js';
 
 const script = defineComponent({
-  name: "FormCombination",
+  name: "FormJsonCombination",
   props: {
     title: {
       type: String,
       default: ""
     },
     value: {
-      type: String
+      type: [String, Array]
     },
     maxGroupNum: {
       type: Number
@@ -35,12 +35,18 @@ const script = defineComponent({
   setup(props, {
     emit
   }) {
+    formRenderLog("\u5F53\u524DCOMBINATION\u63A7\u4EF6\u4E3Ajson\u6A21\u5F0F,\u63A8\u8350\u4F7F\u7528\u975Ejson\u6A21\u5F0F,FieldItem.jsonCombination=false", "warn");
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(combinationData.value));
     }, 300);
     const combinationData = ref([]);
     const currentGroupNum = computed(() => combinationData.value.length);
     function setCombinationData(data, withInitialData = false) {
+      if (isArray(data)) {
+        if (!data.length)
+          data.push({});
+        data = JSON.stringify(data);
+      }
       const parsedData = getParsedData(data);
       if (!needLoad(parsedData))
         return;
@@ -66,7 +72,6 @@ const script = defineComponent({
             return null;
           return result;
         } catch (e) {
-          formRenderLog(`invalid JSON value ${data2} in COMBINATION => ${props.title}`, "warn");
           return null;
         }
       }
@@ -141,7 +146,7 @@ const script = defineComponent({
       })]), Array.from({
         length: currentGroupNum.value
       }).map((_, idx) => createVNode("section", {
-        "class": "form-render__combinationContent"
+        "class": "form-render__combinationContentJson"
       }, [createVNode(FormRenderComponent, {
         "ref": (_ref) => setFormRenderRef(idx, _ref),
         "fieldList": props.getProperties(),
@@ -153,6 +158,6 @@ const script = defineComponent({
     };
   }
 });
-const COMBINATION = connect(script, mapProps(assignUpdateValue));
+const JSON_COMBINATION = connect(script, mapProps(assignUpdateValue));
 
-export { COMBINATION };
+export { JSON_COMBINATION };

package/es/packages/form-render/src/hooks/index.d.ts

@@ -9,6 +9,5 @@ export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
-export * from './useInitialData';
 export * from './useAnchor';
 export * from './useFormContext';

package/es/packages/form-render/src/hooks/index.js

@@ -9,6 +9,5 @@ export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
-export { useInitialData } from './useInitialData.js';
 export { useAnchor } from './useAnchor.js';
 export { useFormContext } from './useFormContext.js';

package/es/packages/form-render/src/hooks/useFieldListAdaptor.d.ts

@@ -3,7 +3,7 @@ import { FieldItem } from '../types';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */
-export declare function useFieldListAdaptor(collector: BusinessCollector, uuid: string): {
+export declare function useFieldListAdaptor(collector: BusinessCollector): {
     schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/json-schema/esm/types").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;

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

@@ -2,10 +2,10 @@ import { isObject } from '@vueuse/core';
 import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
 import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
-import { fieldKeyEscape, createLinebarId, elementIdEscape } from '../utils/schema.js';
+import { fieldKeyEscape, createLinebarId } from '../utils/schema.js';
 import { transformDateFormat } from '../utils/business.js';
 
-function useFieldListAdaptor(collector, uuid) {
+function useFieldListAdaptor(collector) {
   const { createValidatorSchema } = useFormValidator();
   const createStandardSchema = (item) => {
     var _a;
@@ -14,6 +14,7 @@ function useFieldListAdaptor(collector, uuid) {
       type: (_a = item.fieldType) != null ? _a : "string",
       title: item.alias || item.name,
       "x-component": item.html_type,
+      default: item.default_val,
       "x-component-props": {
         placeholder: item.placeholder,
         clearable: item.is_empty === "0",
@@ -38,7 +39,6 @@ function useFieldListAdaptor(collector, uuid) {
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
           annotation: item.annotation,
-          id: elementIdEscape(`${uuid}-${item.val_key}`),
           ...item.decoratorProps || {}
         }
       });
@@ -102,6 +102,10 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCombinationSchema = (item) => {
     const schema = createStandardSchema(item);
+    schema.type = "array";
+    if (item.jsonCombination !== false) {
+      schema["x-component"] = "JSON_COMBINATION";
+    }
     Object.assign(schema["x-decorator-props"], {
       showLabel: false,
       showFeedback: false

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -171,6 +171,10 @@ export declare type FieldItem = {
      * COMBINATION控件最大表单组数量
      */
     maxGroupNum: number;
+    /**
+     * COMBINATION json format
+     */
+    jsonCombination: boolean;
     /**
      * COMBINATION控件子项
      */

package/es/packages/form-render/src/types/index.d.ts

@@ -43,7 +43,7 @@ export declare type FormChangePayload = {
     fieldKey: string;
     fieldName: string;
     fieldInstance: DataField;
-    context: FormChangeContext;
+    context?: FormChangeContext;
 };
 export declare type DependKeyType = string | Record<string, string> | Array<{
     paramName: string;

package/es/packages/form-render/src/utils/index.js

@@ -1,9 +1,10 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
+import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { isNumber, isString, isFunction } from 'lodash-es';
 export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
 export { queryDecorator, queryInput } from './dom.js';
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -19,7 +20,7 @@ function mergeDeepProperties(target, fieldList, traverseProperties = ["children"
       if (!isObject(field))
         return;
       if (targetPropertyFor(field) != null && _target[propertyFor(field)] == null) {
-        _target[propertyFor(field)] = targetPropertyFor(field);
+        Path.setIn(_target, propertyFor(field), targetPropertyFor(field));
       }
       traverseProperties.forEach((p) => {
         if (!field[p])

package/es/packages/form-render/src/utils/schema.d.ts

@@ -14,3 +14,63 @@ export declare function assignUpdateValue(props: AnyObject, field: GeneralField)
     [x: string]: any;
 };
 export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;
+export declare function createObjSchema(properties: Record<string, ISchema>): {
+    type: string;
+    properties: Record<string, import("@formily/json-schema/esm/types").Stringify<{
+        [key: symbol]: any;
+        [key: `x-${string}`]: any;
+        [key: `x-${number}`]: any;
+        version?: string | undefined;
+        name?: import("@formily/json-schema/esm/types").SchemaKey | undefined;
+        title?: any;
+        description?: any;
+        default?: any;
+        readOnly?: boolean | undefined;
+        writeOnly?: boolean | undefined;
+        type?: import("@formily/json-schema/esm/types").SchemaTypes | undefined;
+        enum?: import("@formily/json-schema/esm/types").SchemaEnum<any> | undefined;
+        const?: any;
+        multipleOf?: number | undefined;
+        maximum?: number | undefined;
+        exclusiveMaximum?: number | undefined;
+        minimum?: number | undefined;
+        exclusiveMinimum?: number | undefined;
+        maxLength?: number | undefined;
+        minLength?: number | undefined;
+        pattern?: string | RegExp | undefined;
+        maxItems?: number | undefined;
+        minItems?: number | undefined;
+        uniqueItems?: boolean | undefined;
+        maxProperties?: number | undefined;
+        minProperties?: number | undefined;
+        required?: string | boolean | string[] | undefined;
+        format?: string | undefined;
+        $ref?: string | undefined;
+        $namespace?: string | undefined;
+        definitions?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        properties?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        items?: import("@formily/json-schema/esm/types").SchemaItems<any, any, any, any, any, any, any, any> | undefined;
+        additionalItems?: import("@formily/json-schema/esm/types").Stringify<any> | undefined;
+        patternProperties?: import("@formily/json-schema/esm/types").SchemaProperties<any, any, any, any, any, any, any, any> | undefined;
+        additionalProperties?: import("@formily/json-schema/esm/types").Stringify<any> | undefined;
+        "x-value"?: any;
+        "x-index"?: number | undefined;
+        "x-pattern"?: any;
+        "x-display"?: any;
+        "x-validator"?: any;
+        "x-decorator"?: any;
+        "x-decorator-props"?: any;
+        "x-component"?: any;
+        "x-component-props"?: any;
+        "x-reactions"?: import("@formily/json-schema/esm/types").SchemaReactions<any> | undefined;
+        "x-content"?: any;
+        "x-data"?: any;
+        "x-visible"?: boolean | undefined;
+        "x-hidden"?: boolean | undefined;
+        "x-disabled"?: boolean | undefined;
+        "x-editable"?: boolean | undefined;
+        "x-read-only"?: boolean | undefined;
+        "x-read-pretty"?: boolean | undefined;
+        "x-compile-omitted"?: string[] | undefined;
+    }>>;
+};

package/es/packages/form-render/src/utils/schema.js

@@ -14,7 +14,7 @@ function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
 }
 function elementIdEscape(id) {
-  return id.replace(".", "-");
+  return id.replace(/[.]/g, "-");
 }
 function createLinebarId(id) {
   return elementIdEscape(`id-${id}`);
@@ -90,5 +90,8 @@ function traverseFieldList(fieldList, handler) {
   }
   traverse(fieldList);
 }
+function createObjSchema(properties) {
+  return { type: "object", properties };
+}
 
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };

package/es/packages/form-render/style/index.css

@@ -125,8 +125,15 @@
   vertical-align: middle;
   font-size: 16px;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;

package/es/packages/index.css

@@ -2946,8 +2946,15 @@ body > .vxe-table--tooltip-wrapper {
   vertical-align: middle;
   font-size: 16px;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;

package/es/packages/index.js

@@ -51,7 +51,6 @@ export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';
-export { useInitialData } from './form-render/src/hooks/useInitialData.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';

package/es/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -88,6 +88,7 @@ class ShortcutManager {
       const callback = this.shortcutCallbackMap.get(keySignature);
       if (!callback)
         return;
+      event.preventDefault();
       const shortcutItem = Object.values(this.shortcutCache.value).find((item) => item.currentKeySignature === keySignature);
       if (!shortcutItem || shortcutItem.status !== ShortcutStatus.ACTIVE || shortcutItem.disabled)
         return;

package/es/packages/shortcut-setter/index.d.ts

@@ -122,6 +122,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../es/src/types").AnyObject | undefined;
@@ -1931,7 +1932,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;

package/es/packages/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -124,6 +124,7 @@ declare const _default: import("vue").DefineComponent<{
         content?: string | import("../../../../es/packages/form-render").FormRenderer | Record<string, import("../../../../es/packages/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../../es/src/types").AnyObject | undefined;
@@ -1933,7 +1934,9 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;

package/es/src/utils/index.d.ts

@@ -1,2 +1,3 @@
 import { App, Component } from 'vue';
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
+export declare function generateTimeFormat(format: string): string | undefined;

package/es/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function safeComponentRegister(app, component, cName = component.name, scheduler) {
   if (!cName)
     throw new Error(`[CUI]: invalid component name for ${component}`);
@@ -11,5 +13,13 @@ function safeComponentRegister(app, component, cName = component.name, scheduler
     app.component(cName, component);
   }
 }
+function generateTimeFormat(format) {
+  if (!isString(format))
+    return;
+  const matched = format.match(/[Hms:]+/);
+  if (!matched)
+    return;
+  return matched[0];
+}
 
-export { safeComponentRegister };
+export { generateTimeFormat, safeComponentRegister };

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.12",
+  "version": "3.1.16-beta.15",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -31,9 +31,9 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@formily/core": "^2.1.9",
-    "@formily/path": "^2.1.9",
-    "@formily/vue": "^2.1.9",
+    "@formily/core": "2.1.9",
+    "@formily/path": "2.1.9",
+    "@formily/vue": "2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",

package/es/packages/form-render/src/hooks/useInitialData.d.ts

@@ -1,5 +0,0 @@
-import { AnyObject } from '../../../../../es/src/types';
-import { FieldItem } from '../types';
-export declare function useInitialData(): {
-    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => any;
-};

package/es/packages/form-render/src/hooks/useInitialData.js

@@ -1,16 +0,0 @@
-import { Path } from '@formily/path';
-import { mergeWith } from 'lodash-es';
-import { traverseFieldList } from '../../../../packages/form-render/src/utils';
-
-function useInitialData() {
-  function assignInitialData(initialData, fieldList) {
-    const defaultVal = {};
-    fieldList && traverseFieldList(fieldList, (field) => {
-      field.default_val != void 0 && Path.setIn(defaultVal, field.val_key, field.default_val);
-    });
-    return mergeWith({}, initialData, defaultVal);
-  }
-  return { assignInitialData };
-}
-
-export { useInitialData };