@ftjs/core 1.1.1 → 1.2.1

package/dist/form/columns.d.ts

@@ -1,5 +1,5 @@
 import { MaybeRefOrGetter, VNodeChild } from 'vue';
-import { RecordPath } from '../type-helper';
+import { MaybeRefOrFormGetter, RecordPath } from '../type-helper';
 type WatchHandler<F extends Record<string, any>> = (params: {
     val: any;
     oldVal: any;
@@ -17,7 +17,7 @@ export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 字段名 `fields` 和 `field` 至少有一个存在
      *
-     * `field` 优先级高于 `fields`
+     * `fields` 优先级高于 `field`
      *
      * 如果是在 TableColumns 中，则默认继承其中的 field
      */
@@ -41,15 +41,21 @@ export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 是否隐藏
      */
-    hide?: MaybeRefOrGetter<boolean>;
+    hide?: MaybeRefOrFormGetter<boolean, F>;
     /**
      * 监听字段值变化，如果是 `fields` ，则只会监听第一个字段的值变化
      */
     watch?: Watch<F>;
     /**
      * 字段默认值
+     *
+     * @deprecated 请使用 `defaultValue` 代替
      */
     value?: any;
+    /**
+     * 字段默认值
+     */
+    defaultValue?: any;
     /**
      * 控制其他字段基于此值的显示规则
      *
@@ -93,7 +99,7 @@ export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 是否查看模式
      */
-    isView?: MaybeRefOrGetter<boolean>;
+    isView?: MaybeRefOrFormGetter<boolean, F>;
     /**
      * 自定义查看模式下的渲染
      */

package/dist/form/use-form.d.ts

@@ -1,8 +1,14 @@
 import { ComputedRef } from 'vue';
 import { FtFormColumnBase } from './columns';
+import { MaybeRefOrFormGetter } from '../type-helper';
 interface FormInject<F extends Record<string, any>> {
     form: ComputedRef<F>;
 }
+export declare function isFormGetter<T, F extends Record<string, any>>(fn: MaybeRefOrFormGetter<T, F>): fn is (form: F) => T;
+/**
+ * 将 MaybeRefOrFormGetter 转换为普通值
+ */
+export declare function toValueWithForm<T extends Record<string, any>, R>(fn: MaybeRefOrFormGetter<R, T>, form: ComputedRef<T>): R;
 export declare const useFormInject: <F extends Record<string, any> = Record<string, any>>() => FormInject<F> | undefined;
 export interface FtBaseFormProps<F extends Record<string, any>> {
     /**

package/dist/index.js

@@ -4,6 +4,9 @@ const getField = (column) => {
   var _a;
   return ((_a = column.fields) == null ? void 0 : _a[0]) ?? column.field;
 };
+const getDefaultValues = (column) => {
+  return column.defaultValue ?? column.value;
+};
 const isEmptyStrOrNull = (val) => {
   return val === "" || val == null;
 };
@@ -134,16 +137,25 @@ const isEqual = (a, b) => {
     (key) => Object.prototype.hasOwnProperty.call(b, key) && isEqual(a[key], b[key])
   );
 };
+function isFormGetter(fn) {
+  return typeof fn === "function";
+}
 const provideFormKey = Symbol("@ftjs/core-form-provide");
+function toValueWithForm(fn, form) {
+  if (isFormGetter(fn)) {
+    return fn(form.value);
+  }
+  return unref(fn);
+}
 const useFormInject = () => {
   return inject(provideFormKey);
 };
-const useColumnsChecked = (columns, cache) => {
+const useColumnsChecked = (columns, cache, form) => {
   const storageKey = `ftjs-form-columns-checked-obj`;
   const columnsV = computed(() => {
     const entries = columns.value.map((e) => {
       const field = getField(e);
-      return [field, !toValue(e.hide)];
+      return [field, !toValueWithForm(e.hide, form)];
     });
     return Object.fromEntries(entries);
   });
@@ -168,7 +180,7 @@ const useColumnsChecked = (columns, cache) => {
       const entries = columns.value.map((e) => {
         const field = getField(e);
         const show = v.includes(field);
-        if (show !== !toValue(e.hide)) storageV2[field] = show;
+        if (show !== !toValueWithForm(e.hide, form)) storageV2[field] = show;
         return [field, show];
       });
       vRef.value = Object.fromEntries(entries);
@@ -176,7 +188,7 @@ const useColumnsChecked = (columns, cache) => {
     }
   });
   const resetColumnsChecked = () => {
-    columnsChecked.value = columns.value.filter((e) => !toValue(e.hide)).map((e) => getField(e));
+    columnsChecked.value = columns.value.filter((e) => !toValueWithForm(e.hide, form)).map((e) => getField(e));
   };
   return {
     columnsChecked,
@@ -237,7 +249,7 @@ const useColumnsSorted = (columns, cache) => {
 };
 const getFieldsAndValues = (column) => {
   const fields = column.fields || [column.field];
-  const values = column.fields ? column.value || [] : [column.value];
+  const values = column.fields ? getDefaultValues(column) || [] : [getDefaultValues(column)];
   return { fields, values };
 };
 const useForm = (props) => {
@@ -259,7 +271,8 @@ const useForm = (props) => {
   });
   const { columnsChecked, resetColumnsChecked } = useColumnsChecked(
     columns,
-    () => props.cache
+    () => props.cache,
+    form
   );
   const { columnsSort, resetColumnsSort } = useColumnsSorted(
     columns,
@@ -542,14 +555,17 @@ const useTable = (props) => {
 export {
   cloneDeep,
   get,
+  getDefaultValues,
   getField,
   getStorage,
   has,
   isBrowser,
   isEmptyStrOrNull,
   isEqual,
+  isFormGetter,
   set,
   setStorage,
+  toValueWithForm,
   unrefs,
   useForm,
   useFormInject,

package/dist/type-helper.d.ts

@@ -35,4 +35,5 @@ export type Refs<T> = {
 export type ExtractColumnType<T> = T extends {
     type: infer U;
 } ? U : never;
+export type MaybeRefOrFormGetter<T, F> = MaybeRef<T> | ((form: F) => T);
 export {};

package/dist/utils.d.ts

@@ -2,6 +2,7 @@ import { RecordPath, Unrefs } from './type-helper';
 import { FtFormColumnBase } from './form/columns';
 export declare const isBrowser: boolean;
 export declare const getField: <T extends Record<string, any>>(column: FtFormColumnBase<T>) => RecordPath<T>;
+export declare const getDefaultValues: <T extends Record<string, any>>(column: FtFormColumnBase<T>) => any;
 export declare const isEmptyStrOrNull: (val: any) => boolean;
 /**
  * 深拷贝(简化版)

package/package.json

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