@ftjs/core 0.5.7 → 1.1.0

package/dist/index.js

@@ -97,6 +97,43 @@ const setStorage = (key, value, cache) => {
     localStorage.setItem(key, JSON.stringify(obj));
   }
 };
+const isEqual = (a, b) => {
+  if (a === b) {
+    return true;
+  }
+  if (a == null || b == null) {
+    return a === b;
+  }
+  if (typeof a !== typeof b) {
+    return false;
+  }
+  if (Number.isNaN(a) && Number.isNaN(b)) {
+    return true;
+  }
+  if (typeof a !== "object") {
+    return a === b;
+  }
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return a.length === b.length && a.every((item, index) => isEqual(item, b[index]));
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    return false;
+  }
+  if (a instanceof Date && b instanceof Date) {
+    return a.getTime() === b.getTime();
+  }
+  if (a instanceof Date || b instanceof Date) {
+    return false;
+  }
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  return keysA.every(
+    (key) => Object.prototype.hasOwnProperty.call(b, key) && isEqual(a[key], b[key])
+  );
+};
 const provideFormKey = Symbol("@ftjs/core-form-provide");
 const useFormInject = () => {
   return inject(provideFormKey);
@@ -278,6 +315,8 @@ const useForm = (props) => {
       const control = column.control;
       if (!watchObj && !control) return;
       const field = getField(column);
+      const watchArr = column.fields ?? [column.field];
+      const isSingleWatch = watchArr.length === 1;
       const cancel = [];
       if (typeof watchObj === "function") {
         watchObj = {
@@ -288,9 +327,13 @@ const useForm = (props) => {
         cancel.push(
           watch(
             () => {
-              return get(form.value, field);
+              return watchArr.map((f) => get(form.value, f));
             },
             (val, oldVal) => {
+              if (isSingleWatch) {
+                val = val == null ? void 0 : val[0];
+                oldVal = oldVal == null ? void 0 : oldVal[0];
+              }
               watchObj.handler({ val, oldVal, form: form.value });
             },
             {
@@ -303,7 +346,7 @@ const useForm = (props) => {
       if (control) {
         cancel.push(
           watch(
-            () => get(form.value, field),
+            () => watchArr.map((f) => get(form.value, f)),
             (val) => {
               control.forEach(({ field: targetField, value }) => {
                 let show = true;
@@ -313,7 +356,15 @@ const useForm = (props) => {
                     val
                   });
                 } else {
-                  show = Array.isArray(value) ? value.includes(val) : val === value;
+                  if (Array.isArray(value)) {
+                    if (isSingleWatch) {
+                      show = value.some((v) => isEqual(v, val[0]));
+                    } else {
+                      show = isEqual(value, val);
+                    }
+                  } else {
+                    show = isEqual(value, val[0]);
+                  }
                 }
                 if (!fieldControlMap.value.has(targetField)) {
                   fieldControlMap.value.set(targetField, /* @__PURE__ */ new Map());
@@ -496,6 +547,7 @@ export {
   has,
   isBrowser,
   isEmptyStrOrNull,
+  isEqual,
   set,
   setStorage,
   unrefs,

package/dist/utils.d.ts

@@ -29,3 +29,9 @@ export declare const getStorage: (key: string, cache?: string) => {};
  * @param cache 缓存名称
  */
 export declare const setStorage: (key: string, value: any, cache?: string) => void;
+/**
+ * 简单判断两个值是否相等
+ *
+ * 不考虑循环引用
+ */
+export declare const isEqual: (a: any, b: any) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/core",
-  "version": "0.5.7",
+  "version": "1.1.0",
   "keywords": [],
   "author": "",
   "license": "MIT",