cnhis-design-vue 3.1.16-beta.3 → 3.1.16-beta.6

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createCommentVNode, createBlock, unref, withCtx, renderList, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
+import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createBlock, unref, withCtx, renderList, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
 import { isArray, isFunction } from 'lodash-es';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
@@ -30,12 +30,9 @@ const _hoisted_1 = {
   class: "check-wrap"
 };
 const _hoisted_2 = /* @__PURE__ */ createElementVNode("span", null, "\u7CFB\u7EDF\u68C0\u6D4B\u5230\u6709\u6570\u636E\u66F4\u65B0,", -1);
-const _hoisted_3 = /* @__PURE__ */ createElementVNode("i", {
-  class: "disabled-checked-tips"
-}, null, -1);
+const _hoisted_3 = ["innerHTML"];
 const _hoisted_4 = ["innerHTML"];
-const _hoisted_5 = ["innerHTML"];
-const _hoisted_6 = {
+const _hoisted_5 = {
   class: "refresh-row"
 };
 function _isSlot(s) {
@@ -129,7 +126,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       let {
         noSetting
       } = getOtherConfigInit() || {};
-      return noSetting || ((_a = props.showSettings) == null ? void 0 : _a.hideSettingBtn) == 1;
+      return noSetting || ((_a = props.showSettings) == null ? void 0 : _a.hideSettingBtn);
     });
     const isScanMultiTable = computed(() => {
       var _a;
@@ -340,7 +337,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.currentPageSelectedLength = currentPageSelectedRows.length;
     };
     const formatColumns = (map) => {
-      var _a, _b;
+      var _a, _b, _c;
       let {
         selectType
       } = getOtherConfigInit() || {};
@@ -421,24 +418,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         visible: checkVisible,
         resizable: false,
         width: checkMinWidth,
-        slots: selectType === "checkbox" ? checkboxSlot : null,
+        slots: selectType === "checkbox" && !((_b = attr.checkboxConfig) == null ? void 0 : _b.checkMethod) ? checkboxSlot : null,
         showOverflow: true
       }];
       const seqObj = columns.find((v) => v.type == "seq");
