@ftjs/core 0.5.0 → 0.5.2

package/dist/index.js

@@ -1,8 +1,8 @@
-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;
-  return column.field ?? ((_a = column.fields) == null ? void 0 : _a[0]);
+  return ((_a = column.fields) == null ? void 0 : _a[0]) ?? column.field;
 };
 const isEmptyStrOrNull = (val) => {
   return val === "" || val == null;
@@ -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.5.0",
+  "version": "0.5.2",
   "keywords": [],
   "author": "",
   "license": "MIT",