@ibiz-template/model-helper 0.7.41-alpha.1 → 0.7.41-alpha.100

package/out/utils/merge-model/merge-treeview.js

@@ -17,10 +17,10 @@ export function mergeTreeView(dst, source) {
         }
         source.detreeNodes.forEach(sourceNode => {
             var _a;
-            const isExist = dst.detreeNodes.find(dstNode => {
+            const item = dst.detreeNodes.find(dstNode => {
                 return dstNode.id === sourceNode.id;
             });
-            if (!isExist) {
+            if (!item) {
                 (_a = dst.detreeNodes) === null || _a === void 0 ? void 0 : _a.push(sourceNode);
             }
         });
@@ -32,13 +32,149 @@ export function mergeTreeView(dst, source) {
         }
         source.detreeNodeRSs.forEach(sourceNodeRs => {
             var _a;
-            const isExist = dst.detreeNodeRSs.find(dstNodeRs => {
+            // 若配置了用户标记（dynamic_overlay:before|after|replace|delete|start|end:noderesid），则需根据用户标记进行合并，否则原始数据没有则直接附加末尾
+            if (sourceNodeRs.userTag &&
+                sourceNodeRs.userTag.startsWith('dynamic_overlay') &&
+                sourceNodeRs.userTag.split(':').length === 3) {
+                mergeSubAppTreeNodeResToDst(dst, sourceNodeRs);
+            }
+            else {
+                const itemIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                    return (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId &&
+                        dstNodeRs.childDETreeNodeId === sourceNodeRs.childDETreeNodeId);
+                });
+                // 若存在end标记，则需要添加到第一个end标记节点关系前面，保证end标记节点关系始终添加到最后
+                const endIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                    var _a;
+                    if (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId) {
+                        const tags = (_a = sourceNodeRs.userTag) === null || _a === void 0 ? void 0 : _a.split(':');
+                        if (!tags || tags.length !== 3 || tags[1] !== 'end')
+                            return false;
+                        return true;
+                    }
+                    return false;
+                });
+                if (itemIndex === -1) {
+                    if (endIndex === -1) {
+                        (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+                    }
+                    else {
+                        dst.detreeNodeRSs.splice(endIndex, 0, sourceNodeRs);
+                    }
+                }
+            }
+        });
+    }
+}
+/**
+ * 合并指定子应用树节点关系到主应用树指定位置
+ * @param dst 原始树
+ * @param sourceNode 子应用树节点关系
+ */
+function mergeSubAppTreeNodeResToDst(dst, sourceNodeRs) {
+    var _a;
+    // dynamic_overlay:before|after|replace|delete|start|end:nodeid 定义附加位置
+    const [dynamicOverlay, targetPosition, targetTag] = sourceNodeRs.userTag.split(':');
+    if (!dynamicOverlay || !targetPosition || !targetTag)
+        return;
+    switch (targetPosition) {
+        case 'before':
+            // 在目标节点之前,dynamic_overlay:before:childnodeid,这儿最后一节拼接的是子节点标识
+            const beforeIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (beforeIndex !== -1) {
+                dst.detreeNodeRSs.splice(beforeIndex, 0, sourceNodeRs);
+            }
+            break;
+        case 'after':
+            // 在目标节点之后,格式如：dynamic_overlay:after:childnodeid,最后一节拼接的是子节点标识
+            const afterIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (afterIndex !== -1) {
+                dst.detreeNodeRSs.splice(afterIndex + 1, 0, sourceNodeRs);
+            }
+            break;
+        case 'replace':
+            // 替换目标节点,格式如：dynamic_overlay:replace:childnodeid,最后一节拼接的是子节点标识
+            const replaceIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (replaceIndex !== -1) {
+                dst.detreeNodeRSs.splice(replaceIndex, 1, sourceNodeRs);
+            }
+            break;
+        case 'delete':
+            // 删除目标节点,格式如：dynamic_overlay:delete:childnodeid,最后一节拼接的是子节点标识
+            const deleteIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (deleteIndex !== -1) {
+                dst.detreeNodeRSs.splice(deleteIndex, 1);
+            }
+            break;
+        case 'start':
+            // 在目标节点内部开始，格式如：dynamic_overlay:start:随机字符,最后一节拼接的是随机字符，读的是当前节点关系的父节点标识
+            const startIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId;
+            });
+            if (startIndex !== -1) {
+                dst.detreeNodeRSs.splice(startIndex, 0, sourceNodeRs);
+            }
+            break;
+        case 'end':
+            // 在目标节点内部结束，格式如：dynamic_overlay:end:随机字符,最后一节拼接的是随机字符，读的是当前节点关系的父节点标识
+            const endIndex = getLastIndex(dst.detreeNodeRSs, dstNode => {
+                return dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId;
+            });
+            if (endIndex !== -1) {
+                dst.detreeNodeRSs.splice(endIndex + 1, 0, sourceNodeRs);
+            }
+            break;
+        default:
+            // 未识别位置，若源树不存在该关系，则直接附加到最后
+            const defaultIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
                 return (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId &&
                     dstNodeRs.childDETreeNodeId === sourceNodeRs.childDETreeNodeId);
             });
-            if (!isExist) {
-                (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+            // 若存在end标记，则需要添加到第一个end标记节点关系前面，保证end标记节点关系始终添加到最后
+            const defaultEndIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                var _a;
+                if (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId) {
+                    const tags = (_a = sourceNodeRs.userTag) === null || _a === void 0 ? void 0 : _a.split(':');
+                    if (!tags || tags.length !== 3 || tags[1] !== 'end')
+                        return false;
+                    return true;
+                }
+                return false;
+            });
+            if (defaultIndex === -1) {
+                if (defaultEndIndex === -1) {
+                    (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+                }
+                else {
+                    dst.detreeNodeRSs.splice(defaultEndIndex, 0, sourceNodeRs);
+                }
             }
-        });
+            break;
+    }
+}
+/**
+ * 获取指定数组中满足条件的最后一个元素
+ * @param arr 指定数组
+ * @param predicate 过滤条件
+ * @returns 找到则返回指定元素下标，反之返回-1
+ */
+function getLastIndex(arr, predicate) {
+    for (let i = arr.length - 1; i >= 0; i--) {
+        if (predicate(arr[i])) {
+            return i;
+        }
     }
+    return -1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.41-alpha.1",
+  "version": "0.7.41-alpha.100",
   "description": "模型辅助库",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -30,14 +30,14 @@
   "author": "iBiz",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.1",
-    "@ibiz/model-core": "^0.1.75",
-    "@ibiz/rt-model-api": "0.2.72",
+    "@ibiz-template/core": "^0.7.41-alpha.88",
+    "@ibiz/model-core": "^0.1.86",
+    "@ibiz/rt-model-api": "0.2.84",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.1",
+    "@ibiz-template/runtime": "^0.7.41-alpha.100",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
@@ -45,5 +45,5 @@
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "49b4a4328c21f6b4725855f6f1a1c00a72ed8065"
+  "gitHead": "fddfbaa15b8d916e4da1cbb9308eb5f766bddb90"
 }