@riil-frontend/component-topology 9.0.0-a.38 → 9.0.0-a.39

package/lib/core/models/attributeFormatter/index.js

@@ -13,11 +13,11 @@ var _utils = require("@riil-frontend/utils");
 var _DictCache = _interopRequireDefault(require("../cache/DictCache"));
 
 /**
-   * 格式化指标
-   * @param {*} val 
-   * @param {*} metricInfo 
-   * @returns 
-   */
+ * 格式化指标
+ * @param {*} val
+ * @param {*} metricInfo
+ * @returns
+ */
 function formatMetric(val, metricInfo) {
   // rlog.debug('formatMetric', item, metricInfo);
   if (metricInfo) {
@@ -28,7 +28,7 @@ function formatMetric(val, metricInfo) {
       unit: metricInfo.unit,
       code: metricInfo.code
     });
-    return result.value + " " + (result.value === '-' ? '' : result.unit);
+    return result.value + " " + (result.value === "-" ? "" : result.unit);
   } else {
     return "" + val;
   }
@@ -65,64 +65,33 @@ var AttributeFormatter = /*#__PURE__*/function () {
 
   _proto.commonTransform = function commonTransform(item, ciData, attrType) {
     var fieldCode = item.code;
-    console.log("commonTransform-item, ciData, attrType", item, ciData, attrType);
-
-    if (ciData.ciType) {
-      var fieldMeta = this.topo.ciTyeCache.getCiType(ciData.ciType)[attrType + "Map"][fieldCode];
-      var fieldValue = (ciData[attrType + "Map"] || ciData[attrType + "s"])[fieldCode]; // 引用属性
-
-      if (attrType === "attribute") {
-        if (ciData[attrType + "Map"][fieldCode + "_object"]) {
-          fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
-        }
-      }
+    var fieldMeta = this.topo.ciTyeCache.getCiType(ciData.ciType)[attrType + "Map"][fieldCode];
+    var fieldValue = (ciData[attrType + "Map"] || ciData[attrType + "s"])[fieldCode]; // 引用属性
 
-      var obj = {
-        type: item.type,
-        code: item.code,
-        // 属性code
-        name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || "",
-        // 属性名称
-        value: formatMetric(fieldValue, fieldMeta),
-        // 属性值
-        originValue: fieldValue
-      };
-      return obj;
-    } else {
-      if (item.code === "ipv4_address" && ciData.bindType === "ip") {
-        return {
-          type: item.type,
-          code: item.code,
-          // 属性code
-          name: "IPv4地址",
-          // 属性名称
-          value: ciData.bindIp,
-          // 属性值
-          originValue: ciData.bindIp
-        };
-      } else {
-        var _ciData$attributes$di, _ciData$attributes, _ciData$attributes$di2, _ciData$attributes2;
-
-        return {
-          type: item.type,
-          code: item.code,
-          // 属性code
-          name: "显示名称",
-          // 属性名称
-          value: (_ciData$attributes$di = ciData === null || ciData === void 0 ? void 0 : (_ciData$attributes = ciData.attributes) === null || _ciData$attributes === void 0 ? void 0 : _ciData$attributes.display_name) !== null && _ciData$attributes$di !== void 0 ? _ciData$attributes$di : "",
-          // 属性值
-          originValue: (_ciData$attributes$di2 = ciData === null || ciData === void 0 ? void 0 : (_ciData$attributes2 = ciData.attributes) === null || _ciData$attributes2 === void 0 ? void 0 : _ciData$attributes2.display_name) !== null && _ciData$attributes$di2 !== void 0 ? _ciData$attributes$di2 : ""
-        };
+    if (attrType === "attribute") {
+      if (ciData[attrType + "Map"][fieldCode + "_object"]) {
+        fieldValue = ciData[attrType + "Map"][fieldCode + "_object"].displayName;
       }
     }
+
+    return {
+      type: item.type,
+      code: item.code,
+      // 属性code
+      name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || "",
+      // 属性名称
+      value: formatMetric(fieldValue, fieldMeta),
+      // 属性值
+      originValue: fieldValue
+    };
   };
 
   _proto.attributeTransform = function attributeTransform(item, ciData) {
-    return this.commonTransform(item, ciData, 'attribute');
+    return this.commonTransform(item, ciData, "attribute");
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
-    return this.commonTransform(item, ciData, 'metric');
+    return this.commonTransform(item, ciData, "metric");
   };
 
   _proto.ciTypeAttrTransform = function ciTypeAttrTransform(item, ciData) {
@@ -131,7 +100,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: '资源类型',
+      name: "资源类型",
       // 属性名称
       value: ciTypeMeta.name // 属性数值
 
@@ -139,11 +108,11 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.graphTransform = function graphTransform(item, ciData) {
-    var value = '-';
+    var value = "-";
 
     try {
       var node = this.topo.getDataModel().getDataByTag(ciData.id);
-      value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
+      value = (node === null || node === void 0 ? void 0 : node.a("customName")) || (node === null || node === void 0 ? void 0 : node.a("name")) || "-";
     } catch (error) {
       _rlog["default"].error(error);
     }
@@ -152,7 +121,7 @@ var AttributeFormatter = /*#__PURE__*/function () {
       type: item.type,
       code: item.code,
       // 属性code
-      name: '图片名称',
+      name: "图片名称",
       // 属性名称
       value: value // 属性值
 

package/lib/networkTopo/models/IpNodeTagsTipsBuilder.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports["default"] = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _htElementUtils = require("../../utils/htElementUtils");
@@ -19,29 +17,29 @@ var _attributeFormatter = _interopRequireDefault(require("../../core/models/attr
 // 参与计算的链路指标
 var metrics = [// 总流速
 {
-  code: 'interface_totalbps',
-  calcType: 'sum'
+  code: "interface_totalbps",
+  calcType: "sum"
 }, // 带宽利用率
 {
-  code: 'bandwidth_utilization',
-  calcType: 'avg'
+  code: "bandwidth_utilization",
+  calcType: "avg"
 }, // 发送带宽利用率
 {
-  code: 'out_bandwidth_utilization',
-  calcType: 'avg',
+  code: "out_bandwidth_utilization",
+  calcType: "avg",
   showWhenSameSource: true
 }, // 接收带宽利用率
 {
-  code: 'in_bandwidth_utilization',
-  calcType: 'avg',
+  code: "in_bandwidth_utilization",
+  calcType: "avg",
   showWhenSameSource: true
 }, {
-  code: 'out_rate',
-  calcType: 'sum',
+  code: "out_rate",
+  calcType: "sum",
   showWhenSameSource: true
 }, {
-  code: 'in_rate',
-  calcType: 'sum',
+  code: "in_rate",
+  calcType: "sum",
   showWhenSameSource: true
 }];
 var calcFnMap = {
@@ -68,178 +66,58 @@ var IpNodeTagsTipsBuilder = /*#__PURE__*/function () {
   var _proto = IpNodeTagsTipsBuilder.prototype;
 
   _proto.getExtElementTagsAndTips = function getExtElementTagsAndTips() {
-    return this.getEdgeGroupTagsAndTips();
-  }
-  /**
-   * 获得未关联聚合链路的连线组标注和悬浮框数据
-   * @param {*} ciTagsAndTips 
-   * @returns 
-   */
-  ;
-
-  _proto.getEdgeGroupTagsAndTips = function getEdgeGroupTagsAndTips() {
-    var _this = this;
-
-    var ciConfigs = this.amDisplay.getResourceTagTipConfig();
-    var data = this.amDisplay.getData();
-    var topo = this.topo;
-    var dm = this.topo.getDataModel(); // 获取所有连线组，排除关联聚合链路，排除无子链路
-
-    var groups = (0, _htElementUtils.getEdgeGroups)(dm).map(getGroupInfo).filter(function (item) {
-      return !!item;
-    }); // 计算标注和指标
-
-    var edgeGroupsTagsTips = groups.map(function (_ref) {
-      var groupId = _ref.groupId,
-          linkChildren = _ref.children;
-      var config = ciConfigs.find(function (item) {
-        return item.id === linkChildren[0].id;
-      });
-      return _this.buildEdgeGroupTagTagsAndTips({
-        groupId: groupId,
-        config: config,
-        linkChildren: linkChildren,
-        data: data
-      });
-    }); // 获得连线组及子链路
-    // 关联聚合链路、无子链路 时返回null
-
-    function getGroupInfo(group) {
-      var edges = group.getEdges().toArray();
-      var edge = edges[0];
-      var edgeGroupData = topo.getHtTopo().getEdgeGroupData(edge.getSource(), edge.getTarget()); // eslint-disable-next-line no-underscore-dangle
-
-      var linkId = edgeGroupData.data._attrObject.id;
-
-      if (linkId) {
-        return null;
-      }
-
-      var linkChildren = getLinkChildren(edges);
-
-      if (!linkChildren.length) {
-        return null;
-      }
-
-      return {
-        groupId: [edge.getSource().getId(), edge.getTarget().getId()].sort().join('-'),
-        children: linkChildren
-      };
-    }
-
-    function getLinkChildren(edges) {
-      return edges.map(function (edge) {
-        var edgeData = topo.getHtTopo().getEdgeData(edge); // eslint-disable-next-line no-underscore-dangle
-
-        var childLinkId = edgeData._tag;
-
-        if (childLinkId) {
-          return topo.dataModel.getDataById(childLinkId);
-        }
-
-        return null;
-      }).filter(function (item) {
-        return !!item;
-      }).filter(function (link) {
-        return link.ciType === 'network_link';
-      });
-    }
-
-    return edgeGroupsTagsTips;
+    return this.getIpNodeTagsAndTips();
   };
 
-  _proto.buildEdgeGroupTagTagsAndTips = function buildEdgeGroupTagTagsAndTips(_ref2) {
-    var _this2 = this;
-
-    var groupId = _ref2.groupId,
-        config = _ref2.config,
-        linkChildren = _ref2.linkChildren,
-        data = _ref2.data;
-    // 查询配置，过滤不在范围内的属性
-    var finalConfig = (0, _extends2["default"])({}, config, {
-      tags: config.tags.filter(function (item) {
-        return _this2.filterField(item, linkChildren);
-      }),
-      tips: config.tips.filter(function (item) {
-        return _this2.filterField(item, linkChildren);
-      })
-    }); // 构造数据，计算指标值
-
-    var mergeData = this.buildData(data, linkChildren);
-
-    _rlog["default"].debug('buildEdgeGroupTagTagsAndTips', {
-      groupId: groupId,
-      config: config,
-      linkChildren: linkChildren,
-      data: data,
-      finalConfig: finalConfig,
-      mergeData: mergeData
-    }); // 构造标注、悬浮框数据
-
-
-    var formatter = new _attributeFormatter["default"](this.topo);
-    return {
-      type: 'edgeGroup',
-      edgeGroupId: groupId,
-      tags: formatter.formatAttrs(finalConfig.tags, mergeData),
-      tips: formatter.formatAttrs(finalConfig.tips, mergeData)
-    };
-  } // eslint-disable-next-line class-methods-use-this
-  ;
-
-  _proto.filterField = function filterField(item, linkChildren) {
-    var fieldConfig = metrics.find(function (m) {
-      return item.code === m.code;
+  _proto.getIpNodeTagsAndTips = function getIpNodeTagsAndTips() {
+    // const ciConfigs = this.amDisplay.getResourceTagTipConfig();
+    var tts = [];
+    var data = this.amDisplay.getData();
+    var ipNodes = data.filter(function (item) {
+      return item.bindType === "ip";
     });
-
-    if (item.type !== 'metric' || !fieldConfig) {
-      return false;
-    } // 如果需要校验取值接口，如果取值接口为不同设备的接口，则不显示这四个指标
-
-
-    if (fieldConfig.showWhenSameSource) {
-      var sources = [];
-      linkChildren.forEach(function (link) {
-        if (sources.indexOf(link.source) === -1) {
-          sources.push(link.source);
+    var topo = this.topo;
+    var dm = this.topo.getDataModel();
+    var config = topo.attributeMetricDisplay.getConfig();
+    console.log("getIpNodeTagsAndTips", config, ipNodes);
+
+    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 (sources.length > 1) {
-        return false;
-      }
     }
 
-    return true;
-  } // eslint-disable-next-line class-methods-use-this
-  ;
-
-  _proto.buildData = function buildData(data, linkChildren) {
-    var linkChildrenData = linkChildren.map(function (link) {
-      return data.find(function (item) {
-        return item.id === link.id;
-      });
-    });
-    var mergeData = {
-      ciType: 'network_link',
-      metricMap: {}
-    };
-    metrics.forEach(function (m) {
-      try {
-        var values = linkChildrenData.map(function (linkData) {
-          return linkData.metricMap[m.code];
-        });
-        mergeData.metricMap[m.code] = calcFnMap[m.calcType](values);
-      } catch (error) {
-        _rlog["default"].warn('连线组指标计算异常', error);
-      }
-    }); // console.error(groupId, {config, linkChildrenData, mergeData})
-
-    return mergeData;
+    return tts;
   };
 
   return IpNodeTagsTipsBuilder;
 }();
 
-exports["default"] = IpNodeTagsTipsBuilder;
-;
+exports["default"] = IpNodeTagsTipsBuilder;

package/lib/networkTopo/models/TopoCenter.js

@@ -27,7 +27,8 @@ var _store = _interopRequireDefault(require("../store"));
 
 var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
 
-// import LinkTagsTipsBuilder from './LinkTagsTipsBuilder';
+var _IpNodeTagsTipsBuilder = _interopRequireDefault(require("./IpNodeTagsTipsBuilder"));
+
 var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   (0, _inheritsLoose2["default"])(TopoCenter, _TopoApp);
 
@@ -46,8 +47,8 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
         },
         getDefaultLinkTipConfig: function getDefaultLinkTipConfig() {
           return _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG;
-        } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
-
+        },
+        ExtElementTagTipBuilder: _IpNodeTagsTipsBuilder["default"]
       }
     })) || this;
     _this.resourceConfig = null;

package/package.json

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