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

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

@@ -1,77 +1,19 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { defaultBorderStyle, defaultRectStyle, defaultStyle } from './useDraw.js';
+import { defaultBorderStyle } from './useDraw.js';
 
-function useRight(canvas, propItems) {
-  const { endX, endY, temperatureYCell, canvasWidth, canvasHeight, left, right, breathingHeight, vitalSignsOriginY } = propItems;
-  function drawScaleValue() {
-    var _a, _b, _c;
-    if (!right) {
-      canvas.value.add(new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, canvasHeight], defaultBorderStyle));
-      return false;
-    }
-    const list = [];
-    list.push(new fabric.Rect({
-      ...defaultRectStyle,
-      width: canvasWidth - endX - 1,
-      height: endY + breathingHeight - 1,
-      left: endX,
-      top: 0,
-      originX: "left",
-      originY: "top"
-    }));
-    const difVal = 6;
-    const spaceScaleNumber = right.yScaleValue.spaceScaleNumber || 5;
-    const mainScaleWidth = 9;
-    const subScaleWidth = 5;
-    const cList = left.yScaleValue.find((v) => v.type === "temperature").list;
-    const minC = Math.min(...cList);
-    const h1 = right.yScaleValue.list[1];
-    const h0 = right.yScaleValue.list[0];
-    const c1 = 5 * (h1 - 32) / 9;
-    const c0 = 5 * (h0 - 32) / 9;
-    const top1 = vitalSignsOriginY.endY - (c1 - minC) * temperatureYCell - difVal;
-    const top0 = vitalSignsOriginY.endY - (c0 - minC) * temperatureYCell - difVal;
-    const spaceHVaule = (top0 - top1) / spaceScaleNumber;
-    let endTop = 0;
-    right.yScaleValue.list.forEach((v, i) => {
-      var _a2;
-      const c = 5 * (+v - 32) / 9;
-      const top = vitalSignsOriginY.endY - (c - minC) * temperatureYCell - difVal;
-      if (i === right.yScaleValue.list.length - 1)
-        endTop = top;
-      const text = new fabric.Text(`${v}\xB0`, {
-        left: endX + mainScaleWidth,
-        top: i === 0 ? vitalSignsOriginY.endY - 5 : top - 5,
-        originX: "left",
-        ...((_a2 = right.yScaleValue) == null ? void 0 : _a2.style) || {}
-      });
-      list.push(text);
-      const spaceHVaule0 = (vitalSignsOriginY.endY - top1) / spaceScaleNumber;
-      for (let k = 0; k < spaceScaleNumber; k++) {
-        const scaleTop = i === 0 ? vitalSignsOriginY.endY - k * spaceHVaule0 : top - k * spaceHVaule;
-        const line = new fabric.Line([endX, scaleTop, k > 0 ? endX + subScaleWidth : endX + mainScaleWidth, scaleTop], {
-          ...defaultBorderStyle
-        });
-        list.push(line);
-      }
-    });
-    const width = canvasWidth - endX;
-    const unit = right.yScaleValue.unit ? new fabric.Text((_b = (_a = right.yScaleValue) == null ? void 0 : _a.unit) == null ? void 0 : _b.split("").join("\n"), {
-      left: endX + width / 2,
-      top: endTop / 2,
-      originX: "center",
-      ...((_c = right.yScaleValue) == null ? void 0 : _c.style) || {}
-    }) : null;
-    unit && list.push(unit);
-    const group = list.length > 0 ? new fabric.Group([...list], { ...defaultStyle }) : null;
-    group && canvas.value.add(group);
-    group && group.sendToBack();
-  }
+function useRight(canvas, propItems, drawScaleValue) {
+  const { left, right, getRightInfo, canvasWidth, endY } = propItems;
   onMounted(() => {
     nextTick(() => {
-      drawScaleValue();
-      canvas.value.renderAll();
+      var _a;
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
+        yScaleValueList.push(getRightInfo);
+        const rightBorderLine = new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, endY], defaultBorderStyle);
+        canvas.value.add(rightBorderLine);
+      }
+      drawScaleValue(yScaleValueList);
     });
   });
 }

package/es/packages/fabric-chart/src/interface.d.ts

@@ -1,8 +1,10 @@
 import { InjectionKey, Ref } from 'vue';
 import { fabric } from './utils';
