@riil-frontend/component-topology 9.0.1 → 9.0.2

package/es/core/models/AttributeMetricDisplay.js

@@ -302,31 +302,28 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getNodeNameVisible = function getNodeNameVisible(node) {
-    if (!this.topo.isViewMode()) {
-      return true;
-    }
-
+    // if (!this.topo.isViewMode()) {
+    //   return true;
+    // }
     var _this$getConfig3 = this.getConfig(),
         nodeTag = _this$getConfig3.nodeTag;
 
     var visible = true;
 
     if (nodeTag) {
-      var _nodeTag$data;
-
       var isCustom = nodeTag.isCustom,
           data = nodeTag.data;
       var items = (isCustom ? data[node.ciType] : data) || [];
       visible = !!items.filter(function (item) {
         return item.type === "graph";
-      }).length;
-      console.log("getNodeNameVisible--xxx", nodeTag);
-      var hasIpv4 = Array.isArray(nodeTag.data) && (nodeTag === null || nodeTag === void 0 ? void 0 : (_nodeTag$data = nodeTag.data) === null || _nodeTag$data === void 0 ? void 0 : _nodeTag$data.find(function (item) {
-        return item.code === "ipv4_address";
-      }));
+      }).length; // ipNode逻辑
 
-      if (node.bindType === "ip" && !hasIpv4) {
+      if (isCustom) {
         return true;
+      } else {
+        return !!(data || []).filter(function (item) {
+          return item.type === "graph";
+        }).length;
       }
     }
 

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "9.0.1" === 'string' ? "9.0.1" : null;
+var version = typeof "9.0.2" === 'string' ? "9.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -70,40 +70,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/core/models/AttributeMetricDisplay.js

@@ -320,31 +320,28 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   ;
 
   _proto.getNodeNameVisible = function getNodeNameVisible(node) {
-    if (!this.topo.isViewMode()) {
-      return true;
-    }
-
+    // if (!this.topo.isViewMode()) {
+    //   return true;
+    // }
     var _this$getConfig3 = this.getConfig(),
         nodeTag = _this$getConfig3.nodeTag;
 
     var visible = true;
 
     if (nodeTag) {
-      var _nodeTag$data;
-
       var isCustom = nodeTag.isCustom,
           data = nodeTag.data;
       var items = (isCustom ? data[node.ciType] : data) || [];
       visible = !!items.filter(function (item) {
         return item.type === "graph";
-      }).length;
-      console.log("getNodeNameVisible--xxx", nodeTag);
-      var hasIpv4 = Array.isArray(nodeTag.data) && (nodeTag === null || nodeTag === void 0 ? void 0 : (_nodeTag$data = nodeTag.data) === null || _nodeTag$data === void 0 ? void 0 : _nodeTag$data.find(function (item) {
-        return item.code === "ipv4_address";
-      }));
+      }).length; // ipNode逻辑
 
-      if (node.bindType === "ip" && !hasIpv4) {
+      if (isCustom) {
         return true;
+      } else {
+        return !!(data || []).filter(function (item) {
+          return item.type === "graph";
+        }).length;
       }
     }
 

package/lib/core/models/TopoApp.js

@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "9.0.1" === 'string' ? "9.0.1" : null;
+var version = typeof "9.0.2" === 'string' ? "9.0.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -80,40 +80,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "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.2/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }