3h1-ui 2.15.0 → 2.15.3

package/es/index.js

@@ -7278,7 +7278,7 @@ const _hoisted_5$4 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$1 = {
+const _hoisted_6$2 = {
   key: 1,
   class: "p-5"
 };
@@ -7420,7 +7420,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : createCommentVNode("", true)
-              ])) : (openBlock(), createElementBlock("div", _hoisted_6$1, [
+              ])) : (openBlock(), createElementBlock("div", _hoisted_6$2, [
                 createVNode(unref(AEmpty))
               ]))
             ]),
@@ -7615,12 +7615,13 @@ const _hoisted_2$9 = {
   key: 0,
   class: "table-children-required"
 };
-const _hoisted_3$6 = {
+const _hoisted_3$6 = { class: "text-red-500" };
+const _hoisted_4$4 = {
   key: 0,
   class: "table-children-delete-index"
 };
-const _hoisted_4$4 = ["onClick"];
-const _hoisted_5$3 = {
+const _hoisted_5$3 = ["onClick"];
+const _hoisted_6$1 = {
   key: 2,
   class: "table-children-delete-index"
 };
@@ -7647,7 +7648,7 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
   emits: ["update:value", "change", "add", "remove"],
   setup(__props, { expose, emit }) {
     const props2 = __props;
-    const listFormRefs = ref([]);
+    const formActionType = inject("formActionType");
     const emitData = ref([]);
     const [state] = useRuleFormItem(props2, "value", "change", emitData);
     const getColumns = computed(() => {
@@ -7681,17 +7682,63 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
       emit("remove", state.value, index2);
     };
     const getPopupContainer2 = () => document.body;
-    const loadKv = () => {
-      const columns = props2.columns;
-      let dicData = [];
-      columns.forEach(async (column) => {
-        if (column == null ? void 0 : column.api) {
-          dicData = await column.api();
-          column.dicData = dicData;
-        }
+    const rulesRef = reactive({});
+    const getRules = ({ column, record, index: index2, ...args }) => {
+      var _a2, _b;
+      const errKey = `${column.dataIndex}-${record.uuid}Info`;
+      if (!column.required)
+        return [];
+      if ((_a2 = rulesRef[errKey]) == null ? void 0 : _a2.rules)
+        return (_b = rulesRef[errKey]) == null ? void 0 : _b.rules;
+      rulesRef[errKey] = {
+        rules: [],
+        show: false,
+        msg: ""
+      };
+      if (!column.rules && column.required) {
+        rulesRef[errKey].rules = [
+          {
+            required: true,
+            validator: (rule, value) => {
+              const prefix = column.type.toLocaleLowerCase().includes("input") ? "请输入" : "请选择";
+              const errMsg = `${prefix}${column.title}`;
+              if (value) {
+                rulesRef[errKey].show = false;
+                return Promise.resolve();
+              }
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = errMsg;
+              return Promise.reject(errMsg);
+            }
+          }
+        ];
+        return rulesRef[errKey].rules;
+      }
+      if (!isArray$2(column.rules))
+        return column.rules;
+      rulesRef[errKey].rules = cloneDeep(column.rules);
+      rulesRef[errKey].rules.forEach((item) => {
+        if (!item.validator || !isFunction$4(item.validator))
+          return;
+        const validator = item.validator;
+        item.validator = async (rule, value) => {
+          try {
+            rulesRef[errKey].show = false;
+            return await validator(
+              rule,
+              value,
+              { column, record, ...args },
+              formActionType
+            );
+          } catch (error2) {
+            rulesRef[errKey].show = true;
+            rulesRef[errKey].msg = error2;
+            return Promise.reject(error2);
+          }
+        };
       });
+      return rulesRef[errKey].rules;
     };
-    loadKv();
     watch(
       () => state.value,
       (v, old) => {
@@ -7711,6 +7758,17 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
         deep: true
       }
     );
+    const loadKv = () => {
+      const columns = props2.columns;
+      let dicData = [];
+      columns.forEach(async (column) => {
+        if (column == null ? void 0 : column.api) {
+          dicData = await column.api();
+          column.dicData = dicData;
+        }
+      });
+    };
+    const listFormRefs = ref([]);
     const validate = async () => {
       try {
         for (let formRef of listFormRefs.value) {
@@ -7720,6 +7778,7 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
         throw new Error("校验失败");
       }
     };
+    loadKv();
     expose({ validate });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(Table$1), {
@@ -7751,63 +7810,80 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
         bodyCell: withCtx(({ column, record, index: index2, ...args }) => [
           column.dataIndex !== "index" && column.type !== "text" ? (openBlock(), createBlock(unref(FormItem), {
             required: column.required,
-            rules: (column == null ? void 0 : column.rules) || [],
+            rules: getRules({ column, record, index: index2, ...args }),
             name: [_ctx.$attrs.codeField, index2, column.dataIndex],
             key: record[__props.rowKey]
           }, {
-            default: withCtx(() => [
-              column.type === "select" ? (openBlock(), createBlock(unref(Select), {
-                key: 0,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                options: column.dicData,
-                mode: column.mode,
-                "max-tag-count": column.maxTagCount,
-                "max-tag-text-length": column.maxTagTextLength
-              }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column.type === "datePicker" ? (openBlock(), createBlock(unref(DatePicker), {
-                key: 1,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                valueFormat: "YYYY-MM-DD HH:mm:ss"
-              }, null, 8, ["value", "onUpdate:value"])) : column.type === "number" ? (openBlock(), createBlock(unref(InputNumber), {
-                key: 2,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                min: column.min,
-                max: column.max,
-                precision: column.precision ?? 2
-              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (openBlock(), createBlock(unref(Input), {
-                key: 3,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                disabled: !props2.isShowAction
-              }, null, 8, ["value", "onUpdate:value", "disabled"])) : (openBlock(), createBlock(resolveDynamicComponent(unref(componentMap$2).get(column.type)), mergeProps(
-                {
-                  key: 4,
-                  allowClear: "",
-                  getPopupContainer: getPopupContainer2,
-                  style: { width: "100%" }
-                },
-                unref(isFunction$4)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
-                {
-                  value: record[column.dataIndex],
-                  "onUpdate:value": ($event) => record[column.dataIndex] = $event
-                }
-              ), null, 16, ["value", "onUpdate:value"]))
-            ]),
+            default: withCtx(() => {
+              var _a2;
+              return [
+                createVNode(unref(Popover), {
+                  overlayClassName: "table-children-err-popover",
+                  visible: !!((_a2 = rulesRef == null ? void 0 : rulesRef[`${column.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a2.show)
+                }, {
+                  content: withCtx(() => {
+                    var _a3;
+                    return [
+                      createElementVNode("span", _hoisted_3$6, toDisplayString((_a3 = rulesRef[`${column.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a3.msg), 1)
+                    ];
+                  }),
+                  default: withCtx(() => [
+                    column.type === "select" ? (openBlock(), createBlock(unref(Select), {
+                      key: 0,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      options: column.dicData,
+                      mode: column.mode,
+                      "max-tag-count": column.maxTagCount,
+                      "max-tag-text-length": column.maxTagTextLength
+                    }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column.type === "datePicker" ? (openBlock(), createBlock(unref(DatePicker), {
+                      key: 1,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      valueFormat: "YYYY-MM-DD HH:mm:ss"
+                    }, null, 8, ["value", "onUpdate:value"])) : column.type === "number" ? (openBlock(), createBlock(unref(InputNumber), {
+                      key: 2,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      min: column.min,
+                      max: column.max,
+                      precision: column.precision ?? 2
+                    }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (openBlock(), createBlock(unref(Input), {
+                      key: 3,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      disabled: !props2.isShowAction
+                    }, null, 8, ["value", "onUpdate:value", "disabled"])) : (openBlock(), createBlock(resolveDynamicComponent(unref(componentMap$2).get(column.type)), mergeProps(
+                      {
+                        key: 4,
+                        allowClear: "",
+                        getPopupContainer: getPopupContainer2,
+                        style: { width: "100%" }
+                      },
+                      unref(isFunction$4)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
+                      {
+                        value: record[column.dataIndex],
+                        "onUpdate:value": ($event) => record[column.dataIndex] = $event
+                      }
+                    ), null, 16, ["value", "onUpdate:value"]))
+                  ]),
+                  _: 2
+                }, 1032, ["visible"])
+              ];
+            }),
             _: 2
           }, 1032, ["required", "rules", "name"])) : column.dataIndex === "index" ? (openBlock(), createElementBlock("div", {
             class: "table-children-delete-wrapper",
             key: record[__props.rowKey]
           }, [
-            __props.isShowAction ? (openBlock(), createElementBlock("span", _hoisted_3$6, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
+            __props.isShowAction ? (openBlock(), createElementBlock("span", _hoisted_4$4, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
             __props.isShowAction ? (openBlock(), createElementBlock("div", {
               key: 1,
               class: "table-children-delete-item",
               onClick: ($event) => rowClickEvent(record[__props.rowKey])
             }, [
               createVNode(unref(DeleteFilled$1), { style: { color: "#fff" } })
-            ], 8, _hoisted_4$4)) : (openBlock(), createElementBlock("span", _hoisted_5$3, toDisplayString(index2 + 1), 1))
+            ], 8, _hoisted_5$3)) : (openBlock(), createElementBlock("span", _hoisted_6$1, toDisplayString(index2 + 1), 1))
           ])) : createCommentVNode("", true)
         ]),
         _: 1
@@ -7815,8 +7891,8 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_d996cbc3_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-d996cbc3"]]);
+const Table_vue_vue_type_style_index_0_scoped_9cf892ac_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-9cf892ac"]]);
 const modal = "";
 useI18n$1();
 const modalProps = {
@@ -12234,28 +12310,30 @@ const _sfc_main$M = defineComponent({
       () => formModel,
       useDebounceFn$1((val) => {
         var _a2;
+        if (isEqual(toRaw(val), toRaw(tempFormModel)))
+          return;
         for (const key2 in val) {
-          if (val[key2] !== tempFormModel[key2]) {
-            (_a2 = unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
-              var _a3;
-              const isComponentProps = item.field === key2 && item.componentProps;
-              if (isComponentProps && !isFunction$4(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
-                item.componentProps.onModelChange(val[key2]);
-              } else if (isComponentProps && isFunction$4(item.componentProps)) {
-                const modelProps = item.componentProps({
-                  schema: item,
-                  formModel,
-                  formActionType,
-                  tableAction: props2.tableAction
-                });
-                if (modelProps.onModelChange) {
-                  modelProps.onModelChange(val[key2]);
-                }
+          if (isEqual(toRaw(val[key2]), toRaw(tempFormModel[key2])))
+            continue;
+          (_a2 = unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
+            var _a3;
+            const isComponentProps = item.field === key2 && item.componentProps;
+            if (isComponentProps && !isFunction$4(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
+              item.componentProps.onModelChange(val[key2]);
+            } else if (isComponentProps && isFunction$4(item.componentProps)) {
+              const modelProps = item.componentProps({
+                schema: item,
+                formModel,
+                formActionType,
+                tableAction: props2.tableAction
+              });
+              if (modelProps.onModelChange) {
+                modelProps.onModelChange(val[key2]);
               }
-            });
-          }
+            }
+          });
         }
-        Object.assign(tempFormModel, formModel);
+        Object.assign(tempFormModel, cloneDeep(formModel));
         unref(getProps).submitOnChange && handleSubmit();
       }, 300),
       { deep: true }
@@ -12298,6 +12376,7 @@ const _sfc_main$M = defineComponent({
       submit: handleSubmit,
       scrollToField
     };
+    provide("formActionType", formActionType);
     const clearCurrValidate = (field) => {
       clearValidate([field]);
     };

package/es/style.css

@@ -431,6 +431,10 @@ ul {
 .resize {
   resize: both;
 }
+.text-red-500 {
+  --tw-text-opacity: 1;
+  color: rgba(239, 68, 68, var(--tw-text-opacity));
+}
 .truncate {
   overflow: hidden;
   -o-text-overflow: ellipsis;
@@ -24875,40 +24879,40 @@ span.iconify {
 .shy-tinymce-container textarea {
   z-index: -1;
   visibility: hidden;
-}.shy-table-edit-icon-plus[data-v-d996cbc3] {
+}.shy-table-edit-icon-plus[data-v-9cf892ac] {
   width: 30px;
   height: 30px;
   font-size: 30px;
   cursor: pointer;
   display: flex;
 }
-.table-children[data-v-d996cbc3] .ant-form-item {
+.table-children[data-v-9cf892ac] .ant-form-item {
   margin-bottom: 0 !important;
 }
-.table-children-required[data-v-d996cbc3] {
+.table-children-required[data-v-9cf892ac] {
   color: #ff4d4f;
   margin-right: 4px;
 }
-.table-children[data-v-d996cbc3] .ant-table-cell {
+.table-children[data-v-9cf892ac] .ant-table-cell {
   padding: 8px !important;
 }
-.table-children[data-v-d996cbc3] .ant-table-cell .ant-form-item-explain {
+.table-children[data-v-9cf892ac] .ant-table-cell .ant-form-item-explain {
   display: none;
 }
-.table-children-delete-wrapper[data-v-d996cbc3] {
+.table-children-delete-wrapper[data-v-9cf892ac] {
   display: flex;
   height: 100%;
   justify-content: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-item[data-v-d996cbc3] {
+.table-children-delete-wrapper:hover .table-children-delete-item[data-v-9cf892ac] {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-index[data-v-d996cbc3] {
+.table-children-delete-wrapper:hover .table-children-delete-index[data-v-9cf892ac] {
   display: none;
 }
-.table-children-delete-item[data-v-d996cbc3] {
+.table-children-delete-item[data-v-9cf892ac] {
   background-color: red;
   border-radius: 50%;
   width: 30px;
@@ -24917,7 +24921,7 @@ span.iconify {
   display: none;
   cursor: pointer;
 }
-.table-children-delete-index[data-v-d996cbc3] {
+.table-children-delete-index[data-v-9cf892ac] {
   user-select: none;
   display: inline-block;
 }@media screen and (max-height: 600px) {
@@ -25278,6 +25282,9 @@ span.iconify {
   height: 14px;
   content: '';
   background: #2991ff;
+}
+.table-children-err-popover .ant-popover-inner-content {
+  padding: 6px 16px;
 }.shy-search[data-v-a0f20f9d] {
   position: relative;
   display: flex;

package/lib/index.js

@@ -7302,7 +7302,7 @@ const _hoisted_5$4 = {
   key: 0,
   class: "flex py-2 items-center justify-center"
 };
-const _hoisted_6$1 = {
+const _hoisted_6$2 = {
   key: 1,
   class: "p-5"
 };
@@ -7444,7 +7444,7 @@ const _sfc_main$19 = /* @__PURE__ */ vue.defineComponent({
                     onChange: handlePageChange
                   }, null, 8, ["pageSize", "total"])
                 ])) : vue.createCommentVNode("", true)
-              ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$1, [
+              ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_6$2, [
                 vue.createVNode(vue.unref(AEmpty))
               ]))
             ]),
@@ -7639,12 +7639,13 @@ const _hoisted_2$9 = {
   key: 0,
   class: "table-children-required"
 };
-const _hoisted_3$6 = {
+const _hoisted_3$6 = { class: "text-red-500" };
+const _hoisted_4$4 = {
   key: 0,
   class: "table-children-delete-index"
 };
-const _hoisted_4$4 = ["onClick"];
-const _hoisted_5$3 = {
+const _hoisted_5$3 = ["onClick"];
+const _hoisted_6$1 = {
   key: 2,
   class: "table-children-delete-index"
 };
@@ -7671,7 +7672,7 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
   emits: ["update:value", "change", "add", "remove"],
   setup(__props, { expose, emit }) {
     const props2 = __props;
-    const listFormRefs = vue.ref([]);
+    const formActionType = vue.inject("formActionType");
     const emitData = vue.ref([]);
     const [state] = use.useRuleFormItem(props2, "value", "change", emitData);
     const getColumns = vue.computed(() => {
@@ -7705,17 +7706,63 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
       emit("remove", state.value, index2);
     };
     const getPopupContainer2 = () => document.body;
-    const loadKv = () => {
-      const columns = props2.columns;
-      let dicData = [];
-      columns.forEach(async (column) => {
-        if (column == null ? void 0 : column.api) {
-          dicData = await column.api();
-          column.dicData = dicData;
-        }
+    const rulesRef = vue.reactive({});
+    const getRules = ({ column, record, index: index2, ...args }) => {
+      var _a2, _b;
+      const errKey = `${column.dataIndex}-${record.uuid}Info`;
+      if (!column.required)
+        return [];
+      if ((_a2 = rulesRef[errKey]) == null ? void 0 : _a2.rules)
+        return (_b = rulesRef[errKey]) == null ? void 0 : _b.rules;
+      rulesRef[errKey] = {
+        rules: [],
+        show: false,
+        msg: ""
+      };
+      if (!column.rules && column.required) {
+        rulesRef[errKey].rules = [
+          {
+            required: true,
+            validator: (rule, value) => {
+              const prefix = column.type.toLocaleLowerCase().includes("input") ? "请输入" : "请选择";
+              const errMsg = `${prefix}${column.title}`;
+              if (value) {
+                rulesRef[errKey].show = false;
+                return Promise.resolve();
+              }
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = errMsg;
+              return Promise.reject(errMsg);
+            }
+          }
+        ];
+        return rulesRef[errKey].rules;
+      }
+      if (!isArray$2(column.rules))
+        return column.rules;
+      rulesRef[errKey].rules = cloneDeep(column.rules);
+      rulesRef[errKey].rules.forEach((item) => {
+        if (!item.validator || !utils.isFunction(item.validator))
+          return;
+        const validator = item.validator;
+        item.validator = async (rule, value) => {
+          try {
+            rulesRef[errKey].show = false;
+            return await validator(
+              rule,
+              value,
+              { column, record, ...args },
+              formActionType
+            );
+          } catch (error2) {
+            rulesRef[errKey].show = true;
+            rulesRef[errKey].msg = error2;
+            return Promise.reject(error2);
+          }
+        };
       });
+      return rulesRef[errKey].rules;
     };
-    loadKv();
     vue.watch(
       () => state.value,
       (v, old) => {
@@ -7735,6 +7782,17 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         deep: true
       }
     );
+    const loadKv = () => {
+      const columns = props2.columns;
+      let dicData = [];
+      columns.forEach(async (column) => {
+        if (column == null ? void 0 : column.api) {
+          dicData = await column.api();
+          column.dicData = dicData;
+        }
+      });
+    };
+    const listFormRefs = vue.ref([]);
     const validate = async () => {
       try {
         for (let formRef of listFormRefs.value) {
@@ -7744,6 +7802,7 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         throw new Error("校验失败");
       }
     };
+    loadKv();
     expose({ validate });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Table), {
@@ -7775,63 +7834,80 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         bodyCell: vue.withCtx(({ column, record, index: index2, ...args }) => [
           column.dataIndex !== "index" && column.type !== "text" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), {
             required: column.required,
-            rules: (column == null ? void 0 : column.rules) || [],
+            rules: getRules({ column, record, index: index2, ...args }),
             name: [_ctx.$attrs.codeField, index2, column.dataIndex],
             key: record[__props.rowKey]
           }, {
-            default: vue.withCtx(() => [
-              column.type === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), {
-                key: 0,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                options: column.dicData,
-                mode: column.mode,
-                "max-tag-count": column.maxTagCount,
-                "max-tag-text-length": column.maxTagTextLength
-              }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column.type === "datePicker" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.DatePicker), {
-                key: 1,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                valueFormat: "YYYY-MM-DD HH:mm:ss"
-              }, null, 8, ["value", "onUpdate:value"])) : column.type === "number" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.InputNumber), {
-                key: 2,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                min: column.min,
-                max: column.max,
-                precision: column.precision ?? 2
-              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
-                key: 3,
-                value: record[column.dataIndex],
-                "onUpdate:value": ($event) => record[column.dataIndex] = $event,
-                disabled: !props2.isShowAction
-              }, null, 8, ["value", "onUpdate:value", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(componentMap$2).get(column.type)), vue.mergeProps(
-                {
-                  key: 4,
-                  allowClear: "",
-                  getPopupContainer: getPopupContainer2,
-                  style: { width: "100%" }
-                },
-                vue.unref(utils.isFunction)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
-                {
-                  value: record[column.dataIndex],
-                  "onUpdate:value": ($event) => record[column.dataIndex] = $event
-                }
-              ), null, 16, ["value", "onUpdate:value"]))
-            ]),
+            default: vue.withCtx(() => {
+              var _a2;
+              return [
+                vue.createVNode(vue.unref(antDesignVue.Popover), {
+                  overlayClassName: "table-children-err-popover",
+                  visible: !!((_a2 = rulesRef == null ? void 0 : rulesRef[`${column.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a2.show)
+                }, {
+                  content: vue.withCtx(() => {
+                    var _a3;
+                    return [
+                      vue.createElementVNode("span", _hoisted_3$6, vue.toDisplayString((_a3 = rulesRef[`${column.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a3.msg), 1)
+                    ];
+                  }),
+                  default: vue.withCtx(() => [
+                    column.type === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), {
+                      key: 0,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      options: column.dicData,
+                      mode: column.mode,
+                      "max-tag-count": column.maxTagCount,
+                      "max-tag-text-length": column.maxTagTextLength
+                    }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column.type === "datePicker" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.DatePicker), {
+                      key: 1,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      valueFormat: "YYYY-MM-DD HH:mm:ss"
+                    }, null, 8, ["value", "onUpdate:value"])) : column.type === "number" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.InputNumber), {
+                      key: 2,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      min: column.min,
+                      max: column.max,
+                      precision: column.precision ?? 2
+                    }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
+                      key: 3,
+                      value: record[column.dataIndex],
+                      "onUpdate:value": ($event) => record[column.dataIndex] = $event,
+                      disabled: !props2.isShowAction
+                    }, null, 8, ["value", "onUpdate:value", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(componentMap$2).get(column.type)), vue.mergeProps(
+                      {
+                        key: 4,
+                        allowClear: "",
+                        getPopupContainer: getPopupContainer2,
+                        style: { width: "100%" }
+                      },
+                      vue.unref(utils.isFunction)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
+                      {
+                        value: record[column.dataIndex],
+                        "onUpdate:value": ($event) => record[column.dataIndex] = $event
+                      }
+                    ), null, 16, ["value", "onUpdate:value"]))
+                  ]),
+                  _: 2
+                }, 1032, ["visible"])
+              ];
+            }),
             _: 2
           }, 1032, ["required", "rules", "name"])) : column.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock("div", {
             class: "table-children-delete-wrapper",
             key: record[__props.rowKey]
           }, [
-            __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_3$6, vue.toDisplayString(index2 + 1), 1)) : vue.createCommentVNode("", true),
+            __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_4$4, vue.toDisplayString(index2 + 1), 1)) : vue.createCommentVNode("", true),
             __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 1,
               class: "table-children-delete-item",
               onClick: ($event) => rowClickEvent(record[__props.rowKey])
             }, [
               vue.createVNode(vue.unref(DeleteFilled$1), { style: { color: "#fff" } })
-            ], 8, _hoisted_4$4)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_5$3, vue.toDisplayString(index2 + 1), 1))
+            ], 8, _hoisted_5$3)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_6$1, vue.toDisplayString(index2 + 1), 1))
           ])) : vue.createCommentVNode("", true)
         ]),
         _: 1
@@ -7839,8 +7915,8 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_d996cbc3_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-d996cbc3"]]);
+const Table_vue_vue_type_style_index_0_scoped_9cf892ac_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-9cf892ac"]]);
 const modal = "";
 use.useI18n();
 const modalProps = {
@@ -12258,28 +12334,30 @@ const _sfc_main$M = vue.defineComponent({
       () => formModel,
       useDebounceFn$1((val) => {
         var _a2;
+        if (isEqual(vue.toRaw(val), vue.toRaw(tempFormModel)))
+          return;
         for (const key2 in val) {
-          if (val[key2] !== tempFormModel[key2]) {
-            (_a2 = vue.unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
-              var _a3;
-              const isComponentProps = item.field === key2 && item.componentProps;
-              if (isComponentProps && !utils.isFunction(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
-                item.componentProps.onModelChange(val[key2]);
-              } else if (isComponentProps && utils.isFunction(item.componentProps)) {
-                const modelProps = item.componentProps({
-                  schema: item,
-                  formModel,
-                  formActionType,
-                  tableAction: props2.tableAction
-                });
-                if (modelProps.onModelChange) {
-                  modelProps.onModelChange(val[key2]);
-                }
+          if (isEqual(vue.toRaw(val[key2]), vue.toRaw(tempFormModel[key2])))
+            continue;
+          (_a2 = vue.unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
+            var _a3;
+            const isComponentProps = item.field === key2 && item.componentProps;
+            if (isComponentProps && !utils.isFunction(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
+              item.componentProps.onModelChange(val[key2]);
+            } else if (isComponentProps && utils.isFunction(item.componentProps)) {
+              const modelProps = item.componentProps({
+                schema: item,
+                formModel,
+                formActionType,
+                tableAction: props2.tableAction
+              });
+              if (modelProps.onModelChange) {
+                modelProps.onModelChange(val[key2]);
               }
-            });
-          }
+            }
+          });
         }
-        Object.assign(tempFormModel, formModel);
+        Object.assign(tempFormModel, cloneDeep(formModel));
         vue.unref(getProps).submitOnChange && handleSubmit();
       }, 300),
       { deep: true }
@@ -12322,6 +12400,7 @@ const _sfc_main$M = vue.defineComponent({
       submit: handleSubmit,
       scrollToField
     };
+    vue.provide("formActionType", formActionType);
     const clearCurrValidate = (field) => {
       clearValidate([field]);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.15.0",
+  "version": "2.15.3",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -29,8 +29,8 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/tinymce": "^1.0.6",
     "@shy-plugins/use": "1.0.9",
+    "@shy-plugins/tinymce": "^1.0.6",
     "@shy-plugins/utils": "1.1.1"
   },
   "types": "es/ui/index.d.ts",