@riil-frontend/component-topology 2.15.28 → 2.15.31

package/es/core/models/AttributeMetricDisplay.js

@@ -340,16 +340,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _this4 = this;
-
-      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              linkAdapter = function _linkAdapter(data) {
-                var link = topo.dataModel.getDataById(data.id);
+              transformLinkData = function _transformLinkData(data) {
+                var _topo$dataModel$getDa = topo.dataModel.getData(),
+                    links = _topo$dataModel$getDa.links,
+                    linkGroups = _topo$dataModel$getDa.linkGroups;
+
+                var link = [].concat(links, linkGroups).find(function (item) {
+                  return item.id === data.id;
+                });
 
                 if (!link) {
                   return data;
@@ -411,10 +415,12 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   return map;
                 };
 
-                var resultData = linkAdapter(_extends({}, data, {
+                var resultData = _extends({}, data, {
                   attributeMap: list2map(data.attributes),
                   metricMap: list2map(data.metrics)
-                }), _this4.topo); // 特殊处理：ipv6 从ipv6_address_list取第一个
+                });
+
+                resultData = transformLinkData(resultData); // 特殊处理：ipv6 从ipv6_address_list取第一个
 
                 // 特殊处理：ipv6 从ipv6_address_list取第一个
                 if (resultData.attributeMap.ipv6_address_list && !resultData.attributeMap.ipv6_address) {
@@ -507,7 +513,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _translateRefAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(ciDatas) {
-      var _this5 = this;
+      var _this4 = this;
 
       var refIdMap, ciRefAttributeMap, refIds, refCis, refCiMap;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -523,7 +529,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     attributeMap = ciData.attributeMap;
                 ciRefAttributeMap[id] = [];
 
-                var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
+                var ciTypeMeta = _this4.topo.ciTyeCache.getCiType(ciType);
 
                 if (ciTypeMeta) {
                   ciTypeMeta.attributes.filter(function (attributeMeta) {
@@ -677,7 +683,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips(data, ciConfigs) {
-    var _this6 = this;
+    var _this5 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
     var _this$topo$dataModel$ = this.topo.dataModel.getData(),
@@ -776,7 +782,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
-      var edgeGroup = getEdgeGroupByNodeTags(_this6.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
+      var edgeGroup = getEdgeGroupByNodeTags(_this5.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
       return !!edgeGroup;
     }).map(function (groupId) {
       var linkChildren = groupMap[groupId]; // 查询配置，过滤不在范围内的属性
@@ -817,7 +823,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       }); // console.error(groupId, {config, linkChildrenData, mergeData})
       // 构造标注、悬浮框数据
 
-      var formatter = new AttributeFormatter(_this6.topo);
+      var formatter = new AttributeFormatter(_this5.topo);
       return {
         type: 'edgeGroup',
         edgeGroupId: groupId,

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

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

@@ -341,15 +341,16 @@ function AddLinkDrawer(props) {
         htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
-        var firstEdge = edgesInNodes[0];
-
-        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
-          htTopo.setEdgeData(firstEdge, linkData);
-        } else {
-          htTopo.createEdge(source, target, linkData);
-        }
-
-        htTopo.toggleEdgeGroup(source, target, true);
+        // 有连线组无子连线时，设置连线数据，切换到连线并选中
+        // 注释代码，因为 createEdge 内置该逻辑
+        // const firstEdge = edgesInNodes[0]
+        // if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
+        //   htTopo.setEdgeData(firstEdge, linkData);
+        // } else {
+        //   htTopo.createEdge(source, target, linkData);
+        // }
+        var edge = htTopo.createEdge(source, target, linkData);
+        console.error(edge); // htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 

package/lib/core/models/AttributeMetricDisplay.js

@@ -359,16 +359,20 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var _this4 = this;
-
-      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              linkAdapter = function _linkAdapter(data) {
-                var link = topo.dataModel.getDataById(data.id);
+              transformLinkData = function _transformLinkData(data) {
+                var _topo$dataModel$getDa = topo.dataModel.getData(),
+                    links = _topo$dataModel$getDa.links,
+                    linkGroups = _topo$dataModel$getDa.linkGroups;
+
+                var link = [].concat(links, linkGroups).find(function (item) {
+                  return item.id === data.id;
+                });
 
                 if (!link) {
                   return data;
@@ -430,10 +434,11 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                   return map;
                 };
 
-                var resultData = linkAdapter((0, _extends2["default"])({}, data, {
+                var resultData = (0, _extends2["default"])({}, data, {
                   attributeMap: list2map(data.attributes),
                   metricMap: list2map(data.metrics)
-                }), _this4.topo); // 特殊处理：ipv6 从ipv6_address_list取第一个
+                });
+                resultData = transformLinkData(resultData); // 特殊处理：ipv6 从ipv6_address_list取第一个
 
                 // 特殊处理：ipv6 从ipv6_address_list取第一个
                 if (resultData.attributeMap.ipv6_address_list && !resultData.attributeMap.ipv6_address) {
@@ -526,7 +531,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _translateRefAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(ciDatas) {
-      var _this5 = this;
+      var _this4 = this;
 
       var refIdMap, ciRefAttributeMap, refIds, refCis, refCiMap;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
@@ -542,7 +547,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     attributeMap = ciData.attributeMap;
                 ciRefAttributeMap[id] = [];
 
-                var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
+                var ciTypeMeta = _this4.topo.ciTyeCache.getCiType(ciType);
 
                 if (ciTypeMeta) {
                   ciTypeMeta.attributes.filter(function (attributeMeta) {
@@ -697,7 +702,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips(data, ciConfigs) {
-    var _this6 = this;
+    var _this5 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
     var _this$topo$dataModel$ = this.topo.dataModel.getData(),
@@ -796,7 +801,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var edgeGroupsTagsTips = Object.keys(groupMap) // 过滤非连线组
     .filter(function (groupId) {
       var linkChildren = groupMap[groupId];
-      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(_this6.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
+      var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(_this5.topo.getDataModel(), linkChildren[0].source, linkChildren[0].target);
       return !!edgeGroup;
     }).map(function (groupId) {
       var linkChildren = groupMap[groupId]; // 查询配置，过滤不在范围内的属性
@@ -837,7 +842,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       }); // console.error(groupId, {config, linkChildrenData, mergeData})
       // 构造标注、悬浮框数据
 
-      var formatter = new _attributeFormatter["default"](_this6.topo);
+      var formatter = new _attributeFormatter["default"](_this5.topo);
       return {
         type: 'edgeGroup',
         edgeGroupId: groupId,

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

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

@@ -382,15 +382,16 @@ function AddLinkDrawer(props) {
         htTopo.toggleEdgeGroup(source, target, false);
       } else {
         // 物理、出口链路
-        var firstEdge = edgesInNodes[0];
-
-        if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
-          htTopo.setEdgeData(firstEdge, linkData);
-        } else {
-          htTopo.createEdge(source, target, linkData);
-        }
-
-        htTopo.toggleEdgeGroup(source, target, true);
+        // 有连线组无子连线时，设置连线数据，切换到连线并选中
+        // 注释代码，因为 createEdge 内置该逻辑
+        // const firstEdge = edgesInNodes[0]
+        // if (edgesInNodes.length === 1 && !htTopo.getEdgeData(firstEdge)) {
+        //   htTopo.setEdgeData(firstEdge, linkData);
+        // } else {
+        //   htTopo.createEdge(source, target, linkData);
+        // }
+        var edge = htTopo.createEdge(source, target, linkData);
+        console.error(edge); // htTopo.toggleEdgeGroup(source, target, true);
       } // TODO 选中
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "2.15.28",
+  "version": "2.15.31",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -43,6 +43,7 @@
     "@ice/store": "^1.4.2",
     "@riil-frontend/component-topo-icon-select": "^1.0.10",
     "@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
+    "resize-observer-polyfill": "^1.5.1",
     "classnames": "^2.2.3",
     "prop-types": "^15.5.8",
     "react-color": "^2.19.3",
@@ -110,6 +111,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.28/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.31/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }