@riil-frontend/component-topology 11.0.10 → 11.0.11

package/lib/core/models/tagstips/ElementTagTipConfig.js

@@ -83,7 +83,7 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getNodeFiedldMap = function getNodeFiedldMap() {
     var mtCodes = (0, _utils.getNodeMtCodes)(this.topoData);
-    return this.getFiedldMapByType(mtCodes, 'node');
+    return this.getFiedldMapByMtCodes(mtCodes, 'node');
   }
   /**
    * 获得节点字段配置项map
@@ -92,8 +92,13 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getLinkFidldMap = function getLinkFidldMap() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
-    return this.getFiedldMapByType(mtCodes, 'link');
-  };
+    return this.getFiedldMapByMtCodes(mtCodes, 'link');
+  }
+  /**
+   * 获取链路标注悬浮框属性配置数据
+   * @returns 
+   */
+  ;
 
   _proto.getLinkConfigItems = function getLinkConfigItems() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
@@ -123,49 +128,50 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
     // ]
   };
 
-  _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
+  _proto.getFiedldMapByMtCodes = function getFiedldMapByMtCodes(mtCodes, type) {
     var _this = this;
 
     var map = {};
     mtCodes.forEach(function (mtCode) {
       var ciType = _this.mtCiTypeMap[mtCode];
-
-      var attributes = _this.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attr) {
-        return !!attr.userVisible;
-      });
-
-      var metrics = _this.getMtMetricModels(mtCode);
-
-      var extItems = type === 'node' ? [{
-        lavel: '图片名称',
-        value: 'graph:name',
-        typeName: null
-      }, {
-        lavel: '资源类型',
-        value: 'ciType:name',
-        typeName: null
-      }] : [];
-      map[mtCode] = [].concat(extItems, attributes.map(function (item) {
-        return {
-          type: 'attribute',
-          id: "attribute:" + item.code,
-          code: "attribute:" + item.code,
-          name: item.name,
-          typeName: '属性'
-        };
-      }), metrics.map(function (item) {
-        return {
-          type: 'metric',
-          id: "metric:" + item.code,
-          code: "metric:" + item.code,
-          name: item.name,
-          typeName: '指标'
-        };
-      }));
+      map[mtCode] = _this.getFiedldMapByType(ciType, type, mtCode);
     });
     return map;
   };
 
+  _proto.getFiedldMapByType = function getFiedldMapByType(ciType, type, mtCode) {
+    var attributes = this.topo.ciTyeCache.getCiType(ciType).attributes.filter(function (attr) {
+      return !!attr.userVisible;
+    });
+    var metrics = this.getMtMetricModels(mtCode);
+    var extItems = type === 'node' ? [{
+      lavel: '图片名称',
+      value: 'graph:name',
+      typeName: null
+    }, {
+      lavel: '资源类型',
+      value: 'ciType:name',
+      typeName: null
+    }] : [];
+    return [].concat(extItems, attributes.map(function (item) {
+      return {
+        type: 'attribute',
+        id: "attribute:" + item.code,
+        code: "attribute:" + item.code,
+        name: item.name,
+        typeName: '属性'
+      };
+    }), metrics.map(function (item) {
+      return {
+        type: 'metric',
+        id: "metric:" + item.code,
+        code: "metric:" + item.code,
+        name: item.name,
+        typeName: '指标'
+      };
+    }));
+  };
+
   _proto.getMtMetricModels = function getMtMetricModels(mtCode) {
     var _this2 = this;
 

package/lib/core/models/utils/nodeNameVisibleUtil.js

@@ -0,0 +1,128 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getNodeNameVisible = getNodeNameVisible;
+exports.getNodesNameVisible = getNodesNameVisible;
+exports.setNewNodeNameVisible = setNewNodeNameVisible;
+exports.updateNodesNameVisible = updateNodesNameVisible;
+
+var _htElementUtils = require("../../../utils/htElementUtils");
+
+/**
+ * 根据配置执行节点名称显示隐藏
+ * 1. 资源根据标注配置显示隐藏
+ * 2. 默认标注配置不勾选图片名称，图片节点名称不显示
+ * 3. 自定义标注配置，图片名称显示
+ */
+function updateNodesNameVisible(topo) {
+  getNodesNameVisible(topo).forEach(function (_ref) {
+    var htNode = _ref.htNode,
+        visible = _ref.visible;
+    var prevVisible = htNode.a('isShowName');
+
+    if (prevVisible !== visible) {
+      htNode.a('isShowName', visible);
+    }
+  });
+}
+/**
+ * 新加入节点按配置显示隐藏名称
+ * @param {*} topo 
+ */
+
+
+function setNewNodeNameVisible(topo, element) {
+  if ((0, _htElementUtils.isNode)(element)) {
+    var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+        nodeTag = _topo$store$getModelS.nodeTag;
+
+    var nameVisible = getNodeNameVisible({
+      node: element,
+      topo: topo,
+      nodeTag: nodeTag
+    });
+    element.a('isShowName', nameVisible);
+  }
+}
+
+function getNodesNameVisible(topo) {
+  var _topo$store$getModelS2 = topo.store.getModelState('displayConfig'),
+      nodeTag = _topo$store$getModelS2.nodeTag;
+
+  var dm = topo.getDataModel();
+  var htNodes = (0, _htElementUtils.getNodes)(dm);
+  return htNodes.map(function (htNode) {
+    var node = topo.dataModel.getDataById(htNode.getTag());
+    return {
+      htNode: htNode,
+      node: node,
+      visible: getNodeNameVisible({
+        node: node,
+        topo: topo,
+        nodeTag: nodeTag
+      })
+    };
+  });
+}
+/**
+ * 从配置获得资源节点名称是否显示
+ * @param {*} node
+ * @returns
+ */
+
+
+function getNodeNameVisible(_ref2) {
+  var node = _ref2.node,
+      topo = _ref2.topo,
+      nodeTag = _ref2.nodeTag;
+
+  if (node !== null && node !== void 0 && node.ciType) {
+    return getCiNodeNameVisible({
+      node: node,
+      nodeTag: nodeTag
+    });
+  } else {
+    return getCommonNodeNameVisible({
+      node: node,
+      nodeTag: nodeTag
+    });
+  }
+} // 非CI节点
+
+
+function getCommonNodeNameVisible(_ref3) {
+  var node = _ref3.node,
+      nodeTag = _ref3.nodeTag;
+  var visible = true;
+
+  if (nodeTag) {
+    var isCustom = nodeTag.isCustom,
+        data = nodeTag.data;
+
+    if (!isCustom) {
+      var items = data || [];
+      visible = !!items.filter(function (item) {
+        return item.type === 'graph';
+      }).length;
+    }
+  }
+
+  return visible;
+}
+
+function getCiNodeNameVisible(_ref4) {
+  var node = _ref4.node,
+      nodeTag = _ref4.nodeTag;
+  var visible = true;
+
+  if (nodeTag) {
+    var isCustom = nodeTag.isCustom,
+        data = nodeTag.data;
+    var items = (isCustom ? data[node.ciType] : data) || [];
+    visible = !!items.filter(function (item) {
+      return item.type === 'graph';
+    }).length;
+  }
+
+  return visible;
+}

package/lib/utils/topoData.js

@@ -40,6 +40,8 @@ var _htElementUtils = require("./htElementUtils");
 
 var _v140UpgradeSerializeNodeImageSize = _interopRequireDefault(require("../core/upgrade/v140UpgradeSerializeNodeImageSize"));
 
+var _nodeNameVisibleUtil = require("../core/models/utils/nodeNameVisibleUtil");
+
 var _excluded = ["extraConfig"];
 
 /**
@@ -101,13 +103,20 @@ var tfNode = function tfNode(topoEngine, node) {
  */
 
 
-function updateNodeInfo(topoEngine, topoData) {
+function updateNodeInfo(topo, topoData) {
+  var _topo$store$getModelS = topo.store.getModelState('displayConfig'),
+      nodeTag = _topo$store$getModelS.nodeTag;
+
   return (0, _extends2["default"])({}, topoData, {
     nodes: topoData.nodes.map(function (node) {
       var attributes = node.attributes;
       return (0, _extends2["default"])({}, node, {
         ipAddress: node.ipAddress || (attributes === null || attributes === void 0 ? void 0 : attributes.ipv4_address) || null,
-        isShowName: topoEngine.attributeMetricDisplay.getNodeNameVisible(node)
+        isShowName: (0, _nodeNameVisibleUtil.getNodeNameVisible)({
+          node: node,
+          topo: topo,
+          nodeTag: nodeTag
+        })
       });
     })
   });

package/package.json

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