-      if ((_b = props == null ? void 0 : props.columnConfig) == null ? void 0 : _b.seqSlotFn) {
+      if ((_c = props == null ? void 0 : props.columnConfig) == null ? void 0 : _c.seqSlotFn) {
         seqObj.slots.default = (params) => {
           var _a2;
           return (_a2 = props.columnConfig) == null ? void 0 : _a2.seqSlotFn(params);
         };
       }
       const currentColumns = fieldList.map((item, index) => {
-        var _a2, _b2, _c, _d, _e, _f, _g;
+        var _a2, _b2, _c2, _d, _e, _f, _g;
         let filterField = false;
         let filterItems = [];
         try {
           const fieldSetting = JSON.parse(item.fieldSetting);
           filterField = ((_a2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _a2.type) === "manual" && item.isMerge != 1;
-          filterItems = (_c = (_b2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _b2.mappingFiled) == null ? void 0 : _c.map((item2) => item2.value[0]);
+          filterItems = (_c2 = (_b2 = fieldSetting == null ? void 0 : fieldSetting.mapping) == null ? void 0 : _b2.mappingFiled) == null ? void 0 : _c2.map((item2) => item2.value[0]);
         } catch (e) {
         }
         let notParticipatingSort = ((_d = item == null ? void 0 : item.fieldSetting) == null ? void 0 : _d.notParticipatingSort) || "";
@@ -465,31 +462,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           treeNode,
           type,
           slots: {
-            edit: (params) => {
-              if (isEdit && item.isEdit && item.columnName !== "operatorColumn") {
-                return formatterEdit(params, item);
-              } else {
-                return createVNode("span", null, [params.row[item.columnName]]);
-              }
-            },
+            edit: (params) => formatterEdit(params, item),
             default: (params) => {
-              var _a3;
-              if (!isEdit || item.columnName === "operatorColumn" || !item.isEdit) {
-                return formatter(params, item);
-              } else if (item.formType === "separate") {
-                const SeparateComponent = Separate;
-                return createVNode(SeparateComponent, {
-                  "row": params.row,
-                  "col": item
-                }, null);
-              } else if (isEdit && item.isEdit && ((_a3 = item.checkEditStatus) == null ? void 0 : _a3.call(item, params))) {
-                return formatterEdit(params, item);
-              } else {
-                return createVNode("span", null, [getDefaultValue(params, item)]);
-              }
+              const _isEdit = isEdit && item.isEdit;
+              return formatter(params, item, _isEdit);
             }
           },
-          editRender: isEdit ? {} : generateEditRender(item)
+          editRender: isEdit && item.isEdit ? {} : generateEditRender(item)
         });
         if (filterField && !props.isNestTable && !isScanMultiTable2) {
           state.filterFields[item.columnName] = Object.assign({}, vexutils.clone({
@@ -594,15 +573,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    const formatter = (params, col) => {
-      var _a, _b;
+    const formatter = (params, col, _isEdit) => {
+      var _a, _b, _c;
       let {
         row,
         column,
         $rowIndex
       } = params;
-      let own = (column == null ? void 0 : column._own) || (column == null ? void 0 : column.own) || col;
-      let attrType = (own == null ? void 0 : own.attrType) || "";
+      let attrType = (col == null ? void 0 : col.attrType) || "";
+      if (col.formType === "separate") {
+        const SeparateComponent = Separate;
+        return createVNode(SeparateComponent, {
+          "row": params.row,
+          "col": col
+        }, null);
+      }
+      if (_isEdit) {
+        if ((_a = col.checkEditStatus) == null ? void 0 : _a.call(col, params)) {
+          return formatterEdit(params, col);
+        } else {
+          return createVNode("span", null, [getDefaultValue(params, col)]);
+        }
+      }
       let formUnionItem = showEditForm(row, column, $rowIndex);
       if (formUnionItem) {
         let dynamicProps = initBatchDynamicProps(formUnionItem, row, column);
@@ -618,66 +610,66 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return row[GROUP_TITLE_KEY];
       }
       if (attrType == "PICTURE" || attrType == "HEADPORTRAIT") {
-        return getPicture(row, own, attrType);
+        return getPicture(row, col, attrType);
       }
       if (attrType == "COLOR") {
-        return getColor(row, own);
+        return getColor(row, col);
       }
       if (attrType == "EVALUATE") {
-        return getEvaluate(row, own);
+        return getEvaluate(row, col);
       }
       if (attrType == "MAP") {
-        return getMapVal(row, own);
+        return getMapVal(row, col);
       }
       if (attrType == "DATE" || attrType == "TASKDATE") {
-        return getDate(row, own);
+        return getDate(row, col);
       }
       if (attrType == "PERCENTAGE") {
-        return getPercentage(row, own);
+        return getPercentage(row, col);
       }
       if (attrType == "VIDEO") {
-        return getvideoList(row, own);
+        return getvideoList(row, col);
       }
       if (attrType == "CANDIDATE_COMPONENTS") {
-        return getCandidateComponents(row, own);
+        return getCandidateComponents(row, col);
       }
       if (attrType == "AGE") {
-        return getageShowType(row, own);
+        return getageShowType(row, col);
       }
       if (attrType === "COUNTDOWN") {
         return createVNode(NTooltip, null, {
           trigger() {
             return createVNode("span", {
-              "innerHTML": row[own.columnName + "_countdown"] || ""
+              "innerHTML": row[col.columnName + "_countdown"] || ""
             }, null);
           },
           default() {
-            return row[own.columnName + "_countdownTip"];
+            return row[col.columnName + "_countdownTip"];
           }
         });
       }
       if (attrType === "DURATION") {
-        const value = row[own.columnName];
-        const duration = (_a = own == null ? void 0 : own.fieldSetting) == null ? void 0 : _a.duration;
+        const value = row[col.columnName];
+        const duration = (_b = col == null ? void 0 : col.fieldSetting) == null ? void 0 : _b.duration;
         return parseDurationValue(value, duration);
       }
       if (attrType === "COMBINATION") {
-        const value = row[own.columnName];
-        const params2 = own.fieldSetting || {};
+        const value = row[col.columnName];
+        const params2 = col.fieldSetting || {};
         const data = parseCombinationValue(value, params2);
         return data ? [createVNode("span", {
           "title": data
         }, [data])] : "";
       }
       if (attrType === "PASSWORD") {
-        const value = row[own.columnName];
+        const value = row[col.columnName];
         return [createVNode(resolveComponent("password-com"), {
           "value": value,
           "styleSetting": props.styleSetting
         }, null)];
       }
       if (attrType === "QR_CODE") {
-        return getOrCode(row, own);
+        return getOrCode(row, col);
       }
       if (column.property === "operatorColumn") {
         if ((col == null ? void 0 : col.formType) === "custom" && col.slotFn && !row.initRow) {
@@ -693,21 +685,21 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const foldBtnList = getFoldBtnList(row, $rowIndex);
         return [createVNode("span", null, [tileBtnList, foldBtnList, inlineBtnList])];
       }
-      if (isLink(props, own, row) && !isScanMultiTable.value) {
-        if (own.btnLinkSwitch) {
+      if (isLink(props, col, row) && !isScanMultiTable.value) {
+        if (col.btnLinkSwitch) {
           let disabled = false;
-          let curBtn = (_b = row.btnList) == null ? void 0 : _b.find((v) => v.name == own.columnName);
+          let curBtn = (_c = row.btnList) == null ? void 0 : _c.find((v) => v.name == col.columnName);
           if (curBtn && "authorizedMark" in curBtn) {
             if (!curBtn.authorizedMark) {
               disabled = true;
             }
           }
-          return getBtnLinkSwitch(row, own, disabled, $rowIndex);
+          return getBtnLinkSwitch(row, col, disabled, $rowIndex);
         } else {
-          return getField(row, own, $rowIndex, true);
+          return getField(row, col, $rowIndex, true);
         }
       } else {
-        return getField(row, own, $rowIndex, false);
+        return getField(row, col, $rowIndex, false);
       }
     };
     const formatterHeader = (item) => {
@@ -1156,9 +1148,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       const {
         row,
-        column,
-        _rowIndex,
-        _columnIndex
+        column
       } = payload;
       if (isFunction(attr.spanMethod))
         return attr.spanMethod(payload);
@@ -1206,8 +1196,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         };
       let {
         $rowIndex,
-        _columnIndex,
-        column
+        _columnIndex
       } = obj;
       let len = state.columnLen || 99;
       let {
@@ -1371,7 +1360,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         emit("checkboxChange", {
           checked: checked2,
           row,
-          index: $rowIndex
+          index: $rowIndex,
+          records: [row]
         });
         return;
       }
@@ -1444,7 +1434,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         emit("checkboxChange", {
           checked: setChecked,
           row,
-          index: $rowIndex
+          index: $rowIndex,
+          records: checkedRow
         });
         setChecked && emit("handlerClickRow", row, $rowIndex);
         return;
@@ -1461,7 +1452,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("checkboxChange", {
         checked: setChecked,
         row,
-        index: $rowIndex
+        index: $rowIndex,
+        records: checkedRow
       });
       setChecked && emit("handlerClickRow", row, $rowIndex);
     };
@@ -1481,6 +1473,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const treeTableSelectionChange = (records) => {
       if (state.isTree == 0) {
+        emit("selectionChange", records);
         return false;
       }
       pubCheckChange(records);
@@ -1501,7 +1494,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("checkboxChange", {
         checked,
         row,
-        index: $rowIndex
+        index: $rowIndex,
+        records
       });
       if (treeTableSelectionChange(records))
         return;
@@ -1527,9 +1521,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const radioOnChange = (rowData = {}) => {
       let {
-        data,
-        row,
-        $rowIndex
+        row
       } = rowData;
       emit("selectionChange", [{
         ...row
@@ -2278,14 +2270,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       loadData
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, [createCommentVNode(` <div
-		class="big-table custom-big-table"
-		:class="{
-			mt: state.visibleCheckAllWrap || state.visibleTreeCheck || state.hasRefresh,
-			'expand-padding': !props.isNestTable
-		}"
-		:style="{ height: state.tableHeight }"
-	> `), state.anchorList.length ? (openBlock(), createBlock(unref(NTabs), {
+      return openBlock(), createElementBlock(Fragment, null, [state.anchorList.length ? (openBlock(), createBlock(unref(NTabs), {
         key: 0,
         type: "line",
         animated: "",
@@ -2314,7 +2299,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, [_hoisted_2, createElementVNode("span", {
         class: "check-wrap-btn",
         onClick: refreshTable
-      }, "\u70B9\u51FB\u67E5\u770B")])])) : createCommentVNode("v-if", true), createCommentVNode(" \u5168\u9009 \u9009\u62E9\u6846 "), createCommentVNode(' <div\n			v-show="state.visibleCheckAllWrap && !props.isInlineOperating && !props.isNestTable"\n			class="check-wrap"\n		>\n			<p class="check-wrap-title">\n				<span>\u5DF2\u52FE\u9009\u6570\u636E\u5171{{ allSelectedLength }}\u6761</span>\n				<span v-show="state.visibleCheckAllWrapMore">\n					\uFF08\u5F53\u524D\u9875{{ state.currentPageSelectedLength }}\u6761\uFF09\n				</span>\n			</p>\n			<template v-if="state.visibleCheckAllWrapMore && !props.asyncCount">\n				<p v-if="!visibleCancelCheckAllBtn" class="check-wrap-btn" @click="handleCheckAll">\n					<span v-if="pageVO.total > maxCheckSize">\n						{{ `\u52FE\u9009\u5168\u90E8\u9875 ${maxCheckSize}\u6761\u6570\u636E` }}\n					</span>\n					<span v-else>\n						{{ `\u52FE\u9009\u5168\u90E8\u9875 ${pageVO.total}\u6761\u6570\u636E` }}\n					</span>\n				</p>\n				<p v-else class="check-wrap-btn" @click="handleCancelAllCheck">\u53D6\u6D88\u5168\u90E8\u52FE\u9009</p>\n			</template>\n		</div> '), createCommentVNode(" \u6811\u72B6\u8868\u683C\u5DF2\u9009 "), createCommentVNode(' <div\n			v-show="state.visibleTreeCheck && !props.isInlineOperating && !props.isNestTable"\n			class="check-wrap"\n		>\n			<p class="check-wrap-title">\n				<span>\u5DF2\u52FE\u9009\u6570\u636E\u5171{{ state.treeTableLength }}\u6761</span>\n			</p>\n		</div> '), createVNode(unref(CGrid), mergeProps({
+      }, "\u70B9\u51FB\u67E5\u770B")])])) : createCommentVNode("v-if", true), createVNode(unref(CGrid), mergeProps({
         ref_key: "xGrid",
         ref: xGrid,
         border: "",
@@ -2396,28 +2381,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           "no-data-tip": props.emptyItems.noDataTip,
           "show-img": !props.isNestTable
         }, null, 8, ["no-data-img", "no-data-tip", "show-img"])]) : createCommentVNode("v-if", true)]),
-        tooltip_checkbox: withCtx(({
-          row,
-          checked
-        }) => [row.forbiddenBatchSelect ? (openBlock(), createBlock(unref(NTooltip), {
-          key: 0,
-          trigger: "hover",
-          placement: "right"
-        }, {
-          trigger: withCtx(() => [_hoisted_3]),
-          default: withCtx(() => [createTextVNode(" " + toDisplayString(row.forbiddenBatchSelectReason), 1)]),
-          _: 2
-        }, 1024)) : (openBlock(), createBlock(unref(NCheckbox), {
-          key: 1,
-          class: "tooltip-checkbox-item",
-          checked
-        }, null, 8, ["checked"]))]),
         tooltip_footer: withCtx(({
           column
         }) => [createCommentVNode(" \u5206\u7EC4\u7EDF\u8BA1 "), _ctx.groupCountFields && _ctx.groupCountFields.length ? (openBlock(), createElementBlock("span", {
           key: 0,
           innerHTML: state.groupText
-        }, null, 8, _hoisted_4)) : (openBlock(), createElementBlock(Fragment, {
+        }, null, 8, _hoisted_3)) : (openBlock(), createElementBlock(Fragment, {
           key: 1
         }, [createCommentVNode(" \u4E00\u822C\u7EDF\u8BA1 "), createVNode(unref(NTooltip), {
           trigger: "hover"
@@ -2425,7 +2394,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           trigger: withCtx(() => [createTextVNode(toDisplayString(getFooterTitle(column)), 1)]),
           default: withCtx(() => [createElementVNode("div", {
             innerHTML: getFooterTooltipTitle(column)
-          }, null, 8, _hoisted_5)]),
+          }, null, 8, _hoisted_4)]),
           _: 2
         }, 1024)], 2112))]),
         nest_table_content: withCtx(({
@@ -2448,7 +2417,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, [createVNode(unref(NIcon), {
         size: "14",
         component: unref(SyncOutline)
-      }, null, 8, ["component"]), createElementVNode("p", _hoisted_6, toDisplayString(_ctx.refreshRow) + "\u6761\u66F4\u65B0", 1)], 512), [[vShow, props.refreshRow > 0 && !props.isNestTable]])], 6)], 64);
+      }, null, 8, ["component"]), createElementVNode("p", _hoisted_5, toDisplayString(_ctx.refreshRow) + "\u6761\u66F4\u65B0", 1)], 512), [[vShow, props.refreshRow > 0 && !props.isNestTable]])], 6)], 64);
     };
   }
 });

