@ftjs/core 0.3.0 → 0.4.0

package/dist/form/index.d.ts

@@ -1,5 +1,4 @@
 export * from './use-form-item';
 export * from './use-form';
-export * from './define-component';
 export * from '../utils';
 export * from './columns';

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

@@ -1,6 +1,5 @@
 import { VNodeChild } from 'vue';
-import { FtFormColumnBase } from './columns';
-import { CommonFormItemProps, FormTypeMap } from './define-component';
+import { FtBaseFormProps } from './use-form';
 type Slots = (props: {
     value: any;
     isView: boolean;
@@ -9,9 +8,9 @@ type Slots = (props: {
 export type CommonSlots<T extends readonly string[]> = {
     [K in T[number]]?: Slots;
 };
-interface UseFormItemOptions<FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>> {
+interface UseFormItemOptions<P extends FtBaseFormProps<any>> {
     /** 通用 props */
-    props: CommonFormItemProps<FormTypeMap<FormData>[Type]["columns"]>;
+    props: P;
     /**
      * set 转换
      */
@@ -24,7 +23,7 @@ interface UseFormItemOptions<FormData extends Record<string, any>, Type extends
 /**
  * 通用的 form item 组件处理，处理 form 中的值
  */
-export declare const useFormItem: <FromData extends Record<string, any>, Type extends keyof FormTypeMap<FromData>>(options: UseFormItemOptions<FtFormColumnBase<FormData>, Type>) => {
+export declare const useFormItem: (options: UseFormItemOptions<any>) => {
     valueComputed: import('vue').WritableComputedRef<any, any>;
     slots: Record<string, (props?: any) => VNodeChild> | undefined;
 };

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

@@ -1,20 +1,46 @@
-import { Ref, ComputedRef } from 'vue';
-import { FormTypeMap, FtFormIntrinsicProps } from './define-component';
-import { SplitEventKeys } from '../type-helper';
-import { ExposeWithComment } from './types';
-export type FormInject<FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>> = Pick<ExposeWithComment<FormData, Type>, "form" | "columnsChecked" | "columnsSort" | "visibleColumns" | "internalFormProps" | "onSubmit" | "getFormData" | "resetToDefault" | "setAsDefault" | "resetColumnsSort" | "resetColumnsChecked" | "cache"> & SplitEventKeys<FormTypeMap<FormData>[Type]["extendedProps"]> & {
-    columns: ComputedRef<FormTypeMap<FormData>[Type]["columns"][]>;
-};
-export declare const useForm: <FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>>(props: FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-}, formData: Ref<FormData | undefined>, runtimePropsKeys: string[]) => {
-    form: Ref<FormData, FormData>;
-    visibleColumns: ComputedRef<FormTypeMap<FormData>[Type]["columns"][]>;
+import { ComputedRef } from 'vue';
+import { FtFormColumnBase } from './columns';
+interface FormInject {
+    form: ComputedRef<Record<string, any>>;
+}
+export declare const useFormInject: () => FormInject | undefined;
+export interface FtBaseFormProps<F extends Record<string, any>> {
+    /**
+     * v-model:formData 的值
+     */
+    formData?: F;
+    "onUpdate:formData"?: (value: F) => void;
+    /**
+     * 提交表单
+     */
+    onSubmit?: (formData: F) => Promise<void> | void;
+    /**
+     * 是否查看模式
+     */
+    isView?: boolean;
+    /**
+     * 表单列
+     */
+    columns: FtFormColumnBase<F>[];
+    /**
+     * 用于缓存配置，不填则不缓存
+     */
+    cache?: string;
+}
+export type ExtractFormData<P extends FtBaseFormProps<any>> = P extends FtBaseFormProps<infer F> ? F : never;
+export type ExtractColumns<P extends FtBaseFormProps<any>> = P extends FtBaseFormProps<any> ? P["columns"] : never;
+export declare const useForm: <P extends FtBaseFormProps<any>>(props: P) => {
+    form: import('vue').WritableComputedRef<any, any>;
+    visibleColumns: ComputedRef<ExtractColumns<P>>;
+    columnsChecked: import('vue').WritableComputedRef<string[], string[]>;
+    columnsSort: import('vue').WritableComputedRef<Record<string, number>, Record<string, number>>;
     resetToDefault: ResetToDefault;
-    getFormData: GetFormData<FormData>;
-    setAsDefault: SetAsDefault<FormData>;
+    getFormData: GetFormData<ExtractFormData<P>>;
+    setAsDefault: SetAsDefault<ExtractFormData<P>>;
+    resetColumnsChecked: () => void;
+    resetColumnsSort: () => void;
 };
-export declare const useFormInject: <FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>>() => FormInject<FormData, Type> | undefined;
 export type GetFormData<FormData extends Record<string, any>> = () => FormData;
 export type ResetToDefault = (sync?: boolean) => Promise<void> | void;
 export type SetAsDefault<FormData extends Record<string, any>> = (v?: FormData) => void;
+export {};

package/dist/index.js

@@ -1,4 +1,4 @@
-import { unref, computed, toValue, ref, watch, onUnmounted, provide, inject, nextTick, defineComponent, h } from "vue";
+import { unref, inject, computed, ref, watch, onUnmounted, provide, toValue, nextTick } from "vue";
 const isBrowser = typeof window !== "undefined";
 const getField = (column) => {
   var _a;
@@ -90,27 +90,10 @@ const setStorage = (key, value, cache) => {
     localStorage.setItem(key, JSON.stringify(obj));
   }
 };
-function transferVueArrayPropsToObject(arr) {
-  const props = {};
-  arr.forEach((item) => {
-    if (typeof item === "string") {
-      props[item] = {};
-    } else {
-      props[item[0]] = item[1] || {};
-    }
-  });
-  return props;
-}
-const getPropsKeys = (arr) => {
-  return arr.map((item) => {
-    if (typeof item === "string") {
-      return item;
-    } else {
-      return item[0];
-    }
-  });
-};
 const provideFormKey = Symbol("@ftjs/core-form-provide");
+const useFormInject = () => {
+  return inject(provideFormKey);
+};
 const useColumnsChecked = (columns, cache) => {
   const storageKey = `ftjs-form-columns-checked-obj`;
   const columnsV = computed(() => {
@@ -198,10 +181,23 @@ const getFieldsAndValues = (column) => {
   const values = column.fields ? column.value || [] : [column.value];
   return { fields, values };
 };
-const useForm = (props, formData, runtimePropsKeys) => {
-  const columns = computed(() => toValue(props.columns));
-  const formLocal = ref({});
-  const form = unref(formData) != null ? formData : formLocal;
+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 form = computed({
+    get() {
+      return formLocal.value;
+    },
+    set(v) {
+      var _a2;
+      formLocal.value = v;
+      (_a2 = props["onUpdate:formData"]) == null ? void 0 : _a2.call(props, v);
+    }
+  });
   const { columnsChecked, resetColumnsChecked } = useColumnsChecked(
     columns,
     props.cache
@@ -215,9 +211,9 @@ const useForm = (props, formData, runtimePropsKeys) => {
   const hideFieldSet = ref(/* @__PURE__ */ new Set());
   const visibleColumns = computed(() => {
     return columns.value.filter((column) => {
-      var _a;
+      var _a2;
       const key = getField(column);
-      return !hideFieldSet.value.has(key) && (((_a = columnsChecked.value) == null ? void 0 : _a.includes(key)) ?? true);
+      return !hideFieldSet.value.has(key) && (((_a2 = columnsChecked.value) == null ? void 0 : _a2.includes(key)) ?? true);
     }).sort((a, b) => {
       const keyA = getField(a);
       const keyB = getField(b);
@@ -226,14 +222,6 @@ const useForm = (props, formData, runtimePropsKeys) => {
       return aSort - bSort;
     });
   });
-  const customProps = runtimePropsKeys.reduce((acc, event) => {
-    if (event.startsWith("on")) {
-      acc[event] = props[event];
-    } else {
-      acc[event] = computed(() => props[event]);
-    }
-    return acc;
-  }, {});
   watch(
     columns,
     (_v, _o, onCleanup) => {
@@ -341,7 +329,7 @@ const useForm = (props, formData, runtimePropsKeys) => {
     });
   }
   const getFormData = () => {
-    const formData2 = {};
+    const formData = {};
     visibleColumns.value.forEach((usefulColumn) => {
       const { fields } = getFieldsAndValues(usefulColumn);
       fields.forEach((field) => {
@@ -349,40 +337,26 @@ const useForm = (props, formData, runtimePropsKeys) => {
         if (usefulColumn.formatGetFormData) {
           value = usefulColumn.formatGetFormData(value);
         }
-        set(formData2, field, value);
+        set(formData, field, value);
       });
     });
-    return formData2;
+    return formData;
   };
-  const internalFormProps = computed(() => props.internalFormProps);
-  const cache = computed(() => props.cache);
   provide(provideFormKey, {
-    form,
-    columnsChecked,
-    columnsSort,
-    columns,
-    visibleColumns,
-    internalFormProps,
-    cache,
-    getFormData,
-    resetToDefault,
-    setAsDefault,
-    onSubmit: props.onSubmit,
-    resetColumnsChecked,
-    resetColumnsSort,
-    ...customProps
+    form
   });
   return {
     form,
     visibleColumns,
+    columnsChecked,
+    columnsSort,
     resetToDefault,
     getFormData,
-    setAsDefault
+    setAsDefault,
+    resetColumnsChecked,
+    resetColumnsSort
   };
 };
-const useFormInject = () => {
-  return inject(provideFormKey);
-};
 const useFormItem = (options) => {
   let { props, valueGetter, valueSetter } = options;
   if (props.column.valueGetter) {
@@ -458,147 +432,44 @@ const useFormItem = (options) => {
     slots
   };
 };
-const defineFtForm = (setup, renderMap, _runtimeProps) => {
-  const FormComponent = defineComponent(setup, {
-    inheritAttrs: false,
-    name: "FtFormContainer"
-  });
-  const runtimeProps = [
-    "cache",
-    "columns",
-    "formData",
-    "internalFormProps",
-    "onSubmit",
-    "isView",
-    "onUpdate:formData",
-    ..._runtimeProps
-  ];
-  return defineComponent(
-    (props, ctx) => {
-      const formData = computed({
-        get: () => props.formData,
-        set(v) {
-          var _a;
-          (_a = props["onUpdate:formData"]) == null ? void 0 : _a.call(props, v);
-        }
-      });
-      const { visibleColumns } = useForm(
-        props,
-        formData,
-        getPropsKeys(_runtimeProps)
-      );
-      return () => h(FormComponent, null, {
-        ...ctx.slots,
-        formContent: () => visibleColumns.value.map((column) => {
-          if (!renderMap.has(column.type)) {
-            console.warn(
-              `[@ftjs/core]: 没有配置 column.type ${column.type}, 请检查该组件是否注册`
-            );
-            return null;
-          }
-          const component = renderMap.get(column.type);
-          const isView = toValue(column.isView) ?? props.isView;
-          return h(component, {
-            column,
-            // 是否为查看模式
-            isView,
-            key: getField(column)
-          });
-        })
-      });
-    },
-    {
-      props: transferVueArrayPropsToObject(runtimeProps),
-      name: "FtForm"
-    }
-  );
-};
-function defineFormComponent(setup) {
-  return defineComponent(setup, {
-    props: ["column", "isView"],
-    inheritAttrs: false
-  });
-}
-const provideTableKey = Symbol("@ftjs/core-table-provide");
-const useTable = (props, runtimePropsKeys) => {
+const useTable = (props) => {
   const formColumns = computed(() => {
-    const fromTable = props.columns.filter((e) => e.search).map((e) => ({
-      field: e.field,
-      title: e.title,
-      ...e.search
-    }));
-    return [...fromTable, ...props.searchColumns ?? []];
-  });
-  const tableColumns = computed(() => {
-    return props.columns;
-  });
-  const injectProps = runtimePropsKeys.reduce(
-    (acc, key) => {
-      if (key.startsWith("on")) {
-        acc[key] = props[key];
-      } else {
-        acc[key] = computed(() => props[key]);
+    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
+        };
       }
-      return acc;
-    },
-    {}
-  );
-  provide(provideTableKey, {
-    formColumns,
-    tableColumns,
-    ...injectProps
+      return {
+        field: e.field,
+        title: e.title,
+        ...e.search
+      };
+    });
+    return [
+      ...fromTable,
+      ...props.searchColumns ?? []
+    ];
   });
+  return {
+    formColumns
+  };
 };
-const useTableInject = () => {
-  return inject(provideTableKey);
-};
-function defineFtTable(setup, _runtimeProps) {
-  const TableComponent = defineComponent(setup, {
-    inheritAttrs: false,
-    name: "FtTableContainer"
-  });
-  const runtimeProps = [
-    "cache",
-    "columns",
-    "searchColumns",
-    "total",
-    ["defaultPageSize", { type: Number, default: 20 }],
-    ["loading", { type: Boolean }],
-    "internalTableProps",
-    "internalFormProps",
-    "tableData",
-    "keyField",
-    ..._runtimeProps
-  ];
-  return defineComponent(
-    (props, ctx) => {
-      useTable(props, getPropsKeys(runtimeProps));
-      return () => h(TableComponent, null, ctx.slots);
-    },
-    {
-      props: transferVueArrayPropsToObject(runtimeProps),
-      name: "FtTable"
-    }
-  );
-}
 export {
   cloneDeep,
-  defineFormComponent,
-  defineFtForm,
-  defineFtTable,
   get,
   getField,
-  getPropsKeys,
   getStorage,
   has,
   isBrowser,
   isEmptyStrOrNull,
   set,
   setStorage,
-  transferVueArrayPropsToObject,
   unrefs,
   useForm,
   useFormInject,
   useFormItem,
-  useTableInject
+  useTable
 };

package/dist/table/index.d.ts

@@ -1,3 +1,2 @@
-export * from './columns';
-export * from './define-components';
-export { useTableInject } from './use-table';
+export * from './types';
+export * from './use-table';

package/dist/table/types.d.ts

@@ -0,0 +1,61 @@
+import { FtFormColumnBase } from '../form';
+import { RecordPath } from '../type-helper';
+/**
+ * 表格列定义
+ *
+ * @public
+ */
+export interface FtTableColumn<TableData extends Record<string, any>, SColumn extends string | FtFormColumnBase<any> = FtFormColumnBase<any> | string> {
+    /**
+     * 列标题
+     */
+    title?: string;
+    /**
+     * 列字段
+     */
+    field: RecordPath<TableData> | `_${string}`;
+    /**
+     * 搜索配置
+     */
+    search?: SColumn;
+}
+export interface FtBaseTableProps<T extends Record<string, any>, TableColumn extends FtTableColumn<T>, SearchColumn extends FtFormColumnBase<any>> {
+    /**
+     * 用于缓存配置，不填则不缓存
+     */
+    cache?: string;
+    /**
+     * 列定义
+     */
+    columns: TableColumn[];
+    /**
+     * 列定义外的搜索条件
+     */
+    searchColumns?: SearchColumn[];
+    /**
+     * 表格总条数
+     */
+    total?: number;
+    /**
+     * 默认每页条数
+     *
+     * @default 20
+     */
+    defaultPageSize?: number;
+    /**
+     * 是否显示 loading
+     */
+    loading?: boolean;
+    /**
+     * 表格数据
+     */
+    tableData: T[];
+    /**
+     * 表格数据更新事件
+     */
+    "onUpdate:tableData"?: (data: T[]) => void;
+    /**
+     * 表格 key 字段
+     */
+    keyField?: string;
+}

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

@@ -1,9 +1,7 @@
-import { ComputedRef } from 'vue';
-import { TableTypeMap, FtTableIntrinsicProps } from './define-components';
-import { SplitEventKeys } from '../type-helper';
-export type TableInject<TableData extends Record<string, any>, FormData extends Record<string, any> = TableData, Type extends keyof TableTypeMap<TableData, FormData> = "default"> = SplitEventKeys<FtTableIntrinsicProps<TableData, FormData, Type> & TableTypeMap<TableData, FormData>[Type]["extendedProps"]> & {
-    formColumns: ComputedRef<TableTypeMap<TableData, FormData>[Type]["formColumn"][]>;
-    tableColumns: ComputedRef<TableTypeMap<TableData, FormData>[Type]["tableColumn"][]>;
+import { FtBaseTableProps, FtTableColumn } from './types';
+import { FtFormColumnBase } from '../form';
+type ExtractSearchColumn<P extends FtBaseTableProps<any, any, any>> = P extends FtBaseTableProps<any, any, infer C> ? C extends string ? never : C : never;
+export declare const useTable: <P extends FtBaseTableProps<any, FtTableColumn<any>, FtFormColumnBase<any>>>(props: P) => {
+    formColumns: import('vue').ComputedRef<ExtractSearchColumn<P>[]>;
 };
-export declare const useTable: <TableData extends Record<string, any>, FormData extends Record<string, any>, Type extends keyof TableTypeMap<TableData, FormData>>(props: FtTableIntrinsicProps<TableData, FormData, Type>, runtimePropsKeys: string[]) => void;
-export declare const useTableInject: <TableData extends Record<string, any>, FormData extends Record<string, any> = TableData, Type extends keyof TableTypeMap<TableData, FormData> = "default">() => TableInject<TableData, FormData, Type> | undefined;
+export {};

package/dist/type-helper.d.ts

@@ -1,4 +1,4 @@
-import { ComputedRef, MaybeRef, Ref } from 'vue';
+import { MaybeRef, Ref } from 'vue';
 /**
  * 临时工具类型减1
  */
@@ -29,33 +29,4 @@ export type Unrefs<T> = {
 export type Refs<T> = {
     [K in keyof T]: T[K] extends Ref<any> ? T[K] : MaybeRef<T[K]>;
 };
-/**
- * 工具类型：将对象的属性转换为元组
- *
- * @deprecated 元祖推算的元素顺序不确定，所以实际上无法使用，替换为 {@link WithLengthKeys}
- */
-export type TupleKeys<T> = UnionToTuple<keyof T>;
-/**
- * 工具类型：将联合类型转换为元组
- *
- * @deprecated 元祖推算的元素顺序不确定，所以实际上无法使用
- */
-type UnionToTuple<T> = ((T extends any ? (t: T) => T : never) extends infer U ? (U extends any ? (u: U) => any : never) extends (v: infer V) => any ? V : never : never) extends (_: any) => infer W ? [...UnionToTuple<Exclude<T, W>>, W] : [];
-/**
- * 工具类型：得到一个具有指定长度的数组，且每个元素唯一
- */
-export type WithLengthKeys<T> = (keyof T)[] & {
-    length: TupleKeys<T>["length"];
-};
-/**
- * 工具类型：将对象中所有属性值分流，分为事件和非事件
- *
- * 事件可为空。
- * 属性为可为空的计算属性，本身一定存在。
- */
-export type SplitEventKeys<T> = {
-    [K in keyof T as K extends `on${string}` ? K : never]?: T[K];
-} & {
-    [K in keyof T as K extends `on${string}` ? never : K]-?: ComputedRef<T[K]>;
-};
 export {};

package/dist/utils.d.ts

@@ -1,4 +1,3 @@
-import { PropType } from 'vue';
 import { RecordPath, Unrefs } from './type-helper';
 import { FtFormColumnBase } from './form/columns';
 export declare const isBrowser: boolean;
@@ -30,14 +29,3 @@ export declare const getStorage: (key: string, cache?: string) => {};
  * @param cache 缓存名称
  */
 export declare const setStorage: (key: string, value: any, cache?: string) => void;
-export type RuntimeProps<T extends readonly any[] = []> = T[number] | [
-    T[number],
-    {
-        type?: PropType<any> | true | null;
-        required?: boolean;
-        default?: any;
-        validator?(value: unknown, props: any): boolean;
-    }
-];
-export declare function transferVueArrayPropsToObject<T extends readonly any[] = []>(arr: RuntimeProps<T>[]): any;
-export declare const getPropsKeys: (arr: RuntimeProps<any>[]) => any[];

package/package.json

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

package/dist/form/define-component.d.ts

@@ -1,114 +0,0 @@
-import { Component, EmitsOptions, SetupContext, SlotsType, VNode } from 'vue';
-import { FtFormColumnBase } from './columns';
-import { RuntimeProps } from '../utils';
-import { TupleKeys } from '../type-helper';
-export interface FormTypeMap<_FormData extends Record<string, any>> {
-    default: {
-        formSlots: {};
-        extendedProps: {};
-        internalFormProps: {};
-        columns: (FtFormColumnBase<any> & {
-            type: "custom";
-        }) | (FtFormColumnBase<any> & {
-            type: "custom2";
-        });
-    };
-}
-export interface FtFormIntrinsicProps<FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>> {
-    /**
-     * 用于缓存配置，不填则不缓存
-     */
-    cache?: string;
-    /**
-     * v-model:formData 的值
-     *
-     * 如果`formData`不为`undefined`或者`null`，则双向绑定这个值，否则 FtForm内部会生成一个内部值
-     */
-    formData?: FormData;
-    /**
-     * 是否查看模式
-     */
-    isView?: boolean;
-    /**
-     * 内部 form 组件 props
-     */
-    internalFormProps?: FormTypeMap<FormData>[Type]["internalFormProps"];
-    /**
-     * v-model:formData 的更新函数
-     *
-     * 需要`formData`不为空
-     */
-    "onUpdate:formData"?: (value: FormData) => void;
-    /**
-     * 提交函数
-     * @param formData 当先的有效表单值
-     * @returns
-     */
-    onSubmit?: (formData: FormData) => Promise<void> | void;
-}
-/**
- * 每一个表单组件的 props
- */
-export interface CommonFormItemProps<T extends FtFormColumnBase<any>> {
-    /** column 定义 */
-    column: T;
-    /** 是否查看模式 */
-    isView: boolean;
-}
-export type FtFormPropsMap<FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>> = FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-};
-/**
- * 定义表单容器组件
- */
-export declare const defineFtForm: <Type extends keyof FormTypeMap<any>>(setup: (props: {}, ctx: SetupContext<EmitsOptions, SlotsType<FormTypeMap<any>[Type]["formSlots"] & {
-    /**
-     * 表单内容
-     */
-    formContent: () => any;
-}>>) => any, renderMap: Map<string, Component>, _runtimeProps: RuntimeProps<TupleKeys<FormTypeMap<any>[Type]["extendedProps"]>>[] & {
-    length: TupleKeys<FormTypeMap<any>[Type]["extendedProps"]>["length"];
-}) => new <FormData extends Record<string, any>>(props: (FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & ({
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} | {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-})) & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & ({
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} | {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-}), {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, EmitsOptions, import('vue').PublicProps, {}, false, {}, SlotsType<FormTypeMap<FormData>[Type]["formSlots"]>, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
-    P: {};
-    B: {};
-    D: {};
-    C: {};
-    M: {};
-    Defaults: {};
-}, {} & ((FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & {
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} extends infer T ? T extends FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & {
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} ? T extends void ? {} : T : never : never) | (FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-} extends infer T_1 ? T_1 extends FtFormIntrinsicProps<FormData, Type> & FormTypeMap<FormData>[Type]["extendedProps"] & {
-    columns: FormTypeMap<FormData>[Type]["columns"][];
-} & {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-} ? T_1 extends void ? {} : T_1 : never : never)), {}, {}, {}, {}, {}>;
-/**
- * 定义表单组件
- */
-export declare function defineFormComponent<T extends FtFormColumnBase<any>>(setup: (props: CommonFormItemProps<T>, ctx: SetupContext) => () => VNode): import('vue').DefineSetupFnComponent<CommonFormItemProps<T>, EmitsOptions, {}, CommonFormItemProps<T> & ({
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} | {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-}), import('vue').PublicProps>;

package/dist/form/types.d.ts

@@ -1,78 +0,0 @@
-import { Ref, ComputedRef } from 'vue';
-import { RecordPath } from '../type-helper';
-import { FormTypeMap } from './define-component';
-import { GetFormData, ResetToDefault, SetAsDefault } from './use-form';
-/**
- * 对于需要暴露给外部使用的方法，其类型从这里Pick，这样会有统一的类型提示
- */
-export interface ExposeWithComment<FormData extends Record<string, any>, Type extends keyof FormTypeMap<FormData>> {
-    /**
-     * 获取表单当前展示出的项目的表单值
-     */
-    getFormData: GetFormData<FormData>;
-    /**
-     * 重置表单为默认值
-     *
-     * `sync false` 由于这个方法很可能在`watchEffect`中调用
-     *
-     * 以非同步的方式调用，其内部属性不会放到`watchEffect`的依赖中
-     * @param sync 是否同步更新，默认为 false
-     */
-    resetToDefault: ResetToDefault;
-    /**
-     * 设置当前表单的默认值，如果参数为空，则将`当前表单值`设置为默认值
-     */
-    setAsDefault: SetAsDefault<FormData>;
-    /**
-     * 表单值，包含已经隐藏的值
-     */
-    form: Ref<FormData>;
-    /**
-     * 配置显示的项目
-     */
-    columnsChecked: Ref<RecordPath<FormData>[]>;
-    /**
-     * 重置配置显示项目
-     */
-    resetColumnsChecked: () => void;
-    /**
-     * 配置排序的项目
-     */
-    columnsSort: Ref<Partial<Record<RecordPath<FormData>, number>>>;
-    /**
-     * 重置排序
-     */
-    resetColumnsSort: () => void;
-    /**
-     * 所有表单项目
-     */
-    columns: ComputedRef<FormTypeMap<FormData>[Type]["columns"]>;
-    /**
-     * 当前显示的表单项目
-     */
-    visibleColumns: ComputedRef<FormTypeMap<FormData>[Type]["columns"]>;
-    /**
-     * 表单容器组件 props, 由表单容器组件决定
-     *
-     * 定义方式：
-     *
-     * @example
-     * ```ts
-     *
-     * declare module "@ftjs/core" {
-     *   interface FormContainerProps {
-     *     ...
-     *   }
-     * }
-     * ```
-     */
-    internalFormProps: ComputedRef<FormTypeMap<FormData>[Type]["internalFormProps"] | undefined>;
-    /**
-     * 表单提交事件
-     */
-    onSubmit?: (formData: FormData) => Promise<void> | void;
-    /**
-     * 缓存
-     */
-    cache: ComputedRef<string | undefined>;
-}

package/dist/table/columns.d.ts

@@ -1,16 +0,0 @@
-import { RecordPath } from '../type-helper';
-/**
- * 表格列定义
- *
- * @public
- */
-export interface FtTableColumn<TableData extends Record<string, any>> {
-    /**
-     * 列标题
-     */
-    title?: string;
-    /**
-     * 列字段
-     */
-    field: RecordPath<TableData> | `_${string}`;
-}

package/dist/table/define-components.d.ts

@@ -1,94 +0,0 @@
-import { EmitsOptions, SetupContext, SlotsType } from 'vue';
-import { FtTableColumn } from './columns';
-import { RuntimeProps, FtFormColumnBase } from '../form';
-import { TupleKeys } from '../type-helper';
-export interface TableTypeMap<TableData extends Record<string, any>, SearchData extends Record<string, any>> {
-    default: {
-        tableSlots: {};
-        tableColumn: FtTableColumn<TableData>;
-        formColumn: FtFormColumnBase<SearchData>;
-        extendedProps: {
-            testProps: string;
-            onTestEvent: () => void;
-        };
-        internalFormProps: {};
-        internalTableProps: {};
-    };
-}
-export type TableColumn<TableData extends Record<string, any>, SearchData extends Record<string, any>, Type extends keyof TableTypeMap<TableData, SearchData>> = TableTypeMap<TableData, SearchData>[Type]["tableColumn"] & {
-    /**
-     * 搜索表单配置
-     */
-    search?: TableTypeMap<TableData, SearchData>[Type]["formColumn"];
-};
-export interface FtTableIntrinsicProps<TableData extends Record<string, any>, SearchData extends Record<string, any>, type extends keyof TableTypeMap<TableData, SearchData>> {
-    /**
-     * 用于缓存配置，不填则不缓存
-     */
-    cache?: string;
-    /**
-     * 列定义
-     */
-    columns: TableColumn<TableData, SearchData, type>[];
-    /**
-     * 列定义外的搜索条件
-     */
-    searchColumns?: TableTypeMap<TableData, SearchData>[type]["formColumn"][];
-    /**
-     * 表格总条数
-     */
-    total?: number;
-    /**
-     * 默认每页条数
-     *
-     * @default 20
-     */
-    defaultPageSize?: number;
-    /**
-     * 是否显示 loading
-     */
-    loading?: boolean;
-    /**
-     * 内部表单组件的 props
-     */
-    internalFormProps?: TableTypeMap<TableData, SearchData>[type]["internalFormProps"];
-    /**
-     * 内部表格组件的 props
-     */
-    internalTableProps?: TableTypeMap<TableData, SearchData>[type]["internalTableProps"];
-    /**
-     * 表格数据
-     */
-    tableData?: TableData[];
-    /**
-     * 表格 key 字段
-     */
-    keyField?: string;
-}
-export type FtTablePropsMap<TableData extends Record<string, any>, SearchData extends Record<string, any>, Type extends keyof TableTypeMap<TableData, SearchData>> = FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"];
-export declare function defineFtTable<Type extends keyof TableTypeMap<any, any>>(setup: (props: {}, ctx: SetupContext<EmitsOptions, SlotsType<TableTypeMap<any, any>[Type]["tableSlots"]>>) => any, _runtimeProps: RuntimeProps<TupleKeys<TableTypeMap<any, any>[Type]["extendedProps"]>>[] & {
-    length: TupleKeys<TableTypeMap<any, any>[Type]["extendedProps"]>["length"];
-}): new <TableData extends Record<string, any>, SearchData extends Record<string, any> = TableData>(props: (FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & ({
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} | {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-})) & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & ({
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} | {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-}), {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, EmitsOptions, import('vue').PublicProps, {}, false, {}, SlotsType<TableTypeMap<TableData, SearchData>[Type]["tableSlots"]>, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
-    P: {};
-    B: {};
-    D: {};
-    C: {};
-    M: {};
-    Defaults: {};
-}, {} & ((FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & {
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} extends infer T ? T extends FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & {
-    [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;
-} ? T extends void ? {} : T : never : never) | (FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-} extends infer T_1 ? T_1 extends FtTableIntrinsicProps<TableData, SearchData, Type> & TableTypeMap<TableData, SearchData>[Type]["extendedProps"] & {
-    [x: `on${Capitalize<string>}`]: ((...args: never) => any) | undefined;
-} ? T_1 extends void ? {} : T_1 : never : never)), {}, {}, {}, {}, {}>;