@riil-frontend/component-topology 9.0.1 → 9.0.3

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -14,47 +14,6 @@ var _attributeFormatter = _interopRequireDefault(require("../../core/models/attr
 /**
  * 连线组标注、悬浮框数据构建
  */
-// 参与计算的链路指标
-var metrics = [// 总流速
-{
-  code: "interface_totalbps",
-  calcType: "sum"
-}, // 带宽利用率
-{
-  code: "bandwidth_utilization",
-  calcType: "avg"
-}, // 发送带宽利用率
-{
-  code: "out_bandwidth_utilization",
-  calcType: "avg",
-  showWhenSameSource: true
-}, // 接收带宽利用率
-{
-  code: "in_bandwidth_utilization",
-  calcType: "avg",
-  showWhenSameSource: true
-}, {
-  code: "out_rate",
-  calcType: "sum",
-  showWhenSameSource: true
-}, {
-  code: "in_rate",
-  calcType: "sum",
-  showWhenSameSource: true
-}];
-var calcFnMap = {
-  sum: function sum(values) {
-    return values.reduce(function (total, val) {
-      return total + parseInt(val || 0, 10);
-    }, 0);
-  },
-  avg: function avg(values) {
-    return values.reduce(function (total, val) {
-      return total + parseFloat(val || 0, 10);
-    }, 0) / values.length;
-  }
-};
-
 var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
   function IpNodeTagsTipsBuilder(amDisplay) {
     this.amDisplay = void 0;
@@ -80,40 +39,91 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
     var dm = this.topo.getDataModel();
     var config = topo.attributeMetricDisplay.getConfig();
     console.log("getIpNodeTagsAndTips", config, ipNodes);
+    var tagDatas = config.nodeTag && !config.nodeTag.isCustom ? config.nodeTag.data : [];
+    var tipDatas = config.nodeTip && !config.nodeTip.isCustom ? config.nodeTip.data : [];
+    var tagHasIpv4 = tagDatas.filter(function (item) {
+      return item.code === "ipv4_address";
+    }).length > 0;
+    var tagHasName = tagDatas.filter(function (item) {
+      return item.code === "display_name";
+    }).length > 0;
+    var tipHasIpv4 = tipDatas.filter(function (item) {
+      return item.code === "ipv4_address";
+    }).length > 0;
+    var tipHasName = tipDatas.filter(function (item) {
+      return item.code === "display_name";
+    }).length > 0;
+    ipNodes.map(function (node) {
+      var tags = [];
 
-    if (config.nodeTag && !config.nodeTag.isCustom) {
-      var tagDatas = config.nodeTag.data;
-      var hasIpv4 = tagDatas.filter(function (item) {
-        return item.code === "ipv4_address";
-      }).length > 0;
-      ipNodes.map(function (node) {
-        if (hasIpv4) {
-          tts.push({
-            type: node,
-            id: node.id,
-            tags: [{
-              type: "attribute",
-              code: "ipv4_address",
-              // 属性code
-              name: "IPv4地址",
-              // 属性名称
-              value: node.bindIp,
-              // 属性值
-              originValue: node.bindIp
-            }],
-            tips: []
-          });
-        } else {
-          tts.push({
-            type: node,
-            id: node.id,
-            tags: [],
-            tips: []
-          });
-        }
-      });
-    }
+      if (tagHasName) {
+        var _element$a, _element$a2;
+
+        var element = dm.getDataByTag(node.id);
+        tags.push({
+          type: "attribute",
+          code: "display_name",
+          // 属性code
+          name: "显示名称",
+          // 属性名称
+          value: (_element$a = element.a("customName")) !== null && _element$a !== void 0 ? _element$a : node.name,
+          // 属性值
+          originValue: (_element$a2 = element.a("customName")) !== null && _element$a2 !== void 0 ? _element$a2 : node.name
+        });
+      }
+
+      if (tagHasIpv4) {
+        tags.push({
+          type: "attribute",
+          code: "ipv4_address",
+          // 属性code
+          name: "IPv4地址",
+          // 属性名称
+          value: node.bindIp,
+          // 属性值
+          originValue: node.bindIp
+        });
+      }
+
+      var tips = [];
 
+      if (tipHasName) {
+        var _element$a3, _element$a4;
+
+        var _element = dm.getDataByTag(node.id);
+
+        tips.push({
+          type: "attribute",
+          code: "display_name",
+          // 属性code
+          name: "显示名称",
+          // 属性名称
+          value: (_element$a3 = _element.a("customName")) !== null && _element$a3 !== void 0 ? _element$a3 : node.name,
+          // 属性值
+          originValue: (_element$a4 = _element.a("customName")) !== null && _element$a4 !== void 0 ? _element$a4 : node.name
+        });
+      }
+
+      if (tipHasIpv4) {
+        tips.push({
+          type: "attribute",
+          code: "ipv4_address",
+          // 属性code
+          name: "IPv4地址",
+          // 属性名称
+          value: node.bindIp,
+          // 属性值
+          originValue: node.bindIp
+        });
+      }
+
+      tts.push({
+        type: node,
+        id: node.id,
+        tags: tags,
+        tips: tips
+      });
+    });
     return tts;
   };
 

package/lib/style.js

@@ -14,13 +14,13 @@ require('@riil-frontend/component-pager/lib/style');
 require('@alifd/next/lib/button/style');
 require('@alifd/next/lib/icon/style');
 require('@alifd/next/lib/loading/style');
-require('@alifd/next/lib/switch/style');
 require('@alifd/next/lib/divider/style');
 require('@riil-frontend/component-no-data-page/lib/style');
 
 require('@alifd/next/lib/overlay/style');
 require('@alifd/next/lib/checkbox/style');
 require('@riil-frontend/component-crucial-link-topo/lib/style');
+require('@alifd/next/lib/switch/style');
 require('@alifd/next/lib/input/style');
 require('@alifd/next/lib/field/style');
 require('@alifd/next/lib/form/style');

package/package.json

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