3h1-ui 2.14.14 → 2.14.15

package/es/index.js

@@ -7685,8 +7685,10 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
       type: Boolean
     }
   },
+  emits: ["clearCurrValidate"],
   setup(props2, {
-    slots
+    slots,
+    emit
   }) {
     const {
       schema,
@@ -7823,6 +7825,7 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
         dynamicRules,
         required
       } = props2.schema;
+      emit("clearCurrValidate", unref(getValues).field);
       if (isFunction$4(dynamicRules)) {
         return dynamicRules(unref(getValues));
       }
@@ -10402,6 +10405,9 @@ const _sfc_main$N = defineComponent({
       submit: handleSubmit,
       scrollToField
     };
+    const clearCurrValidate = (field) => {
+      clearValidate([field]);
+    };
     onMounted(() => {
       initDefault();
       emit("register", formActionType);
@@ -10426,7 +10432,8 @@ const _sfc_main$N = defineComponent({
         () => ({ ...getProps.value, ...advanceState })
       ),
       fieldsIsAdvancedMap,
-      ...formActionType
+      ...formActionType,
+      clearCurrValidate
     };
   }
 });
@@ -10459,7 +10466,8 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
                 formProps: _ctx.getProps,
                 allDefaultValues: _ctx.defaultValueRef,
                 formModel: _ctx.formModel,
-                setFormModel: _ctx.setFormModel
+                setFormModel: _ctx.setFormModel,
+                onClearCurrValidate: _ctx.clearCurrValidate
               }, createSlots({ _: 2 }, [
                 renderList(Object.keys(_ctx.$slots), (item) => {
                   return {
@@ -10469,7 +10477,7 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
                     ])
                   };
                 })
-              ]), 1032, ["isAdvanced", "tableAction", "formActionType", "schema", "formProps", "allDefaultValues", "formModel", "setFormModel"]);
+              ]), 1032, ["isAdvanced", "tableAction", "formActionType", "schema", "formProps", "allDefaultValues", "formModel", "setFormModel", "onClearCurrValidate"]);
             }), 128))
           ]),
           _: 3
