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

package/es/networkTopo/utils/relateTopoDataUtil.js

@@ -0,0 +1,149 @@
+import _extends from "@babel/runtime/helpers/extends";
+// 关联拓扑数据
+import { topoLinks } from "./__tests__/relateTopoData";
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+export function processBothTopoData(topoData) {
+  var nodes = topoData.nodes,
+      links = topoData.links;
+  var serialize = upgradeSerializeOldTopoNode(topoData.serialize);
+  return _extends({}, topoData, {
+    nodes: [].concat(nodes, buildTopoNodeDatasFromSerialize(serialize)),
+    links: buildTopoLinks(links),
+    serialize: serialize
+  });
+}
+/**
+ * 构造子拓扑节点
+ * 构造子拓扑链路
+ * @param {*} ctx 
+ */
+
+export function processByConditionTopoData(ctx) {
+  var data = ctx.data,
+      config = ctx.config;
+  var nodes = data.nodes,
+      links = data.links;
+  return _extends({}, data, {
+    nodes: [].concat(nodes, buildTopoNodeDatas(config)),
+    links: buildTopoLinks(links)
+  });
+}
+export function getRelateTopoIdListFromConfig(groups) {
+  var relateTopoIdList = [];
+  groups.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      if (!relateTopoIdList.includes(topoId)) {
+        relateTopoIdList.push(topoId);
+      }
+    });
+  });
+  return relateTopoIdList;
+}
+export function buildTopoNode(topoId) {
+  return {
+    id: "topo:" + topoId,
+    //   name: ,
+    bindType: "topo",
+    // 绑定资源类型。关联资源 值为空，关联IP ip
+    bindIp: topoId,
+    // TODO 所属区域，从序列化拿
+    // 'groupId': null,
+    // 'groupTag': null,
+    // 'attributes': [],
+    // 'metrics': [],
+    type: "node",
+    isbinding: true,
+    // 'dtype': 'device'
+    operation: "delete"
+  };
+}
+
+function buildTopoLinks(links) {
+  if (process.env.NODE_ENV !== 'production') {
+    links.push.apply(links, topoLinks);
+  }
+
+  return links.map(function (link) {
+    return _extends({}, link, {
+      "source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
+      "target": link.targetType ? link.targetType + ':' + link.target : link.target
+    });
+  });
+}
+/**
+ * 升级历史数据：子拓扑节点序列化数据
+ * @param {*} serialize 
+ */
+
+
+function upgradeSerializeOldTopoNode(serialize) {
+  if (serialize) {
+    var isOldTopoNode = function isOldTopoNode(ele) {
+      return isTopoNode(ele) && !ele.p.tag;
+    };
+
+    var oldTopoNodes = serialize.d.filter(isOldTopoNode);
+    oldTopoNodes.forEach(function (node) {
+      var _node$a;
+
+      var topoId = (_node$a = node.a) === null || _node$a === void 0 ? void 0 : _node$a.bindTopo;
+      node.a = _extends({}, node.a, buildTopoNode(topoId));
+      node.p.tag = "topo:" + topoId;
+    });
+  }
+
+  return serialize;
+}
+
+function isTopoNode(ele) {
+  var _ele$a;
+
+  return !!((_ele$a = ele.a) !== null && _ele$a !== void 0 && _ele$a.bindTopo);
+}
+
+function buildTopoNodeDatasFromSerialize(serialize) {
+  if (!serialize) {
+    return [];
+  }
+
+  var topoNodes = serialize.d.filter(isTopoNode);
+  var topoNodeDatas = topoNodes.map(function (node) {
+    var _node$a2;
+
+    var topoId = (_node$a2 = node.a) === null || _node$a2 === void 0 ? void 0 : _node$a2.bindTopo;
+    return buildTopoNode(topoId);
+  });
+  return topoNodeDatas;
+}
+
+function buildTopoNodeDatas(config) {
+  var topoNodeDatas = [];
+  config.forEach(function (g) {
+    g.resources["static"].filter(function (ciId) {
+      return ciId.startsWith('topo:');
+    }).map(function (ciId) {
+      return ciId.replace('topo:', '');
+    }).map(function (topoId) {
+      topoNodeDatas.push(_extends({}, buildTopoNode(topoId), {
+        // 添加资源拓扑节点消失的问题
+        'groupId': g.id,
+        'groupTag': g.tag
+      }));
+    });
+  });
+  return topoNodeDatas;
+}
+
+function getRelateTopoIdsFromSerialize(serialize) {
+  return serialize;
+}

package/es/style.js

@@ -1,7 +1,7 @@
 import '@riil-frontend/component-topology-graph/es/style';
 import '@alifd/next/es/box/style';
-import '@riil-frontend/component-topology-utils/es/style';
 import '@alifd/next/es/message/style';
+import '@riil-frontend/component-topology-utils/es/style';
 import '@riil-frontend/utils/es/style';
 import '@riil-frontend/component-riil-event-emitter/es/style';
 import '@alifd/next/es/menu-button/style';

package/es/utils/ResourceConfigUtil.js

@@ -41,23 +41,8 @@ function getResourceConfigFromHt(topo) {
   return {
     layers: sortBy(layers, 'order'),
     groups: groups,
-    resources: resources,
-    relateTopoIdList: getRelateTopoIdList(dataModel)
+    resources: resources
   };
-} // 查询关联拓扑id列表
-
-
-function getRelateTopoIdList(dataModel) {
-  return getNodes(dataModel).reduce(function (topoIds, node) {
-    var bindType = node.a('bindType');
-    var bindTopo = node.a('bindTopo');
-
-    if (bindType === 'topo' && bindTopo && !topoIds.includes(bindTopo)) {
-      return [].concat(topoIds, [bindTopo]);
-    }
-
-    return topoIds;
-  }, []);
 }
 
 function getLayerDatas(dataModel) {

package/es/utils/clusterUtil.js

@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
  */
 import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
-import { getGroups, isExistedElement } from "./htElementUtils";
+import { getGroups, containsElement } from "./htElementUtils";
 import { findGroupChildren } from "./topoData";
 export function isCluster(node) {
   return !!node.cluster;
@@ -76,7 +76,7 @@ export function isClusterHtElement(element) {
   return !!element.a('cluster');
 }
 export function isClusterMemberHtElement(element) {
-  return element && element.getParent() && isClusterHtElement(element.getParent());
+  return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
 }
 /**
  * 集群无权限时收起
@@ -111,7 +111,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
     var topoDataTrans = transformTopoElements(topoData);
     var dm = topo.getDataModel();
     var unExistedList = topoDataTrans.filter(function (data) {
-      return !isExistedElement(topo.getHtTopo(), dm, data);
+      return !containsElement(dm, data);
     });
 
     if (!unExistedList.length) {

package/es/utils/htElementUtils.js

@@ -115,9 +115,6 @@ export function getNodeData(element) {
 export function getEdges(dataModel) {
   return getElements(dataModel).filter(isValidEdge);
 }
-export function isEdgeGroupExpanded(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && !!edge.s("edge.expanded");
-}
 /**
  * 是否连线组代理
  * @param {*} edge
@@ -125,7 +122,10 @@ export function isEdgeGroupExpanded(edge) {
  */
 
 export function isEdgeGroupAgent(edge) {
-  return isEdge(edge) && edge.getEdgeGroup() && edge.isEdgeGroupAgent();
+  return isEdge(edge) && edge.a('x.edgegroup.isEdgeGroup');
+}
+export function isEdgeVisible(edge) {
+  return edge.s('2d.visible') || edge.s('2d.visible') === undefined;
 }
 /**
  * 获得两个节点间的连线列表
@@ -142,7 +142,9 @@ export function getEdgesBetweenNodes(node1, node2) {
     return edges;
   }
 
-  node1Edges.toArray().filter(isValidEdge).forEach(function (edge) {
+  node1Edges.toArray().filter(isValidEdge).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).forEach(function (edge) {
     var isEdgeBetweenNodes = edge.getSource().getTag() === node2.getTag() || edge.getTarget().getTag() === node2.getTag();
 
     if (isEdgeBetweenNodes) {
@@ -152,61 +154,18 @@ export function getEdgesBetweenNodes(node1, node2) {
   return edges;
 }
 /**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
+ * 获得连线组连线列表
+ * @param {*} dataModel 
+ * @returns 
  */
 
-export function getEdgeGroupByNodes(node1, node2) {
-  var htEdgeGroup = null;
-  getEdgesBetweenNodes(node1, node2).forEach(function (edge) {
-    if (!htEdgeGroup) {
-      htEdgeGroup = edge.getEdgeGroup();
-    }
-  });
-
-  if (!htEdgeGroup) {
-    return null;
-  }
-
-  return new EdgeGroup(htEdgeGroup);
-}
-/**
- * 获得节点间的连线组，连线<=1时返回null
- * @returns
- */
-
-export function getEdgeGroupByNodeTags(dataModel, nodeTag1, nodeTag2) {
-  var node1 = dataModel.getDataByTag(nodeTag1);
-  var node2 = dataModel.getDataByTag(nodeTag2);
-
-  if (!node1 || !node2) {
-    console.warn("getEdgeGroupByNodes 未找到节点", {
-      node1: node1,
-      node2: node2,
-      nodeTag1: nodeTag1,
-      nodeTag2: nodeTag2
-    });
-    return null;
-  }
-
-  return getEdgeGroupByNodes(node1, node2);
-}
-export function getEdgeGroups(dataModel) {
-  var edgeGroups = [];
-  getEdges(dataModel).forEach(function (edge) {
-    var group = edge.getEdgeGroup();
-
-    if (group && !edgeGroups.includes(group)) {
-      edgeGroups.push(group);
-    }
-  });
-  return edgeGroups;
-}
 export function getEdgeGroupAgents(dataModel) {
   return getEdges(dataModel).filter(isEdgeGroupAgent);
 }
 export function getEdgeDatas(dataModel) {
-  return getEdges(dataModel).map(function (element) {
+  return getEdges(dataModel).filter(function (edge) {
+    return !isEdgeGroupAgent(edge);
+  }).map(function (element) {
     var _element$getSource, _element$getTarget;
 
     return _extends({}, element.getAttrObject(), {
@@ -309,9 +268,13 @@ export function setElementRuntimeStyle(element, name, value) {
 }
 /**
  * 判断拓扑图是否存在元素
+ * 
+ * @param {*} dataModel 
+ * @param {{id?: string, tag?: string}} data 
+ * @returns 
  */
 
-export function isExistedElement(htTopo, dataModel, data) {
+export function containsElement(dataModel, data) {
   if (dataModel.getDataByTag(data.id)) {
     return true;
   } // 识别区域
@@ -320,34 +283,5 @@ export function isExistedElement(htTopo, dataModel, data) {
   var element = getElements(dataModel).find(function (item) {
     return data.tag && item.a("tag") === data.tag;
   });
-
-  if (element) {
-    return true;
-  } // 连线/连线组
-
-
-  var edges = getEdges(dataModel);
-
-  for (var i = 0; i < edges.length; i++) {
-    var edge = edges[i]; // 如果连线组折叠，判断子连线
-
-    var edgeData = htTopo.getEdgeData(edge);
-
-    if (edgeData) {
-      // eslint-disable-next-line no-underscore-dangle
-      var id = edgeData._attrObject.id;
-
-      if (id === data.id) {
-        return true;
-      }
-    } // 如果连线组展开，判断连线组
-    // eslint-disable-next-line no-underscore-dangle
-
-
-    if (edge.__edgeGroup && edge.__edgeGroup._tag === data.id) {
-      return true;
-    }
-  }
-
-  return false;
+  return !!element;
 }

package/lib/components/ColorPanel/index.js

@@ -7,8 +7,12 @@ exports["default"] = void 0;
 
 var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _react = _interopRequireWildcard(require("react"));
 
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
 var _classnames4 = _interopRequireDefault(require("classnames"));
 
 var _color = _interopRequireDefault(require("color"));
@@ -26,7 +30,58 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /* eslint-disable eqeqeq */
 
 /* eslint-disable jsx-a11y/alt-text */
-
+var defaultColorList = [{
+  color: 'rgba(255, 255, 255, 1)',
+  borderColor: 'rgba(219, 219, 219, 1)'
+}, {
+  color: 'rgba(245, 245, 245, 1)',
+  borderColor: 'rgba(208, 208, 208, 1)'
+}, {
+  color: 'rgba(230, 230, 230, 1)',
+  borderColor: 'rgba(196, 196, 196, 1)'
+}, {
+  color: 'rgba(168, 168, 168, 1)',
+  borderColor: 'rgba(146, 146, 146, 1)'
+}, {
+  color: 'rgba(97, 97, 97, 1)',
+  borderColor: 'rgba(85, 85, 85, 1)'
+}, {
+  color: 'rgba(49, 49, 49, 1)',
+  borderColor: 'rgba(43, 43, 43, 1)'
+}, {
+  color: 'rgba(251, 115, 80, 1)',
+  borderColor: 'rgba(213, 98, 69, 1)'
+}, {
+  color: 'rgba(255, 166, 41, 1)',
+  borderColor: 'rgba(219, 144, 45, 1)'
+}, {
+  color: 'rgba(255, 205, 42, 1)',
+  borderColor: 'rgba(216, 175, 37, 1)'
+}, {
+  color: 'rgba(18, 174, 92, 1)',
+  borderColor: 'rgba(23, 148, 79, 1)'
+}, {
+  color: 'rgba(83, 184, 255, 1)',
+  borderColor: 'rgba(74, 156, 217, 1)'
+}, {
+  color: 'rgba(183, 128, 255, 1)',
+  borderColor: 'rgba(155, 109, 216, 1)'
+}, {
+  color: 'rgba(254, 192, 174, 1)',
+  borderColor: 'rgba(217, 163, 148, 1)'
+}, {
+  color: 'rgba(252, 209, 156, 1)',
+  borderColor: 'rgba(215, 178, 133, 1)'
+}, {
+  color: 'rgba(255, 232, 163, 1)',
+  borderColor: 'rgba(217, 198, 139, 1)'
+}, {
+  color: 'rgba(176, 244, 197, 1)',
+  borderColor: 'rgba(153, 209, 171, 1)'
+}, {
+  color: 'rgba(189, 227, 255, 1)',
+  borderColor: 'rgba(161, 193, 217, 1)'
+}];
 /**
  * 颜色选择
  *
@@ -34,12 +89,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @return {*}
  * @constructor
  */
+
 function ColorPanel(props) {
   var _classnames2, _classnames3;
 
   var value = props.value,
       showClear = props.showClear,
-      dataSource = props.dataSource,
+      _props$dataSource = props.dataSource,
+      dataSource = _props$dataSource === void 0 ? defaultColorList : _props$dataSource,
+      colorPickerBalloonProps = props.colorPickerBalloonProps,
       onChange = props.onChange,
       onPickerFocus = props.onPickerFocus,
       onPickerBlur = props.onPickerBlur;
@@ -187,9 +245,7 @@ function ColorPanel(props) {
     onClick: function onClick() {
       changClick('17');
     }
-  }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
-    visible: visible,
-    trigger: defaultTrigger,
+  }, /*#__PURE__*/_react["default"].createElement(_balloon["default"], (0, _extends2["default"])({
     closable: false,
     triggerType: "click",
     animation: false,
@@ -198,9 +254,12 @@ function ColorPanel(props) {
     alignEdge: true,
     style: {
       paddingBottom: 0
-    },
+    }
+  }, colorPickerBalloonProps, {
+    visible: visible,
+    trigger: defaultTrigger,
     onClose: close
-  }, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
+  }), /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
     color: data !== null && data !== void 0 ? data : undefined // width={230}
     ,
     disableAlpha: true,
@@ -216,61 +275,14 @@ function ColorPanel(props) {
   }))))));
 }
 
+ColorPanel.propTypes = {
+  dataSource: _propTypes["default"].array
+};
 ColorPanel.defaultProps = {
   value: undefined,
   showClear: false,
-  dataSource: [{
-    color: 'rgba(255, 255, 255, 1)',
-    borderColor: 'rgba(219, 219, 219, 1)'
-  }, {
-    color: 'rgba(245, 245, 245, 1)',
-    borderColor: 'rgba(208, 208, 208, 1)'
-  }, {
-    color: 'rgba(230, 230, 230, 1)',
-    borderColor: 'rgba(196, 196, 196, 1)'
-  }, {
-    color: 'rgba(168, 168, 168, 1)',
-    borderColor: 'rgba(146, 146, 146, 1)'
-  }, {
-    color: 'rgba(97, 97, 97, 1)',
-    borderColor: 'rgba(85, 85, 85, 1)'
-  }, {
-    color: 'rgba(49, 49, 49, 1)',
-    borderColor: 'rgba(43, 43, 43, 1)'
-  }, {
-    color: 'rgba(251, 115, 80, 1)',
-    borderColor: 'rgba(213, 98, 69, 1)'
-  }, {
-    color: 'rgba(255, 166, 41, 1)',
-    borderColor: 'rgba(219, 144, 45, 1)'
-  }, {
-    color: 'rgba(255, 205, 42, 1)',
-    borderColor: 'rgba(216, 175, 37, 1)'
-  }, {
-    color: 'rgba(18, 174, 92, 1)',
-    borderColor: 'rgba(23, 148, 79, 1)'
-  }, {
-    color: 'rgba(83, 184, 255, 1)',
-    borderColor: 'rgba(74, 156, 217, 1)'
-  }, {
-    color: 'rgba(183, 128, 255, 1)',
-    borderColor: 'rgba(155, 109, 216, 1)'
-  }, {
-    color: 'rgba(254, 192, 174, 1)',
-    borderColor: 'rgba(217, 163, 148, 1)'
-  }, {
-    color: 'rgba(252, 209, 156, 1)',
-    borderColor: 'rgba(215, 178, 133, 1)'
-  }, {
-    color: 'rgba(255, 232, 163, 1)',
-    borderColor: 'rgba(217, 198, 139, 1)'
-  }, {
-    color: 'rgba(176, 244, 197, 1)',
-    borderColor: 'rgba(153, 209, 171, 1)'
-  }, {
-    color: 'rgba(189, 227, 255, 1)',
-    borderColor: 'rgba(161, 193, 217, 1)'
-  }],
+  dataSource: defaultColorList,
+  colorPickerBalloonProps: {},
   onChange: function onChange() {},
   onPickerFocus: function onPickerFocus() {},
   onPickerBlur: function onPickerBlur() {}

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/components/TopoView/topoView.js

@@ -19,7 +19,7 @@ var _componentTopologyGraph = _interopRequireWildcard(require("@riil-frontend/co
 
 var _PortalContainer = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/components/PortalContainer"));
 
-var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
+var _loglevel = _interopRequireDefault(require("loglevel"));
 
 var _showMessage = _interopRequireDefault(require("../../utils/showMessage"));
 
@@ -66,6 +66,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 通用
 // 显示模式
 // 编辑模式
+var rlog = _loglevel["default"].getLogger('topo');
+
 var Topology = function Topology(props) {
   var _classnames;
 
@@ -138,40 +140,39 @@ var Topology = function Topology(props) {
   (0, _react.useEffect)(function () {
     // 拓扑退出注销
     return function () {
-      _componentTopologyUtils.rlog.info('TopoView 退出');
-
+      rlog.info('TopoView 退出');
       topo.selectionModel.destroy();
       topoDispatchers.reset();
     };
   }, []);
   var onGraphCreated = (0, _react.useCallback)(function (topoClient) {
     topo.view.onCreatedView(topoClient);
-
-    _componentTopologyUtils.rlog.info('TopoView.onGraphCreated');
+    rlog.info('TopoView.onGraphCreated');
 
     if (onReady) {
       onReady();
     }
   }, []);
   var handleGraphDataLoaded = (0, _react.useCallback)(function () {
-    _componentTopologyUtils.rlog.info('TopoView.handleGraphDataLoaded', new Date().toString(), {
+    rlog.info('TopoView.handleGraphDataLoaded: 数据加载完成', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
     });
-
     (0, _nodeNameVisibleUtil.updateNodesNameVisible)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _graphLinkUtil.fixLink)(topo);
     (0, _clusterUtil.handleClusterNoPermission)(topo);
     (0, _edgeUtil.updateEdgeExpanded)(topo);
+    topo.selectionModel.init();
     var htHistoryManager = topo.getDataModel().getHistoryManager();
 
-    if (htHistoryManager) {
+    if (topo.store.getState().topoMod.viewState === 'edit' && htHistoryManager) {
       topo.historyManager = new _HistoryManager["default"](topo, htHistoryManager);
+      topo.historyManager.clear();
+      rlog.info('TopoView.handleGraphDataLoaded: 初始化HistoryManager ', topo.historyManager.toString());
     }
 
-    topo.selectionModel.init();
     topoDispatchers.update({
       graphLoaded2: true
     });
@@ -181,12 +182,11 @@ var Topology = function Topology(props) {
     }
   }, [topoData]);
   var handleGraphLoaded = (0, _react.useCallback)(function () {
-    _componentTopologyUtils.rlog.info('TopoView.handleGraphLoaded', new Date().toString(), {
+    rlog.info('TopoView.handleGraphLoaded', new Date().toString(), {
       topoMod: topo.store.getState().topoMod,
       topoData: topoData,
       htElements: topo.getDataModel().getDatas().toArray()
     });
-
     (0, _nodeNameVisibleUtil.updateNodesNameVisible)(topo);
     (0, _clusterUtil.upgradeV103GraphClusterNode)(topo, topoData);
     (0, _graphLinkUtil.fixLink)(topo);
@@ -223,8 +223,7 @@ var Topology = function Topology(props) {
   }, [topoData]);
 
   var rightEventHandle = function rightEventHandle(event) {
-    _componentTopologyUtils.rlog.debug('右键事件', event);
-
+    rlog.debug('右键事件', event);
     var contextMenu = topo.view.contextMenu;
 
     if (contextMenu.containsCommand(event.data.id)) {
@@ -233,8 +232,7 @@ var Topology = function Topology(props) {
   };
 
   var onRefresh = function onRefresh(e) {
-    _componentTopologyUtils.rlog.debug('TopoView:onRefresh', e);
-
+    rlog.debug('TopoView:onRefresh', e);
     onRefreshTopo ? onRefreshTopo() : topoDispatchers.refreshTopo();
   };
   /**
@@ -244,8 +242,7 @@ var Topology = function Topology(props) {
 
 
   var handleEvent = function handleEvent(event) {
-    _componentTopologyUtils.rlog.debug('TopoView:onEvent', event);
-
+    rlog.debug('TopoView:onEvent', event);
     onEvent && onEvent(event);
     topoEdit.onEvent(event);
 
@@ -272,8 +269,7 @@ var Topology = function Topology(props) {
         break;
 
       case _componentTopologyGraph.TopoEvent.EVENT_CONTEXT_TOOL:
-        _componentTopologyUtils.rlog.debug('自定义工具栏事件', event);
-
+        rlog.debug('自定义工具栏事件', event);
         break;
 
       default:

package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js

@@ -53,14 +53,14 @@ function EdgeColorButton(props) {
     });
   };
 
-  var getLines = function getLines(list) {
+  var getCustomLines = function getCustomLines(list) {
     return list.filter(_edgeUtil.isCustomEdge);
   };
 
   (0, _react.useEffect)(function () {
     if (graphLoaded) {
       var edges = (0, _edgeTypeStyleUtil.getEdgesBySelection)(topo);
-      var list = getLines(edges);
+      var list = getCustomLines(edges);
       setLineWidth(1); // eslint-disable-next-line eqeqeq
 
       if (selection.length == 1 && list.length === 1) {