@riil-frontend/component-topology 2.15.21 → 2.15.24

package/lib/topoCenter/components/TopoView.js

@@ -41,7 +41,7 @@ function NetworkTopology(props) {
       titleBar = props.titleBar,
       onEnterEdit = props.onEnterEdit,
       otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var topoState = topo.store.useModelState('topoMod');
+  var topoState = topo.store.useModelState("topoMod");
   var loading = topoState.loading,
       topoId = topoState.topoId,
       topoData = topoState.topoData,
@@ -51,7 +51,8 @@ function NetworkTopology(props) {
     var viewerProps = (0, _extends2["default"])({}, props.viewerProps, {
       showLinkConfig: true,
       // 是否显示链路相关配置
-      plugins: [_AlarmListPanel["default"]]
+      AlarmListPanel: _AlarmListPanel["default"],
+      plugins: []
     });
     return /*#__PURE__*/_react["default"].createElement(_TopoView["default"], (0, _extends2["default"])({}, otherProps, {
       topo: topo,
@@ -89,9 +90,9 @@ function NetworkTopology(props) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"]['topo-center-view']
+    className: _indexModule["default"]["topo-center-view"]
   }, /*#__PURE__*/_react["default"].createElement(_loading["default"], {
-    className: _indexModule["default"]['topo-center-mask-loading'],
+    className: _indexModule["default"]["topo-center-mask-loading"],
     visible: loading
   }, renderContent()));
 }

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.24",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -41,7 +41,7 @@
     "@ahooksjs/use-tree-plugin": "^0.2.1",
     "@alifd/biz-anchor": "^1.1.7",
     "@ice/store": "^1.4.2",
-    "@riil-frontend/component-topo-icon-select": "^1.0.9",
+    "@riil-frontend/component-topo-icon-select": "^1.0.10",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
@@ -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.6",
     "@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.24/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }