@ftjs/core 0.1.2 → 0.2.0

package/dist/form/columns.d.ts

@@ -27,11 +27,11 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
      *
      * 如： [startTime, endTime]
      *
-     * 注意： 第一个字段需要尽量是基础类型的值(这个值会用于watch, expect等操作)，后面可以包含详情
+     * 注意： 第一个字段需要尽量是基础类型的值(这个值会用于watch, expect等操作)，中间字段则可以用'-'来忽略，后面字段可以直接忽略
      *
      * 如人员信息: [staffId, staffInfoObj, deptInfoObj, ...]
      */
-    fields?: string[];
+    fields?: (RecordPath<FormData> | "-")[];
     /**
      * 字段标题
      *

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

@@ -25,6 +25,10 @@ export interface FtFormIntrinsicProps<FormData extends Record<string, any>, Type
      * 如果`formData`不为`undefined`或者`null`，则双向绑定这个值，否则 FtForm内部会生成一个内部值
      */
     formData?: FormData;
+    /**
+     * 是否查看模式
+     */
+    isView?: boolean;
     /**
      * 内部 form 组件 props
      */

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

@@ -17,6 +17,5 @@ interface UseFormItemOptions<FormData extends Record<string, any>, Type extends
  */
 export declare const useFormItem: <FromData extends Record<string, any>, Type extends keyof FormTypeMap<FromData>>(options: UseFormItemOptions<FtFormColumnBase<FormData>, Type>) => {
     valueComputed: import('vue').WritableComputedRef<any, any>;
-    isView: import('vue').ComputedRef<boolean>;
 };
 export {};

package/dist/index.js

@@ -90,7 +90,7 @@ const setStorage = (key, value, cache) => {
     localStorage.setItem(key, JSON.stringify(obj));
   }
 };
