@ftjs/core 0.5.4 → 0.5.6

package/README.md

@@ -13,4 +13,4 @@
 
 ## License
 
-[MIT](../../LICENSE)
+[MIT](https://github.com/yuhengshen/ftjs/blob/main/LICENSE)

package/dist/index.js

@@ -231,7 +231,17 @@ const useForm = (props) => {
   );
   let tmpDefaultForm;
   const watchMap = /* @__PURE__ */ new Map();
-  const hideFieldSet = ref(/* @__PURE__ */ new Set());
+  const fieldControlMap = ref(/* @__PURE__ */ new Map());
+  const hideFieldSet = computed(() => {
+    const hiddenFields = /* @__PURE__ */ new Set();
+    fieldControlMap.value.forEach((controlMap, targetField) => {
+      const shouldShow = Array.from(controlMap.values()).every(Boolean);
+      if (!shouldShow) {
+        hiddenFields.add(targetField);
+      }
+    });
+    return hiddenFields;
+  });
   const visibleColumns = computed(() => {
     return columns.value.filter((column) => {
       var _a2;
@@ -251,7 +261,7 @@ const useForm = (props) => {
       onCleanup(() => {
         watchMap.forEach((cancel) => cancel());
         watchMap.clear();
-        hideFieldSet.value.clear();
+        fieldControlMap.value.clear();
       });
       addFormDefaultValue();
       runFieldWatch();
@@ -296,7 +306,7 @@ const useForm = (props) => {
           watch(
             () => get(form.value, field),
             (val) => {
-              control.forEach(({ field: field2, value }) => {
+              control.forEach(({ field: targetField, value }) => {
                 let show = true;
                 if (typeof value === "function") {
                   show = value({
@@ -306,11 +316,10 @@ const useForm = (props) => {
                 } else {
                   show = Array.isArray(value) ? value.includes(val) : val === value;
                 }
-                if (show) {
-                  hideFieldSet.value.delete(field2);
-                } else {
-                  hideFieldSet.value.add(field2);
+                if (!fieldControlMap.value.has(targetField)) {
+                  fieldControlMap.value.set(targetField, /* @__PURE__ */ new Map());
                 }
+                fieldControlMap.value.get(targetField).set(field, show);
               });
             },
             {

package/package.json

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