@riil-frontend/component-topology 11.0.10 → 11.0.12

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

@@ -11,15 +11,21 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
+
 var _utils = require("./utils");
 
 var _tagtip = require("../../services/topo/tagtip");
 
-var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/lib/rlog"));
-
+/**
+ * 标注、悬浮框字段模型
+ */
 var ElementTagTipConfig = /*#__PURE__*/function () {
   function ElementTagTipConfig(topo) {
     this.topoData = void 0;
+    this.modelMap = {};
     this.mtCodes = void 0;
     this.mtMetricsMap = {};
     this.mtCiTypeMap = void 0;
@@ -35,55 +41,216 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
           switch (_context.prev = _context.next) {
             case 0:
               this.topoData = topoData;
-              this.mtCodes = (0, _utils.getMonitorTemplateCodesFromTopoData)(topoData);
-              _context.prev = 2;
+              _context.next = 3;
+              return this.initNetworkLinkModel();
+
+            case 3:
+              this.mtCiTypeMap = (0, _utils.getMtCodeCiTypeMap)(topoData);
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
 
-              if (!this.mtCodes.length) {
-                _context.next = 7;
+    function init(_x) {
+      return _init.apply(this, arguments);
+    }
+
+    return init;
+  }();
+
+  _proto.initNetworkLinkModel = /*#__PURE__*/function () {
+    var _initNetworkLinkModel = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var mtCodes;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.prev = 0;
+              mtCodes = ['m.critical_link', 'm.ethernet_link'];
+
+              if (!mtCodes.length) {
+                _context2.next = 6;
                 break;
               }
 
-              _context.next = 6;
-              return (0, _tagtip.getMetricsByMonitorTemplateCodes)(this.mtCodes);
+              _context2.next = 5;
+              return (0, _tagtip.getMetricsByMonitorTemplateCodes)(mtCodes);
 
-            case 6:
-              this.mtMetricsMap = _context.sent;
+            case 5:
+              this.mtMetricsMap = _context2.sent;
 
-            case 7:
-              _context.next = 12;
+            case 6:
+              _context2.next = 11;
               break;
 
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](2);
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](0);
 
-              _rlog["default"].error('查询监控模板指标失败', _context.t0);
+              _rlog["default"].error('查询监控模板指标失败', _context2.t0);
 
-            case 12:
-              this.mtCiTypeMap = (0, _utils.getMtCodeCiTypeMap)(topoData);
-
-            case 13:
+            case 11:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, this, [[2, 9]]);
+      }, _callee2, this, [[0, 8]]);
     }));
 
-    function init(_x) {
-      return _init.apply(this, arguments);
+    function initNetworkLinkModel() {
+      return _initNetworkLinkModel.apply(this, arguments);
     }
 
-    return init;
-  }()
+    return initNetworkLinkModel;
+  }();
+
+  _proto.getModelTypes = function getModelTypes(cis) {
+    var _this = this;
+
+    var modelTypes = [];
+    cis.forEach(function (ci) {
+      var modelType = _this.getModelType(ci);
+
+      if (modelType && modelTypes.indexOf(modelType) < 0) {
+        modelTypes.push(modelType);
+      }
+    });
+    return modelTypes;
+  }
   /**
-   * 获得节点字段配置项map
+   * 查询模型
+   * @param {*} ci 
+   * @returns 
    */
+  // eslint-disable-next-line class-methods-use-this
   ;
 
