@tmagic/utils 1.5.3 → 1.5.4

package/dist/tmagic-utils.js

@@ -425,14 +425,19 @@ const addParamToUrl = (obj, global2 = globalThis, needReload = true) => {
 };
 const dataSourceTemplateRegExp = /\$\{([\s\S]+?)\}/g;
 const isDslNode = (config) => typeof config[IS_DSL_NODE_KEY] === "undefined" || config[IS_DSL_NODE_KEY] === true;
-const traverseNode = (node, cb, parents = []) => {
-  cb(node, parents);
+const traverseNode = (node, cb, parents = [], evalCbAfter = false) => {
+  if (!evalCbAfter) {
+    cb(node, parents);
+  }
   if (Array.isArray(node.items) && node.items.length) {
     parents.push(node);
     node.items.forEach((item) => {
       traverseNode(item, cb, [...parents]);
     });
   }
+  if (evalCbAfter) {
+    cb(node, parents);
+  }
 };
 const isValueIncludeDataSource = (value) => {
   if (typeof value === "string" && /\$\{([\s\S]+?)\}/.test(value)) {

package/dist/tmagic-utils.umd.cjs

@@ -3034,14 +3034,19 @@
   };
   const dataSourceTemplateRegExp = /\$\{([\s\S]+?)\}/g;
   const isDslNode = (config) => typeof config[IS_DSL_NODE_KEY] === "undefined" || config[IS_DSL_NODE_KEY] === true;
-  const traverseNode = (node, cb, parents = []) => {
-    cb(node, parents);
+  const traverseNode = (node, cb, parents = [], evalCbAfter = false) => {
+    if (!evalCbAfter) {
+      cb(node, parents);
+    }
     if (Array.isArray(node.items) && node.items.length) {
       parents.push(node);
       node.items.forEach((item) => {
         traverseNode(item, cb, [...parents]);
       });
     }
+    if (evalCbAfter) {
+      cb(node, parents);
+    }
   };
   const isValueIncludeDataSource = (value) => {
     if (typeof value === "string" && /\$\{([\s\S]+?)\}/.test(value)) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.3",
+  "version": "1.5.4",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -37,7 +37,7 @@
   },
   "peerDependencies": {
     "typescript": "*",
-    "@tmagic/schema": "1.5.3"
+    "@tmagic/schema": "1.5.4"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -499,8 +499,11 @@ export const traverseNode = <T extends NodeItem = NodeItem>(
   node: T,
   cb: (node: T, parents: T[]) => void,
   parents: T[] = [],
+  evalCbAfter = false,
 ) => {
-  cb(node, parents);
+  if (!evalCbAfter) {
+    cb(node, parents);
+  }
 
   if (Array.isArray(node.items) && node.items.length) {
     parents.push(node);
@@ -508,6 +511,10 @@ export const traverseNode = <T extends NodeItem = NodeItem>(
       traverseNode(item as T, cb, [...parents]);
     });
   }
+
+  if (evalCbAfter) {
+    cb(node, parents);
+  }
 };
 
 export const isValueIncludeDataSource = (value: any) => {

package/types/index.d.ts

@@ -94,7 +94,7 @@ interface NodeItem {
     items?: NodeItem[];
     [key: string]: any;
 }
-declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node: T, parents: T[]) => void, parents?: T[]) => void;
+declare const traverseNode: <T extends NodeItem = NodeItem>(node: T, cb: (node: T, parents: T[]) => void, parents?: T[], evalCbAfter?: boolean) => void;
 declare const isValueIncludeDataSource: (value: any) => boolean;
 
 export { DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DSL_NODE_KEY_COPY_PREFIX, IS_DSL_NODE_KEY, type NodeItem, addClassName, addParamToUrl, asyncLoadCss, asyncLoadJs, calcValueByFontsize, calculatePercentage, compiledCond, compiledNode, convertToNumber, createDiv, dataSourceTemplateRegExp, emptyFn, filterXSS, getDefaultValueFromFields, getDepKeys, getDepNodeIds, getDocument, getElById, getGlobalThis, getHost, getIdFromEl, getKeys, getKeysArray, getNodeInfo, getNodePath, getNodes, getUrlParam, getValueByKeyPath, guid, injectStyle, isDslNode, isNumber, isObject, isPage, isPageFragment, isPercentage, isPop, isSameDomain, isValueIncludeDataSource, removeClassName, removeClassNameByClassName, replaceChildNode, setDslDomRelateConfig, setIdToEl, setValueByKeyPath, sleep, toHump, toLine, traverseNode };