@riil-frontend/component-topology 3.5.12 → 3.5.15

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 "3.5.12" === 'string' ? "3.5.12" : null;
+var version = typeof "3.5.15" === 'string' ? "3.5.15" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/hooks/useManageStatus.js

@@ -33,7 +33,9 @@ export default function useManageStatus(props) {
       topoState = _topo$store$useModel[0],
       topoDispatchers = _topo$store$useModel[1];
 
-  var graphLoaded = topoState.graphLoaded;
+  var graphLoaded = topoState.graphLoaded,
+      viewState = topoState.viewState;
+  var isEditMode = viewState === 'edit';
   var resources = topo.dataModel.useCis();
   useTopoEventListener({
     type: 'manageStatus',
@@ -55,7 +57,7 @@ export default function useManageStatus(props) {
   });
   useEffect(function () {
     // 首次加载和监控状态变化后，更新节点和连线置灰状态
-    if (graphLoaded) {
+    if (!isEditMode && graphLoaded) {
       resources.forEach(function (resource) {
         var type = resource.type,
             id = resource.id,
@@ -74,5 +76,5 @@ export default function useManageStatus(props) {
         }
       });
     }
-  }, [graphLoaded, resources]);
+  }, [isEditMode, graphLoaded, resources]);
 }

package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -72,24 +72,35 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return service.getPortsById(id);
+              if (!(id === null)) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return", {
+                ports: [],
+                portsDoc: {}
+              });
 
             case 2:
+              _context.next = 4;
+              return service.getPortsById(id);
+
+            case 4:
               result = _context.sent;
-              _context.next = 5;
+              _context.next = 7;
               return service.queryLinksByNodeId(id);
 
-            case 5:
+            case 7:
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
               }); // console.log("端口类型列表", ifTypes);
 
-              _context.next = 9;
+              _context.next = 11;
               return getInterfaceObject(ifTypes);
 
-            case 9:
+            case 11:
               ifDoc = _context.sent;
               // console.log("端口类型字典", ifDoc);
               usedPorts = [];
