@carefrees/form-utils-vue 0.0.8 → 0.0.10

package/esm/hooks/attr/attr.FormItem.mjs

@@ -38,7 +38,7 @@ const useFormItemAttr = (options) => {
   formItemInstance.preserve = preserve;
   const oldValue = ref(get(form.formData, toValue(newName)));
   watch(() => [get(form.formData, toValue(newName)), toValue(newName)], () => {
-    oldValue.value = form.getFieldValue(newName.value);
+    oldValue.value = form.getFieldValue(toValue(newName));
   }, {
     immediate: true
   });
@@ -55,7 +55,7 @@ const useFormItemAttr = (options) => {
         value = formatValue(value, form, formItemInstance, event);
       }
       if (oldValue.value !== value) {
-        form.updatedFieldValue(newName.value, value, "validate");
+        form.updatedFieldValue(toValue(newName), value, "validate");
         (_a = formItemInstance.onAfterUpdate) == null ? void 0 : _a.call(formItemInstance, value, form, formItemInstance, event);
         if (Array.isArray(formItemInstance.noticeWatchField) && formItemInstance.noticeWatchField.length) {
           form.noticeWatch(formItemInstance.noticeWatchField);
@@ -90,16 +90,16 @@ const useFormItemAttr = (options) => {
   });
   const attrsLastData = ref(toValue(newAttrs));
   watch(() => [toValue(newAttrs), toValue(deepRefData), toValue(oldValue)], () => {
-    attrsLastData.value = (useAttrs == null ? void 0 : useAttrs(newAttrs.value, form, formItemInstance)) || newAttrs.value;
+    attrsLastData.value = (useAttrs == null ? void 0 : useAttrs(toValue(newAttrs), form, formItemInstance)) || toValue(newAttrs);
   }, {
     immediate: true
   });
-  const validateResult = ref(ruleInstance.value.getValidateResult());
+  const validateResult = ref(toValue(ruleInstance).getValidateResult());
   watch(() => [toValue(deepRefData), toValue(oldValue)], () => {
-    useRules == null ? void 0 : useRules(ruleInstance.value, form, formItemInstance);
+    useRules == null ? void 0 : useRules(ruleInstance, form, formItemInstance);
   });
-  watch(() => [ruleInstance.value.messages, ruleInstance.value.rules, toValue(oldValue)], () => {
-    validateResult.value = ruleInstance.value.getValidateResult();
+  watch(() => [toValue(ruleInstance).messages, toValue(ruleInstance).rules, toValue(oldValue)], () => {
+    validateResult.value = toValue(ruleInstance).getValidateResult();
   });
   return {
     valuePropName,

package/esm/hooks/register/register.FormHideItem.mjs

@@ -1,4 +1,4 @@
-import { ref, watch } from "vue";
+import { ref, watch, toValue } from "vue";
 import { FormHideItemInstanceBase } from "@carefrees/form-utils";
 import { useFormItemParentNameInject } from "../useFormItemParentName.mjs";
 import { useFormInject } from "../useForm.mjs";
@@ -10,7 +10,7 @@ const useRegisterFormHideItem = (options) => {
   const hideItemInstance = ref(new FormHideItemInstanceBase().ctor(newName.value));
   const isHide = ref(form.getFieldHideValue(newName.value));
   watch(
-    [isHide.value],
+    () => [toValue(isHide)],
     () => {
       hideItemInstance.value.preHideValue = isHide.value;
     },
@@ -21,15 +21,15 @@ const useRegisterFormHideItem = (options) => {
   };
   hideItemInstance.value.updatedItem = setValue;
   watch(
-    [form, newSort.value],
+    () => [form, toValue(newSort)],
     () => {
       hideItemInstance.value.instance = form;
-      hideItemInstance.value.sort = newSort.value;
+      hideItemInstance.value.sort = toValue(newSort);
     },
     { immediate: true }
   );
   useEffect(() => {
-    return form.registerFormHideItem(hideItemInstance.value);
+    return form.registerFormHideItem(toValue(hideItemInstance));
   });
   return { form, isHide };
 };