@ibiz-template/core 0.7.40 → 0.7.41-alpha.101

package/out/utils/recursive/find-recursive-child.js

@@ -4,8 +4,10 @@ import { mergeDeepRight } from 'ramda';
 const IterateOpts = {
     /** 子集合属性数组 */
     childrenFields: ['children'],
+    /** 是否跳出当前操作 */
+    isBreak: false,
 };
-const BreakError = new Error('中断操作');
+const ReturnError = new Error('中断操作');
 /**
  * @description 获取子属性集合
  * @param {IData} parent
@@ -20,16 +22,33 @@ function getChildField(parent, fields) {
         }
     }
 }
+/**
+ * @description 获取子属性对象
+ * @param {IData} parent
+ * @param {string[]} fields
+ * @returns {*}  {(IData[] | undefined)}
+ */
+function getChildFieldObj(parent, fields) {
+    for (const field of fields) {
+        if (parent[field]) {
+            return parent[field];
+        }
+    }
+}
 function _recursiveIterate(parent, callback, opts) {
     const { childrenFields } = mergeDeepRight(IterateOpts, opts || {});
     const children = getChildField(parent, childrenFields);
     if (children === null || children === void 0 ? void 0 : children.length) {
-        for (const child of children) {
+        for (let i = 0; i < children.length; i++) {
+            const child = children[i];
             // 递归自身的子成员
-            const isBreak = callback(child, parent);
-            // 如果回调返回true则退出
-            if (isBreak) {
-                throw BreakError;
+            const result = callback(child, parent);
+            // 回调返回true若未启用跳出当次操作则退出，启用跳出当次操作则跳出本次循环
+            if (result) {
+                if (opts === null || opts === void 0 ? void 0 : opts.isBreak) {
+                    break;
+                }
+                throw ReturnError;
             }
             // 递归孙的成员
             recursiveIterate(child, callback, opts);
@@ -69,7 +88,50 @@ export function recursiveIterate(parent, callback, opts) {
         _recursiveIterate(parent, callback, opts);
     }
     catch (error) {
-        if (error !== BreakError) {
+        if (error !== ReturnError) {
+            throw error;
+        }
+    }
+}
+/**
+ * @description 递归执行，处理对象结构
+ * @export
+ * @param {IData} parent
+ * @param {((item: any, _parent?: any) => boolean | void)} callback
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export function _recursiveExecute(parent, callback, opts) {
+    const { childrenFields } = mergeDeepRight(IterateOpts, opts || {});
+    const children = getChildFieldObj(parent, childrenFields);
+    if (children) {
+        for (let i = 0; i < Object.values(children).length; i++) {
+            const child = Object.values(children)[i];
+            const result = callback(child, parent);
+            // 回调返回true若未启用跳出当次操作则退出，启用跳出当次操作则跳出本次循环
+            if (result) {
+                if (opts === null || opts === void 0 ? void 0 : opts.isBreak) {
+                    break;
+                }
+                throw ReturnError;
+            }
+            // 递归孙的成员
+            _recursiveExecute(child, callback, opts);
+        }
+    }
+}
+/**
+ * @description 递归执行，处理对象结构
+ * @export
+ * @param {IData} parent
+ * @param {((item: any, _parent: any) => boolean | void)} callback
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export function recursiveExecute(parent, callback, opts) {
+    try {
+        _recursiveExecute(parent, callback, opts);
+    }
+    catch (error) {
+        if (error !== ReturnError) {
             throw error;
         }
     }

package/out/utils/string-util/string-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string-util.d.ts","sourceRoot":"","sources":["../../../src/utils/string-util/string-util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qBAAa,UAAU;IACrB;;;;OAIG;IACH,MAAM,CAAC,UAAU,SAAgD;IAEjE;;;;OAIG;IACH,MAAM,CAAC,OAAO,SAA6C;IAE3D;;;;OAIG;IACH,MAAM,CAAC,SAAS,SAA+C;IAE/D;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,MAAM;CA4BV"}
+{"version":3,"file":"string-util.d.ts","sourceRoot":"","sources":["../../../src/utils/string-util/string-util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qBAAa,UAAU;IACrB;;;;OAIG;IACH,MAAM,CAAC,UAAU,SAAgD;IAEjE;;;;OAIG;IACH,MAAM,CAAC,OAAO,SAA6C;IAE3D;;;;OAIG;IACH,MAAM,CAAC,SAAS,SAA+C;IAE/D;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,IAAI,CACT,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,MAAM;CA0BV"}

package/out/utils/string-util/string-util.js

@@ -32,10 +32,8 @@ export class StringUtil {
             if (notNilEmpty(params)) {
                 const strArr = str.match(this.paramsReg);
                 strArr === null || strArr === void 0 ? void 0 : strArr.forEach(_key => {
-                    const key = _key.slice(8, _key.length - 1);
-                    if (params[key]) {
-                        str = str.replace(`\${params.${key}}`, params[key]);
-                    }
+                    const key = _key.slice(9, _key.length - 1);
+                    str = str.replace(`\${params.${key}}`, params[key] || '');
                 });
             }
             if (notNilEmpty(data)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/core",
-  "version": "0.7.40",
+  "version": "0.7.41-alpha.101",
   "description": "运行时核心库",
   "type": "module",
   "main": "out/index.js",
@@ -32,7 +32,7 @@
   "license": "MIT",
   "dependencies": {
     "@microsoft/fetch-event-source": "^2.0.1",
-    "axios": "^1.6.5",
+    "axios": "^1.8.2",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.8.1",
     "loglevel-plugin-prefix": "^0.8.4",
@@ -44,11 +44,11 @@
     "@types/qs": "^6.9.11"
   },
   "peerDependencies": {
-    "axios": "^1.4.0",
+    "axios": "^1.8.2",
     "lodash-es": "^4.17.21",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "46e39bf68e6e2212eb077ba6bd6e907e180fa335"
+  "gitHead": "f9d085280db4778ad952333525a03889fc37e2ab"
 }