-const transferVueArrayPropsToObject = (arr) => {
+function transferVueArrayPropsToObject(arr) {
   const props = {};
   arr.forEach((item) => {
     if (typeof item === "string") {
@@ -100,7 +100,7 @@ const transferVueArrayPropsToObject = (arr) => {
     }
   });
   return props;
-};
+}
 const getPropsKeys = (arr) => {
   return arr.map((item) => {
     if (typeof item === "string") {
@@ -388,13 +388,26 @@ const useFormItem = (options) => {
     valueSetter = props.column.valueSetter;
   }
   const { form } = useFormInject();
+  const fieldsData = ref([]);
   const valueComputed = computed({
     get() {
       let val;
       if (props.column.fields) {
-        val = props.column.fields.map((field) => {
-          return get(form.value, field);
-        }).filter((e) => !isEmptyStrOrNull(e));
+        const length = Math.max(
+          props.column.fields.length,
+          fieldsData.value.length
+        );
+        const valArr = Array(length).fill(void 0);
+        for (let i = 0; i < length; i++) {
+          const field = props.column.fields[i];
+          if (field && field !== "-") {
+            valArr[i] = get(form.value, field);
+          }
+          if (fieldsData.value[i]) {
+            valArr[i] = fieldsData.value[i];
+          }
+        }
+        val = valArr;
       } else if (props.column.field) {
         val = get(form.value, props.column.field);
       } else {
@@ -406,8 +419,14 @@ const useFormItem = (options) => {
     set(val) {
       if (valueSetter) val = valueSetter(val);
       if (props.column.fields) {
+        const valArr = val ?? [];
+        fieldsData.value = valArr;
         props.column.fields.forEach((field, index) => {
-          set(form.value, field, val == null ? void 0 : val[index]);
+          const v = valArr[index];
+          if (field === "-") {
+            return;
+          }
+          set(form.value, field, v);
         });
       } else if (props.column.field) {
         set(form.value, props.column.field, val);
@@ -416,12 +435,8 @@ const useFormItem = (options) => {
       }
     }
   });
-  const isView = computed(() => {
-    return toValue(props.column.isView) ?? props.isView;
-  });
   return {
-    valueComputed,
-    isView
+    valueComputed
   };
 };
 const defineFtForm = (setup, renderMap, _runtimeProps) => {
@@ -435,6 +450,7 @@ const defineFtForm = (setup, renderMap, _runtimeProps) => {
     "formData",
     "internalFormProps",
     "onSubmit",
+    "isView",
     "onUpdate:formData",
     ..._runtimeProps
   ];
@@ -455,7 +471,6 @@ const defineFtForm = (setup, renderMap, _runtimeProps) => {
       return () => h(FormComponent, null, {
         ...ctx.slots,
         formContent: () => visibleColumns.value.map((column) => {
-          var _a;
           if (!renderMap.has(column.type)) {
             console.warn(
               `[@ftjs/core]: 没有配置 column.type ${column.type}, 请检查该组件是否注册`
@@ -463,11 +478,12 @@ const defineFtForm = (setup, renderMap, _runtimeProps) => {
             return null;
           }
           const component = renderMap.get(column.type);
+          const isView = toValue(column.isView) ?? props.isView;
           return h(component, {
             column,
             // 是否为查看模式
-            isView: column.isView,
-            key: column.field ?? ((_a = column.fields) == null ? void 0 : _a[0])
+            isView,
+            key: getField(column)
           });
         })
       });

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

@@ -7,7 +7,10 @@ export interface TableTypeMap<TableData extends Record<string, any>, SearchData
         tableSlots: {};
         tableColumn: FtTableColumn<TableData>;
         formColumn: FtFormColumnBase<SearchData>;
-        extendedProps: {};
+        extendedProps: {
+            testProps: string;
+            onTestEvent: () => void;
+        };
         internalFormProps: {};
         internalTableProps: {};
     };

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

@@ -1,10 +1,9 @@
 import { ComputedRef } from 'vue';
 import { TableTypeMap, FtTableIntrinsicProps } from './define-components';
 import { SplitEventKeys } from '../type-helper';
-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"]> & {
+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"][]>;
 };
 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 } from 'vue';
+import { ComputedRef, MaybeRef, Ref } from 'vue';
 /**
  * 临时工具类型减1
  */
@@ -27,7 +27,7 @@ export type Unrefs<T> = {
  * 工具类型：将对象的属性值转换为 {@link MaybeRef}
  */
 export type Refs<T> = {
-    [K in keyof T]: MaybeRef<T[K]>;
+    [K in keyof T]: T[K] extends Ref<any> ? T[K] : MaybeRef<T[K]>;
 };
 /**
  * 工具类型：将对象的属性转换为元组
@@ -47,12 +47,6 @@ type UnionToTuple<T> = ((T extends any ? (t: T) => T : never) extends infer U ?
 export type WithLengthKeys<T> = (keyof T)[] & {
     length: TupleKeys<T>["length"];
 };
-/**
- * 工具类型：将对象中所有属性值转为 {@link ComputedRef}
- */
-export type ComputedRefKeys<T> = {
-    [K in keyof T]-?: T[K] extends ComputedRef<any> ? T[K] : ComputedRef<T[K]>;
-};
 /**
  * 工具类型：将对象中所有属性值分流，分为事件和非事件
  *

package/dist/type-helper.spec-d.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils.d.ts

@@ -4,6 +4,9 @@ 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 isEmptyStrOrNull: (val: any) => boolean;
+/**
+ * 深拷贝(简化版)
+ */
 export declare const cloneDeep: <T>(obj: T) => T;
 export declare const get: (obj: any, path: string) => any;
 export declare const set: (obj: any, path: string, value: any) => void;
@@ -36,5 +39,5 @@ export type RuntimeProps<T extends readonly any[] = []> = T[number] | [
         validator?(value: unknown, props: any): boolean;
     }
 ];
-export declare const transferVueArrayPropsToObject: (arr: RuntimeProps[]) => any;
+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.1.2",
+  "version": "0.2.0",
   "keywords": [],
   "author": "",
   "license": "MIT",
@@ -37,7 +37,7 @@
   "scripts": {
     "build": "vite build",
     "minify": "pnpm dlx esbuild ./dist/index.js --minify --outfile=./dist/index.min.js",
-    "test": "vitest",
+    "test": "vitest --typecheck",
     "test:coverage": "vitest run --coverage",
     "pub": "tsx ../../scripts/publish.ts"
   }