+import { AnyObject } from '../../../../es/src/types';
 interface IEvent {
     selectable: boolean;
     evented: boolean;
+    hovered: boolean;
 }
 interface ImainLineStyle {
     x: fabric.ILineOptions;
@@ -60,6 +62,7 @@ export interface IPropItems {
     painYCell: number;
     event: Partial<IEvent>;
     itemList: Array<any>;
+    getRightInfo: AnyObject;
 }
 export interface IPoint {
     time: string;

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

@@ -142,7 +142,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
     FormConfigEdit: import("vue").DefineComponent<{}, {
         key: import("vue").Ref<number>;
         formRenderRef: import("vue").Ref<import("..").FormRenderExpose | undefined>;
-        currentActiveField: import("vue").Ref<import("../../../es/src/types").WithUndefined<import("./src/types").FormConfigItem>>;
+        currentActiveField: import("vue").Ref<import("../../../es/src/types").UndefinedAble<import("./src/types").FormConfigItem>>;
         fieldList: import("vue").Ref<{
             [x: string]: any;
             val_key: string;
@@ -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;
@@ -3864,7 +3865,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -3979,7 +3980,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 lifeCycle: {
                     type: import("vue").PropType<Partial<{
                         onSetup(): void;
-                        beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                        beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                     }>>;
                 };
@@ -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;
@@ -5479,7 +5482,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -8950,7 +8953,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -9065,7 +9068,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 lifeCycle: {
                     type: import("vue").PropType<Partial<{
                         onSetup(): void;
-                        beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                        beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                         afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                     }>>;
                 };
@@ -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;
@@ -10565,7 +10570,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };

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

@@ -144,7 +144,7 @@ declare const _default: import("vue").DefineComponent<{
     FormConfigEdit: import("vue").DefineComponent<{}, {
         key: import("vue").Ref<number>;
         formRenderRef: import("vue").Ref<import("../..").FormRenderExpose | undefined>;
-        currentActiveField: import("vue").Ref<import("../../../../es/src/types").WithUndefined<FormConfigItem>>;
+        currentActiveField: import("vue").Ref<import("../../../../es/src/types").UndefinedAble<FormConfigItem>>;
         fieldList: import("vue").Ref<{
             [x: string]: any;
             val_key: string;
@@ -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;
@@ -3866,7 +3867,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -3981,7 +3982,7 @@ declare const _default: import("vue").DefineComponent<{
                 lifeCycle: {
                     type: PropType<Partial<{
                         onSetup(): void;
-                        beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                        beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                     }>>;
                 };
@@ -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;
@@ -5481,7 +5484,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -8952,7 +8955,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -9067,7 +9070,7 @@ declare const _default: import("vue").DefineComponent<{
                 lifeCycle: {
                     type: PropType<Partial<{
                         onSetup(): void;
-                        beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                        beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                         afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                     }>>;
                 };
@@ -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;
@@ -10567,7 +10572,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };

package/es/packages/form-config/src/components/FormConfigCreator.js

@@ -50,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             default: withCtx(() => [
               createVNode(unref(FormRender), {
+                column: "12",
                 ref_key: "lineBreakFormRef",
                 ref: lineBreakFormRef,
                 "initial-data": unref(pick)(initialData, ["layoutWidthEnum"]),
@@ -77,6 +78,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             default: withCtx(() => [
               createVNode(unref(FormRender), {
+                column: "12",
                 ref_key: "linebarFormRef",
                 ref: linebarFormRef,
                 "initial-data": initialData,

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

@@ -3456,7 +3456,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").UndefinedAble<import("../../../../src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
             }>>;
         };
@@ -3571,7 +3571,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").UndefinedAble<import("../../../../src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
                 }>>;
             };
@@ -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;
@@ -5071,7 +5073,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").WithUndefined<import("../../../../src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../src/types").AnyObject | undefined): void | import("../../../../src/types").UndefinedAble<import("../../../../src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../src/types").AnyObject[];
             }>>;
         };

package/es/packages/form-config/src/components/FormConfigEdit.js

@@ -54,6 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock(Fragment, null, [
         (openBlock(), createBlock(unref(CFormRender), {
           key: key.value,
+          column: "12",
           ref_key: "formRenderRef",
           ref: formRenderRef,
           size: "small",

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

@@ -5,7 +5,7 @@ import { FormConfigItem } from '../../../../../es/packages/index';
 declare const _default: import("vue").DefineComponent<{}, {
     key: import("vue").Ref<number>;
     formRenderRef: import("vue").Ref<FormRenderExpose | undefined>;
-    currentActiveField: import("vue").Ref<import("../../../../../es/src/types").WithUndefined<FormConfigItem>>;
+    currentActiveField: import("vue").Ref<import("../../../../../es/src/types").UndefinedAble<FormConfigItem>>;
     fieldList: import("vue").Ref<{
         [x: string]: any;
         val_key: string;
@@ -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;
@@ -3727,7 +3728,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").UndefinedAble<import("../../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -3842,7 +3843,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").UndefinedAble<import("../../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -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;
@@ -5342,7 +5345,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").WithUndefined<import("../../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | import("../../../../../es/src/types").UndefinedAble<import("../../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../../es/src/types").AnyObject[];
             }>>;
         };

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

@@ -1,4 +1,4 @@
-import { WithUndefined } from '../../../../../es/src/types';
+import { UndefinedAble } from '../../../../../es/src/types';
 import { InjectionKey, Ref } from 'vue';
 import { FormConfigItem } from '../../../../../es/packages/form-config';
 export declare const WidgetTextMap: Map<string, string>;
@@ -59,4 +59,4 @@ export declare function isNullOptionConfig(): {
         value: boolean;
     };
 };
-export declare const InjectionActiveFieldItem: InjectionKey<Ref<WithUndefined<FormConfigItem>>>;
+export declare const InjectionActiveFieldItem: InjectionKey<Ref<UndefinedAble<FormConfigItem>>>;

package/es/packages/form-config/src/hooks/useConfigurationField.js

@@ -2,24 +2,24 @@ import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOp
 
 function useConfigurationField() {
   const fieldMap = /* @__PURE__ */ new Map([
-    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 12, is_null: "0", html_type: "INPUT" }],
-    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 12, html_type: "INPUT" }],
+    [EditAbleField.NAME, { alias: "\u540D\u79F0", elem_width: 6, is_null: "0", html_type: "INPUT" }],
+    [EditAbleField.NOTES, { alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 6, html_type: "INPUT" }],
     [
       EditAbleField.DEFAULT_VALUE,
-      { alias: "\u9ED8\u8BA4\u503C", elem_width: 12, html_type: "INPUT", validate: { max_length: 20 } }
+      { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } }
     ],
     [
       EditAbleField.LAYOUT_WIDTH_ENUM,
-      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 12, ...widgetWidthOptionConfig() }
+      { alias: "\u5BBD\u5EA6", fieldType: "number", html_type: "SELECT", elem_width: 6, ...widgetWidthOptionConfig() }
     ],
-    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 12, html_type: "INPUT", validate: { max_length: 30 } }],
+    [EditAbleField.DESC, { alias: "\u8BF4\u660E\u6587\u672C", elem_width: 6, html_type: "INPUT", validate: { max_length: 30 } }],
     [
       EditAbleField.DEFAULT_EXPAND,
-      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 12, ...isShowOptionConfig() }
+      { alias: "\u662F\u5426\u9ED8\u8BA4\u5C55\u5F00", html_type: "SWITCH", elem_width: 6, ...isShowOptionConfig() }
     ],
-    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 12, ...isNotFoldOptionConfig() }],
-    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 12, ...isEditOptionConfig() }],
-    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 12, ...isNullOptionConfig() }]
+    [EditAbleField.FOLD, { alias: "\u662F\u5426\u53EF\u6298\u53E0", html_type: "SWITCH", elem_width: 6, ...isNotFoldOptionConfig() }],
+    [EditAbleField.EDITABLE, { alias: "\u662F\u5426\u53EF\u7F16\u8F91", html_type: "SWITCH", elem_width: 6, ...isEditOptionConfig() }],
+    [EditAbleField.REQUIRED, { alias: "\u662F\u5426\u5FC5\u586B", html_type: "SWITCH", elem_width: 6, ...isNullOptionConfig() }]
   ]);
   function generateFieldListByKeys(keyList) {
     return keyList.map((key) => {

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

@@ -112,7 +112,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     lifeCycle: {
         type: import("vue").PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
             afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };
@@ -227,7 +227,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -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;
@@ -1727,7 +1729,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     lifeCycle: {
         type: import("vue").PropType<Partial<{
             onSetup(): void;
-            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+            beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
             afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
         }>>;
     };

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

@@ -7,12 +7,11 @@ export { useCommonLog } from './src/hooks/useCommonLog.js';
 export { useFormField } from './src/hooks/useFormField.js';
 export { AsyncQueue, useAsyncQueue } from './src/hooks/useAsyncQueue.js';
 export { useFieldVisitor } from './src/hooks/useFieldVisitor.js';
-export { useTypeNormalize } from './src/hooks/useTypeNormalize.js';
+export { useFieldNormalize } from './src/hooks/useFieldNormalize.js';
 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';
@@ -26,7 +25,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     fieldList: { type: Array },
     initialData: { type: Object, default: () => ({}) },
     fieldVisitor: { type: Object },
-    column: { type: Number, default: 12 },
+    column: { type: Number, default: 24 },
     maxHeight: { type: [Number, String], default: "" },
     anchor: { type: Boolean, default: false },
     parallelism: { type: Number, default: 3 },
@@ -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 });