vue-devui 1.0.0-rc.10 → 1.0.0-rc.13

package/switch/index.es.js

@@ -7516,6 +7516,16 @@ Schema.register = function register(type4, validator) {
 Schema.warning = warning;
 Schema.messages = messages;
 Schema.validators = validators;
+function getFieldValue(obj, path) {
+  return {
+    get value() {
+      return lodash.exports.get(obj, path);
+    },
+    set value(val) {
+      lodash.exports.set(obj, path, val);
+    }
+  };
+}
 function useFormItem(messageType, _rules, validateState) {
   const formContext = inject(FORM_TOKEN);
   const ns2 = useNamespace("form");
@@ -7554,17 +7564,12 @@ function useFormItemValidate(props, _rules) {
   const computedField = computed(() => {
     return typeof props.field === "string" ? props.field : "";
   });
-  const fieldValue = computed({
-    get: () => {
-      const formData = formContext.data;
-      if (!formData || !props.field) {
-        return;
-      }
-      return formData[props.field];
-    },
-    set: (val) => {
-      formContext.data[props.field] = val;
+  const fieldValue = computed(() => {
+    const formData = formContext.data;
+    if (!formData || !props.field) {
+      return;
     }
+    return getFieldValue(formData, props.field).value;
   });
   const getRuleByTrigger = (triggerVal) => {
     return _rules.value.filter((rule) => {
@@ -7577,7 +7582,7 @@ function useFormItemValidate(props, _rules) {
         return rule.trigger === triggerVal;
       }
     }).map((_a) => {
-      var _b = _a, { trigger } = _b, rule = __objRest(_b, ["trigger"]);
+      var rule = __objRest(_a, []);
       return rule;
     });
   };
@@ -7633,13 +7638,16 @@ function useFormItemValidate(props, _rules) {
     if (!formContext.data || !props.field) {
       return;
     }
-    isResetting = true;
-    fieldValue.value = initFieldValue;
+    const currentValue = getFieldValue(formContext.data, props.field);
+    if (!lodash.exports.isEqual(currentValue.value, initFieldValue)) {
+      isResetting = true;
+    }
+    currentValue.value = initFieldValue;
     await nextTick();
     clearValidate();
   };
   onMounted(() => {
-    initFieldValue = lodash.exports.cloneDeep(formContext.data[props.field]);
+    initFieldValue = lodash.exports.clone(fieldValue.value);
   });
   return { validateState, validateMessage, validate, resetField, clearValidate };
 }