@riil-frontend/component-topology 3.17.3 → 3.17.6

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

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

@@ -16,6 +16,7 @@ import service from "./server";
 import { clone } from "../../../../../../utils/copyUtil";
 import { getInterfaceObject } from "../../../../../../core/models/utils/linkUtils";
 import { getEdgesBetweenNodes, getNodes } from "../../../../../../utils/htElementUtils";
+import { getCiTypes } from "../../../../../../utils/topoData";
 var CollapsePanel = _Collapse.Panel;
 
 function AddLinkDrawer(props) {
@@ -72,8 +73,10 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(id === null)) {
-                _context.next = 2;
+              console.log("getPortsById", id, currentLink);
+
+              if (id) {
+                _context.next = 3;
                 break;
               }
 
@@ -82,25 +85,25 @@ function AddLinkDrawer(props) {
                 portsDoc: {}
               });
 
-            case 2:
-              _context.next = 4;
+            case 3:
+              _context.next = 5;
               return service.getPortsById(id);
 
-            case 4:
+            case 5:
               result = _context.sent;
-              _context.next = 7;
+              _context.next = 8;
               return service.queryLinksByNodeId(id);
 
-            case 7:
+            case 8:
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
               }); // console.log("端口类型列表", ifTypes);
 
-              _context.next = 11;
+              _context.next = 12;
               return getInterfaceObject(ifTypes);
 
-            case 11:
+            case 12:
               ifDoc = _context.sent;
               // console.log("端口类型字典", ifDoc);
               usedPorts = [];
@@ -134,7 +137,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -299,15 +302,16 @@ function AddLinkDrawer(props) {
 
   var getCiTypesConnectable = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-      var ciTypesConnectable, nodes, ciIds, ciNodes;
+      var ciTypes, ciTypesConnectable, nodes, ciIds, ciNodes;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
-              return topoService.networkLink.getCiTypesConnectable(RESOURCE_LIMIT_TYPES);
+              ciTypes = getCiTypes(topo.dataModel.getData());
+              _context4.next = 3;
+              return topoService.networkLink.getCiTypesConnectable(ciTypes);
 
-            case 2:
+            case 3:
               ciTypesConnectable = _context4.sent;
               nodes = getNodes(topo.getDataModel());
               ciIds = [];
@@ -325,7 +329,7 @@ function AddLinkDrawer(props) {
               setCiIdsConnectable(ciIds);
               return _context4.abrupt("return", ciNodes);
 
-            case 10:
+            case 11:
             case "end":
               return _context4.stop();
           }

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -58,7 +58,15 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
   var _proto = LinkTagsTipsBuilder.prototype;
 
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
-    return this.getEdgeGroupTagsAndTips();
+    var data = [];
+
+    try {
+      data = this.getEdgeGroupTagsAndTips();
+    } catch (error) {
+      rlog.error('getExtElementTagsAndTips 失败', error);
+    }
+
+    return data;
   }
   /**
    * 获得未关联聚合链路的连线组标注和悬浮框数据
@@ -97,7 +105,12 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     function getGroupInfo(group) {
       var edges = group.getEdges().toArray();
       var edge = edges[0];
-      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget()); // eslint-disable-next-line no-underscore-dangle
+      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget());
+
+      if (!edgeGroupData || !edgeGroupData.data) {
+        return null;
+      } // eslint-disable-next-line no-underscore-dangle
+
 
       var linkId = edgeGroupData.data._attrObject.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.17.3" === 'string' ? "3.17.3" : null;
+var version = typeof "3.17.6" === 'string' ? "3.17.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -41,6 +41,8 @@ var _linkUtils = require("../../../../../../core/models/utils/linkUtils");
 
 var _htElementUtils = require("../../../../../../utils/htElementUtils");
 
+var _topoData = require("../../../../../../utils/topoData");
+
 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; }
@@ -101,8 +103,10 @@ function AddLinkDrawer(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(id === null)) {
-                _context.next = 2;
+              console.log("getPortsById", id, currentLink);
+
+              if (id) {
+                _context.next = 3;
                 break;
               }
 
@@ -111,25 +115,25 @@ function AddLinkDrawer(props) {
                 portsDoc: {}
               });
 
-            case 2:
-              _context.next = 4;
+            case 3:
+              _context.next = 5;
               return _server["default"].getPortsById(id);
 
-            case 4:
+            case 5:
               result = _context.sent;
-              _context.next = 7;
+              _context.next = 8;
               return _server["default"].queryLinksByNodeId(id);
 
-            case 7:
+            case 8:
               links = _context.sent;
               ifTypes = result.map(function (item) {
                 return item.type;
               }); // console.log("端口类型列表", ifTypes);
 
-              _context.next = 11;
+              _context.next = 12;
               return (0, _linkUtils.getInterfaceObject)(ifTypes);
 
-            case 11:
+            case 12:
               ifDoc = _context.sent;
               // console.log("端口类型字典", ifDoc);
               usedPorts = [];
@@ -163,7 +167,7 @@ function AddLinkDrawer(props) {
                 portsDoc: portsDoc
               });
 
-            case 18:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -330,15 +334,16 @@ function AddLinkDrawer(props) {
 
   var getCiTypesConnectable = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-      var ciTypesConnectable, nodes, ciIds, ciNodes;
+      var ciTypes, ciTypesConnectable, nodes, ciIds, ciNodes;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
-              return _topo["default"].networkLink.getCiTypesConnectable(_ResourceTypeLimit.RESOURCE_LIMIT_TYPES);
+              ciTypes = (0, _topoData.getCiTypes)(topo.dataModel.getData());
+              _context4.next = 3;
+              return _topo["default"].networkLink.getCiTypesConnectable(ciTypes);
 
-            case 2:
+            case 3:
               ciTypesConnectable = _context4.sent;
               nodes = (0, _htElementUtils.getNodes)(topo.getDataModel());
               ciIds = [];
@@ -356,7 +361,7 @@ function AddLinkDrawer(props) {
               setCiIdsConnectable(ciIds);
               return _context4.abrupt("return", ciNodes);
 
-            case 10:
+            case 11:
             case "end":
               return _context4.stop();
           }

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -68,7 +68,15 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
   var _proto = LinkTagsTipsBuilder.prototype;
 
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
-    return this.getEdgeGroupTagsAndTips();
+    var data = [];
+
+    try {
+      data = this.getEdgeGroupTagsAndTips();
+    } catch (error) {
+      _rlog["default"].error('getExtElementTagsAndTips 失败', error);
+    }
+
+    return data;
   }
   /**
    * 获得未关联聚合链路的连线组标注和悬浮框数据
@@ -107,7 +115,12 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
     function getGroupInfo(group) {
       var edges = group.getEdges().toArray();
       var edge = edges[0];
-      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget()); // eslint-disable-next-line no-underscore-dangle
+      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget());
+
+      if (!edgeGroupData || !edgeGroupData.data) {
+        return null;
+      } // eslint-disable-next-line no-underscore-dangle
+
 
       var linkId = edgeGroupData.data._attrObject.id;
 

package/package.json

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