@riil-frontend/component-topology 2.15.21 → 2.15.22

package/es/core/common/icons/defaultIcons.js

@@ -1,16 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
-import { getIconMap } from '@riil-frontend/component-topology-graph/es/icons/ciTypeIcons';
-
-function getIconImgUrlById(id) {
-  return getIconMap()[id];
-}
+import { iconFactory } from '@riil-frontend/component-topology-graph';
 /**
  * 资源面板图片-默认节点图标
  *
  * @type {(*|{url: *})[]}
  */
 
-
 export var DEFAULT_NODE_ICONS = [{
   id: 'ciType.switch',
   name: '交换机'
@@ -44,7 +39,6 @@ export var DEFAULT_NODE_ICONS = [{
   name: '互联网'
 }].map(function (item) {
   return _extends({}, item, {
-    url: getIconImgUrlById(item.id)
+    url: iconFactory.getIconImageUrl(item.id)
   });
-});
-export default _extends({}, getIconMap());
+});

package/es/core/common/icons/icon.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
-import defaultIcons, { DEFAULT_NODE_ICONS } from "./defaultIcons";
+import { DEFAULT_NODE_ICONS } from "./defaultIcons";
 import getNetworkTopoCiTypeIcons from "./networkTopoCiTypeIcons";
 var groupDefaultIcons = [{
   id: 'editor.icon.cloud.medium',
@@ -69,13 +69,6 @@ export function transformCustomIcons2HtIcons(icons) {
 export function getUserCustomIcons(topo) {
   var uploadIcons = topo.store.getModelState('iconManage').icons;
   return [].concat(transformCustomIcons2HtIcons(uploadIcons.node));
-}
-export function getIconMap(topo) {
-  var bizIconMap = {};
-  [].concat(groupDefaultIcons, getNodeDefaultIcons(topo), getUserCustomIcons(topo)).forEach(function (icon) {
-    bizIconMap[icon.id] = icon;
-  });
-  return _extends({}, defaultIcons, bizIconMap);
 } // 获得节点图标列表
 
 export function getNodeIconGroups(topo) {
@@ -95,18 +88,4 @@ export function getGroupIconGroups(topo) {
     name: '自定义',
     icons: getUserCustomIcons(topo)
   }];
-}
-export function getIconById(id, topo) {
-  var iconMap = getIconMap(topo);
-  var icon = iconMap[id];
-
-  if (typeof icon === 'string') {
-    return icon.replace('.json', '.png');
-  }
-
-  if (!icon) {
-    console.warn('图标不存在', id, iconMap);
-  }
-
-  return icon === null || icon === void 0 ? void 0 : icon.url;
 }

package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -1,9 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import { useState } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import { iconFactory } from "@riil-frontend/component-topology-graph";
 import sortBy from 'lodash/sortBy';
 import { getGroupChildrenNodes, getNodeData } from "../../../../../../../../utils/htElementUtils";
-import { getIconById } from "../../../../../../../common/icons/icon";
 
 function sortResourcesByName(resources) {
   return sortBy(resources, 'name');
@@ -29,7 +29,7 @@ export default function useGroupRelateResource(props) {
   })).map(function (item) {
     return {
       title: item.name,
-      img: getIconById(item.image, topo),
+      img: iconFactory.getIconImageUrl(item.image),
       data: item,
       node: item.node
     };

package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -1,7 +1,7 @@
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React from 'react';
+import { iconFactory } from '@riil-frontend/component-topology-graph';
 import ResourceList from "../../../common/GroupNodeList/ResourceList";
 import { getLayerChildrenNodes } from "../../../../../../../utils/htElementUtils";
-import { getIconById } from "../../../../../../common/icons/icon";
 /**
  * 分层关联资源列表
  */
@@ -16,7 +16,7 @@ export default function LayerResourceList(props) {
   var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),
-      img: getIconById(node.getImage(), topo)
+      img: iconFactory.getIconImageUrl(node.getImage())
     };
   });
   return /*#__PURE__*/React.createElement(ResourceList, {

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "2.15.21" === 'string' ? "2.15.21" : null;
+var version = typeof "2.15.22" === 'string' ? "2.15.22" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -12,6 +12,9 @@ var interfaceTypeMap = {
     displayName: '聚合接口'
   }
 };
+export function isAggLink(link) {
+  return link.attributes['network_link.connect_type'] === 'agg';
+}
 export function mergeLinksData(links, linkCis, nodes, interfaceCis) {
   var linkCiMap = keyBy(linkCis, 'id');
   return links.map(function (link) {

package/es/index.js

@@ -1,4 +1,6 @@
+import { iconFactory } from '@riil-frontend/component-topology-graph';
 import Topology from "./core/components/TopoView";
+import * as htElementUtils from "./utils/htElementUtils";
 export * from "./createTopo";
 export * from "./core/components/titlebar";
-export { Topology };
+export { Topology, htElementUtils, iconFactory };

package/es/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -1,8 +1,7 @@
 import React, { useState, useEffect, useRef, useCallback } from 'react';
-import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { iconFactory } from '@riil-frontend/component-topology-graph';
 import ResourceList from "../../../../core/editor/components/settings/common/GroupNodeList/ResourceList";
 import { getLayerChildrenNodes } from "../../../../utils/htElementUtils";
-import { getIconById } from "../../../../core/common/icons/icon";
 
 function getResourceNodes(store, htNodes) {
   var _store$getModelState = store.getModelState('topoMod'),
@@ -38,7 +37,7 @@ export default function LayerResourceList(props) {
         resource = _ref.resource;
     return {
       title: resource.name,
-      img: getIconById(node.getImage(), topo)
+      img: iconFactory.getIconImageUrl(node.getImage())
     };
   }); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
 

package/es/topoCenter/hooks/editor/useDeleteEdges.js

@@ -4,6 +4,7 @@ import _Message from "@alifd/next/es/message";
 import _Dialog from "@alifd/next/es/dialog";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+import { isAggLink } from "../../../core/models/utils/linkUtils";
 import linkService from "../../services/link";
 import { getLinkPermission } from "../../utils/linPermissionUtil";
 /**
@@ -43,6 +44,7 @@ export default (function (_ref) {
   var deleteLink = function deleteLink(edge) {
     var id = edge.getTag();
     var link = topo.dataModel.getDataById(id);
+    var isAgg = isAggLink(link);
 
     if (!checkLinkDeleteable(link)) {
       return;
@@ -50,7 +52,7 @@ export default (function (_ref) {
 
     var htTopo = topo.getHtTopo();
     confirmDeleteLink( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var success, edgesInNodes, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
+      var success, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -72,26 +74,32 @@ export default (function (_ref) {
               return _context.abrupt("return");
 
             case 6:
-              _Message.success('删除成功'); // 当前是连线组代理，清空组数据
+              _Message.success('删除成功'); // 获取两个节点间的连线数据列表 
 
 
-              if (htTopo.isEdgeGroupAgent(edge)) {
-                // 获取两个节点间的连线数据列表 
-                edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget()); // 如果仅一条连线且有连线数据，则清空连线组数据，此时展示连线的数据
+              edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
 
-                if (edgesInNodes.length === 1 && htTopo.getEdgeData(edge)) {
+              if (edgesInNodes.length >= 2) {
+                htTopo.deleteEdge(edge);
+              } else {
+                // 一根线时
+                edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
+                edgeData = htTopo.getEdgeData(edge);
+
+                if (isAgg && edgeData) {
+                  // 当前是连线组代理 且 有连线数据，清空组数据
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
+                } else if (!isAgg && edgeGroupData) {
+                  htTopo.setEdgeData(edge, null);
                 } else {
                   htTopo.deleteEdge(edge);
                 }
-              } else {
-                htTopo.deleteEdge(edge);
               } // 更新数据
 
 
               _topo$store$getModel = topo.store.getModel('topoMod'), topoState = _topo$store$getModel[0], topoDispatchers = _topo$store$getModel[1];
               _topoState$data = topoState.data, links = _topoState$data.links, linkGroups = _topoState$data.linkGroups;
-              _context.next = 12;
+              _context.next = 13;
               return topoDispatchers.update({
                 data: _extends({}, topoState.data, {
                   links: links.filter(function (link) {
@@ -103,11 +111,11 @@ export default (function (_ref) {
                 })
               });
 
-            case 12:
+            case 13:
               // 刷新链路动态线宽
               topo.linkDynamicStyleExecutor.execute();
 
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }

package/lib/core/common/icons/defaultIcons.js

@@ -3,22 +3,17 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = exports.DEFAULT_NODE_ICONS = void 0;
+exports.DEFAULT_NODE_ICONS = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _ciTypeIcons = require("@riil-frontend/component-topology-graph/es/icons/ciTypeIcons");
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
-function getIconImgUrlById(id) {
-  return (0, _ciTypeIcons.getIconMap)()[id];
-}
 /**
  * 资源面板图片-默认节点图标
  *
  * @type {(*|{url: *})[]}
  */
-
-
 var DEFAULT_NODE_ICONS = [{
   id: 'ciType.switch',
   name: '交换机'
@@ -52,11 +47,7 @@ var DEFAULT_NODE_ICONS = [{
   name: '互联网'
 }].map(function (item) {
   return (0, _extends2["default"])({}, item, {
-    url: getIconImgUrlById(item.id)
+    url: _componentTopologyGraph.iconFactory.getIconImageUrl(item.id)
   });
 });
-exports.DEFAULT_NODE_ICONS = DEFAULT_NODE_ICONS;
-
-var _default = (0, _extends2["default"])({}, (0, _ciTypeIcons.getIconMap)());
-
-exports["default"] = _default;
+exports.DEFAULT_NODE_ICONS = DEFAULT_NODE_ICONS;

package/lib/core/common/icons/icon.js

@@ -8,8 +8,6 @@ exports.getCustomIconIdFromHtId = getCustomIconIdFromHtId;
 exports.getEditorIcons = getEditorIcons;
 exports.getGroupDefaultIcons = getGroupDefaultIcons;
 exports.getGroupIconGroups = getGroupIconGroups;
-exports.getIconById = getIconById;
-exports.getIconMap = getIconMap;
 exports.getNodeDefaultIcons = getNodeDefaultIcons;
 exports.getNodeIconGroups = getNodeIconGroups;
 exports.getUserCustomIcons = getUserCustomIcons;
@@ -18,14 +16,10 @@ exports.transformCustomIcons2HtIcons = transformCustomIcons2HtIcons;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _defaultIcons = _interopRequireWildcard(require("./defaultIcons"));
+var _defaultIcons = require("./defaultIcons");
 
 var _networkTopoCiTypeIcons = _interopRequireDefault(require("./networkTopoCiTypeIcons"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var groupDefaultIcons = [{
   id: 'editor.icon.cloud.medium',
   name: '区域',
@@ -101,14 +95,6 @@ function transformCustomIcons2HtIcons(icons) {
 function getUserCustomIcons(topo) {
   var uploadIcons = topo.store.getModelState('iconManage').icons;
   return [].concat(transformCustomIcons2HtIcons(uploadIcons.node));
-}
-
-function getIconMap(topo) {
-  var bizIconMap = {};
-  [].concat(groupDefaultIcons, getNodeDefaultIcons(topo), getUserCustomIcons(topo)).forEach(function (icon) {
-    bizIconMap[icon.id] = icon;
-  });
-  return (0, _extends2["default"])({}, _defaultIcons["default"], bizIconMap);
 } // 获得节点图标列表
 
 
@@ -130,19 +116,4 @@ function getGroupIconGroups(topo) {
     name: '自定义',
     icons: getUserCustomIcons(topo)
   }];
-}
-
-function getIconById(id, topo) {
-  var iconMap = getIconMap(topo);
-  var icon = iconMap[id];
-
-  if (typeof icon === 'string') {
-    return icon.replace('.json', '.png');
-  }
-
-  if (!icon) {
-    console.warn('图标不存在', id, iconMap);
-  }
-
-  return icon === null || icon === void 0 ? void 0 : icon.url;
 }

package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js

@@ -11,12 +11,12 @@ var _react = require("react");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
+
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _htElementUtils = require("../../../../../../../../utils/htElementUtils");
 
-var _icon = require("../../../../../../../common/icons/icon");
-
 function sortResourcesByName(resources) {
   return (0, _sortBy["default"])(resources, 'name');
 }
@@ -41,7 +41,7 @@ function useGroupRelateResource(props) {
   })).map(function (item) {
     return {
       title: item.name,
-      img: (0, _icon.getIconById)(item.image, topo),
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(item.image),
       data: item,
       node: item.node
     };

package/lib/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js

@@ -5,18 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = LayerResourceList;
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
+
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
 var _ResourceList = _interopRequireDefault(require("../../../common/GroupNodeList/ResourceList"));
 
 var _htElementUtils = require("../../../../../../../utils/htElementUtils");
 
-var _icon = require("../../../../../../common/icons/icon");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /**
  * 分层关联资源列表
  */
@@ -30,7 +26,7 @@ function LayerResourceList(props) {
   var data = relateDataNodes.map(function (node) {
     return {
       title: node.a('name'),
-      img: (0, _icon.getIconById)(node.getImage(), topo)
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
     };
   });
   return /*#__PURE__*/_react["default"].createElement(_ResourceList["default"], {

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.21" === 'string' ? "2.15.21" : null;
+var version = typeof "2.15.22" === 'string' ? "2.15.22" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.getLinksDetail = getLinksDetail;
+exports.isAggLink = isAggLink;
 exports.mergeLinksData = mergeLinksData;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -28,6 +29,10 @@ var interfaceTypeMap = {
   }
 };
 
+function isAggLink(link) {
+  return link.attributes['network_link.connect_type'] === 'agg';
+}
+
 function mergeLinksData(links, linkCis, nodes, interfaceCis) {
   var linkCiMap = (0, _keyBy["default"])(linkCis, 'id');
   return links.map(function (link) {

package/lib/index.js

@@ -4,13 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 var _exportNames = {
-  Topology: true
+  iconFactory: true,
+  Topology: true,
+  htElementUtils: true
 };
+exports.htElementUtils = void 0;
+
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
+
+exports.iconFactory = _componentTopologyGraph.iconFactory;
 
 var _TopoView = _interopRequireDefault(require("./core/components/TopoView"));
 
 exports.Topology = _TopoView["default"];
 
+var htElementUtils = _interopRequireWildcard(require("./utils/htElementUtils"));
+
+exports.htElementUtils = htElementUtils;
+
 var _createTopo = require("./createTopo");
 
 Object.keys(_createTopo).forEach(function (key) {
@@ -27,4 +38,8 @@ Object.keys(_titlebar).forEach(function (key) {
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _titlebar[key]) return;
   exports[key] = _titlebar[key];
-});
+});
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js

@@ -7,14 +7,12 @@ exports["default"] = LayerResourceList;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
 
 var _ResourceList = _interopRequireDefault(require("../../../../core/editor/components/settings/common/GroupNodeList/ResourceList"));
 
 var _htElementUtils = require("../../../../utils/htElementUtils");
 
-var _icon = require("../../../../core/common/icons/icon");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -53,7 +51,7 @@ function LayerResourceList(props) {
         resource = _ref.resource;
     return {
       title: resource.name,
-      img: (0, _icon.getIconById)(node.getImage(), topo)
+      img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
     };
   }); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
 

package/lib/topoCenter/hooks/editor/useDeleteEdges.js

@@ -17,6 +17,8 @@ var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
+var _linkUtils = require("../../../core/models/utils/linkUtils");
+
 var _link = _interopRequireDefault(require("../../services/link"));
 
 var _linPermissionUtil = require("../../utils/linPermissionUtil");
@@ -57,6 +59,7 @@ var _default = function _default(_ref) {
   var deleteLink = function deleteLink(edge) {
     var id = edge.getTag();
     var link = topo.dataModel.getDataById(id);
+    var isAgg = (0, _linkUtils.isAggLink)(link);
 
     if (!checkLinkDeleteable(link)) {
       return;
@@ -64,7 +67,7 @@ var _default = function _default(_ref) {
 
     var htTopo = topo.getHtTopo();
     confirmDeleteLink( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var success, edgesInNodes, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
+      var success, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
@@ -86,26 +89,32 @@ var _default = function _default(_ref) {
               return _context.abrupt("return");
 
             case 6:
-              _message["default"].success('删除成功'); // 当前是连线组代理，清空组数据
+              _message["default"].success('删除成功'); // 获取两个节点间的连线数据列表 
+
 
+              edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
 
-              if (htTopo.isEdgeGroupAgent(edge)) {
-                // 获取两个节点间的连线数据列表 
-                edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget()); // 如果仅一条连线且有连线数据，则清空连线组数据，此时展示连线的数据
+              if (edgesInNodes.length >= 2) {
+                htTopo.deleteEdge(edge);
+              } else {
+                // 一根线时
+                edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
+                edgeData = htTopo.getEdgeData(edge);
 
-                if (edgesInNodes.length === 1 && htTopo.getEdgeData(edge)) {
+                if (isAgg && edgeData) {
+                  // 当前是连线组代理 且 有连线数据，清空组数据
                   htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
+                } else if (!isAgg && edgeGroupData) {
+                  htTopo.setEdgeData(edge, null);
                 } else {
                   htTopo.deleteEdge(edge);
                 }
-              } else {
-                htTopo.deleteEdge(edge);
               } // 更新数据
 
 
               _topo$store$getModel = topo.store.getModel('topoMod'), topoState = _topo$store$getModel[0], topoDispatchers = _topo$store$getModel[1];
               _topoState$data = topoState.data, links = _topoState$data.links, linkGroups = _topoState$data.linkGroups;
-              _context.next = 12;
+              _context.next = 13;
               return topoDispatchers.update({
                 data: (0, _extends2["default"])({}, topoState.data, {
                   links: links.filter(function (link) {
@@ -117,11 +126,11 @@ var _default = function _default(_ref) {
                 })
               });
 
-            case 12:
+            case 13:
               // 刷新链路动态线宽
               topo.linkDynamicStyleExecutor.execute();
 
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.21",
+  "version": "2.15.22",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -68,7 +68,7 @@
     "@riil-frontend/component-table-filter-tags": "latest",
     "@riil-frontend/component-table-layout": "^2.0.2",
     "@riil-frontend/component-topology-common": "^1.0.9",
-    "@riil-frontend/component-topology-graph": "^2.5.2",
+    "@riil-frontend/component-topology-graph": "^2.5.5",
     "@riil-frontend/css": "^2.0.2",
     "@riil-frontend/hooks": "latest",
     "@riil-frontend/next-collapse": "^1.0.1-a.0",
@@ -110,6 +110,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.21/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.22/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }