@ftjs/core 0.4.2 → 0.4.5

package/dist/index.js

@@ -1,4 +1,4 @@
-import { unref, inject, computed, ref, watch, onUnmounted, provide, toValue, nextTick } from "vue";
+import { unref, inject, computed, ref, watch, onUnmounted, provide, toValue, watchEffect, nextTick } from "vue";
 const isBrowser = typeof window !== "undefined";
 const getField = (column) => {
   var _a;
@@ -104,10 +104,18 @@ const useColumnsChecked = (columns, cache) => {
     });
     return Object.fromEntries(entries);
   });
-  const storageV = getStorage(storageKey, cache);
+  const storageV = computed(() => {
+    return getStorage(storageKey, toValue(cache));
+  });
   const vRef = ref(
-    Object.assign({}, columnsV.value, storageV)
+    {}
   );
+  watchEffect(() => {
+    vRef.value = {
+      ...columnsV.value,
+      ...storageV.value
+    };
+  });
   const columnsChecked = computed({
     get() {
       return Object.entries(vRef.value).filter(([_, show]) => show).map(([field]) => field);
@@ -121,7 +129,7 @@ const useColumnsChecked = (columns, cache) => {
         return [field, show];
       });
       vRef.value = Object.fromEntries(entries);
-      setStorage(storageKey, storageV2, cache);
+      setStorage(storageKey, storageV2, toValue(cache));
     }
   });
   const resetColumnsChecked = () => {
@@ -142,10 +150,18 @@ const useColumnsSorted = (columns, cache) => {
     });
     return Object.fromEntries(entries);
   });
-  const storageV = getStorage(storageKey, cache);
+  const storageV = computed(() => {
+    return getStorage(storageKey, toValue(cache));
+  });
   const vRef = ref(
-    Object.assign({}, columnsV.value, storageV)
+    {}
   );
+  watchEffect(() => {
+    vRef.value = {
+      ...columnsV.value,
+      ...storageV.value
+    };
+  });
   const columnsSort = computed({
     get() {
       return vRef.value;
@@ -160,7 +176,7 @@ const useColumnsSorted = (columns, cache) => {
         return [field, v[field]];
       });
       vRef.value = Object.fromEntries(entries);
-      setStorage(storageKey, storageV2, cache);
+      setStorage(storageKey, storageV2, toValue(cache));
     }
   });
   const resetColumnsSort = () => {
@@ -200,11 +216,11 @@ const useForm = (props) => {
   });
   const { columnsChecked, resetColumnsChecked } = useColumnsChecked(
     columns,
-    props.cache
+    () => props.cache
   );
   const { columnsSort, resetColumnsSort } = useColumnsSorted(
     columns,
-    props.cache
+    () => props.cache
   );
   let tmpDefaultForm;
   const watchMap = /* @__PURE__ */ new Map();

package/dist/type-helper.d.ts

@@ -29,4 +29,10 @@ export type Unrefs<T> = {
 export type Refs<T> = {
     [K in keyof T]: T[K] extends Ref<any> ? T[K] : MaybeRef<T[K]>;
 };
+/**
+ * 工具类型：提取 Column 的类型
+ */
+export type ExtractColumnType<T> = T extends {
+    type: infer U;
+} ? U : never;
 export {};

package/package.json

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