@riil-frontend/component-topology 11.0.13 → 11.0.15

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

@@ -4,48 +4,28 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports["default"] = void 0;
-exports.formatMetric = formatMetric;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _utils = require("@riil-frontend/utils");
+var _attributeTransform = _interopRequireDefault(require("./formatter/attributeTransform"));
 
-var _DictCache = _interopRequireDefault(require("../cache/DictCache"));
+var _metricTransform = _interopRequireDefault(require("./formatter/metricTransform"));
+
+var _ciTypeAttrTransform = _interopRequireDefault(require("./formatter/ciTypeAttrTransform"));
+
+var _graphTransform = _interopRequireDefault(require("./formatter/graphTransform"));
 
-/**
- * 格式化指标
- * @param {*} val
- * @param {*} metricInfo
- * @returns
- */
-function formatMetric(val, metricInfo) {
-  // rlog.debug('formatMetric', item, metricInfo);
-  if (metricInfo) {
-    var result = (0, _utils.metricValueFormat)({
-      value: val,
-      dataType: metricInfo.dataType,
-      dict: _DictCache["default"].getDictObject(),
-      unit: metricInfo.unit,
-      code: metricInfo.code
-    });
-    return result.value + " " + (result.value === "-" ? "" : result.unit);
-  } else {
-    return "" + val;
-  }
-}
 /**
  * 标注值格式化
  */
-
-
 var AttributeFormatter = /*#__PURE__*/function () {
   function AttributeFormatter(topo) {
     this.topo = topo;
     this.transformMap = {
-      attribute: this.attributeTransform.bind(this),
-      metric: this.metricTransform.bind(this),
-      ciType: this.ciTypeAttrTransform.bind(this),
-      graph: this.graphTransform.bind(this)
+      attribute: _attributeTransform["default"],
+      metric: _metricTransform["default"],
+      ciType: _ciTypeAttrTransform["default"],
+      graph: _graphTransform["default"]
     };
   }
 
@@ -56,76 +36,23 @@ var AttributeFormatter = /*#__PURE__*/function () {
 
     return items.map(function (item) {
       return _this.transformAttr(item, ciData);
+    }).filter(function (item) {
+      return !!item;
     });
   };
 
   _proto.transformAttr = function transformAttr(item, ciData) {
-    return this.transformMap[item.type](item, ciData);
-  };
-
-  _proto.commonTransform = function commonTransform(item, ciData, attrType) {
-    var fieldCode = item.code;
-    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;
-      }
-    }
-
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.name) || "",
-      // 属性名称
-      value: formatMetric(fieldValue, fieldMeta),
-      // 属性值
-      originValue: fieldValue
+    var options = {
+      item: item,
+      ciData: ciData,
+      topo: this.topo
     };
+    var transform = this.transformMap[item.type];
+    return transform(options);
   };
 
-  _proto.attributeTransform = function attributeTransform(item, ciData) {
-    return this.commonTransform(item, ciData, "attribute");
-  };
-
-  _proto.metricTransform = function metricTransform(item, ciData) {
-    return this.commonTransform(item, ciData, "metric");
-  };
-
-  _proto.ciTypeAttrTransform = function ciTypeAttrTransform(item, ciData) {
-    var ciTypeMeta = this.topo.ciTyeCache.getCiType(ciData.ciType);
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: "资源类型",
-      // 属性名称
-      value: ciTypeMeta.name // 属性数值
-
-    };
-  };
-
-  _proto.graphTransform = function graphTransform(item, ciData) {
-    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")) || "-";
-    } catch (error) {
-      _rlog["default"].error(error);
-    }
-
-    return {
-      type: item.type,
-      code: item.code,
-      // 属性code
-      name: "图片名称",
-      // 属性名称
-      value: value // 属性值
-
-    };
+  _proto.addTransform = function addTransform(name, transform) {
+    this.transformMap[name] = transform;
   };
 
   return AttributeFormatter;

package/lib/networkTopo/getTopoData.js

@@ -70,6 +70,10 @@ function fixNodeGroupId(data) {
   });
 }
 
+function isNetworkLink(link) {
+  return link.ciType === 'network_link' || link.typeCode === 'network_link';
+}
+
 function addLinkData(_x) {
   return _addLinkData.apply(this, arguments);
 } // FIXME 业务拓扑不需要链路相关逻辑
@@ -77,7 +81,7 @@ function addLinkData(_x) {
 
 function _addLinkData() {
   _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var links, nodes, networkLinks, otherLinks;
+    var links, nodes, prevNetworkLinks, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -85,23 +89,23 @@ function _addLinkData() {
             links = data.links || [];
             nodes = data.nodes || []; // 如果是网络链路，补充详情信息
 
-            _context.next = 4;
-            return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
-              return link.ciType === 'network_link';
-            }), nodes);
+            prevNetworkLinks = links.filter(function (link) {
+              return isNetworkLink(link);
+            });
+            _context.next = 5;
+            return (0, _linkUtils.getLinksDetail)(prevNetworkLinks, nodes);
 
-          case 4:
+          case 5:
             networkLinks = _context.sent;
-            // console.log("如果是网络链路，补充详情信息", networkLinks);
             otherLinks = links.filter(function (link) {
-              return link.ciType !== 'network_link';
+              return !isNetworkLink(link);
             });
             return _context.abrupt("return", (0, _extends2["default"])({}, data, {
               links: [].concat(networkLinks, otherLinks),
               linkGroups: []
             }));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/package.json

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