cnhis-design-vue 3.1.16-beta.9 → 3.1.16

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

@@ -2537,7 +2537,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             modelValue: boolean;
         };
         emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-        form: any;
+        form: {
+            account: string;
+            password: string;
+        };
         rules: import("naive-ui").FormRules;
         style: {
             width: string;

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

@@ -2541,7 +2541,10 @@ declare const _default: import("vue").DefineComponent<{
             modelValue: boolean;
         };
         emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-        form: any;
+        form: {
+            account: string;
+            password: string;
+        };
         rules: import("naive-ui").FormRules;
         style: {
             width: string;

package/es/packages/button-print/src/components/IdentityVerification.js

@@ -1,4 +1,4 @@
-import { defineComponent, reactive, ref, onMounted, watch, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, createVNode, createTextVNode } from 'vue';
+import { defineComponent, reactive, ref, watch, openBlock, createBlock, unref, normalizeStyle, withCtx, createElementVNode, createVNode, createTextVNode } from 'vue';
 import { useMessage, NModal, NForm, NFormItem, NInput, NButton } from 'naive-ui';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 
@@ -19,7 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       account: "",
       password: ""
     };
-    let form = reactive(JSON.parse(JSON.stringify(DEFAULT_FORM)));
+    let form = reactive({ ...DEFAULT_FORM });
     const rules = {
       account: { required: true, message: "\u8BF7\u8F93\u5165\u8D26\u53F7" },
       password: { required: true, message: "\u8BF7\u8F93\u5165\u5BC6\u7801" }
@@ -33,9 +33,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const submit = async () => {
       var _a;
-      const { data = {} } = await props.verifyUser(form);
+      const { data = {} } = await props.verifyUser(form) || {};
       if (data.result !== "SUCCESS") {
-        $message.error(data.resultMsg);
+        $message.error(data.resultMsg || "\u8BF7\u6DFB\u52A0\u8EAB\u4EFD\u6821\u9A8C\u63A5\u53E3\u914D\u7F6E");
         return false;
       }
       emit("success", (_a = data.map) == null ? void 0 : _a.token);
@@ -51,12 +51,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    onMounted(() => {
-    });
     watch(() => props.modelValue, (val) => {
       if (val)
         return;
-      form = JSON.parse(JSON.stringify(DEFAULT_FORM));
+      Object.assign(form, DEFAULT_FORM);
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(NModal), {

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

@@ -26,7 +26,10 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: boolean;
     };
     emit: (event: "success" | "update:modelValue", ...args: any[]) => void;
-    form: any;
+    form: {
+        account: string;
+        password: string;
+    };
     rules: FormRules;
     style: {
         width: string;

package/es/packages/fabric-chart/src/FabricChart.js

@@ -260,7 +260,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const list = (item == null ? void 0 : item.list) || [];
       if (!list.length)
         return 0;
-      return yCellHeight.value / ((parseInt(list[1]) - parseInt(list[0])) / item.spaceGridNumber);
+      return yCellHeight.value / ((list[1] - list[0]) / item.spaceGridNumber);
     }
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);

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/constant.js

@@ -1,7 +1,7 @@
 const TEMPERATURE_MENU = [
   {
     label: "\u5347\u6E29",
-    value: false,
+    value: true,
     type: "rise"
   },
   {

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/fabric-chart/src/hooks/useOther.js

@@ -3,25 +3,75 @@ import { fabric } from '../utils/index.js';
 import { defaultStyle } from './useDraw.js';
 
 function useOther(canvas, propItems, cumputedX) {
-  const { originY, other, vitalSignsOriginY } = propItems;
+  const { other, vitalSignsOriginY } = propItems;
   function drawOther() {
-    if (!other || !other.list)
+    if (!(other == null ? void 0 : other.list))
       return false;
     const list = [];
-    other.list.forEach((v, i) => {
-      var _a;
-      const text = new fabric.Text(String(v.value.toString().split("").join("\n")), {
-        originX: "center",
-        top: (((_a = v.style) == null ? void 0 : _a.baseTop) || 0) + vitalSignsOriginY.originY,
-        left: cumputedX(v.time),
-        textAlign: "center",
-        ...defaultStyle,
-        ...v.style || {}
+    const otherList = [];
+    other.list.forEach((item) => {
+      const align = item.align || "vertical";
+      const left = cumputedX(item.time);
+      const obj = otherList.find((v) => v.left == left);
+      if (obj) {
+        obj[align].push(item);
+      } else {
+        const initObj = {
+          left,
+          vertical: [],
+          horizontal: []
+        };
+        initObj[align].push(item);
+        otherList.push(initObj);
+      }
+    });
+    let textWidth = 0;
+    otherList.forEach((item) => {
+      let topY = vitalSignsOriginY.originY;
+      let leftX = item.left;
+      let textHeight = 0;
+      item.vertical.forEach((v) => {
+        const { commonOptions, value } = getTextData(v);
+        topY += (v.baseTop || 0) + textHeight;
+        const text = new fabric.Text(value, {
+          top: topY,
+          left: item.left,
+          ...commonOptions
+        });
+        textHeight = text.height || 0;
+        setTextWidth(text);
+      });
+      item.horizontal.forEach((v, i) => {
+        if (i > 0 || item.vertical.length) {
+          leftX += textWidth;
+        }
+        const { commonOptions, value } = getTextData(v);
+        const text = new fabric.Text(value, {
+          top: vitalSignsOriginY.originY,
+          left: leftX,
+          ...commonOptions
+        });
+        setTextWidth(text);
       });
-      list.push(text);
     });
+    function setTextWidth(text) {
+      if (!textWidth) {
+        textWidth = text.width || 0;
+      }
+      list.push(text);
+    }
+    function getTextData(v) {
+      return {
+        commonOptions: {
+          originX: "center",
+          textAlign: "center",
+          ...defaultStyle,
+          ...v.style || {}
+        },
+        value: String(v.value.toString().split("").join("\n"))
+      };
+    }
     const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-    group && group.sendToBack();
     group && canvas.value.add(group);
   }
   onMounted(() => {

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-config/src/types/index.d.ts

@@ -30,6 +30,7 @@ export interface FormConfigTextFormatter {
 }
 export interface FormConfigExpose {
     loadData(payload: Record<'fieldList', FormConfigItem[]>): void;
+    validate(): Promise<unknown>;
     getData(): Record<'fieldList' | 'materialList', FormConfigItem[]>;
 }
 export {};

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

@@ -69,7 +69,7 @@
   padding: 16px;
   box-sizing: border-box;
   flex-shrink: 0;
-  width: 220px;
+  width: 240px;
   background: white;
 }
 .form-config__configHeader {

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,10 +49,12 @@ 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();
+          businessCollector.trigger(fieldKey);
+          formItemDepsCollector.trigger(fieldKey);
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
@@ -61,23 +62,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value: field.value,
             context: await changeContextCollector.getContext(fieldKey)
           });
-          businessCollector.trigger(fieldKey);
-          formItemDepsCollector.trigger(fieldKey);
         });
       }
     });
     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,92 @@
+import { defineComponent, ref, computed, inject, createVNode } from 'vue';
+import { isNumber } from 'lodash-es';
+import { useFieldListAdaptor } from '../../../../../packages/form-render';
+import { useField, RecursionField, connect } from '@formily/vue';
+import { NButton, NIcon } from 'naive-ui';
+import { InjectionBusinessCollector } from '../../../../../packages/form-render/src/constants';
+import { createObjSchema } from '../../../../../packages/form-render/src/utils';
+import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
+
+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
+      }, {
+        icon: () => createVNode(NIcon, {
+          "component": AddCircleOutline
+        }, null),
+        default: () => "\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(NButton, {
+        "text": true,
+        "type": "error",
+        "class": "form-render__combinationClose",
+        "onClick": () => removeGroup(idx)
+      }, {
+        icon: () => createVNode(NIcon, {
+          "component": RemoveCircle
+        }, null)
+      })]))]);
+    };
+  }
+});
+const COMBINATION = connect(script);
+
+export { COMBINATION };