@tmagic/utils 1.3.16 → 1.4.0-beta.2

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.16",
+  "version": "1.4.0-beta.2",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -25,7 +25,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/schema": "1.3.16",
+    "@tmagic/schema": "1.4.0-beta.2",
     "dayjs": "^1.11.4",
     "lodash-es": "^4.17.21"
   },
@@ -36,8 +36,8 @@
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
     "rimraf": "^3.0.2",
-    "typescript": "^5.0.4",
-    "vite": "^5.0.7"
+    "typescript": "^5.4.2",
+    "vite": "^5.1.6"
   },
   "scripts": {
     "build": "rimraf ./dist && npm run build:type && vite build --mode=es && vite build --mode=umd",

package/src/index.ts

@@ -18,7 +18,7 @@
 
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
-import { cloneDeep, get as objectGet, set as objectSet } from 'lodash-es';
+import { cloneDeep, set as objectSet } from 'lodash-es';
 
 import type { DataSchema, DataSourceDeps, Id, MComponent, MNode } from '@tmagic/schema';
 import { NodeType } from '@tmagic/schema';
@@ -165,7 +165,18 @@ export const guid = (digit = 8): string =>
     return v.toString(16);
   });
 
-export const getValueByKeyPath: any = (keys: string, data: Record<string | number, any> = {}) => objectGet(data, keys);
+export const getValueByKeyPath: any = (keys = '', data: Record<string | number, any> = {}) =>
+  // 将 array[0] 转成 array.0
+  keys
+    .replaceAll(/\[(\d+)\]/g, '.$1')
+    .split('.')
+    .reduce((accumulator, currentValue: any) => {
+      if (isObject(accumulator) || Array.isArray(accumulator)) {
+        return accumulator[currentValue];
+      }
+
+      return void 0;
+    }, data);
 
 export const setValueByKeyPath: any = (keys: string, value: any, data: Record<string | number, any> = {}) =>
   objectSet(data, keys, value);
@@ -238,6 +249,8 @@ export const replaceChildNode = (newNode: MNode, data?: MNode[], parentId?: Id)
   parent.items.splice(index, 1, newNode);
 };
 
+export const DSL_NODE_KEY_COPY_PREFIX = '__magic__';
+
 export const compiledNode = (
   compile: (value: any) => any,
   node: MNode,
@@ -252,10 +265,8 @@ export const compiledNode = (
     keys = dep?.[node.id].keys || [];
   }
 
-  const keyPrefix = '__magic__';
-
   keys.forEach((key) => {
-    const cacheKey = `${keyPrefix}${key}`;
+    const cacheKey = `${DSL_NODE_KEY_COPY_PREFIX}${key}`;
 
     const value = getValueByKeyPath(key, node);
     let templateValue = getValueByKeyPath(cacheKey, node);
@@ -276,10 +287,6 @@ export const compiledNode = (
     setValueByKeyPath(key, newValue, node);
   });
 
-  if (Array.isArray(node.items)) {
-    node.items.forEach((item) => compiledNode(compile, item, dataSourceDeps));
-  }
-
   return node;
 };
 

package/types/index.d.ts

@@ -39,11 +39,12 @@ export declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[
  * @param parentId 父节点 id
  */
 export declare const replaceChildNode: (newNode: MNode, data?: MNode[], parentId?: Id) => void;
+export declare const DSL_NODE_KEY_COPY_PREFIX = "__magic__";
 export declare const compiledNode: (compile: (value: any) => any, node: MNode, dataSourceDeps?: DataSourceDeps, sourceId?: Id) => MNode;
 export declare const compiledCond: (op: string, fieldValue: any, inputValue: any, range?: number[]) => boolean;
 export declare const getDefaultValueFromFields: (fields: DataSchema[]) => Record<string, any>;
 export declare const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = "ds-field::";
-export declare const getKeys: <T extends object>(obj: T) => (keyof T)[];
+export declare const getKeys: <T extends object>(obj: T) => Array<keyof T>;
 export declare const calculatePercentage: (value: number, percentageStr: string) => number;
 export declare const isPercentage: (value: number | string) => boolean;
 export declare const convertToNumber: (value: number | string, parentValue?: number) => number;