@@ -17041,7 +17049,7 @@ const basicColProps = 24;
 const basicProps$2 = {
   schema: {
     type: Array,
-    default: () => [{ label: "a", field: "a" }]
+    default: () => []
   },
   labelAlign: {
     type: String,
@@ -17108,7 +17116,7 @@ const Description = /* @__PURE__ */ defineComponent({
     };
     const rows = computed(() => {
       return getProps.value.schema.map((item) => {
-        var _a2, _b;
+        var _a2, _b, _c, _d;
         if ((item == null ? void 0 : item.component) === "Divider") {
           return createVNode(Divider$1, null, null);
         } else if ((item == null ? void 0 : item.component) === "Group") {
@@ -17131,11 +17139,11 @@ const Description = /* @__PURE__ */ defineComponent({
               textAlign: getProps.value.labelAlign
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), createVNode("span", {
+          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), createVNode("span", {
             "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field], (item == null ? void 0 : item.isCopy) ? createVNode("span", {
+          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? createVNode("span", {
             "style": "cursor:pointer;margin-left:5px",
-            "onClick": () => handleClick(getProps.value.data[item.field])
+            "onClick": () => handleClick(getProps.value.data[`${item.field}`])
           }, [createVNode(CopyOutlined$1, {
             "style": {
               color: "#458ef9",
@@ -17162,12 +17170,24 @@ function useDescription(props2) {
   const desc = ref(null);
   const loaded = ref(false);
   function register(instance) {
-    if (unref(loaded)) {
+    onUnmounted(() => {
+      desc.value = null;
+      loaded.value = false;
+    });
+    if (unref(loaded) && instance === unref(desc))
       return;
-    }
     desc.value = instance;
-    props2 && instance.setDescProps(props2);
     loaded.value = true;
+    watch(
+      () => props2,
+      () => {
+        props2 && instance.setDescProps(props2);
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    );
   }
   const methods2 = {
     setDescProps: (descProps) => {

package/lib/index.js

@@ -7687,8 +7687,10 @@ const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
       type: Boolean
     }
   },
+  emits: ["clearCurrValidate"],
   setup(props2, {
-    slots
+    slots,
+    emit
   }) {
     const {
       schema,
@@ -7825,6 +7827,7 @@ const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
         dynamicRules,
         required
       } = props2.schema;
+      emit("clearCurrValidate", vue.unref(getValues).field);
       if (utils.isFunction(dynamicRules)) {
         return dynamicRules(vue.unref(getValues));
       }
@@ -10404,6 +10407,9 @@ const _sfc_main$N = vue.defineComponent({
       submit: handleSubmit,
       scrollToField
     };
+    const clearCurrValidate = (field) => {
+      clearValidate([field]);
+    };
     vue.onMounted(() => {
       initDefault();
       emit("register", formActionType);
@@ -10428,7 +10434,8 @@ const _sfc_main$N = vue.defineComponent({
         () => ({ ...getProps.value, ...advanceState })
       ),
       fieldsIsAdvancedMap,
-      ...formActionType
+      ...formActionType,
+      clearCurrValidate
     };
   }
 });
@@ -10461,7 +10468,8 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
                 formProps: _ctx.getProps,
                 allDefaultValues: _ctx.defaultValueRef,
                 formModel: _ctx.formModel,
-                setFormModel: _ctx.setFormModel
+                setFormModel: _ctx.setFormModel,
+                onClearCurrValidate: _ctx.clearCurrValidate
               }, vue.createSlots({ _: 2 }, [
                 vue.renderList(Object.keys(_ctx.$slots), (item) => {
                   return {
@@ -10471,7 +10479,7 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
                     ])
                   };
                 })
-              ]), 1032, ["isAdvanced", "tableAction", "formActionType", "schema", "formProps", "allDefaultValues", "formModel", "setFormModel"]);
+              ]), 1032, ["isAdvanced", "tableAction", "formActionType", "schema", "formProps", "allDefaultValues", "formModel", "setFormModel", "onClearCurrValidate"]);
             }), 128))
           ]),
           _: 3
@@ -17043,7 +17051,7 @@ const basicColProps = 24;
 const basicProps$2 = {
   schema: {
     type: Array,
-    default: () => [{ label: "a", field: "a" }]
+    default: () => []
   },
   labelAlign: {
     type: String,
@@ -17110,7 +17118,7 @@ const Description = /* @__PURE__ */ vue.defineComponent({
     };
     const rows = vue.computed(() => {
       return getProps.value.schema.map((item) => {
-        var _a2, _b;
+        var _a2, _b, _c, _d;
         if ((item == null ? void 0 : item.component) === "Divider") {
           return vue.createVNode(antDesignVue.Divider, null, null);
         } else if ((item == null ? void 0 : item.component) === "Group") {
@@ -17133,11 +17141,11 @@ const Description = /* @__PURE__ */ vue.defineComponent({
               textAlign: getProps.value.labelAlign
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), vue.createVNode("span", {
+          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), vue.createVNode("span", {
             "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field], (item == null ? void 0 : item.isCopy) ? vue.createVNode("span", {
+          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? vue.createVNode("span", {
             "style": "cursor:pointer;margin-left:5px",
-            "onClick": () => handleClick(getProps.value.data[item.field])
+            "onClick": () => handleClick(getProps.value.data[`${item.field}`])
           }, [vue.createVNode(CopyOutlined$1, {
             "style": {
               color: "#458ef9",
@@ -17164,12 +17172,24 @@ function useDescription(props2) {
   const desc = vue.ref(null);
   const loaded = vue.ref(false);
   function register(instance) {
-    if (vue.unref(loaded)) {
+    vue.onUnmounted(() => {
+      desc.value = null;
+      loaded.value = false;
+    });
+    if (vue.unref(loaded) && instance === vue.unref(desc))
       return;
-    }
     desc.value = instance;
-    props2 && instance.setDescProps(props2);
     loaded.value = true;
+    vue.watch(
+      () => props2,
+      () => {
+        props2 && instance.setDescProps(props2);
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    );
   }
   const methods2 = {
     setDescProps: (descProps) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.14.14",
+  "version": "2.14.15",
   "description": "",
   "module": "es/index.js",
   "main": "lib/index.js",