package/es/packages/big-table/style/index.css

@@ -282,7 +282,7 @@ body > .vxe-table--tooltip-wrapper {
   height: 30px;
   line-height: 30px;
 }
-.custom-big-table .vxe-table .vxe-cell--checkbox.is--disabled .vxe-checkbox--icon {
+.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label {
   display: none;
 }
 .custom-big-table .filter-box {
@@ -307,7 +307,6 @@ body > .vxe-table--tooltip-wrapper {
 }
 .custom-big-table .disabled-checked-tips {
   position: absolute;
-  left: 6px;
   top: 50%;
   bottom: 0;
   right: 0;

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

@@ -115,7 +115,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const times = top.xScalevalue.times;
       let left = originX.value - xCellWidth.value;
       function getDate(date) {
-        return String(date).length < 9 ? `20${date}` : date;
+        const [year = "2022", month = "01", day = "01"] = String(date).match(/\d+/g) || [];
+        return `20${year}`.slice(-4) + "-" + `00${month}`.slice(-2) + "-" + `00${day}`.slice(-2);
       }
       const timeList = dateList.map((item) => {
         return times.map((v) => {

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

@@ -65,12 +65,14 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     const list = [];
     if (item.showScale || item.showNumber) {
       const { lineXMain, textLeft } = getScaleInfo(item.position, iconsWidth, originX - iconsWidth);
+      const listLen = item.list.length;
       item.list.forEach((v, i) => {
         let top = painOriginY.endY - i * yCellHeight * item.spaceGridNumber;
         if (i === 0) {
           top = endY - 5;
         }
-        if (item.showNumber) {
+        const isMaxMinNumber = i === 0 || i === listLen - 1;
+        if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
           list.push(drawScaleNumber(v, item, textLeft, top));
         }
         if (item.showScale && i !== 0) {
@@ -117,20 +119,22 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
         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 top = vitalSignsOriginY.endY - i * yCellHeight * spaceGridNumber;
-          if (item.showNumber) {
+          const isMaxMinNumber = i === 0 || i === listLen - 1;
+          if (item.showNumber && (isMaxMinNumber ? item.showMaxMinNumber : true)) {
             const text = drawScaleNumber(v, item, textLeft, i === 0 ? top - 5 : top);
             list.push(text);
           }
-          if (item.showScale && i !== item.list.length - 1) {
+          if (item.showScale && i !== listLen - 1) {
             for (let j = 0; j < 5; j++) {
               if (j > 0 || !item.showNumber || position !== "center") {
                 const x1 = j == 0 ? lineXMain[0] : lineXSub[0];
                 const x2 = j == 0 ? lineXMain[1] : lineXSub[1];
                 const y = top - j * spaceScale;
                 createLine([x1, y, x2, y]);
-                if (i == item.list.length - 2 && j == 4) {
+                if (i == listLen - 2 && j == 4) {
                   createLine([lineXMain[0], y - spaceScale, lineXMain[1], y - spaceScale]);
                 }
               }

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

@@ -7239,9 +7239,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;
@@ -12317,9 +12315,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("..").BusinessCollector;
             formItemDepsCollector: import("..").FormItemDepsCollector;

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

@@ -7241,9 +7241,7 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
             formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;
@@ -12319,9 +12317,7 @@ declare const _default: import("vue").DefineComponent<{
             }>>;
             emit: (event: "formChange", ...args: any[]) => void;
             nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-            formModel: import("@formily/core").Form<{
-                [x: string]: any;
-            }>;
+            formModel: import("@formily/core").Form<any>;
             SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
             businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
             formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;

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

@@ -3571,9 +3571,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

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

@@ -3817,9 +3817,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../../es/packages/form-render").FormItemDepsCollector;

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

@@ -230,9 +230,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
+    formModel: import("@formily/core").Form<any>;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./src/hooks").BusinessCollector;
     formItemDepsCollector: import("./src/hooks").FormItemDepsCollector;

package/es/packages/form-render/src/FormRender.js

@@ -1,7 +1,8 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
-import { cloneDeep, isArray, isObject } from 'lodash-es';
+import { isObject } from '@vue/shared';
+import { cloneDeep, isArray } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
 import { useFormRenderLifeCycle } from '../../../packages/form-render/src/hooks/useFormRenderLifeCycle';
@@ -50,14 +51,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
-        onFieldValueChange("*", (field) => {
+        onFieldValueChange("*", async (field) => {
           const fieldKey = field.props.name.toString();
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
             fieldName: field.title,
             value: field.value,
-            context: changeContextCollector.getContext(fieldKey)
+            context: await changeContextCollector.getContext(fieldKey)
           });
           businessCollector.trigger(fieldKey);
           formItemDepsCollector.trigger(fieldKey);
@@ -101,6 +102,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
         });
         function errInfoNormalize(result, error) {
+          if (!isObject(error))
+            return result;
           let hasChildMessage = false;
           if (isArray(error.messages)) {
             error.messages.forEach((message) => {

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

@@ -230,9 +230,7 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
+    formModel: import("@formily/core").Form<any>;
     SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -46,7 +46,7 @@ const script = defineComponent({
       var _a, _b;
       return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
     });
-    const _value = computed(() => {
+    const valueRef = computed(() => {
       try {
         const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
         if (!Array.isArray(parsed) || !parsed.length)
@@ -158,7 +158,7 @@ const script = defineComponent({
         "checkStrategy": "child",
         "show": !!show.value,
         "onUpdate:show": updateShow,
-        "value": _value.value,
+        "value": valueRef.value,
         "onUpdate:value": updateValue,
         "labelField": labelKey.value,
         "valueField": valueKey.value,