@ftjs/core 0.4.5 → 0.5.1

package/dist/form/columns.d.ts

@@ -1,19 +1,19 @@
-import { MaybeRefOrGetter } from 'vue';
+import { MaybeRefOrGetter, VNodeChild } from 'vue';
 import { RecordPath } from '../type-helper';
-type WatchHandler<FormData extends Record<string, any>> = (params: {
+type WatchHandler<F extends Record<string, any>> = (params: {
     val: any;
     oldVal: any;
-    form: FormData;
+    form: F;
 }) => void;
-type Watch<FormData extends Record<string, any>> = WatchHandler<FormData> | {
-    handler: WatchHandler<FormData>;
+type Watch<F extends Record<string, any>> = WatchHandler<F> | {
+    handler: WatchHandler<F>;
     deep?: boolean;
     immediate?: boolean;
 };
 /**
  * 实现方需要继承这个interface
  */
-export interface FtFormColumnBase<FormData extends Record<string, any>> {
+export interface FtFormColumnBase<F extends Record<string, any>> {
     /**
      * 字段名 `fields` 和 `field` 至少有一个存在
      *
@@ -21,7 +21,7 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
      *
      * 如果是在 TableColumns 中，则默认继承其中的 field
      */
-    field?: RecordPath<FormData>;
+    field?: RecordPath<F>;
     /**
      * 字段名数组，当表单需要返回多个值时，使用这个字段
      *
@@ -31,7 +31,7 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
      *
      * 如人员信息: [staffId, staffInfoObj, deptInfoObj, ...]
      */
-    fields?: (RecordPath<FormData> | "-")[];
+    fields?: (RecordPath<F> | "-")[];
     /**
      * 字段标题
      *
@@ -45,7 +45,7 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
     /**
      * 监听字段值变化，如果是 `fields` ，则只会监听第一个字段的值变化
      */
-    watch?: Watch<FormData>;
+    watch?: Watch<F>;
     /**
      * 字段默认值
      */
@@ -66,7 +66,7 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
          *
          */
         value: boolean | string | number | boolean[] | string[] | number[] | /** 返回值表示这个字段是否显示 */ (({ formData, val, }: {
-            formData: FormData;
+            formData: F;
             val: any;
         }) => boolean);
     }[];
@@ -94,5 +94,17 @@ export interface FtFormColumnBase<FormData extends Record<string, any>> {
      * 是否查看模式
      */
     isView?: MaybeRefOrGetter<boolean>;
+    /**
+     * 自定义查看模式下的渲染
+     */
+    viewRender?: (props: {
+        formData: F;
+    }) => VNodeChild;
+    /**
+     * 自定义编辑模式下的渲染
+     */
+    editRender?: (props: {
+        formData: F;
+    }) => VNodeChild;
 }
 export {};

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

@@ -1,9 +1,9 @@
 import { ComputedRef } from 'vue';
 import { FtFormColumnBase } from './columns';
-interface FormInject {
-    form: ComputedRef<Record<string, any>>;
+interface FormInject<F extends Record<string, any>> {
+    form: ComputedRef<F>;
 }
-export declare const useFormInject: () => FormInject | undefined;
+export declare const useFormInject: <F extends Record<string, any> = Record<string, any>>() => FormInject<F> | undefined;
 export interface FtBaseFormProps<F extends Record<string, any>> {
     /**
      * v-model:formData 的值

package/dist/index.js

@@ -1,4 +1,4 @@
-import { unref, inject, computed, ref, watch, onUnmounted, provide, toValue, watchEffect, nextTick } from "vue";
+import { unref, inject, computed, ref, watch, onScopeDispose, provide, toValue, watchEffect, nextTick } from "vue";
 const isBrowser = typeof window !== "undefined";
 const getField = (column) => {
   var _a;
@@ -28,16 +28,23 @@ const get = (obj, path) => {
   }
   return result;
 };
-const set = (obj, path, value) => {
+const set = (target, path, value) => {
+  if (path === "") return;
   const keys = path.split(".");
+  let obj = target;
   for (let i = 0; i < keys.length - 1; i++) {
     const key = keys[i];
-    if (!Reflect.has(obj, key)) {
-      Reflect.set(obj, key, {});
+    const nextKey = keys[i + 1];
+    if (typeof obj !== "object" || obj == null) {
+      throw new Error("set 赋值错误, target", obj);
     }
-    obj = Reflect.get(obj, key);
+    if (obj[key] == null) {
+      obj[key] = /^\d+$/.test(nextKey) ? [] : {};
+    }
+    obj = obj[key];
   }
-  Reflect.set(obj, keys[keys.length - 1], value);
+  const lastKey = keys[keys.length - 1];
+  obj[lastKey] = value;
 };
 const has = (obj, path) => {
   const keys = path.split(".");
@@ -253,7 +260,7 @@ const useForm = (props) => {
       immediate: true
     }
   );
-  onUnmounted(() => {
+  onScopeDispose(() => {
     watchMap.forEach((cancel) => cancel());
   });
   function runFieldWatch() {

package/dist/utils.d.ts

@@ -8,7 +8,7 @@ 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;
+export declare const set: (target: any, path: string, value: any) => void;
 export declare const has: (obj: any, path: string) => boolean;
 /**
  * 浅层的将对象的属性值(可能是响应式)转换为普通值，不转化getter

package/package.json

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