cnhis-design-vue 3.1.16 → 3.1.17-beta.2

package/es/packages/fabric-chart/index.d.ts

@@ -52,6 +52,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
         endY: number;
     }>;
     topList: import("vue").ComputedRef<import("./src/interface").IDate[]>;
+    getRightInfo: import("vue").ComputedRef<any>;
     propItems: any;
     computedYCell: (type: import("./src/interface").IPointType) => number;
     cumputedX: (value: string | number) => any;
@@ -81,6 +82,7 @@ declare const FabricChart: SFCWithInstall<import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => import("./src/interface").IPointType[];
+    drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;

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

@@ -65,10 +65,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return grid.mainYCell * grid.subYCell + grid.surplusYCell;
     });
     const endX = computed(() => {
+      var _a;
       const { width, right = null, top } = props.data;
       if (!right)
         return width;
-      const endWidth = right.width || 50;
+      const endWidth = (_a = right.width) != null ? _a : 0;
       return width - endWidth;
     });
     const endXLimit = computed(() => {
@@ -148,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const event = computed(() => {
       var _a;
-      return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true };
+      return ((_a = props.data.grid) == null ? void 0 : _a.event) || { selectable: true, evented: true, hovered: true };
     });
     const itemList = computed(() => {
       const { left } = props.data;
@@ -214,6 +215,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return topList2.sort((a, b) => a.seq - b.seq);
     });
+    const getRightInfo = computed(() => {
+      var _a;
+      const { left, right } = props.data;
+      const temperatureObj = left.yScaleValue.find((v) => v.type === "temperature");
+      const yScaleValue = (right == null ? void 0 : right.yScaleValue) || {};
+      if ((_a = temperatureObj == null ? void 0 : temperatureObj.list) == null ? void 0 : _a.length) {
+        Object.assign(yScaleValue, {
+          list: temperatureObj.list.map((v) => Math.floor((1.8 * v + 32) * 100) / 100),
+          spaceGridNumber: temperatureObj.spaceGridNumber
+        });
+      }
+      return yScaleValue;
+    });
     const propItems = reactive({
       canvasWidth: props.data.width,
       canvasHeight: props.data.height,
@@ -252,7 +266,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       temperatureYCell: temperatureYCell.value,
       painYCell: painYCell.value,
       event: event.value,
-      itemList: itemList.value
+      itemList: itemList.value,
+      getRightInfo: getRightInfo.value
     });
     function computedYCell(type) {
       const { yScaleValue } = props.data.left;
@@ -265,8 +280,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { cumputedX, cumputedY, getXValue, getYValue } = useCumputedPoint(propItems);
     useTop(canvas, propItems);
     const { pointTipProps, pointMenuProps, clickMenu, setPopup, getEqualXTypes } = useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, props.addRenderItem);
-    useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
-    useRight(canvas, propItems);
+    const { drawScaleValue } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, getYValue, getEqualXTypes);
+    useRight(canvas, propItems, drawScaleValue);
     useBottom(canvas, propItems);
     useOther(canvas, propItems, cumputedX);
     onMounted(() => {

package/es/packages/fabric-chart/src/FabricChart.vue.d.ts

@@ -53,6 +53,7 @@ declare const _default: import("vue").DefineComponent<{
         endY: number;
     }>;
     topList: import("vue").ComputedRef<IDate[]>;
+    getRightInfo: import("vue").ComputedRef<any>;
     propItems: any;
     computedYCell: (type: IPointType) => number;
     cumputedX: (value: string | number) => any;
@@ -82,6 +83,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => void;
     setPopup: (point: any) => void;
     getEqualXTypes: (pointX: number) => IPointType[];
+    drawScaleValue: (yScaleValueList: any[]) => void;
     PopupTip: import("vue").DefineComponent<{
         show: {
             type: BooleanConstructor;

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

@@ -31,8 +31,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     originY,
     endY,
     itemList,
-    painIndex,
-    painHeight,
+    event,
     vitalSignsOriginY,
     painOriginY
   } = propItems;
@@ -131,23 +130,23 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   function setCanvasEvent() {
     if (!propItems.event.evented)
       return;
-    canvas.value.on("mouse:up", (event) => {
+    canvas.value.on("mouse:up", (event2) => {
       var _a;
-      if (event.button === 3) {
-        const { x = 0, y = 0 } = event.pointer || {};
+      if (event2.button === 3) {
+        const { x = 0, y = 0 } = event2.pointer || {};
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
           pointTipProps.show = false;
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
-          const { type } = ((_a = event.target) == null ? void 0 : _a.origin) || {};
-          if (event.target && (type === "temperature" || type === "pain")) {
+          const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
+          if (event2.target && (type === "temperature" || type === "pain")) {
             if (type === "temperature") {
               pointMenuProps.list = [...TEMPERATURE_MENU];
             }
             if (type === "pain") {
               pointMenuProps.list = [...PAIN_MENU];
             }
-            pointMenuProps.target = event.target;
+            pointMenuProps.target = event2.target;
           } else {
             pointMenuProps.target = null;
             pointMenuProps.list = ["\u65B0\u589E\u8282\u70B9"];
@@ -162,7 +161,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                     dataIndex: v.dataIndex,
                     key: v.key
                   },
-                  pointer: event.pointer
+                  pointer: event2.pointer
                 });
               }
             });
@@ -397,21 +396,23 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function setPointEvent(point) {
-    point.on("mouseover", () => {
-      setPopup(point);
-    });
-    point.on("mouseout", () => {
-      pointTipProps.show = false;
-    });
+    if (event.hovered) {
+      point.on("mouseover", () => {
+        setPopup(point);
+      });
+      point.on("mouseout", () => {
+        pointTipProps.show = false;
+      });
+    }
     point.on("moving", () => {
       moveLimit(point);
       updateLine(point);
       canvas.value.renderAll();
-      setPopup(point);
+      event.hovered && setPopup(point);
     });
-    point.on("mouseup:before", (event) => {
+    point.on("mouseup:before", (event2) => {
       pointTipProps.show = false;
-      if (event.e.button === 0) {
+      if (event2.e.button === 0) {
         const { type } = point.origin;
         const value = getYValue(type, point.top);
         emits("change", {

package/es/packages/fabric-chart/src/hooks/useLeft.d.ts

@@ -1,4 +1,6 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function): void;
+export declare function useLeft(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: any, setPopup: Function, pointTipProps: any, getXValue: Function, getYValue: Function, getEqualXTypes: Function): {
+    drawScaleValue: (yScaleValueList: any[]) => void;
+};

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

@@ -16,8 +16,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     iconsWidth,
     itemList,
     painIndex,
-    canvasWidth,
-    canvasHeight
+    right,
+    getRightInfo
   } = propItems;
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
@@ -88,13 +88,23 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     canvas.value.add(title, ...list);
     title.sendToBack();
   }
-  function drawScaleValue() {
+  function drawScaleValue(yScaleValueList) {
+    var _a;
+    if (!(yScaleValueList == null ? void 0 : yScaleValueList.length))
+      return;
+    const { layout } = yScaleValueList[0];
+    let start = iconsWidth;
+    let end = originX;
+    if (layout === "right") {
+      start = endX;
+      end = endX + ((_a = right == null ? void 0 : right.width) != null ? _a : 0);
+    }
     const groupList = [];
-    const column = !painHeight ? left.yScaleValue.length : left.yScaleValue.length - 1;
-    const colWidth = (originX - iconsWidth) / column;
-    const residue = (originX - iconsWidth) % column;
+    const column = !painHeight || layout === "right" ? yScaleValueList.length : yScaleValueList.length - 1;
+    const colWidth = (end - start) / column;
+    const residue = (end - start) % column;
     const firstColWidth = colWidth + residue;
-    left.yScaleValue.forEach((item, index) => {
+    yScaleValueList.forEach((item, index) => {
       if (item.type === "pain") {
         drwaPainScaleValue(item);
         return;
@@ -108,7 +118,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
         list.push(line2);
       }
       const rectWidth = index === 0 ? firstColWidth : colWidth;
-      const rectLeft = index === 0 ? iconsWidth : firstColWidth + iconsWidth + (index - 1) * colWidth;
+      const rectLeft = index === 0 ? start : firstColWidth + start + (index - 1) * colWidth;
       const line = index > 0 ? new fabric.Line([rectLeft, painIndex == 0 ? vitalSignsOriginY.originY : originY, rectLeft, vitalSignsOriginY.endY], {
         ...defaultBorderStyle
       }) : null;
@@ -157,9 +167,9 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     });
     groupList.push(new fabric.Rect({
       ...defaultRectStyle,
-      width: originX - iconsWidth,
-      height: endY - originY,
-      left: iconsWidth,
+      width: layout === "right" ? end - start - 1 : end - start,
+      height: layout === "right" ? endY - originY - 1 : endY - originY,
+      left: start,
       top: originY,
       originX: "left",
       originY: "top"
@@ -249,11 +259,19 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   }
   onMounted(() => {
     nextTick(() => {
+      var _a;
       iconsWidth && drawIcons();
-      drawScaleValue();
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" || v.type === "pain");
+      if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
+        yScaleValueList.push(getRightInfo);
+      }
+      drawScaleValue(yScaleValueList);
       canvas.value.renderAll();
     });
   });
+  return {
+    drawScaleValue
+  };
 }
 
 export { useLeft };

package/es/packages/fabric-chart/src/hooks/useRight.d.ts

@@ -1,4 +1,4 @@
 import { Ref } from 'vue';
 import { fabric } from '../utils';
 import { IPropItems } from '../interface';
-export declare function useRight(canvas: Ref<fabric.Canvas>, propItems: IPropItems): void;
+export declare function useRight(canvas: Ref<fabric.Canvas>, propItems: IPropItems, drawScaleValue: Function): void;

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;
@@ -3865,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[];
                 }>>;
             };
@@ -3980,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[];
                     }>>;
                 };
@@ -5482,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[];
                 }>>;
             };
@@ -8953,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[];
                 }>>;
             };
@@ -9068,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[];
                     }>>;
                 };
@@ -10570,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;
@@ -3867,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[];
                 }>>;
             };
@@ -3982,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[];
                     }>>;
                 };
@@ -5484,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[];
                 }>>;
             };
@@ -8955,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[];
                 }>>;
             };
@@ -9070,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[];
                     }>>;
                 };
@@ -10572,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[];
                 }>>;
             };
@@ -5073,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;
@@ -3728,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[];
             }>>;
         };
@@ -3843,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[];
                 }>>;
             };
@@ -5345,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>>>;