@@ -123,7 +134,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -4,8 +4,7 @@ import _extends from "@babel/runtime/helpers/extends";
  * 连线组标注、悬浮框数据构建
  */
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import groupBy from 'lodash/groupBy';
-import { getEdgeGroupByNodeTags, getEdgeGroups } from "../../utils/htElementUtils";
+import { getEdgeGroups } from "../../utils/htElementUtils";
 import AttributeFormatter from "../../core/models/attributeFormatter"; // 参与计算的链路指标
 
 var metrics = [// 总流速
@@ -87,11 +86,6 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = groups.map(function (_ref) {
       var groupId = _ref.groupId,
           linkChildren = _ref.children;
-      console.error(1111, {
-        ciConfigs: ciConfigs,
-        linkChildren: linkChildren,
-        data: data
-      });
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -101,10 +95,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         linkChildren: linkChildren,
         data: data
       });
-    }); // console.error({
-    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
-    // })
-    // 获得连线组及子链路
+    }); // 获得连线组及子链路
     // 关联聚合链路、无子链路 时返回null
 
     function getGroupInfo(group) {

package/es/utils/ResourceConfigUtil.js

@@ -1,3 +1,4 @@
+import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import sortBy from "lodash/sortBy";
 import { getEdges, getGroupChildrenNodes, getGroups, getLayerChildrenNodes, getLayers, getNodes } from "./htElementUtils";
 /**
@@ -49,18 +50,21 @@ function getResourceConfigFromHt(topo) {
 
   var exportLinkIdList = [];
   var edges = getEdges(dataModel);
-  console.log(" 查询出口链路列表-edges", edges, dataModel);
+  rlog.debug(" 查询出口链路列表-edges", edges, dataModel);
   edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
+    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
 
-    var id = edgeData._attrObject.id;
+    if (edgeData) {
+      // eslint-disable-next-line no-underscore-dangle
+      var id = edgeData._attrObject.id;
 
-    if (id) {
-      var linkData = topo.dataModel.getDataById(id);
-      var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
+      if (id) {
+        var linkData = topo.dataModel.getDataById(id);
+        var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
-      if (connectType === "exit" && !exportLinkIdList.includes(id)) {
-        exportLinkIdList.push(id);
+        if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+          exportLinkIdList.push(id);
+        }
       }
     }
   });

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 "3.5.12" === 'string' ? "3.5.12" : null;
+var version = typeof "3.5.15" === 'string' ? "3.5.15" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/hooks/useManageStatus.js

@@ -43,7 +43,9 @@ function useManageStatus(props) {
       topoState = _topo$store$useModel[0],
       topoDispatchers = _topo$store$useModel[1];
 
-  var graphLoaded = topoState.graphLoaded;
+  var graphLoaded = topoState.graphLoaded,
+      viewState = topoState.viewState;
+  var isEditMode = viewState === 'edit';
   var resources = topo.dataModel.useCis();
   (0, _useTopoEventListener["default"])({
     type: 'manageStatus',
@@ -64,7 +66,7 @@ function useManageStatus(props) {
   });
   (0, _react.useEffect)(function () {
     // 首次加载和监控状态变化后，更新节点和连线置灰状态
-    if (graphLoaded) {
+    if (!isEditMode && graphLoaded) {
       resources.forEach(function (resource) {
         var type = resource.type,
             id = resource.id,
@@ -83,5 +85,5 @@ function useManageStatus(props) {
         }
       });
     }
-  }, [graphLoaded, resources]);
+  }, [isEditMode, graphLoaded, resources]);
 }

package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js

@@ -101,24 +101,35 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return _server["default"].getPortsById(id);
+              if (!(id === null)) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return", {
+                ports: [],
+                portsDoc: {}
+              });
 
             case 2:
+              _context.next = 4;
+              return _server["default"].getPortsById(id);
+
+            case 4:
               result = _context.sent;
-              _context.next = 5;
+              _context.next = 7;
               return _server["default"].queryLinksByNodeId(id);
 
-            case 5:
+            case 7:
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
               }); // console.log("端口类型列表", ifTypes);
 
-              _context.next = 9;
+              _context.next = 11;
               return (0, _linkUtils.getInterfaceObject)(ifTypes);
 
-            case 9:
+            case 11:
               ifDoc = _context.sent;
               // console.log("端口类型字典", ifDoc);
               usedPorts = [];
@@ -152,7 +163,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -9,8 +9,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _groupBy = _interopRequireDefault(require("lodash/groupBy"));
-
 var _htElementUtils = require("../../utils/htElementUtils");
 
 var _attributeFormatter = _interopRequireDefault(require("../../core/models/attributeFormatter"));
@@ -98,11 +96,6 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = groups.map(function (_ref) {
       var groupId = _ref.groupId,
           linkChildren = _ref.children;
-      console.error(1111, {
-        ciConfigs: ciConfigs,
-        linkChildren: linkChildren,
-        data: data
-      });
       var config = ciConfigs.find(function (item) {
         return item.id === linkChildren[0].id;
       });
@@ -112,10 +105,7 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         linkChildren: linkChildren,
         data: data
       });
-    }); // console.error({
-    //   noParentLinks, groupMap, edgeGroups: edgeGroupsTagsTips, ciTagsAndTips, data
-    // })
-    // 获得连线组及子链路
+    }); // 获得连线组及子链路
     // 关联聚合链路、无子链路 时返回null
 
     function getGroupInfo(group) {

package/lib/utils/ResourceConfigUtil.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
 var _sortBy = _interopRequireDefault(require("lodash/sortBy"));
 
 var _htElementUtils = require("./htElementUtils");
@@ -57,18 +59,23 @@ function getResourceConfigFromHt(topo) {
 
   var exportLinkIdList = [];
   var edges = (0, _htElementUtils.getEdges)(dataModel);
-  console.log(" 查询出口链路列表-edges", edges, dataModel);
+
+  _rlog["default"].debug(" 查询出口链路列表-edges", edges, dataModel);
+
   edges.forEach(function (edge) {
-    var edgeData = htTopo.getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
+    var edgeData = htTopo.getEdgeData(edge); // 有组无子连线返回null
 
-    var id = edgeData._attrObject.id;
+    if (edgeData) {
+      // eslint-disable-next-line no-underscore-dangle
+      var id = edgeData._attrObject.id;
 
-    if (id) {
-      var linkData = topo.dataModel.getDataById(id);
-      var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
+      if (id) {
+        var linkData = topo.dataModel.getDataById(id);
+        var connectType = linkData !== null && linkData !== void 0 && linkData.attributes ? linkData === null || linkData === void 0 ? void 0 : linkData.attributes["network_link.connect_type"] : undefined;
 
-      if (connectType === "exit" && !exportLinkIdList.includes(id)) {
-        exportLinkIdList.push(id);
+        if (connectType === "exit" && !exportLinkIdList.includes(id)) {
+          exportLinkIdList.push(id);
+        }
       }
     }
   });

package/package.json

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