@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.10

package/es/core/models/AttributeMetricDisplay.js

@@ -1,13 +1,14 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { rlog } from '@riil-frontend/component-topology-utils';
+import Logger from 'loglevel';
 import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
 import { isMonitoring } from "../utils/manageStatusUtil";
 import AttributeFormatter from "./attributeFormatter";
 import DictCache from "./cache/DictCache";
 import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
 import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
+var rlog = Logger.getLogger('topo');
 
 function isGraphField(item) {
   return item.type === 'graph';
@@ -526,7 +527,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: tags
       });
     });
-    rlog.debug('推送标注 => ht', elementTagsAndTips);
+    rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
     var htTopo = topo.getHtTopo();
 
     if (htTopo) {
@@ -537,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

@@ -1,5 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { rlog } from '@riil-frontend/component-topology-utils';
+import Logger from 'loglevel';
+var log = Logger.getLogger('topo.HistoryManager');
 var ht = window.ht;
 
 var HistoryManager = /*#__PURE__*/function () {
@@ -10,7 +12,7 @@ var HistoryManager = /*#__PURE__*/function () {
     this.topo = topo;
     this.htHistoryManager = htHistoryManager;
     htHistoryManager.clear();
-    rlog.info('HistoryManager 初始化', htHistoryManager);
+    log.info('HistoryManager 初始化', htHistoryManager);
     this.updateStore = this.updateStore.bind(this);
     this.init();
   }
@@ -58,10 +60,10 @@ var HistoryManager = /*#__PURE__*/function () {
 
   _proto.setDisabled = function setDisabled(disabled, message) {
     this.htHistoryManager.setDisabled(disabled);
-    rlog.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() {
+  _proto.beginTransaction = function beginTransaction(name) {
     var _this = this;
 
     this.htHistoryManager.beginTransaction();
@@ -92,7 +94,7 @@ var HistoryManager = /*#__PURE__*/function () {
         oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
       });
     });
-    rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.addStoreHistory = function addStoreHistory() {
@@ -117,16 +119,16 @@ var HistoryManager = /*#__PURE__*/function () {
         type: 'store',
         data: storeChanged
       });
-      rlog.debug('HistoryManager.addStoreHistory', storeChanged);
+      log.debug('HistoryManager.addStoreHistory', storeChanged);
     }
 
     this.storeHistory = [];
   };
 
-  _proto.endTransaction = function endTransaction() {
+  _proto.endTransaction = function endTransaction(name) {
     this.addStoreHistory();
     this.htHistoryManager.endTransaction();
-    rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
+    log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
   };
 
   _proto.clear = function clear() {
@@ -170,7 +172,7 @@ var HistoryManager = /*#__PURE__*/function () {
       return;
     }
 
-    rlog.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
+    log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(true);
 
     if (storeHistory) {
@@ -188,7 +190,7 @@ var HistoryManager = /*#__PURE__*/function () {
   _proto.redo = function redo() {
     var _this4 = this;
 
-    rlog.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
+    log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
     var storeHistory = this.getCurrentStoreHistory(false);
 
     if (storeHistory) {

package/es/core/models/TopoApp.js

@@ -10,7 +10,7 @@ import Alarm from "./Alarm";
 import TopoGraphView from "./TopoGraphView";
 import createStore from "../store/createStore";
 import buildProvider from "../components/buildProvider";
-import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes as _getNodes } from "../../utils/htElementUtils";
+import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes } from "../../utils/htElementUtils";
 import Test from "../test/Test";
 import { formatGroups } from "../../utils/topoData";
 import DictCache from "./cache/DictCache";
@@ -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 "13.0.0-dev.1" === 'string' ? "13.0.0-dev.1" : null;
+var version = typeof "13.0.0-dev.10" === 'string' ? "13.0.0-dev.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -188,38 +188,29 @@ var Topo = /*#__PURE__*/function () {
 
   _proto.getData = function getData() {
     return {
-      groups: this.getGroups(),
-      nodes: this.getNodes(),
-      lines: this.getLines(),
+      groups: getGroupDatas(this.getDataModel()),
+      nodes: getNodes(this.getDataModel()).filter(function (node) {
+        return !!node.getTag();
+      }).map(getNodeData),
       customNodes: getNodeDatas(this.getDataModel()).filter(function (item) {
         return !item.id;
       }),
-      customLines: this.getEdges().filter(function (item) {
+      lines: getEdgeDatas(this.getDataModel()).filter(function (item) {
+        return !!item.id;
+      }),
+      customLines: getEdgeDatas(this.getDataModel()).filter(function (item) {
         return !item.id;
       })
     };
-  };
-
-  _proto.getGroups = function getGroups() {
-    return getGroupDatas(this.getDataModel());
-  };
-
-  _proto.getNodes = function getNodes() {
-    var nodes = _getNodes(this.getDataModel()).filter(function (node) {
-      return !!node.getTag();
-    });
-
-    return nodes.map(getNodeData);
-  };
+  }
+  /**
+   * @deprecated 待移除。uicbb有使用
+   * @returns 
+   */
+  ;
 
   _proto.getLines = function getLines() {
-    return this.getEdges().filter(function (item) {
-      return !!item.id;
-    });
-  };
-
-  _proto.getEdges = function getEdges() {
-    return getEdgeDatas(this.getDataModel());
+    return this.getData().lines;
   }
   /**
    * 全量更新数据
@@ -278,18 +269,19 @@ var Topo = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _addElements = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(elements) {
-      var data;
+      var prevData, data;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            prevData = this.getData();
             data = {
-              groups: [].concat(this.getGroups(), elements.groups || []),
-              nodes: [].concat(this.getNodes(), elements.nodes || []),
-              lines: [].concat(this.getLines(), elements.lines || [])
+              groups: [].concat(prevData.groups, elements.groups || []),
+              nodes: [].concat(prevData.nodes, elements.nodes || []),
+              lines: [].concat(prevData.lines, elements.lines || [])
             };
             this.updateElements(data); // TODO 更新store，触发属性、指标模型加载，更新指标
 
-          case 2:
+          case 3:
           case "end":
             return _context5.stop();
         }
@@ -516,38 +508,39 @@ var Topo = /*#__PURE__*/function () {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             rlog.info('TopoApp.enterEditMode');
+            this.historyManager = null;
 
             if (!this.options.onSwitchToEditModeBegin) {
-              _context12.next = 4;
+              _context12.next = 5;
               break;
             }
 
-            _context12.next = 4;
+            _context12.next = 5;
             return this.options.onSwitchToEditModeBegin(this);
 
-          case 4:
+          case 5:
             topoDispatchers = this.store.getModelDispatchers('topoMod');
-            _context12.next = 7;
+            _context12.next = 8;
             return topoDispatchers.update({
               viewState: 'edit'
             });
 
-          case 7:
-            _context12.next = 9;
+          case 8:
+            _context12.next = 10;
             return this.view.switchToEditMode();
 
-          case 9:
+          case 10:
             updateEdgeExpanded(this);
 
             if (!this.options.onSwitchToEditMode) {
-              _context12.next = 13;
+              _context12.next = 14;
               break;
             }
 
-            _context12.next = 13;
+            _context12.next = 14;
             return this.options.onSwitchToEditMode(this);
 
-          case 13:
+          case 14:
             if (this.getDataModel()) {
               // 更新节点名称显示隐藏
               this.attributeMetricDisplay.updateNodesNameVisible();
@@ -557,7 +550,7 @@ var Topo = /*#__PURE__*/function () {
             iconManageDispatchers = this.store.getModelDispatchers('customIcon');
             iconManageDispatchers.loadEditorIcons();
 
-          case 16:
+          case 17:
           case "end":
             return _context12.stop();
         }
@@ -581,18 +574,19 @@ var Topo = /*#__PURE__*/function () {
             return this.view.switchToViewMode();
 
           case 2:
+            this.historyManager = null;
             editDispatchers = this.store.getModelDispatchers('topoConfig');
             editDispatchers.switchToViewMode(this.id);
 
             if (!this.options.onSwitchToViewMode) {
-              _context13.next = 7;
+              _context13.next = 8;
               break;
             }
 
-            _context13.next = 7;
+            _context13.next = 8;
             return this.options.onSwitchToViewMode(this);
 
-          case 7:
+          case 8:
           case "end":
             return _context13.stop();
         }

package/es/core/models/topoData.js

@@ -41,11 +41,11 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
-    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources, linkIps;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, viewGroupId, groupInfo, viewResources;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+          topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, viewGroupId = data.viewGroupId;
           rlog.debug("saveTopo", data); // 保存布局
 
           if (!(template && layout)) {
@@ -72,7 +72,7 @@ function _saveTopo() {
 
         case 8:
           if (!(resources || groups)) {
-            _context.next = 16;
+            _context.next = 15;
             break;
           }
 
@@ -94,30 +94,22 @@ function _saveTopo() {
             });
           }
 
-          linkIps = []; // resources?.static.map((nodeId) => {
-          //   if (nodeId.startsWith("ip_")) {
-          //     linkIps.push(nodeId.replace("ip_", ""));
-          //   }
-          // });
-
           rlog.debug("saveTopo-groupInfo", groupInfo);
-          _context.next = 16;
+          _context.next = 15;
           return topoService.bindResourceToTopo(topoId, {
-            groups: groupInfo,
-            linkIps: linkIps,
-            relateTopoIdList: relateTopoIdList
+            groups: groupInfo
           });
 
-        case 16:
+        case 15:
           if (!serialize) {
-            _context.next = 19;
+            _context.next = 18;
             break;
           }
 
-          _context.next = 19;
+          _context.next = 18;
           return topoService.saveSerializeData(topoId, serialize);
 
-        case 19:
+        case 18:
         case "end":
           return _context.stop();
       }

package/es/core/models/utils/linkUtils.js

@@ -2,10 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import keyBy from "lodash/keyBy";
-import _ from "lodash";
-import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
+import _ from "lodash"; // 查询所有连线
 
-import { getEdges } from "../../../utils/htElementUtils";
+import { getEdges, isEdgeGroupAgent } from "../../../utils/htElementUtils";
 import CiTypeCache from "../cache/CiTypeCache";
 import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
 //   "network.interface": {
@@ -32,42 +31,49 @@ export function isCrucialLink(link) {
  */
 
 export function isExitLink(link) {
-  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes["destination_id"]);
+  var _link$attributes;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
+}
+/**
+ * 是否聚合链路
+ * @param {*} link 
+ * @returns 
+ */
+
+export function isAggLink(link) {
+  var _link$attributes2, _link$attributes3;
+
+  return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
 }
-export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
+export function mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc) {
   var linkCiMap = keyBy(links, "id");
   return links.map(function (link) {
-    var _interfaceCiMap$attri, _interfaceCiMap$attri2;
+    var _ciMap$attributes$net, _ciMap$attributes$net2, _ciMap$attributes$sou, _ciMap$attributes$des;
 
     var linkCi = linkCiMap[link.id];
 
-    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
+    var attributes = _extends({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
 
-    var sourceNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.source_device_id"];
-    });
-    var targetNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.destination_device_id"];
-    }); // 翻译
 
     return _extends({}, link, {
       attributes: _extends({}, attributes, {
         // 源/目的设备
         "network_link.source_device_id_object": {
-          displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
+          displayName: (_ciMap$attributes$net = ciMap[attributes["network_link.source_device_id"]]) === null || _ciMap$attributes$net === void 0 ? void 0 : _ciMap$attributes$net.attributes["display_name"]
         },
         "network_link.destination_device_id_object": {
-          displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
+          displayName: (_ciMap$attributes$net2 = ciMap[attributes["network_link.destination_device_id"]]) === null || _ciMap$attributes$net2 === void 0 ? void 0 : _ciMap$attributes$net2.attributes["display_name"]
         },
         // 源/目的接口类型
         source_type_object: interfaceDoc[attributes.source_type],
         destination_type_object: interfaceDoc[attributes.destination_type],
         // 源/目的接口
         source_id_object: {
-          displayName: (_interfaceCiMap$attri = interfaceCiMap[attributes.source_id]) === null || _interfaceCiMap$attri === void 0 ? void 0 : _interfaceCiMap$attri.attributes["display_name"]
+          displayName: (_ciMap$attributes$sou = ciMap[attributes.source_id]) === null || _ciMap$attributes$sou === void 0 ? void 0 : _ciMap$attributes$sou.attributes["display_name"]
         },
         destination_id_object: {
-          displayName: (_interfaceCiMap$attri2 = interfaceCiMap[attributes.destination_id]) === null || _interfaceCiMap$attri2 === void 0 ? void 0 : _interfaceCiMap$attri2.attributes["display_name"]
+          displayName: (_ciMap$attributes$des = ciMap[attributes.destination_id]) === null || _ciMap$attributes$des === void 0 ? void 0 : _ciMap$attributes$des.attributes["display_name"]
         }
       })
     });
@@ -79,11 +85,11 @@ export function getLinksDetail(_x, _x2) {
 
 function _getLinksDetail() {
   _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
-    var linkCis, interfaceIds, interfaceTypes, interfaceCiMap, interfaceDoc;
+    var linkCis, ciMap, ciIds, interfaceTypes, loadCiMap, interfaceDoc;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!links || !links.length)) {
+          if (links !== null && links !== void 0 && links.length) {
             _context.next = 2;
             break;
           }
@@ -91,15 +97,21 @@ function _getLinksDetail() {
           return _context.abrupt("return", []);
 
         case 2:
-          // const linkCis = await topoService.relation.batchQueryRelation(
-          //   links.map((link) => link.id)
-          // );
           linkCis = links;
-          interfaceIds = [].concat(linkCis.map(function (item) {
+          ciMap = keyBy(nodes, "id");
+          ciIds = _.uniq([].concat(linkCis.map(function (item) {
+            return item.attributes['network_link.destination_device_id'];
+          }), linkCis.map(function (item) {
+            return item.attributes['network_link.source_device_id'];
+          }), linkCis.map(function (item) {
             return item.attributes.source_id;
           }), linkCis.map(function (item) {
             return item.attributes.destination_id;
-          }));
+          }))).filter(function (item) {
+            return !!item;
+          }).filter(function (item) {
+            return !ciMap[item];
+          });
           interfaceTypes = _.compact(_.uniq([].concat(linkCis.map(function (item) {
             return item.attributes.source_type;
           }), linkCis.map(function (item) {
@@ -107,19 +119,21 @@ function _getLinksDetail() {
           })))).filter(function (item) {
             return item !== "ip";
           });
-          _context.next = 7;
-          return CiCache.load(interfaceIds);
+          _context.next = 8;
+          return CiCache.load(ciIds);
 
-        case 7:
-          interfaceCiMap = _context.sent;
-          _context.next = 10;
+        case 8:
+          loadCiMap = _context.sent;
+          _context.next = 11;
           return CiTypeCache.load(interfaceTypes);
 
-        case 10:
+        case 11:
           interfaceDoc = _context.sent;
-          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc));
+          Object.assign(ciMap, loadCiMap); // console.log('getLinksDetail-mergeLinksData', { relations, interfaceIds, interfaceCis, })
 
-        case 12:
+          return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, ciMap, interfaceDoc));
+
+        case 14:
         case "end":
           return _context.stop();
       }
@@ -149,7 +163,8 @@ export var plurals = {
   2: ["phy"],
   3: ["agg"],
   4: ["phy", "agg"]
-};
+}; // 待办：移到网络拓扑组件
+
 export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
 
@@ -161,31 +176,29 @@ export var showLinkByConfig = function showLinkByConfig(props) {
 
   var gv = topo.getGraphView();
   var dm = gv.getDataModel();
-  var edges = getEdges(dm); // console.log("edges", edges);
+  var edges = getEdges(dm).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }); // console.log("edges", edges);
 
   var showPhy = types.indexOf("phy") >= 0;
   var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
-  if (Array.isArray(edges) && edges.length > 0) {
-    edges.forEach(function (edge) {
-      if (showType === 1 || showType === true) {
-        // 单链路全部显示
-        // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
-      } else {
-        var _d$attributes, _d$attributes2;
-
-        var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
+  edges.forEach(function (edge) {
+    if (showType === 1 || showType === true) {
+      // 单链路全部显示
+      // console.log("单链路全部显示", edge);
+      edge.s("x.visible", true);
+    } else {
+      var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
-        } else {
-          // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
-        }
+      if (isAggLink(d)) {
+        edge.s("x.visible", showAgg);
+      } else {
+        // console.log("edge", edge, d, showAgg);
+        edge.s("x.visible", showPhy);
       }
-    });
-  }
+    }
+  });
 };
 export var mergeExportLinkData = function mergeExportLinkData(props) {
   var source = props.source,

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

@@ -8,13 +8,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getUUID, isAvailableArray } from "@riil-frontend/utils";
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import Logger from 'loglevel';
 import { removeFromArray } from "../../../utils/format";
 import { DEFAULT_GROUP } from "../../../utils/template";
 import { combTopoData, getCiTypes } from "../../../utils/topoData";
 import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../../../core/models/topoData";
 import networkLinkServer from "../../../networkTopo/services/topo/networkLink";
 import { addLinkData, buildData as buildTopoData } from "../../../networkTopo/getTopoData";
+var rlog = Logger.getLogger('topo');
 
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
@@ -259,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:
@@ -327,10 +322,11 @@ export default function (topoApp) {
 
                 case 11:
                   data = _context4.sent;
-                  _context4.next = 14;
+                  rlog.debug("getTopoByConditions--------", data, groupInfo);
+                  _context4.next = 15;
                   return Promise.all([addLinkData(data), topoApp.ciTyeCache.load(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
-                case 14:
+                case 15:
                   _yield$Promise$all = _context4.sent;
                   dataWithLinkDetail = _yield$Promise$all[0];
                   _combTopoData = combTopoData({
@@ -357,7 +353,7 @@ export default function (topoApp) {
                     topoDataTrans: topoDataTrans
                   });
 
-                case 22:
+                case 23:
                 case "end":
                   return _context4.stop();
               }

package/es/core/utils/edgeUtil.js

@@ -1,12 +1,13 @@
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import { showLinkByConfig } from "../models/utils/linkUtils";
+import { isEdgeGroupAgent } from "../../utils/htElementUtils";
 /**
  * 是否手工连线
  * @param {*} edge 
  */
 
 export function isCustomEdge(edge) {
-  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+  return !isEdgeGroupAgent(edge) && (edge.a('type') == 'line' || !edge.a('type'));
 }
 /**
  * 根据配置更新连线展开折叠状态
@@ -15,7 +16,7 @@ export function isCustomEdge(edge) {
  */
 
 export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
-  var _topo$historyManager, _topo$historyManager2;
+  var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
 
   var _topo$store$getModelS = topo.store.getModelState("topoMod"),
       viewState = _topo$store$getModelS.viewState;
@@ -28,8 +29,7 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   }
 
   var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
-      expandAllEdges = _topo$store$getModelS2.expandAllEdges; // console.log("expandAllEdges----------", expandAllEdges);
-
+      expandAllEdges = _topo$store$getModelS2.expandAllEdges;
 
   (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
 
@@ -38,10 +38,10 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
       topo: topo,
       showType: 1
     });
-    htTopo.collapseAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(false);
     rlog.debug("updateEdgeExpanded 折叠");
   } else {
-    htTopo.expandAllEdgeGroups();
+    htTopo.toggleAllEdgeGroups(true);
     showLinkByConfig({
       topo: topo,
       showType: expandAllEdges,
@@ -51,8 +51,5 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   }
 
   (_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
-
-  if (topo.linkDynamicStyleExecutor) {
-    topo.linkDynamicStyleExecutor.execute();
-  }
+  (_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
 };