@ftjs/core 1.2.0 → 1.2.2

package/dist/form/columns.d.ts

@@ -41,7 +41,7 @@ export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 是否隐藏
      */
-    hide?: MaybeRefOrFormGetter<boolean>;
+    hide?: MaybeRefOrFormGetter<boolean, F>;
     /**
      * 监听字段值变化，如果是 `fields` ，则只会监听第一个字段的值变化
      */
@@ -99,7 +99,7 @@ export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 是否查看模式
      */
-    isView?: MaybeRefOrFormGetter<boolean>;
+    isView?: MaybeRefOrFormGetter<boolean, F>;
     /**
      * 自定义查看模式下的渲染
      */

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

@@ -4,11 +4,11 @@ import { MaybeRefOrFormGetter } from '../type-helper';
 interface FormInject<F extends Record<string, any>> {
     form: ComputedRef<F>;
 }
-export declare function isFormGetter<T>(fn: MaybeRefOrFormGetter<T>): fn is (form: any) => T;
+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, R>(fn: MaybeRefOrFormGetter<R>, form: ComputedRef<T>): R;
+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

@@ -137,6 +137,14 @@ const isEqual = (a, b) => {
     (key) => Object.prototype.hasOwnProperty.call(b, key) && isEqual(a[key], b[key])
   );
 };
+function forEachTree(tree, cb) {
+  for (const item of tree) {
+    cb(item);
+    if (item.children) {
+      forEachTree(item.children, cb);
+    }
+  }
+}
 function isFormGetter(fn) {
   return typeof fn === "function";
 }
@@ -253,20 +261,30 @@ const getFieldsAndValues = (column) => {
   return { fields, values };
 };
 const useForm = (props) => {
-  var _a;
   const columns = computed(() => props.columns);
-  const formLocal = ref(props.formData ?? {});
-  if (props.formData == null) {
-    (_a = props["onUpdate:formData"]) == null ? void 0 : _a.call(props, formLocal.value);
-  }
+  const formLocal = ref();
+  watch(
+    () => props.formData,
+    (v) => {
+      var _a;
+      if (v == null) {
+        v = {};
+        (_a = props["onUpdate:formData"]) == null ? void 0 : _a.call(props, v);
+      }
+      formLocal.value = v;
+    },
+    {
+      immediate: true
+    }
+  );
   const form = computed({
     get() {
       return formLocal.value;
     },
     set(v) {
-      var _a2;
+      var _a;
       formLocal.value = v;
-      (_a2 = props["onUpdate:formData"]) == null ? void 0 : _a2.call(props, v);
+      (_a = props["onUpdate:formData"]) == null ? void 0 : _a.call(props, v);
     }
   });
   const { columnsChecked, resetColumnsChecked } = useColumnsChecked(
@@ -293,9 +311,9 @@ const useForm = (props) => {
   });
   const visibleColumns = computed(() => {
     return columns.value.filter((column) => {
-      var _a2;
+      var _a;
       const key = getField(column);
-      return !hideFieldSet.value.has(key) && (((_a2 = columnsChecked.value) == null ? void 0 : _a2.includes(key)) ?? true);
+      return !hideFieldSet.value.has(key) && (((_a = columnsChecked.value) == null ? void 0 : _a.includes(key)) ?? true);
     }).sort((a, b) => {
       const keyA = getField(a);
       const keyB = getField(b);
@@ -529,22 +547,26 @@ const useFormItem = (options) => {
 };
 const useTable = (props) => {
   const formColumns = computed(() => {
-    const fromTable = props.columns.filter((e) => e.search).map((e) => {
-      if (typeof e.search === "string") {
-        return {
-          field: e.field,
-          title: e.title,
-          type: e.search
-        };
+    const tableSearch = [];
+    forEachTree(props.columns, (e) => {
+      if (e.search) {
+        if (typeof e.search === "string") {
+          tableSearch.push({
+            field: e.field,
+            title: e.title,
+            type: e.search
+          });
+        } else {
+          tableSearch.push({
+            field: e.field,
+            title: e.title,
+            ...e.search
+          });
+        }
       }
-      return {
-        field: e.field,
-        title: e.title,
-        ...e.search
-      };
     });
     return [
-      ...fromTable,
+      ...tableSearch,
       ...props.searchColumns ?? []
     ];
   });
@@ -554,6 +576,7 @@ const useTable = (props) => {
 };
 export {
   cloneDeep,
+  forEachTree,
   get,
   getDefaultValues,
   getField,

package/dist/table/types.d.ts

@@ -18,6 +18,10 @@ export interface FtTableColumn<TableData extends Record<string, any>, SColumn ex
      * 搜索配置
      */
     search?: SColumn;
+    /**
+     * 子列，用于表头合并
+     */
+    children?: FtTableColumn<TableData, SColumn>[];
 }
 export interface FtBaseTableProps<T extends Record<string, any>, TableColumn extends FtTableColumn<T>, SearchColumn extends FtFormColumnBase<any>> {
     /**

package/dist/type-helper.d.ts

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

package/dist/utils.d.ts

@@ -36,3 +36,9 @@ export declare const setStorage: (key: string, value: any, cache?: string) => vo
  * 不考虑循环引用
  */
 export declare const isEqual: (a: any, b: any) => any;
+interface TreeData {
+    children?: TreeData[];
+    [key: string]: any;
+}
+export declare function forEachTree<T extends TreeData>(tree: T[], cb: (item: T) => void): void;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/core",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "keywords": [],
   "author": "",
   "license": "MIT",
@@ -34,6 +34,16 @@
   "peerDependencies": {
     "vue": ">=3.3.0"
   },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/",
+    "provenance": true
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/yuhengshen/ftjs",
+    "directory": "packages/core"
+  },
   "scripts": {
     "build": "vite build",
     "minify": "pnpm dlx esbuild ./dist/index.js --minify --outfile=./dist/index.min.js",