@riil-frontend/component-topology 3.5.9 → 3.5.10

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

package/es/topoCenter/models/LinkTagsTipsBuilder.js

@@ -133,15 +133,26 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         config = _ref.config,
         linkChildren = _ref.linkChildren,
         data = _ref.data;
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return _extends({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
 
-    // 查询配置，过滤不在范围内的属性
     var finalConfig = _extends({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
 
@@ -194,15 +205,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         rlog.warn('连线组指标计算异常', error);
       }

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

package/lib/topoCenter/models/LinkTagsTipsBuilder.js

@@ -144,14 +144,26 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
         config = _ref.config,
         linkChildren = _ref.linkChildren,
         data = _ref.data;
-    // 查询配置，过滤不在范围内的属性
+    var connectTypes = ['physical_link.', 'export_link.'];
+
+    var replaceMetricConfigCode = function replaceMetricConfigCode(item) {
+      var code = item.code;
+      connectTypes.forEach(function (prefix) {
+        code = code.replace(prefix, 'physical_link.');
+      });
+      return (0, _extends2["default"])({}, item, {
+        code: code
+      });
+    }; // 查询配置，过滤不在范围内的属性
+
+
     var finalConfig = (0, _extends2["default"])({}, config, {
       tags: config.tags.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      }),
+      }).map(replaceMetricConfigCode),
       tips: config.tips.filter(function (item) {
         return _this2.filterField(item, linkChildren);
-      })
+      }).map(replaceMetricConfigCode)
     }); // 构造数据，计算指标值
 
     var mergeData = this.buildData(data, linkChildren); // 构造标注、悬浮框数据
@@ -203,15 +215,14 @@ var LinkTagsTipsBuilder = /*#__PURE__*/function () {
       ciType: 'network_link',
       metricMap: {}
     };
-    var connectType = linkChildren[0].attributes['network_link.connect_type'];
     metrics.forEach(function (m) {
-      var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
-
       try {
         var values = linkChildrenData.map(function (linkData) {
+          var connectType = linkData.attributeMap['network_link.connect_type'];
+          var metricCode = "" + connectTypePrefixMap[connectType] + m.code;
           return linkData.metricMap[metricCode];
         });
-        mergeData.metricMap[metricCode] = calcFnMap[m.calcType](values);
+        mergeData.metricMap["physical_link." + m.code] = calcFnMap[m.calcType](values);
       } catch (error) {
         _rlog["default"].warn('连线组指标计算异常', error);
       }

package/package.json

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