npm - cnhis-design-vue - Versions diffs - 3.1.34-beta.14 → 3.1.34-beta.16 - Mend

cnhis-design-vue 3.1.34-beta.14 → 3.1.34-beta.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/es/components/big-table/src/components/edit-form/edit-select.js CHANGED Viewed

@@ -37,6 +37,7 @@ var EditSelect = defineComponent({
     const state = reactive({
       keyupValue: attrs.value,
       options: [],
+      filterOptions: [],
       loading: false,
       keyword: "",
       config: {
@@ -46,10 +47,8 @@ var EditSelect = defineComponent({
     });
     const setOptions = async () => {
       if (props.col.options) {
-        state.options = JSON.parse(JSON.stringify(props.col.options));
-        if (!state.keyupValue && state.options.length) {
-          state.keyupValue = state.options[0].value;
-        }
+        state.options = XEUtils.clone(props.col.options);
+        state.filterOptions = XEUtils.clone(props.col.options);
       } else {
         `${props.col.columnName}_options`;
         const obj = {
@@ -60,8 +59,8 @@ var EditSelect = defineComponent({
         };
         state.options = await props.col.queryOptions(obj);
         state.loading = false;
-        emit("setOptions", state.options);
       }
+      emit("setOptions", state.options);
     };
     let selectSearch = (value) => {
       state.keyword = value;
@@ -81,6 +80,13 @@ var EditSelect = defineComponent({
     const init = () => {
       if (props.col.options) {
         setOptions();
+        state.config.onSearch = (value) => {
+          var _a, _b, _c;
+          const filterOptions = ((_c = (_b = (_a = formRef == null ? void 0 : formRef.value) == null ? void 0 : _a.treeMate) == null ? void 0 : _b.treeNodes) == null ? void 0 : _c.map((item) => item.rawNode)) || XEUtils.clone(props.col.options);
+          state.filterOptions = filterOptions;
+          props.row[`${props.col.columnName}_filter_options`] = state.filterOptions;
+          props.row[`${props.col.columnName}_is_key_arrow`] = false;
+        };
       } else {
         state.config.remote = true;
         state.config.onSearch = selectSearch;
@@ -88,22 +94,28 @@ var EditSelect = defineComponent({
       }
     };
     function onKeyup(event) {
+      var _a, _b, _c, _d;
       const {
         key
       } = event;
       if (state.config.multiple || !["ArrowUp", "ArrowDown"].includes(key))
         return;
+      props.row[`${props.col.columnName}_is_key_arrow`] = true;
       if (!state.keyupValue)
-        state.keyupValue = state.options[0].value;
-      let index = state.options.findIndex((item) => item.value === state.keyupValue);
-      const length = state.options.length;
+        state.keyupValue = (_b = (_a = state.filterOptions) == null ? void 0 : _a[0]) == null ? void 0 : _b.value;
+      let index = state.filterOptions.findIndex((item) => item.value === state.keyupValue);
+      if (!~index) {
+        state.keyupValue = (_d = (_c = state.filterOptions) == null ? void 0 : _c[0]) == null ? void 0 : _d.value;
+        index = 0;
+      }
+      const length = state.filterOptions.length;
       if (key === "ArrowUp") {
         index = index - 1 === -1 ? length - 1 : index - 1;
       }
       if (key === "ArrowDown") {
         index = index + 1 === length ? 0 : index + 1;
       }
-      state.keyupValue = state.options[index].value;
+      state.keyupValue = state.filterOptions[index].value;
       onUpdateValue(state.keyupValue);
     }
     init();

package/es/components/big-table/src/components/edit-form/useCommon.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../../es/shared/types';
 export declare const useCommon: (props: AnyObject, attrs: AnyObject, isTriggerClick?: boolean) => {
-    formRef: import("vue").Ref<HTMLElement | null>;
+    formRef: any;
     isShow: import("vue").Ref<boolean>;
 };

package/es/components/big-table/src/hooks/useEvent.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { hideFilterWrap } from '../utils.js';
 const useEvent = (props, state, emit, xGrid, anchorEvent) => {
   function keyDown({ $event }) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const { isArrow, isEnter, isChecked, isTab, isEdit } = ((_a = props.columnConfig) == null ? void 0 : _a.keyboardConfig) || {};
     let activeRow = null;
     let index = 0;
@@ -18,6 +18,24 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
       return;
     if (isEdit) {
       const data = xGridRef.getEditRecord() || xGridRef.getSelectedCell() || {};
+      const { row, column } = data;
+      const { fieldList = [] } = props.columnConfig;
+      if ($event.key === "Tab") {
+        const fieldItem = fieldList.find((item) => item.columnName === column.field);
+        const { formType = "", componentProps } = fieldItem;
+        const _index = (_b = row[`${column.field}_filter_options`]) == null ? void 0 : _b.findIndex((item) => item.value === row[column.field]);
+        if (formType === "select" && !(componentProps == null ? void 0 : componentProps.multiple) && ((_c = row[`${column.field}_filter_options`]) == null ? void 0 : _c.length) > 0 && (!row[column.field] || !row[`${column.field}_is_key_arrow`] && !~_index)) {
+          const oldValue = row[column.field];
+          row[column.field] = (_d = row[`${column.field}_filter_options`]) == null ? void 0 : _d[0].value;
+          emit("formChange", {
+            value: row[column.field],
+            row,
+            column,
+            index: data.rowIndex,
+            oldValue
+          });
+        }
+      }
       emit("keyboard", {
         key: $event.key,
         ...data,
@@ -29,7 +47,7 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
       if ($event.key === "ArrowUp" && index > 0) {
         activeIndex = index - 1;
       }
-      if ($event.key === "ArrowDown" && index < ((_b = props.data) == null ? void 0 : _b.length) - 1) {
+      if ($event.key === "ArrowDown" && index < ((_e = props.data) == null ? void 0 : _e.length) - 1) {
         activeIndex = index + 1;
       }
       const row = xGridRef.getData(activeIndex);

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

@@ -4,11 +4,12 @@ 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 { getPointArr, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
+import { isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, useCommon) {
   useGrid(canvas, propItems);
   const { getEqualXTypes, repeatTip, maxLimitTip, minLimitTip } = useCommon;
+  const { createShadowLines } = useShadow();
   const {
     left,
     xScaleList,
@@ -26,22 +27,21 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     config
   } = propItems;
   const shadowLinesCache = /* @__PURE__ */ new Set();
-  let shadowPointCache = [];
+  const SHADOWKEYS = ["xinmai", "mai"];
+  const shadowPointCache = /* @__PURE__ */ new Map();
   const maiboPoints = /* @__PURE__ */ new Set();
   const otherPoints = /* @__PURE__ */ new Set();
-  const prevLines = /* @__PURE__ */ new Set();
   const gridPoints = /* @__PURE__ */ new Set();
   const yScaleValue = cloneDeep(left.yScaleValue);
   init();
   function init() {
-    shadowPointCache = [];
+    shadowPointCache.clear();
     maiboPoints.clear();
     otherPoints.clear();
-    prevLines.clear();
     yScaleValue.forEach((scaleValue) => {
       drawPositionLine(scaleValue);
       scaleValue.dataList.forEach((item, dataIndex) => {
-        if (scaleValue.type !== "temperature" || item.enable) {
+        if (!isOneLine(scaleValue.type) || item.enable) {
           drawPolyLine(item, dataIndex, scaleValue);
         }
       });
@@ -50,6 +50,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     drawOverlapPoint();
     setCanvasEvent();
   }
+  function isOneLine(type) {
+    return ["temperature", "pulse"].includes(type);
+  }
   function drawPositionLine(scaleValue) {
     if (scaleValue.type !== "temperature" || !scaleValue.positionLine)
       return;
@@ -65,35 +68,101 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     if (shadowLinesCache.size)
       canvas.value.remove(...shadowLinesCache);
     shadowLinesCache.clear();
-    if (shadowPointCache.length > 1) {
+    if (shadowPointCache.size > 1) {
       if (target) {
-        const { type, dataIndex, index } = target.origin || {};
+        const { type, key } = target.origin || {};
         if (type === "pulse") {
-          shadowPointCache[dataIndex].splice(index, 1, target);
+          const list = shadowPointCache.get(key);
+          const index = list == null ? void 0 : list.findIndex((point) => point[0] === target.left);
+          list.splice(index, 1, [target.left, target.top]);
         }
       }
-      const [data1, data2] = shadowPointCache;
-      if (!data1.length || !data2.length)
-        return;
-      const points1 = getPointArr(data1);
-      const points2 = getPointArr(data2);
-      const data = points1.reduce(
-        (pre, cur, index) => pre.concat([[...cur, ...points2[index].reverse()]]),
-        []
-      );
-      const { createShadowLines } = useShadow();
-      data.forEach((item) => {
-        var _a2, _b, _c, _d;
-        if (((_a2 = pulseObj.shadow) == null ? void 0 : _a2.mode) == "color") {
-          const points = item.map((v) => ({ x: v[0], y: v[1] }));
-          const polygon = new fabric.Polygon(points, {
-            ...defaultStyle,
-            ...((_b = pulseObj.shadow) == null ? void 0 : _b.style) || {}
+      console.log("shadowPointCache :>> ", shadowPointCache);
+      const data = [];
+      const _shadowPointCache = [];
+      const somes = [];
+      for (const item of shadowPointCache) {
+        _shadowPointCache.push(item[1]);
+        if (item[0] === SHADOWKEYS[0]) {
+          item[1].forEach((_item) => {
+            const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v[0] === _item[0]);
+            someIndex > -1 && somes.push(_item[0]);
           });
-          shadowLinesCache.add(polygon);
-          canvas.value.add(polygon);
+        }
+      }
+      const [points1, points2] = _shadowPointCache;
+      console.log("points1, points2 :>> ", points1, points2);
+      let _arr1 = [];
+      let _arr2 = [];
+      somes.forEach((x, i) => {
+        const index1 = points1.findIndex((point) => point[0] === x);
+        const index2 = points2.findIndex((point) => point[0] === x);
+        const currentPoint1 = points1[index1];
+        const currentPoint2 = points2[index2];
+        const prevPoint1 = points1[index1 - 1];
+        const nextPoint1 = points1[index1 + 1];
+        const prevPoint2 = points2[index2 - 1];
+        const nextPoint2 = points2[index2 + 1];
+        if (prevPoint1 && prevPoint2) {
+          if (prevPoint1[0] !== prevPoint2[0]) {
+            const maxPoint = Math.max(prevPoint1[0], prevPoint2[0]);
+            _arr1.push([prevPoint1, prevPoint2].find((point) => point[0] === maxPoint));
+          } else {
+            const minYPoint = Math.min(currentPoint1[1], currentPoint2[1]);
+            _arr1.push([currentPoint1, currentPoint2].find((point) => point[1] === minYPoint));
+            const maxYPoint = Math.max(currentPoint1[1], currentPoint2[1]);
+            _arr2.push([currentPoint1, currentPoint2].find((point) => point[1] === maxYPoint));
+          }
+        } else if (prevPoint1) {
+          _arr1.push(prevPoint1);
+        } else if (prevPoint2) {
+          _arr2.push(prevPoint2);
+        } else {
+          const minYPoint = Math.min(currentPoint1[1], currentPoint2[1]);
+          _arr1.push([currentPoint1, currentPoint2].find((point) => point[1] === minYPoint));
+          const maxYPoint = Math.max(currentPoint1[1], currentPoint2[1]);
+          _arr2.push([currentPoint1, currentPoint2].find((point) => point[1] === maxYPoint));
+        }
+        const setData = () => {
+          const dataItem = [..._arr1, ..._arr2.reverse()];
+          const [firstPoint] = dataItem;
+          const lastPoint = dataItem.at(-1);
+          if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1])
+            dataItem.splice(-1, 1);
+          data.push(dataItem);
+          _arr1 = [];
+          _arr2 = [];
+        };
+        if (nextPoint1 && nextPoint2) {
+          if (nextPoint1[0] !== nextPoint2[0]) {
+            const minPoint = Math.min(nextPoint1[0], nextPoint2[0]);
+            _arr1.push([nextPoint1, nextPoint2].find((point) => point[0] === minPoint));
+            setData();
+          }
+        } else if (nextPoint1) {
+          _arr1.push(nextPoint1);
+          setData();
+        } else if (nextPoint2) {
+          _arr2.push(nextPoint2);
+          setData();
         } else {
-          const shadowLines = createShadowLines(item, (_c = pulseObj.shadow) == null ? void 0 : _c.style._angle, (_d = pulseObj.shadow) == null ? void 0 : _d.style.space);
+          setData();
+        }
+      });
+      console.log(data, somes);
+      data.forEach((item) => {
+        var _a2, _b, _c, _d, _e, _f;
+        const points = item.map((v) => ({ x: v[0], y: v[1] }));
+        const polygon = new fabric.Polygon(points, {
+          ...defaultStyle,
+          ...((_a2 = pulseObj.shadow) == null ? void 0 : _a2.style) || {}
+        });
+        if (((_b = pulseObj.shadow) == null ? void 0 : _b.mode) == "slash") {
+          polygon.set({
+            fill: "transparent",
+            stroke: ((_d = (_c = pulseObj.shadow) == null ? void 0 : _c.style) == null ? void 0 : _d.stroke) || "#f00"
+          });
+          const shadowLines = createShadowLines(item, (_e = pulseObj.shadow) == null ? void 0 : _e.style._angle, (_f = pulseObj.shadow) == null ? void 0 : _f.style.space);
           shadowLines.forEach((l) => {
             var _a3;
             Object.assign(l, {
@@ -104,6 +173,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           });
           canvas.value.add(...shadowLines);
         }
+        shadowLinesCache.add(polygon);
+        canvas.value.add(polygon);
       });
     }
   }
@@ -220,7 +291,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const lineList = [];
     const otherList = [];
     (_a = item.list) == null ? void 0 : _a.forEach((v, index) => {
-      const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
+      const _item = !isOneLine(type) ? item : dataList.find((_v) => _v.key === v.key);
       const points = getPointer(v, scaleValue);
       const otherObj = {};
       otherObj.value = drawValue(points, v, _item);
@@ -228,7 +299,17 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       drawPulseOther(points, v, _item, otherObj);
       drawPointLine(points, v, index, _item, otherObj);
     });
-    type === "pulse" && shadowPointCache.push(pointList);
+    if (type === "pulse") {
+      SHADOWKEYS.forEach((key) => {
+        shadowPointCache.set(
+          key,
+          pointList.filter((point) => {
+            var _a2;
+            return ((_a2 = point.origin) == null ? void 0 : _a2.key) === key;
+          }).map((point) => [point.left, point.top])
+        );
+      });
+    }
     Promise.all(pointList).then((res) => {
       const lineListFilter = lineList.filter((v) => v);
       let prevPoint = null;
@@ -396,19 +477,10 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       const nextPoint = getPointer(nextV, scaleValue);
       const isNonePain = isNoneValuePain(type, item.list[index].value);
       const isNextNonePain = nextPoint && isNoneValuePain(type, nextV.value);
-      if (points && nextPoint && !v.breakpoint && !isNonePain && !isNextNonePain) {
+      if (points && nextPoint && !v.breakpoint && !isNonePain && !isNextNonePain && points[0] !== nextPoint[0]) {
         line = drawLine([...points, ...nextPoint], {
           ...lineAttr
         });
-      } else if (points && !nextPoint && !v.breakpoint) {
-        const nextLinePoint = getPointer(nextV, scaleValue);
-        line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
-          ...lineAttr
-        }) : null;
-        nextLinePoint && prevLines.add({
-          dataIndex,
-          line
-        });
       }
       const currentPointType = v.pacemakerShow && type == "pulse" ? pacemaker.value : isNonePain ? 0 : pointType;
       const previousLine = lineList[index - 1];
@@ -627,14 +699,13 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   function redrawPoints() {
     var _a;
     gridPoints.size && ((_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints])));
-    shadowPointCache = [];
+    shadowPointCache.clear();
     gridPoints.clear();
     maiboPoints.clear();
     otherPoints.clear();
-    prevLines.clear();
     yScaleValue.forEach((scaleValue) => {
       scaleValue.dataList.forEach((item, dataIndex) => {
-        if (scaleValue.type !== "temperature" || item.enable) {
+        if (!isOneLine(scaleValue.type) || item.enable) {
           drawPolyLine(item, dataIndex, scaleValue);
         }
       });

package/es/components/fabric-chart/src/hooks/useLeft.js CHANGED Viewed

@@ -114,6 +114,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
     const residue = (end - start) % column;
     const firstColWidth = colWidth + residue;
     yScaleValueList2.forEach((item, index) => {
+      var _a3, _b2;
       if (item.type === "pain") {
         drwaPainScaleValue(item);
         return;
@@ -138,8 +139,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
         const spaceScale = spaceGridNumber * yCellHeight / 5;
         const position = item.position || "center";
         const { lineXMain, lineXSub, textLeft } = getScaleInfo(item.position, rectLeft, rectWidth);
-        const listLen = item.list.length;
-        item.list.forEach((v, i) => {
+        const listLen = (_a3 = item.list) == null ? void 0 : _a3.length;
+        (_b2 = item == null ? void 0 : item.list) == null ? void 0 : _b2.forEach((v, i) => {
           const top = vitalSignsOriginY.endY - i * yCellHeight * spaceGridNumber;
           const isMaxMinNumber = i === 0 || i === listLen - 1;
           if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {

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

@@ -1,11 +1,5 @@
 import { IPoint } from '../interface';
 import { AnyObject } from '../../../../../es/shared/types';
 export declare function isEffectiveNode(node: IPoint): string | number | boolean;
-/**
- * @description: 根据断点分割数组
- * @param {any} arr
- * @return {[number, number][][]}
- */
-export declare function getPointArr(arr: AnyObject[]): AnyObject;
 export declare function deleteProperty(data: AnyObject, list: AnyObject[]): void;
 export declare function getIndex(time: string, list: AnyObject[]): number;

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

@@ -1,18 +1,6 @@
 function isEffectiveNode(node) {
   return (node == null ? void 0 : node.time) && ((node == null ? void 0 : node.value) || (node == null ? void 0 : node.value) === 0);
 }
-function getPointArr(arr) {
-  let _arr = [];
-  return arr.reduce((pre, cur, index) => {
-    var _a, _b;
-    _arr.push([cur.left, cur.top]);
-    if (((_b = (_a = cur.origin) == null ? void 0 : _a.data) == null ? void 0 : _b.breakpoint) || arr.length - 1 === index) {
-      pre.push(_arr);
-      _arr = [];
-    }
-    return pre;
-  }, []);
-}
 function deleteProperty(data, list) {
   list.map((v) => v.type).forEach((key) => {
     if (Reflect.has(data, key))
@@ -24,4 +12,4 @@ function getIndex(time, list) {
   return !~index ? list.length : index;
 }
-export { deleteProperty, getIndex, getPointArr, isEffectiveNode };
+export { deleteProperty, getIndex, isEffectiveNode };

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

@@ -34,6 +34,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -51,6 +55,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -281,7 +289,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -403,7 +411,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         type: import("vue").PropType<import("..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -781,7 +789,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -795,7 +803,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -2598,6 +2606,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             type?: string | undefined;
             name?: string | undefined;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -2612,6 +2624,10 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 type: string;
                 name: string;
                 show?: boolean | undefined;
+                options?: {
+                    value: string;
+                    text: string;
+                }[] | undefined;
                 defaultValue?: any;
                 defaultExpand?: boolean | undefined;
                 fold?: boolean | undefined;
@@ -2755,7 +2771,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -2877,7 +2893,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                         type: import("vue").PropType<import("..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -3255,7 +3271,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -3269,7 +3285,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -35,6 +35,10 @@ declare const _default: import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -52,6 +56,10 @@ declare const _default: import("vue").DefineComponent<{
         type: string;
         name: string;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -282,7 +290,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -404,7 +412,7 @@ declare const _default: import("vue").DefineComponent<{
                         type: PropType<import("../..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -782,7 +790,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -796,7 +804,7 @@ declare const _default: import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("../..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -2599,6 +2607,10 @@ declare const _default: import("vue").DefineComponent<{
             type?: string | undefined;
             name?: string | undefined;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -2613,6 +2625,10 @@ declare const _default: import("vue").DefineComponent<{
                 type: string;
                 name: string;
                 show?: boolean | undefined;
+                options?: {
+                    value: string;
+                    text: string;
+                }[] | undefined;
                 defaultValue?: any;
                 defaultExpand?: boolean | undefined;
                 fold?: boolean | undefined;
@@ -2756,7 +2772,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }, {
@@ -2878,7 +2894,7 @@ declare const _default: import("vue").DefineComponent<{
                         type: PropType<import("../..").RequestInstance>;
                     };
                     enterToNextWidget: {
-                        type: BooleanConstructor;
+                        type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                         default: boolean;
                     };
                 }>> & {
@@ -3256,7 +3272,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: PropType<import("../..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: PropType<boolean | ((fieldItem: import("../..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -3270,7 +3286,7 @@ declare const _default: import("vue").DefineComponent<{
                 parallelism: number;
                 scope: import("../../../../es/shared/types").AnyObject;
                 consumer: boolean;
-                enterToNextWidget: boolean;
+                enterToNextWidget: boolean | ((fieldItem: import("../..").FieldItem) => boolean | void);
             }>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -139,7 +139,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -261,7 +261,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                     type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -639,7 +639,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -653,7 +653,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             parallelism: number;
             scope: import("../../../../shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {

package/es/components/form-config/src/components/FormConfigDragDisplay.vue.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { defineComponent, openBlock, createBlock, unref, mergeProps, withCtx, cr
 import draggableComponent from '../../../../shared/components/VueDraggable/src/vuedraggable.js';
 import { usePresetRenderer } from '../hooks/usePresetRenderer.js';
 import { useSortableConfig } from '../hooks/useSortalbeConfig.js';
+import 'lodash-es';
 import { layoutWidthEnum2Column } from '../utils/index.js';
 import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';

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

@@ -1690,6 +1690,10 @@ declare const _default: import("vue").DefineComponent<{
         type?: string | undefined;
         name?: string | undefined;
         show?: boolean | undefined;
+        options?: {
+            value: string;
+            text: string;
+        }[] | undefined;
         defaultValue?: any;
         defaultExpand?: boolean | undefined;
         fold?: boolean | undefined;
@@ -1704,6 +1708,10 @@ declare const _default: import("vue").DefineComponent<{
             type: string;
             name: string;
             show?: boolean | undefined;
+            options?: {
+                value: string;
+                text: string;
+            }[] | undefined;
             defaultValue?: any;
             defaultExpand?: boolean | undefined;
             fold?: boolean | undefined;
@@ -1847,7 +1855,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -1969,7 +1977,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -2347,7 +2355,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -2361,7 +2369,7 @@ declare const _default: import("vue").DefineComponent<{
             parallelism: number;
             scope: import("../../../../../es/shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/form-config/src/hooks/useConfigurationField.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { isArray } from 'lodash-es';
 import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig } from '../constants/index.js';
 function useConfigurationField() {
@@ -6,7 +7,12 @@ function useConfigurationField() {
     [EditAbleField.NOTES, () => ({ alias: "\u95EE\u53F7\u63D0\u793A", elem_width: 6, html_type: "INPUT" })],
     [
       EditAbleField.DEFAULT_VALUE,
-      () => ({ alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } })
+      (fieldItem) => {
+        if (isArray(fieldItem == null ? void 0 : fieldItem.options) && fieldItem.options.length) {
+          return { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "SELECT", option: fieldItem == null ? void 0 : fieldItem.options };
+        }
+        return { alias: "\u9ED8\u8BA4\u503C", elem_width: 6, html_type: "INPUT", validate: { max_length: 20 } };
+      }
     ],
     [
       EditAbleField.LAYOUT_WIDTH_ENUM,

package/es/components/form-config/src/types/index.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ export declare type FormConfigItem = {
     name: string;
 } & Partial<{
     show: boolean;
+    options: Record<'text' | 'value', string>[];
     defaultValue: any;
     defaultExpand: boolean;
     fold: boolean;

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

@@ -126,7 +126,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("./src/hooks").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }, {
@@ -248,7 +248,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("./src/hooks").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -626,7 +626,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("./src/hooks").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -640,7 +640,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         parallelism: number;
         scope: import("../../../es/shared/types").AnyObject;
         consumer: boolean;
-        enterToNextWidget: boolean;
+        enterToNextWidget: boolean | ((fieldItem: import("./src/types").FieldItem) => boolean | void);
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default FormRender;

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

@@ -120,7 +120,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<RequestInstance>;
     };
     enterToNextWidget: {
-        type: BooleanConstructor;
+        type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
         default: boolean;
     };
 }, {
@@ -242,7 +242,7 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -620,7 +620,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<RequestInstance>;
     };
     enterToNextWidget: {
-        type: BooleanConstructor;
+        type: PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
         default: boolean;
     };
 }>> & {
@@ -634,6 +634,6 @@ declare const _default: import("vue").DefineComponent<{
     parallelism: number;
     scope: AnyObject;
     consumer: boolean;
-    enterToNextWidget: boolean;
+    enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
 }>;
 export default _default;

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

@@ -4,7 +4,7 @@ import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { Path } from '@formily/path';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
-import { cloneDeep, isArray } from 'lodash-es';
+import { cloneDeep, isArray, isFunction } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { NESTED_FORM_ITEM_TYPE, FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
@@ -60,7 +60,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     uuid: { type: String },
     lifeCycle: { type: Object },
     requestInstance: { type: Object },
-    enterToNextWidget: { type: Boolean, default: true }
+    enterToNextWidget: {
+      type: [Boolean, Function],
+      default: true
+    }
   },
   emits: [
     "formChange"
@@ -111,6 +114,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     watch(parsedSchema, generateAnchorList, { immediate: true });
     function onKeydown(event) {
+      var _a;
       if (!props.enterToNextWidget || !formRenderRef.value)
         return;
       const ancestorFormItem = findAncestor(
@@ -124,10 +128,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const formItemIndex = formItemElements.findIndex((ele) => ele.id === ancestorFormItem.id);
       if (!~formItemIndex)
         return;
-      const nextWidget = findNextWidget(formItemElements, formItemIndex, event.target);
-      if (!nextWidget)
+      const { widget, field } = findNextWidget(formItemElements, formItemIndex, event.target);
+      if (!widget)
         return;
-      setTimeout(() => nextWidget.focus());
+      const formItemInstance = field && formModel.query(field).take();
+      if (formItemInstance && isFunction(props.enterToNextWidget)) {
+        props.enterToNextWidget((_a = formItemInstance.decoratorProps) == null ? void 0 : _a.fieldItem) ? focus() : onKeydown({ target: widget });
+      }
+      function focus() {
+        widget == null ? void 0 : widget.focus();
+      }
     }
     async function queryWidget(key, wrapperElement, fieldList) {
       if (!formRenderRef.value)

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

@@ -123,7 +123,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }, {
@@ -245,7 +245,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -623,7 +623,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
         };
         enterToNextWidget: {
-            type: BooleanConstructor;
+            type: import("vue").PropType<boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void)>;
             default: boolean;
         };
     }>> & {
@@ -637,7 +637,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         parallelism: number;
         scope: import("../../../shared/types").AnyObject;
         consumer: boolean;
-        enterToNextWidget: boolean;
+        enterToNextWidget: boolean | ((fieldItem: import("../../../../es/components/form-render").FieldItem) => boolean | void);
     }>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

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

@@ -65,7 +65,8 @@ const script = defineComponent({
       }
     }, {
       id: id.value,
-      "widget-type": field.value.componentType
+      "widget-type": field.value.componentType,
+      "form-field": field.value.path.toString()
     }), {
       ...slots,
       label: renderLabel

package/es/components/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate.js CHANGED Viewed

@@ -15,14 +15,14 @@ function useDeepValidate() {
       field.value.validator = [
         {
           async validator() {
-            return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then(
-              (resultList) => {
-                const rejected = resultList.filter((res) => res.status === "rejected");
-                if (!rejected.length)
-                  return "";
-                return flatten(rejected.map((res) => res.reason));
-              }
-            );
+            return Promise.allSettled(
+              formRenderRefs.value.filter((formRenderRef) => formRenderRef).map((formRenderRef) => formRenderRef.validate())
+            ).then((resultList) => {
+              const rejected = resultList.filter((res) => res.status === "rejected");
+              if (!rejected.length)
+                return "";
+              return flatten(rejected.map((res) => res.reason));
+            });
           }
         },
         ...tempValidator ? arrayed(tempValidator) : []

package/es/components/form-render/src/utils/dom.d.ts CHANGED Viewed

@@ -1,7 +1,13 @@
-import { Nullable, UndefinedAble } from '../../../../../es/shared/types';
+import { Nullable } from '../../../../../es/shared/types';
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
 export declare function queryInput(decoratorElement?: Nullable<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };
-export declare function findNextWidget(containers: HTMLElement[], currentContainerIndex: number, currentWidget: HTMLElement): UndefinedAble<HTMLElement>;
+export declare function findNextWidget(containers: HTMLElement[], currentContainerIndex: number, currentWidget: HTMLElement): {
+    widget: HTMLElement;
+    field: string | null;
+} | {
+    widget: null;
+    field: null;
+};

package/es/components/form-render/src/utils/dom.js CHANGED Viewed

@@ -13,17 +13,24 @@ function queryInput(decoratorElement) {
 function findNextWidget(containers, currentContainerIndex, currentWidget) {
   const nextWidget = findInnerNextWidget(containers[currentContainerIndex], currentWidget);
   if (nextWidget)
-    return nextWidget;
-  let result;
+    return { widget: nextWidget, field: getFormField(containers[currentContainerIndex]) };
+  let widget = null;
+  let field = null;
   containers.slice(currentContainerIndex + 1).some((container) => {
-    return result = findInnerNextWidget(container);
+    const res = widget = findInnerNextWidget(container);
+    if (res)
+      field = getFormField(container);
+    return res;
   });
-  return result;
+  return { widget, field };
+  function getFormField(formItemElement) {
+    return formItemElement && formItemElement.getAttribute("form-field");
+  }
   function findInnerNextWidget(container, currentWidget2) {
     const widgets = Array.from(container.querySelectorAll("textarea,input,[tabindex]"));
-    const widgetIndex = currentWidget2 ? widgets.findIndex((widget) => widget === currentWidget2) : -1;
+    const widgetIndex = currentWidget2 ? widgets.findIndex((widget2) => widget2 === currentWidget2) : -1;
     return widgets.slice(widgetIndex + 1).find(
-      (widget) => !Reflect.get(widget, "disabled") && !Array.from(widget.classList).some((className) => className.endsWith("--disabled"))
+      (widget2) => !Reflect.get(widget2, "disabled") && !Array.from(widget2.classList).some((className) => className.endsWith("--disabled"))
     );
   }
 }

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

@@ -1835,7 +1835,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 type: import("vue").PropType<import("..").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -1957,7 +1957,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                     type: import("vue").PropType<import("..").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -2335,7 +2335,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 type: import("vue").PropType<import("..").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: import("..").FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -2349,7 +2349,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             parallelism: number;
             scope: import("../../../es/shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: import("..").FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("error" | "update")[], "error" | "update", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -1837,7 +1837,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }, {
@@ -1959,7 +1959,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
                 };
                 enterToNextWidget: {
-                    type: BooleanConstructor;
+                    type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                     default: boolean;
                 };
             }>> & {
@@ -2337,7 +2337,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<import("../../../../es/components/form-render").RequestInstance>;
             };
             enterToNextWidget: {
-                type: BooleanConstructor;
+                type: import("vue").PropType<boolean | ((fieldItem: FieldItem) => boolean | void)>;
                 default: boolean;
             };
         }>> & {
@@ -2351,7 +2351,7 @@ declare const _default: import("vue").DefineComponent<{
             parallelism: number;
             scope: import("../../../../es/shared/types").AnyObject;
             consumer: boolean;
-            enterToNextWidget: boolean;
+            enterToNextWidget: boolean | ((fieldItem: FieldItem) => boolean | void);
         }>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("error" | "update")[], "error" | "update", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.34-beta.14",
+	"version": "3.1.34-beta.16",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "d37dc056e3ca400fbf4a2d2a7907e1cbbb5d65ba"
+	"gitHead": "b4bd6163c854b00c2401f51ab21e90121abafcb3"
 }