+  _proto.getModelType = function getModelType(ci) {
+    if (ci.ciType === 'network_link') {
+      return ci.attributes.support_templates;
+    }
+
+    return ci.ciType;
+  };
+
+  _proto.getModelByType = function getModelByType(type) {
+    return this.getNetworkLinkModel(type) || this.topo.ciTyeCache.getCiType(type);
+  };
+
+  _proto.getNetworkLinkModel = function getNetworkLinkModel(type) {
+    var _this2 = this;
+
+    var baseInfo = [{
+      code: 'm.critical_link',
+      displayName: '关键链路',
+      typeCode: 'network_link'
+    }, {
+      code: 'm.ethernet_link',
+      displayName: '网络链路',
+      typeCode: 'network_link'
+    }].find(function (item) {
+      return item.code === type;
+    });
+
+    if (!baseInfo) {
+      return null;
+    }
+
+    var ciTypeModel = this.topo.ciTyeCache.getCiType('network_link');
+    var metrics = ciTypeModel.metrics.filter(function (m) {
+      return _this2.mtMetricsMap[type] && !!_this2.mtMetricsMap[type][m.code];
+    });
+    return (0, _extends2["default"])({}, this.topo.ciTyeCache.getCiType('network_link'), baseInfo, {
+      metrics: metrics,
+      metricMap: (0, _keyBy["default"])(metrics, 'code')
+    });
+  }
+  /**
+   * 获取链路标注悬浮框属性配置数据
+   * @returns 
+   */
+  ;
+
+  _proto.getLinkConfigItems = function getLinkConfigItems() {
+    var _this3 = this;
+
+    var _this$topo$dataModel$ = this.topo.dataModel.getData(),
+        links = _this$topo$dataModel$.links;
+
+    var modelTypes = this.getModelTypes(links);
+    var list = modelTypes.map(this.getModelByType.bind(this)).map(function (item) {
+      return _this3.buildModels(item, 'link');
+    });
+    return list;
+  } // eslint-disable-next-line
+  ;
+
+  _proto.buildModels = function buildModels(ciTypeObj, type) {
+    return {
+      id: ciTypeObj.code,
+      label: ciTypeObj.displayName,
+      icon: "/img/model/" + ciTypeObj.icon + ".svg",
+      list: this.buildModelFields(ciTypeObj, type)
+    };
+  }
+  /**
+   * 过滤ci元数据中的属性和指标，用于属性和指标显示设置
+   * @param {} ciTypeObj
+   * @returns
+   */
+  // eslint-disable-next-line
+  ;
+
+  _proto.buildModelFields = function buildModelFields(ciTypeObj, type) {
+    var custom = [];
+
+    if (type === 'node') {
+      custom.push.apply(custom, [{
+        id: 'graph:name',
+        code: 'name',
+        name: '图片名称',
+        type: 'custom'
+      }, {
+        id: 'ciType:display_name',
+        code: 'ciType',
+        name: '资源类型',
+        type: 'custom'
+      }]);
+    }
+
+    var attributes = ciTypeObj.attributes.filter(function (attr) {
+      return !!attr.userVisible;
+    }).map(function (item) {
+      return {
+        type: 'attribute',
+        id: "attribute:" + item.code,
+        code: "attribute:" + item.code,
+        name: item.name,
+        typeName: '属性'
+      };
+    });
+    var metrics = ciTypeObj.metrics.map(function (item) {
+      return {
+        type: 'metric',
+        id: "metric:" + item.code,
+        code: "metric:" + item.code,
+        name: item.name,
+        typeName: '指标'
+      };
+    });
+    return [].concat(custom, attributes, metrics);
+  };
+
+  /**
+   * 获得节点字段配置项map
+   */
   _proto.getNodeFiedldMap = function getNodeFiedldMap() {
     var mtCodes = (0, _utils.getNodeMtCodes)(this.topoData);
-    return this.getFiedldMapByType(mtCodes, 'node');
+    return this.getFiedldMapByMtCodes(mtCodes, 'node');
   }
   /**
    * 获得节点字段配置项map
@@ -92,87 +259,60 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
 
   _proto.getLinkFidldMap = function getLinkFidldMap() {
     var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
-    return this.getFiedldMapByType(mtCodes, 'link');
-  };
-
-  _proto.getLinkConfigItems = function getLinkConfigItems() {
-    var mtCodes = (0, _utils.getLinkMtCodes)(this.topoData);
-    var linkFidldMap = this.getLinkFidldMap();
-    var list = [{
-      id: 'm.critical_link',
-      label: '关键链路'
-    }, {
-      id: 'm.ethernet_link',
-      label: '网络链路'
-    }] // 只拓扑图上已有资源的监控模板
-    .filter(function (item) {
-      return mtCodes.includes(item.id);
-    }).map(function (t) {
-      return (0, _extends2["default"])({}, t, {
-        icon: '/img/model/networkLink.svg',
-        list: linkFidldMap[t.id] || []
-      });
-    });
-    return list; // return [
-    //   { id: 'ax1', label: '本级平台', children: list, type: 'folder', disabled: true },
-    //   {
-    //     id: 'bb22', label: '下级平台', type: 'folder', children: [
-    //       { id: 'xvdafa', label: '关键链路', icon: '/img/model/networkLink.svg' },
-    //     ]
-    //   },
-    // ]
+    return this.getFiedldMapByMtCodes(mtCodes, 'link');
   };
 
-  _proto.getFiedldMapByType = function getFiedldMapByType(mtCodes, type) {
-    var _this = this;
+  _proto.getFiedldMapByMtCodes = function getFiedldMapByMtCodes(mtCodes, type) {
+    var _this4 = 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: '指标'
-        };
-      }));
+      var ciType = _this4.mtCiTypeMap[mtCode];
+      map[mtCode] = _this4.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;
+    var _this5 = this;
 
     var ciType = this.mtCiTypeMap[mtCode];
     var ciTypeModel = this.topo.ciTyeCache.getCiType(ciType);
     var metrics = ciTypeModel.metrics.filter(function (m) {
-      return _this2.mtMetricsMap[mtCode] && !!_this2.mtMetricsMap[mtCode][m.code];
+      return _this5.mtMetricsMap[mtCode] && !!_this5.mtMetricsMap[mtCode][m.code];
     });
     return metrics;
   };

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.12",
   "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.12/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }