cnhis-design-vue 3.1.37 → 3.1.38-beta.1

package/es/components/fabric-chart/src/hooks/constant.js

@@ -16,7 +16,7 @@ const TEMPERATURE_MENU = [
   },
   {
     label: "\u4E0D\u5347",
-    value: false,
+    value: true,
     type: "noRise"
   }
 ];

package/es/components/fabric-chart/src/hooks/useBirthProcess.js

@@ -4,6 +4,7 @@ import { drawLine, drawPoint, defaultTextStyle, drawText, defaultRectStyle } fro
 import { fabric } from '../utils/index.js';
 import { getIndex, isEffectiveNode } from '../utils/utils.js';
 import { cloneDeep } from 'lodash-es';
+import { format } from 'date-fns';
 
 function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps, commonFunc) {
   const { cumputedX, cumputedY, getXValue, getYValue } = useBirthProcessCumputedPoint(propItems);
@@ -26,16 +27,18 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
     borderStyle,
     rightAddAreaWidth,
     event,
-    originYCervix
+    originYCervix,
+    other
   } = propItems;
   const yScaleValue = cloneDeep(scaleValues);
   const gridPoints = /* @__PURE__ */ new Set();
   useGrid(canvas, propItems, true);
   init();
   function init() {
+    drawBorder();
     drawYScale();
     drawXScale();
-    drawBorder();
+    drawOther();
     drawPolyLine();
     setCanvasEvent();
     drawIcons();
@@ -297,6 +300,59 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
       updateData(params);
     }
   }
+  function drawOther() {
+    const lineData = Object.values(other);
+    const lines = [];
+    lineData.forEach((line) => {
+      if (!line.show)
+        return;
+      const { key } = line;
+      if (key === "fetalPresentation") {
+        const { range } = yScaleValue.find((item) => item.key === key);
+        const y = cumputedY(key, range, 0);
+        lines.push(
+          drawLine([originX, y, endX, y], {
+            ...line
+          })
+        );
+      }
+      if (key === "alert") {
+        const item = yScaleValue.find((item2) => item2.key === "cervix");
+        const { data = [], key: key2, range } = item || {};
+        const startPoint = data.find((_data) => +_data.value === 3);
+        if (startPoint) {
+          const _time = 6 * 60 * 60 * 1e3;
+          const endPoint = {
+            time: format(new Date(new Date(startPoint.time).getTime() + _time), "yyyy-MM-dd HH:mm"),
+            value: 10
+          };
+          const [x1, y1] = [cumputedX(startPoint.time) - originX, endY - cumputedY(key2, range, startPoint.value)];
+          const [x2, y2] = [cumputedX(endPoint.time) - originX, endY - cumputedY(key2, range, endPoint.value)];
+          const k = (y2 - y1) / (x1 + x2);
+          const b = y1 - x1 * k;
+          let pointer1 = [-(b / k), 0];
+          if (pointer1[0] < 0) {
+            pointer1 = [originX, endY - b];
+          } else {
+            pointer1 = [originX + b / k, endY];
+          }
+          const _originY = cumputedY(key2, range, 10);
+          let pointer2 = [(endY - _originY - b) / k, endY - _originY];
+          if (pointer2[0] > endX - originX) {
+            pointer2 = [endX, endY - (k * (endX - originX) + b)];
+          } else {
+            pointer2 = [originX + (endY - _originY - b) / k, _originY];
+          }
+          lines.push(
+            drawLine([...pointer1, ...pointer2], {
+              ...line
+            })
+          );
+        }
+      }
+    });
+    canvas.value.add(...lines);
+  }
   function drawIcons() {
     const leftX = leftAddAreaWidth / 2;
     const rightX = canvasWidth - rightAddAreaWidth / 2;

package/es/components/fabric-chart/src/hooks/useBirthProcessChart.js

@@ -1,8 +1,9 @@
 import { ref, reactive, computed, onMounted, nextTick } from 'vue';
 import { defaultBorderStyle } from './useDraw.js';
+import 'date-fns';
 import '../utils/index.js';
-import './useShadow.js';
 import 'lodash-es';
+import './useShadow.js';
 import { useEvent, useCanvasEvent } from './useEvent.js';
 import { useBirthProcess } from './useBirthProcess.js';
 import { useCommon } from './useCommon.js';
@@ -99,6 +100,7 @@ function useBirthProcessChart(canvas, props, emits, canvasRef) {
     borderStyle: { ...defaultBorderStyle, ...props.data.borderStyle },
     selectionStyle: props.data.selectionStyle || {},
     grid: props.data.grid,
+    other: props.data.other,
     originX: originX.value,
     endX: endX.value,
     originY: originY.value,

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

@@ -4,7 +4,7 @@ import useGrid from './useGrid.js';
 import { useShadow } from './useShadow.js';
 import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant.js';
 import { cloneDeep } from 'lodash-es';
-import { isOneLine, getType, setOtherType, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
+import { isOneLine, getType, isValidValue, setOtherType, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
 
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, commonFunc) {
   useGrid(canvas, propItems);
@@ -24,7 +24,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     vitalSignsOriginY,
     painOriginY,
     hospitalizationDate,
-    config
+    config,
+    canvasHeight
   } = propItems;
   const shadowLinesCache = /* @__PURE__ */ new Set();
   const SHADOWKEYS = ["xinmai", "mai"];
@@ -371,12 +372,17 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         }
       }
       if (v.rise && riseStyle.show) {
-        riseText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
-          value: v.rise.split("").join("\n"),
-          originY: "bottom",
-          ...riseStyle
-        });
-        otherList.push(riseText);
+        if (typeof v.rise === "boolean") {
+          v.rise = "\u5347\u6E29";
+        }
+        if (typeof v.rise === "string") {
+          riseText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
+            value: v.rise.split("").join("\n"),
+            originY: "bottom",
+            ...riseStyle
+          });
+          otherList.push(riseText);
+        }
       }
       if (v.verified) {
         verifiedText = drawText([points[0], points[1] - (value ? yCellHeight : 0) - 5], {
@@ -387,7 +393,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         });
         otherList.push(verifiedText);
       }
-      if (v.physicsReduce || v.drugReduce) {
+      if (isValidValue(v.physicsReduce) || isValidValue(v.drugReduce)) {
         const reduceY = cumputedY(type, scaleValue.list, v.physicsReduce || v.drugReduce);
         reduceLine = drawLine([...points, points[0], reduceY], {
           ...lineAttr,
@@ -398,7 +404,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           left: points[0],
           top: reduceY,
           ...reduceStyle.point,
-          ...defaultStyle
+          ...defaultStyle,
+          originY: reduceY === canvasHeight ? "bottom" : "center"
         });
         reduceLine && otherList.push(reduceLine);
         reducePoint && otherList.push(reducePoint);
@@ -581,10 +588,10 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     pointTipProps.show = true;
     function getListValue() {
       const { value = getYValue(type, point.top), drugReduce, physicsReduce } = data || {};
-      if (drugReduce) {
+      if (isValidValue(drugReduce)) {
         return `\u836F\u7269\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${drugReduce}${unit || ""}`;
       }
-      if (physicsReduce) {
+      if (isValidValue(physicsReduce)) {
         return `\u7269\u7406\u964D${type == "pain" ? "\u75DB" : "\u6E29"} ${value}\u2014>${physicsReduce}${unit || ""}`;
       }
       return `${title} ${value}${unit || ""}`;

package/es/components/fabric-chart/src/hooks/useCumputedPoint.js

@@ -1,3 +1,5 @@
+import { format } from 'date-fns';
+
 function useCumputedPoint(propItems) {
   const { xScaleList, originX, endY, xCellWidth, left, vitalSignsOriginY, painOriginY, canvasWidth } = propItems;
   function cumputedX(value, setAllCenter = false) {
@@ -27,13 +29,7 @@ function useCumputedPoint(propItems) {
       const residueX = pointX - item.left;
       const residueTime = item.scaleCell * residueX;
       const time = item.start + residueTime;
-      const d = new Date(time);
-      const month = `00${d.getMonth() + 1}`.slice(-2);
-      const day = `00${d.getDate()}`.slice(-2);
-      const hours = `00${d.getHours()}`.slice(-2);
-      const minutes = `00${d.getMinutes()}`.slice(-2);
-      const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
-      return date;
+      return format(new Date(time), "yyyy-MM-dd HH:mm");
     }
   }
   function getYValue(type, pointY) {
@@ -64,13 +60,7 @@ function useBirthProcessCumputedPoint(propItems) {
   }
   function getXValue(pointX) {
     const time = (pointX - originX) * timeXCell + startTime;
-    const d = new Date(time);
-    const month = `00${d.getMonth() + 1}`.slice(-2);
-    const day = `00${d.getDate()}`.slice(-2);
-    const hours = `00${d.getHours()}`.slice(-2);
-    const minutes = `00${d.getMinutes()}`.slice(-2);
-    const date = `${d.getFullYear()}-${month}-${day} ${hours}:${minutes}`;
-    return date;
+    return format(new Date(time), "yyyy-MM-dd HH:mm");
   }
   function getYValue(key, pointY) {
     const item = scaleValues.find((item2) => key === item2.key);

package/es/components/fabric-chart/src/hooks/useOther.js

@@ -9,8 +9,8 @@ function useOther(canvas, propItems, cumputedX) {
       return false;
     const list = [];
     const otherList = [];
-    other.list.forEach((item) => {
-      const align = item.align || "vertical";
+    other.list.forEach((item, index) => {
+      const align = index === 0 ? "vertical" : item.align || "vertical";
       const left = cumputedX(item.time, true);
       const obj = otherList.find((v) => v.left == left);
       if (obj) {

package/es/components/fabric-chart/src/hooks/useTemperatureChart.js

@@ -11,6 +11,7 @@ import { useEvent, useCanvasEvent } from './useEvent.js';
 import '../utils/index.js';
 import { setOtherType } from '../utils/utils.js';
 import 'lodash-es';
+import 'date-fns';
 import { useCommon } from './useCommon.js';
 
 function useTemperatureChart(canvas, props, emits, canvasRef) {

package/es/components/fabric-chart/src/utils/utils.d.ts

@@ -11,3 +11,4 @@ export declare function getIndex(time: string, list: AnyObject[]): number;
 export declare function isOneLine(type: string): boolean;
 export declare function setOtherType(title: string, type: string): string;
 export declare function getType(type: string): string;
+export declare function isValidValue(value: number | string): boolean;

package/es/components/fabric-chart/src/utils/utils.js

@@ -1,3 +1,5 @@
+import { isNull } from 'lodash-es';
+
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
@@ -23,5 +25,8 @@ function setOtherType(title, type) {
 function getType(type) {
   return type.includes("_other") ? type.split("_")[0] : type;
 }
+function isValidValue(value) {
+  return !Number.isNaN(+value) && !isNull(value);
+}
 
-export { deleteProperty, getIndex, getType, isEffectiveNode, isOneLine, setOtherType };
+export { deleteProperty, getIndex, getType, isEffectiveNode, isOneLine, isValidValue, setOtherType };

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

@@ -422,8 +422,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
+                    onScroll?: ((...args: any[]) => any) | undefined;
                 }>>;
-                emit: (event: "formChange", ...args: any[]) => void;
+                emit: (event: "scroll" | "formChange", ...args: any[]) => void;
                 nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
                 formModel: import("@formily/core").Form<{
                     [x: string]: any;
@@ -614,7 +615,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     title: string;
                 }[]>;
                 formHeight: import("vue").ComputedRef<string | undefined>;
-                onScroll: () => void;
+                onScroll: (scrollEvent: Event) => void;
                 onKeydown: (event: KeyboardEvent) => void;
                 queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("..").FieldItem[]) => Promise<{
                     widgetElement: HTMLInputElement | null | undefined;
@@ -679,7 +680,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 }>;
                 NTabs: any;
                 NConfigProvider: any;
-            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
                     type: import("vue").PropType<import("..").FieldItem[]>;
                 };
@@ -805,6 +806,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }, {
                 anchor: boolean;
                 maxHeight: string | number;
@@ -2919,8 +2921,9 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
+                    onScroll?: ((...args: any[]) => any) | undefined;
                 }>>;
-                emit: (event: "formChange", ...args: any[]) => void;
+                emit: (event: "scroll" | "formChange", ...args: any[]) => void;
                 nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
                 formModel: import("@formily/core").Form<{
                     [x: string]: any;
@@ -3111,7 +3114,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     title: string;
                 }[]>;
                 formHeight: import("vue").ComputedRef<string | undefined>;
-                onScroll: () => void;
+                onScroll: (scrollEvent: Event) => void;
                 onKeydown: (event: KeyboardEvent) => void;
                 queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("..").FieldItem[]) => Promise<{
                     widgetElement: HTMLInputElement | null | undefined;
@@ -3176,7 +3179,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 }>;
                 NTabs: any;
                 NConfigProvider: any;
-            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
                     type: import("vue").PropType<import("..").FieldItem[]>;
                 };
@@ -3302,6 +3305,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }, {
                 anchor: boolean;
                 maxHeight: string | number;

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

@@ -423,8 +423,9 @@ declare const _default: import("vue").DefineComponent<{
                     };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
+                    onScroll?: ((...args: any[]) => any) | undefined;
                 }>>;
-                emit: (event: "formChange", ...args: any[]) => void;
+                emit: (event: "scroll" | "formChange", ...args: any[]) => void;
                 nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
                 formModel: import("@formily/core").Form<{
                     [x: string]: any;
@@ -615,7 +616,7 @@ declare const _default: import("vue").DefineComponent<{
                     title: string;
                 }[]>;
                 formHeight: import("vue").ComputedRef<string | undefined>;
-                onScroll: () => void;
+                onScroll: (scrollEvent: Event) => void;
                 onKeydown: (event: KeyboardEvent) => void;
                 queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("../..").FieldItem[]) => Promise<{
                     widgetElement: HTMLInputElement | null | undefined;
@@ -680,7 +681,7 @@ declare const _default: import("vue").DefineComponent<{
                 }>;
                 NTabs: any;
                 NConfigProvider: any;
-            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
                     type: PropType<import("../..").FieldItem[]>;
                 };
@@ -806,6 +807,7 @@ declare const _default: import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }, {
                 anchor: boolean;
                 maxHeight: string | number;
@@ -2920,8 +2922,9 @@ declare const _default: import("vue").DefineComponent<{
                     };
                 }>> & {
                     onFormChange?: ((...args: any[]) => any) | undefined;
+                    onScroll?: ((...args: any[]) => any) | undefined;
                 }>>;
-                emit: (event: "formChange", ...args: any[]) => void;
+                emit: (event: "scroll" | "formChange", ...args: any[]) => void;
                 nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
                 formModel: import("@formily/core").Form<{
                     [x: string]: any;
@@ -3112,7 +3115,7 @@ declare const _default: import("vue").DefineComponent<{
                     title: string;
                 }[]>;
                 formHeight: import("vue").ComputedRef<string | undefined>;
-                onScroll: () => void;
+                onScroll: (scrollEvent: Event) => void;
                 onKeydown: (event: KeyboardEvent) => void;
                 queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("../..").FieldItem[]) => Promise<{
                     widgetElement: HTMLInputElement | null | undefined;
@@ -3177,7 +3180,7 @@ declare const _default: import("vue").DefineComponent<{
                 }>;
                 NTabs: any;
                 NConfigProvider: any;
-            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+            }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                 fieldList: {
                     type: PropType<import("../..").FieldItem[]>;
                 };
@@ -3303,6 +3306,7 @@ declare const _default: import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }, {
                 anchor: boolean;
                 maxHeight: string | number;

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

@@ -272,8 +272,9 @@ declare const _default: import("vue").DefineComponent<{}, {
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "formChange", ...args: any[]) => void;
+            emit: (event: "scroll" | "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
             formModel: import("../../../../../es/components/form-render").Form<{
                 [x: string]: any;
@@ -464,7 +465,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 title: string;
             }[]>;
             formHeight: import("vue").ComputedRef<string | undefined>;
-            onScroll: () => void;
+            onScroll: (scrollEvent: Event) => void;
             onKeydown: (event: KeyboardEvent) => void;
             queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
                 widgetElement: HTMLInputElement | null | undefined;
@@ -529,7 +530,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             }>;
             NTabs: any;
             NConfigProvider: any;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
                 type: import("vue").PropType<FieldItem[]>;
             };
@@ -655,6 +656,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }, {
             anchor: boolean;
             maxHeight: string | number;

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

@@ -1992,8 +1992,9 @@ declare const _default: import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "formChange", ...args: any[]) => void;
+            emit: (event: "scroll" | "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
             formModel: import("../../../../../es/components/form-render").Form<{
                 [x: string]: any;
@@ -2184,7 +2185,7 @@ declare const _default: import("vue").DefineComponent<{
                 title: string;
             }[]>;
             formHeight: import("vue").ComputedRef<string | undefined>;
-            onScroll: () => void;
+            onScroll: (scrollEvent: Event) => void;
             onKeydown: (event: KeyboardEvent) => void;
             queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
                 widgetElement: HTMLInputElement | null | undefined;
@@ -2249,7 +2250,7 @@ declare const _default: import("vue").DefineComponent<{
             }>;
             NTabs: any;
             NConfigProvider: any;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
                 type: import("vue").PropType<FieldItem[]>;
             };
@@ -2375,6 +2376,7 @@ declare const _default: import("vue").DefineComponent<{
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }, {
             anchor: boolean;
             maxHeight: string | number;

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

@@ -259,8 +259,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }>>;
-        emit: (event: "formChange", ...args: any[]) => void;
+        emit: (event: "scroll" | "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
         formModel: import("@formily/core/esm/models/Form").Form<{
             [x: string]: any;
@@ -451,7 +452,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             title: string;
         }[]>;
         formHeight: import("vue").ComputedRef<string | undefined>;
-        onScroll: () => void;
+        onScroll: (scrollEvent: Event) => void;
         onKeydown: (event: KeyboardEvent) => void;
         queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
             widgetElement: HTMLInputElement | null | undefined;
@@ -516,7 +517,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         }>;
         NTabs: any;
         NConfigProvider: any;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
             type: import("vue").PropType<import("./src/types").FieldItem[]>;
         };
@@ -642,6 +643,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
+        onScroll?: ((...args: any[]) => any) | undefined;
     }, {
         anchor: boolean;
         maxHeight: string | number;

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

@@ -253,8 +253,9 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
+        onScroll?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "formChange", ...args: any[]) => void;
+    emit: (event: "scroll" | "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
     formModel: import("@formily/core").Form<{
         [x: string]: any;
@@ -445,7 +446,7 @@ declare const _default: import("vue").DefineComponent<{
         title: string;
     }[]>;
     formHeight: import("vue").ComputedRef<string | undefined>;
-    onScroll: () => void;
+    onScroll: (scrollEvent: Event) => void;
     onKeydown: (event: KeyboardEvent) => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
@@ -510,7 +511,7 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     NTabs: any;
     NConfigProvider: any;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: PropType<FieldItem[]>;
     };
@@ -636,6 +637,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
+    onScroll?: ((...args: any[]) => any) | undefined;
 }, {
     anchor: boolean;
     maxHeight: string | number;

package/es/components/form-render/src/FormRender.vue.js

@@ -70,7 +70,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   emits: [
-    "formChange"
+    "formChange",
+    "scroll"
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
@@ -119,6 +120,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const { currentAnchor, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(
       props,
+      emit,
       formRenderRef,
       formItemDepsCollector
     );

package/es/components/form-render/src/FormRenderWrapper.vue.d.ts

@@ -256,8 +256,9 @@ declare const _default: import("vue").DefineComponent<{}, {
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }>>;
-        emit: (event: "formChange", ...args: any[]) => void;
+        emit: (event: "scroll" | "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
         formModel: import("../../../../es/components/form-render").Form<{
             [x: string]: any;
@@ -448,7 +449,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             title: string;
         }[]>;
         formHeight: import("vue").ComputedRef<string | undefined>;
-        onScroll: () => void;
+        onScroll: (scrollEvent: Event) => void;
         onKeydown: (event: KeyboardEvent) => void;
         queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("../../../../es/components/form-render").FieldItem[]) => Promise<{
             widgetElement: HTMLInputElement | null | undefined;
@@ -513,7 +514,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>;
         NTabs: any;
         NConfigProvider: any;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
             type: import("vue").PropType<import("../../../../es/components/form-render").FieldItem[]>;
         };
@@ -639,6 +640,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
+        onScroll?: ((...args: any[]) => any) | undefined;
     }, {
         anchor: boolean;
         maxHeight: string | number;

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, watch, inject, createVNode } from 'vue';
 import { isObjectField } from '@formily/core';
-import { isNumber, isArray } from 'lodash-es';
+import { isNumber, isArray, range } from 'lodash-es';
 import '../../../index.js';
 import { useField, RecursionField, connect } from '@formily/vue';
 import { NButton, NIcon } from 'naive-ui';
@@ -87,9 +87,7 @@ const script = defineComponent({
           "component": AddCircleOutline
         }, null),
         default: () => "\u65B0\u589E"
-      })]), Array.from({
-        length: currentGroupNum.value
-      }).map((_, idx) => createVNode("section", {
+      })]), range(currentGroupNum.value).map((_, idx) => createVNode("section", {
         "class": "form-render__combinationContent"
       }, [createVNode(RecursionField, {
         "schema": createObjSchema(schemaAdaptor(props.getProperties())),

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

@@ -2,7 +2,7 @@ import { defineComponent, ref, computed, watch, onMounted, createVNode } from 'v
 import { isField } from '@formily/core';
 import { Path } from '@formily/path';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
-import { isNumber, isArray, isEqual } from 'lodash-es';
+import { isNumber, range, isArray, isEqual } from 'lodash-es';
 import { useDeepValidate } from './hooks/useDeepValidate.js';
 import { formRenderLog, mergeDeepProperties } from '../../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
@@ -151,9 +151,7 @@ const script = defineComponent({
           "component": AddCircleOutline
         }, null),
         default: () => "\u65B0\u589E"
-      })]), Array.from({
-        length: currentGroupNum.value
-      }).map((_, idx) => createVNode("section", {
+      })]), range(currentGroupNum.value).map((_, idx) => createVNode("section", {
         "class": "form-render__combinationContentJson"
       }, [createVNode(FormRenderComponent, {
         "ref": (_ref) => setFormRenderRef(idx, _ref),

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

@@ -1,16 +1,15 @@
-import { UndefinedAble } from '../../../../../es/shared/types';
+import { Func, UndefinedAble } from '../../../../../es/shared/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Ref } from 'vue';
 import { FormItemDepsCollector, FormRenderProps } from '../../../../../es/components/form-render';
-export declare function useAnchor(props: Readonly<FormRenderProps>, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
+export declare function useAnchor(props: Readonly<FormRenderProps>, emit: Func, scrollbarRef: Ref<UndefinedAble<HTMLElement>>, collector: FormItemDepsCollector): {
     currentAnchor: import("vue").WritableComputedRef<string>;
-    onScroll: () => void;
+    onScroll: (scrollEvent: Event) => void;
     formHeight: import("vue").ComputedRef<string | undefined>;
     anchorIdList: Ref<{
         name: string;
         title: string;
     }[]>;
     generateAnchorList: (schema: ISchema) => void;
-    scrollbarRef: Ref<UndefinedAble<HTMLElement>>;
     scrollTo: (id: string) => Promise<void>;
 };

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

@@ -6,7 +6,7 @@ import { FormItemLineBarDepKeyPrepend } from '../constants/index.js';
 import '../utils/index.js';
 import { createLinebarId, traverseSchema } from '../utils/schema.js';
 
-function useAnchor(props, scrollbarRef, collector) {
+function useAnchor(props, emit, scrollbarRef, collector) {
   const __currentAnchor = ref("");
   const formHeight = computed(() => {
     if (isNumber(props.maxHeight))
@@ -51,7 +51,7 @@ function useAnchor(props, scrollbarRef, collector) {
       scrollLock = false;
     }
   }
-  const onScroll = useDebounceFn(function() {
+  const onScroll = useDebounceFn(function(scrollEvent) {
     var _a;
     if (scrollLock || !scrollbarRef.value)
       return;
@@ -66,6 +66,7 @@ function useAnchor(props, scrollbarRef, collector) {
       return node.offsetTop > scrollTop + clientHeight / 2;
     }) || anchorIdList.value[anchorIdList.value.length - 1];
     __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
+    emit("scroll", scrollEvent);
   }, 300);
   watch(
     anchorIdList,
@@ -91,7 +92,6 @@ function useAnchor(props, scrollbarRef, collector) {
     formHeight,
     anchorIdList,
     generateAnchorList,
-    scrollbarRef,
     scrollTo
   };
 }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -1,6 +1,6 @@
 import { reactive, inject, createVNode, toRaw, h, onBeforeUnmount } from 'vue';
 import { traverse } from '../../../../../../../shared/utils/index.js';
-import { isFunction, isObject } from 'lodash-es';
+import { isFunction, isObject, range } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE, InjectionIhoTableUUID } from '../../../../constants/index.js';
 import { IhoTableRenderHelper, getRowHeight, getColumnRenderWidth } from '../../../../utils/index.js';
@@ -98,9 +98,7 @@ function separateRendererPlugins() {
             data: contentSeparate(rowData[column.field], column, width)
           });
         }
-        Array.from({
-          length: getColumnInfoMaxLength(parsedRowDataInfo)
-        }).forEach((_, index) => {
+        range(getColumnInfoMaxLength(parsedRowDataInfo)).forEach((_, index) => {
           const separateData = generateSeparateRowData(parsedRowDataInfo, index);
           if (index === 0) {
             setSeparateRowData(config.uuid, rowData, {

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

@@ -1972,8 +1972,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "formChange", ...args: any[]) => void;
+            emit: (event: "scroll" | "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
             formModel: import("@formily/core").Form<{
                 [x: string]: any;
@@ -2164,7 +2165,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 title: string;
             }[]>;
             formHeight: import("vue").ComputedRef<string | undefined>;
-            onScroll: () => void;
+            onScroll: (scrollEvent: Event) => void;
             onKeydown: (event: KeyboardEvent) => void;
             queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("..").FieldItem[]) => Promise<{
                 widgetElement: HTMLInputElement | null | undefined;
@@ -2229,7 +2230,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             }>;
             NTabs: any;
             NConfigProvider: any;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
                 type: import("vue").PropType<import("..").FieldItem[]>;
             };
@@ -2355,6 +2356,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }, {
             anchor: boolean;
             maxHeight: string | number;

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

@@ -1974,8 +1974,9 @@ declare const _default: import("vue").DefineComponent<{
                 };
             }>> & {
                 onFormChange?: ((...args: any[]) => any) | undefined;
+                onScroll?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "formChange", ...args: any[]) => void;
+            emit: (event: "scroll" | "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
             formModel: import("../../../../es/components/form-render").Form<{
                 [x: string]: any;
@@ -2166,7 +2167,7 @@ declare const _default: import("vue").DefineComponent<{
                 title: string;
             }[]>;
             formHeight: import("vue").ComputedRef<string | undefined>;
-            onScroll: () => void;
+            onScroll: (scrollEvent: Event) => void;
             onKeydown: (event: KeyboardEvent) => void;
             queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
                 widgetElement: HTMLInputElement | null | undefined;
@@ -2231,7 +2232,7 @@ declare const _default: import("vue").DefineComponent<{
             }>;
             NTabs: any;
             NConfigProvider: any;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "formChange")[], "scroll" | "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             fieldList: {
                 type: import("vue").PropType<FieldItem[]>;
             };
@@ -2357,6 +2358,7 @@ declare const _default: import("vue").DefineComponent<{
             };
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
+            onScroll?: ((...args: any[]) => any) | undefined;
         }, {
             anchor: boolean;
             maxHeight: string | number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.37",
+	"version": "3.1.38-beta.1",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "47d539ee769b9f51d6883ba88c687b89993e2253"
+	"gitHead": "81cf177885dd1c953d895711c55df5a347dc69fc"
 }