@riil-frontend/component-topology 12.1.0-dev.10 → 12.1.0-dev.12

package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -64,7 +64,7 @@ function ResourceSelectDrawer(props) {
             _context.prev = 9;
             _context.t0 = _context["catch"](1);
             setLoading(false);
-            rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
+            rlog.error('ResourceSelectDrawer.handleOk', _context.t0, _context.t0.stack);
 
           case 13:
           case "end":

package/es/core/hooks/useTopoEdit.js

@@ -8,7 +8,7 @@ import React, { useCallback, useState } from "react";
 import Logger from 'loglevel';
 import { TopoEvent } from "@riil-frontend/component-topology-graph";
 import { TPL_BLANK, TPL_TREE } from "../../utils/template";
-import { getGroupElementByTag, isEdge, containsElement, isGroup, isLayer, isNode, getGroupChildren } from "../../utils/htElementUtils";
+import { getGroupElementByTag, isEdge, containsElement, isGroup, isLayer, isNode, getGroupChildren, getElements } from "../../utils/htElementUtils";
 import useResourceConfig from "./useResourceConfig";
 import useGroupAddResource from "./useGroupAddResource";
 import { findGroupChildren } from "../../utils/topoData";
@@ -280,7 +280,7 @@ var useTopoEdit = function useTopoEdit(params) {
       if (typeof onNodeDelete === "function") {
         onNodeDelete(data);
       } else {
-        emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, node);
+        emitEvent(TopoEvent.EVENT_TRIGGER_DELETE, data);
       }
     }
   }; // 删除关联在节点上的出口链路
@@ -369,13 +369,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function findUNExistedElements(elements) {
     var dm = topo.getDataModel();
-    var newLinkElements = elements.filter(function (element) {
+    var unExistedElements = elements.filter(function (element) {
       return !containsElement(dm, element);
     });
-    return newLinkElements;
+    return unExistedElements;
   }
   /**
-   * 关联容器的资源
+   * 区域关联资源
+   * @param {{ id, tag }} group 
+   * @param {*} resources 
    */
 
 
@@ -385,25 +387,39 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindGroupResources() {
     _bindGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(group, resources) {
-      var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
+      var _yield$editDispatcher2, elements, dm, needDeleteHtDatas, nodeElements, newLinkElements, updateElements;
 
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            id = group.id, tag = group.tag;
-            rlog.debug("bindGroupResources--id, tag", id, tag);
+            rlog.debug("区域关联资源", {
+              group: group,
+              resources: resources
+            });
             topo.historyManager.beginTransaction();
-            _context9.next = 5;
+            _context9.next = 4;
             return resourceConfig.updateGroupResources(group, resources);
 
-          case 5:
-            _context9.next = 7;
+          case 4:
+            _context9.next = 6;
             return editDispatchers.fetchDataByConfig();
 
-          case 7:
+          case 6:
             _yield$editDispatcher2 = _context9.sent;
             elements = _yield$editDispatcher2.elements;
-            // 区域里的子区域及子区域的节点、新增的链路
+            rlog.debug("区域关联资源: 元素列表", elements); // 先删除多余的元素
+
+            dm = topo.getDataModel();
+            needDeleteHtDatas = getElements(dm).filter(function (htData) {
+              return htData.a('id') && !elements.find(function (ele) {
+                return ele.id === htData.a('id');
+              });
+            });
+            needDeleteHtDatas.forEach(function (htData) {
+              return dm.remove(htData);
+            }); // 区域里的子区域及子区域的节点、新增的链路
+            // 区域里的所有节点
+
             nodeElements = findGroupChildren(elements, group);
             newLinkElements = findUNExistedLinkElements(elements);
             updateElements = [].concat(nodeElements, newLinkElements);
@@ -414,11 +430,21 @@ var useTopoEdit = function useTopoEdit(params) {
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
-            }
+            } // const unExistedElements = findUNExistedElements(elements) 
+            // const createElementsData = {
+            //   groups: unExistedElements.filter((item) => item.type === "group"),
+            //   nodes: unExistedElements.filter((item) => item.type === "node"),
+            //   links: unExistedElements.filter((item) => item.type === "link"),
+            //   linkGroups: unExistedElements.filter((item) => item.type === "linkGroup"),
+            // };
+            // const htTopo = topo.getHtTopo()
+            // htTopo.createElements(createElementsData);
+            // rlog.debug('==> ht: createElements ', createElementsData)
+
 
             topo.historyManager.endTransaction();
 
-          case 14:
+          case 17:
           case "end":
             return _context9.stop();
         }
@@ -714,7 +740,7 @@ var useTopoEdit = function useTopoEdit(params) {
       type: type,
       data: data
     };
-    rlog.debug("TopoCenter:onSaveBind", eventData);
+    rlog.debug("=> ht: saveBind", eventData);
     emitEvent(TopoEvent.EVENT_DATA_RESULT, eventData);
   };
   /**

package/es/core/models/AttributeMetricDisplay.js

@@ -527,7 +527,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-    rlog.debug('推送标注 => ht', elementTagsAndTips);
+    rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
@@ -538,7 +538,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       try {
         htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
       } catch (error) {
-        rlog.error('推送标注 => ht 失败', error);
+        rlog.error(' ==> ht: 推送标注失败', error);
       }
 
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');

package/es/core/models/HistoryManager.js

@@ -60,7 +60,7 @@ var HistoryManager = /*#__PURE__*/function () {
 
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
-    log.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
   };
 
   _proto.beginTransaction = function beginTransaction(name) {

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.1.0-dev.10" === 'string' ? "12.1.0-dev.10" : null;
+var version = typeof "12.1.0-dev.12" === 'string' ? "12.1.0-dev.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/store/models/topoConfig.js

@@ -260,13 +260,7 @@ export default function (topoApp) {
 
                 case 5:
                   data = _context2.sent;
-                  rlog.debug("按配置查询拓扑数据", {
-                    config: {
-                      resources: resources,
-                      groups: groups
-                    },
-                    data: data
-                  });
+                  rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
                   return _context2.abrupt("return", data);
 
                 case 8:

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -33,7 +33,7 @@ function EventsCard(props) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(url);
+      topo.viewProps.jumpto(formatUrl(url));
     } else {
       getHistory().push(formatUrl(url));
     }

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss

@@ -1,7 +1,7 @@
 .container {
   width: 100%;
   height: 100%;
-  min-height: 250px;
+  min-height: 260px;
   position: relative;
   .floatBox{
     position: absolute;

package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js

@@ -83,7 +83,7 @@ function ResourceSelectDrawer(props) {
             _context.t0 = _context["catch"](1);
             setLoading(false);
 
-            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0);
+            _componentTopologyUtils.rlog.error('ResourceSelectDrawer.handleOk', _context.t0, _context.t0.stack);
 
           case 13:
           case "end":

package/lib/core/hooks/useTopoEdit.js

@@ -309,7 +309,7 @@ var useTopoEdit = function useTopoEdit(params) {
       if (typeof onNodeDelete === "function") {
         onNodeDelete(data);
       } else {
-        emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, node);
+        emitEvent(_componentTopologyGraph.TopoEvent.EVENT_TRIGGER_DELETE, data);
       }
     }
   }; // 删除关联在节点上的出口链路
@@ -398,13 +398,15 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function findUNExistedElements(elements) {
     var dm = topo.getDataModel();
-    var newLinkElements = elements.filter(function (element) {
+    var unExistedElements = elements.filter(function (element) {
       return !(0, _htElementUtils.containsElement)(dm, element);
     });
-    return newLinkElements;
+    return unExistedElements;
   }
   /**
-   * 关联容器的资源
+   * 区域关联资源
+   * @param {{ id, tag }} group 
+   * @param {*} resources 
    */
 
 
@@ -414,25 +416,39 @@ var useTopoEdit = function useTopoEdit(params) {
 
   function _bindGroupResources() {
     _bindGroupResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(group, resources) {
-      var id, tag, _yield$editDispatcher2, elements, nodeElements, newLinkElements, updateElements;
+      var _yield$editDispatcher2, elements, dm, needDeleteHtDatas, nodeElements, newLinkElements, updateElements;
 
       return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            id = group.id, tag = group.tag;
-            rlog.debug("bindGroupResources--id, tag", id, tag);
+            rlog.debug("区域关联资源", {
+              group: group,
+              resources: resources
+            });
             topo.historyManager.beginTransaction();
-            _context9.next = 5;
+            _context9.next = 4;
             return resourceConfig.updateGroupResources(group, resources);
 
-          case 5:
-            _context9.next = 7;
+          case 4:
+            _context9.next = 6;
             return editDispatchers.fetchDataByConfig();
 
-          case 7:
+          case 6:
             _yield$editDispatcher2 = _context9.sent;
             elements = _yield$editDispatcher2.elements;
-            // 区域里的子区域及子区域的节点、新增的链路
+            rlog.debug("区域关联资源: 元素列表", elements); // 先删除多余的元素
+
+            dm = topo.getDataModel();
+            needDeleteHtDatas = (0, _htElementUtils.getElements)(dm).filter(function (htData) {
+              return htData.a('id') && !elements.find(function (ele) {
+                return ele.id === htData.a('id');
+              });
+            });
+            needDeleteHtDatas.forEach(function (htData) {
+              return dm.remove(htData);
+            }); // 区域里的子区域及子区域的节点、新增的链路
+            // 区域里的所有节点
+
             nodeElements = (0, _topoData.findGroupChildren)(elements, group);
             newLinkElements = findUNExistedLinkElements(elements);
             updateElements = [].concat(nodeElements, newLinkElements);
@@ -443,11 +459,21 @@ var useTopoEdit = function useTopoEdit(params) {
               if (topo.linkDynamicStyleExecutor) {
                 topo.linkDynamicStyleExecutor.execute();
               }
-            }
+            } // const unExistedElements = findUNExistedElements(elements) 
+            // const createElementsData = {
+            //   groups: unExistedElements.filter((item) => item.type === "group"),
+            //   nodes: unExistedElements.filter((item) => item.type === "node"),
+            //   links: unExistedElements.filter((item) => item.type === "link"),
+            //   linkGroups: unExistedElements.filter((item) => item.type === "linkGroup"),
+            // };
+            // const htTopo = topo.getHtTopo()
+            // htTopo.createElements(createElementsData);
+            // rlog.debug('==> ht: createElements ', createElementsData)
+
 
             topo.historyManager.endTransaction();
 
-          case 14:
+          case 17:
           case "end":
             return _context9.stop();
         }
@@ -743,7 +769,7 @@ var useTopoEdit = function useTopoEdit(params) {
       type: type,
       data: data
     };
-    rlog.debug("TopoCenter:onSaveBind", eventData);
+    rlog.debug("=> ht: saveBind", eventData);
     emitEvent(_componentTopologyGraph.TopoEvent.EVENT_DATA_RESULT, eventData);
   };
   /**

package/lib/core/models/AttributeMetricDisplay.js

@@ -542,7 +542,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-    rlog.debug('推送标注 => ht', elementTagsAndTips);
+    rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
@@ -553,7 +553,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       try {
         htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
       } catch (error) {
-        rlog.error('推送标注 => ht 失败', error);
+        rlog.error(' ==> ht: 推送标注失败', error);
       }
 
       (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');

package/lib/core/models/HistoryManager.js

@@ -71,7 +71,7 @@ var HistoryManager = /*#__PURE__*/function () {
 
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
-    log.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
   };
 
   _proto.beginTransaction = function beginTransaction(name) {

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.1.0-dev.10" === 'string' ? "12.1.0-dev.10" : null;
+var version = typeof "12.1.0-dev.12" === 'string' ? "12.1.0-dev.12" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/store/models/topoConfig.js

@@ -278,13 +278,7 @@ function _default(topoApp) {
 
                 case 5:
                   data = _context2.sent;
-                  rlog.debug("按配置查询拓扑数据", {
-                    config: {
-                      resources: resources,
-                      groups: groups
-                    },
-                    data: data
-                  });
+                  rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
                   return _context2.abrupt("return", data);
 
                 case 8:

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -51,7 +51,7 @@ function EventsCard(props) {
     closeDetailDrawer();
 
     if (topo.viewProps.jumpto) {
-      topo.viewProps.jumpto(url);
+      topo.viewProps.jumpto(formatUrl(url));
     } else {
       (0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
     }

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss

@@ -1,7 +1,7 @@
 .container {
   width: 100%;
   height: 100%;
-  min-height: 250px;
+  min-height: 260px;
   position: relative;
   .floatBox{
     position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "12.1.0-dev.10",
+  "version": "12.1.0-dev.12",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -123,6 +123,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.10/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@12.1.0-dev.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }