@riil-frontend/component-topology 3.1.5 → 3.1.6

package/es/core/models/AttributeMetricDisplay.js

@@ -76,6 +76,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var ciTypeMeta = this.topo.ciTyeCache.getCiType(ciType);
 
     function getItems(cfg) {
+      if (!ciTypeMeta || !cfg) {
+        return [];
+      }
+
       var isCustom = cfg.isCustom,
           data = cfg.data;
       var items = (isCustom ? data[ciType] : data) || []; // 过滤类型不存在的属性和指标、图片名称
@@ -90,94 +94,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: getItems(nodeTip || DEFAULT_TIP_COMMON_CONFIG)
     };
   }
-  /**
-   * 按链路类型获取对应的属性、指标配置
-   * @param {*} link 
-   * @param {*} config 
-   * @returns 
-   */
-  ;
-
-  _proto.getNetworkLinkConfig = function getNetworkLinkConfig(link, config) {
-    var _this$getConfig2 = this.getConfig(config),
-        linkTag = _this$getConfig2.linkTag,
-        linkTip = _this$getConfig2.linkTip;
-
-    var linkConnectType = link.attributes['network_link.connect_type'];
-    var ciTypeMeta = this.topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
-
-    var getMetricCode = function getMetricCode(code) {
-      var _connectTypeMap$linkC;
-
-      var connectTypeMap = {
-        phy: {
-          id: 'phy',
-          metricPrefix: 'physical_link.'
-        },
-        agg: {
-          id: 'agg',
-          metricPrefix: 'agg_link.'
-        },
-        exit: {
-          id: 'exit',
-          metricPrefix: 'export_link.'
-        }
-      };
-      var metricPrefix = (_connectTypeMap$linkC = connectTypeMap[linkConnectType]) === null || _connectTypeMap$linkC === void 0 ? void 0 : _connectTypeMap$linkC.metricPrefix;
-
-      if (!metricPrefix) {
-        return null;
-      }
-
-      var finalCode = null;
-
-      if (ciTypeMeta.metricMap[code]) {
-        finalCode = code;
-      } else if (ciTypeMeta.metricMap["" + metricPrefix + code]) {
-        finalCode = "" + metricPrefix + code;
-      }
-
-      return finalCode;
-    };
-
-    var formatItems = function formatItems(items) {
-      var newItems = [];
-      items.forEach(function (item) {
-        if (item.type === 'metric') {
-          var code = item.code;
-          var finalCode = getMetricCode(code);
-
-          if (finalCode) {
-            newItems.push(_extends({}, item, {
-              code: finalCode
-            }));
-          }
-        } else {
-          newItems.push(item);
-        }
-      });
-      return newItems;
-    };
-
-    function getItems(cfg) {
-      if (!ciTypeMeta || !cfg) {
-        return [];
-      }
-
-      var isCustom = cfg.isCustom,
-          data = cfg.data;
-      var configItems = (isCustom ? data[linkConnectType] : data) || [];
-      var items = formatItems(configItems); // 过滤不存在的
-
-      return filterUnExistedFields(items, ciTypeMeta);
-    }
-
-    var defaultLinkTagTipConfig = this.topo.options.defaultLinkTagTipConfig;
-    return {
-      tags: getItems(linkTag || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tag)),
-      tips: getItems(linkTip || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tip))
-    };
-  }
   /**
    * 查询需要查询数据的连线
    * 
@@ -203,10 +119,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     }));
   };
 
-  _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
-    return this.getNetworkLinkConfig(link);
-  };
-
   _proto.getNodesTagTipConfig = function getNodesTagTipConfig() {
     var _this = this;
 
@@ -228,6 +140,107 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
     });
+  }
+  /**
+   * 按链路类型获取对应的属性、指标配置
+   * @param {*} link 
+   * @returns 
+   */
+  ;
+
+  _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
+    var _this$getConfig2 = this.getConfig(),
+        linkTag = _this$getConfig2.linkTag,
+        linkTip = _this$getConfig2.linkTip;
+
+    var ciTypeMeta;
+    var isNetworkLink = link.ciType === 'network_link';
+
+    if (isNetworkLink) {
+      var linkConnectType = link.attributes['network_link.connect_type'];
+      ciTypeMeta = this.topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
+    } else {
+      ciTypeMeta = this.topo.ciTyeCache.getCiType(link.ciType);
+    }
+
+    var dataType = isNetworkLink ? link.attributes['network_link.connect_type'] : link.ciType;
+
+    function getNetworkFieldItems(configItems) {
+      var getMetricCode = function getMetricCode(code) {
+        var _connectTypeMap$linkC;
+
+        var linkConnectType = link.attributes['network_link.connect_type'];
+        var connectTypeMap = {
+          phy: {
+            id: 'phy',
+            metricPrefix: 'physical_link.'
+          },
+          agg: {
+            id: 'agg',
+            metricPrefix: 'agg_link.'
+          },
+          exit: {
+            id: 'exit',
+            metricPrefix: 'export_link.'
+          }
+        };
+        var metricPrefix = (_connectTypeMap$linkC = connectTypeMap[linkConnectType]) === null || _connectTypeMap$linkC === void 0 ? void 0 : _connectTypeMap$linkC.metricPrefix;
+
+        if (!metricPrefix) {
+          return null;
+        }
+
+        var finalCode = null;
+
+        if (ciTypeMeta.metricMap[code]) {
+          finalCode = code;
+        } else if (ciTypeMeta.metricMap["" + metricPrefix + code]) {
+          finalCode = "" + metricPrefix + code;
+        }
+
+        return finalCode;
+      };
+
+      var formatItems = function formatItems(items) {
+        var newItems = [];
+        items.forEach(function (item) {
+          if (item.type === 'metric') {
+            var code = item.code;
+            var finalCode = getMetricCode(code);
+
+            if (finalCode) {
+              newItems.push(_extends({}, item, {
+                code: finalCode
+              }));
+            }
+          } else {
+            newItems.push(item);
+          }
+        });
+        return newItems;
+      };
+
+      return formatItems(configItems);
+    }
+
+    function getItems(cfg) {
+      if (!ciTypeMeta || !cfg) {
+        return [];
+      }
+
+      var isCustom = cfg.isCustom,
+          data = cfg.data;
+      var configItems = (isCustom ? data[dataType] : data) || [];
+      var items = isNetworkLink ? getNetworkFieldItems(configItems) : configItems; // 过滤不存在的
+
+      return filterUnExistedFields(items, ciTypeMeta);
+    }
+
+    var defaultLinkTagTipConfig = this.topo.options.defaultLinkTagTipConfig;
+    return {
+      tags: getItems(linkTag || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tag)),
+      tips: getItems(linkTip || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tip))
+    };
   };
 
   _proto.getLinksTagTipConfig = function getLinksTagTipConfig() {
@@ -580,10 +593,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     });
                   });
                 } else {
-                  rlog.warn('推送属性指标数据：未查询到ciType', {
-                    ciData: ciData,
-                    ciType: ciType
-                  });
+                  rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
                 }
               });
               refIds = Object.keys(refIdMap);

package/es/core/models/TopoApp.js

@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
 import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
 
-var version = typeof "3.1.5" === 'string' ? "3.1.5" : null;
+var version = typeof "3.1.6" === 'string' ? "3.1.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/AttributeMetricDisplay.js

@@ -93,6 +93,10 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var ciTypeMeta = this.topo.ciTyeCache.getCiType(ciType);
 
     function getItems(cfg) {
+      if (!ciTypeMeta || !cfg) {
+        return [];
+      }
+
       var isCustom = cfg.isCustom,
           data = cfg.data;
       var items = (isCustom ? data[ciType] : data) || []; // 过滤类型不存在的属性和指标、图片名称
@@ -107,94 +111,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: getItems(nodeTip || _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG)
     };
   }
-  /**
-   * 按链路类型获取对应的属性、指标配置
-   * @param {*} link 
-   * @param {*} config 
-   * @returns 
-   */
-  ;
-
-  _proto.getNetworkLinkConfig = function getNetworkLinkConfig(link, config) {
-    var _this$getConfig2 = this.getConfig(config),
-        linkTag = _this$getConfig2.linkTag,
-        linkTip = _this$getConfig2.linkTip;
-
-    var linkConnectType = link.attributes['network_link.connect_type'];
-    var ciTypeMeta = this.topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
-
-    var getMetricCode = function getMetricCode(code) {
-      var _connectTypeMap$linkC;
-
-      var connectTypeMap = {
-        phy: {
-          id: 'phy',
-          metricPrefix: 'physical_link.'
-        },
-        agg: {
-          id: 'agg',
-          metricPrefix: 'agg_link.'
-        },
-        exit: {
-          id: 'exit',
-          metricPrefix: 'export_link.'
-        }
-      };
-      var metricPrefix = (_connectTypeMap$linkC = connectTypeMap[linkConnectType]) === null || _connectTypeMap$linkC === void 0 ? void 0 : _connectTypeMap$linkC.metricPrefix;
-
-      if (!metricPrefix) {
-        return null;
-      }
-
-      var finalCode = null;
-
-      if (ciTypeMeta.metricMap[code]) {
-        finalCode = code;
-      } else if (ciTypeMeta.metricMap["" + metricPrefix + code]) {
-        finalCode = "" + metricPrefix + code;
-      }
-
-      return finalCode;
-    };
-
-    var formatItems = function formatItems(items) {
-      var newItems = [];
-      items.forEach(function (item) {
-        if (item.type === 'metric') {
-          var code = item.code;
-          var finalCode = getMetricCode(code);
-
-          if (finalCode) {
-            newItems.push((0, _extends2["default"])({}, item, {
-              code: finalCode
-            }));
-          }
-        } else {
-          newItems.push(item);
-        }
-      });
-      return newItems;
-    };
-
-    function getItems(cfg) {
-      if (!ciTypeMeta || !cfg) {
-        return [];
-      }
-
-      var isCustom = cfg.isCustom,
-          data = cfg.data;
-      var configItems = (isCustom ? data[linkConnectType] : data) || [];
-      var items = formatItems(configItems); // 过滤不存在的
-
-      return filterUnExistedFields(items, ciTypeMeta);
-    }
-
-    var defaultLinkTagTipConfig = this.topo.options.defaultLinkTagTipConfig;
-    return {
-      tags: getItems(linkTag || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tag)),
-      tips: getItems(linkTip || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tip))
-    };
-  }
   /**
    * 查询需要查询数据的连线
    * 
@@ -220,10 +136,6 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     }));
   };
 
-  _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
-    return this.getNetworkLinkConfig(link);
-  };
-
   _proto.getNodesTagTipConfig = function getNodesTagTipConfig() {
     var _this = this;
 
@@ -245,6 +157,107 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
     });
+  }
+  /**
+   * 按链路类型获取对应的属性、指标配置
+   * @param {*} link 
+   * @returns 
+   */
+  ;
+
+  _proto.getLinkTagTipConfig = function getLinkTagTipConfig(link) {
+    var _this$getConfig2 = this.getConfig(),
+        linkTag = _this$getConfig2.linkTag,
+        linkTip = _this$getConfig2.linkTip;
+
+    var ciTypeMeta;
+    var isNetworkLink = link.ciType === 'network_link';
+
+    if (isNetworkLink) {
+      var linkConnectType = link.attributes['network_link.connect_type'];
+      ciTypeMeta = this.topo.ciTyeCache.getNetworkLinkCiType(linkConnectType);
+    } else {
+      ciTypeMeta = this.topo.ciTyeCache.getCiType(link.ciType);
+    }
+
+    var dataType = isNetworkLink ? link.attributes['network_link.connect_type'] : link.ciType;
+
+    function getNetworkFieldItems(configItems) {
+      var getMetricCode = function getMetricCode(code) {
+        var _connectTypeMap$linkC;
+
+        var linkConnectType = link.attributes['network_link.connect_type'];
+        var connectTypeMap = {
+          phy: {
+            id: 'phy',
+            metricPrefix: 'physical_link.'
+          },
+          agg: {
+            id: 'agg',
+            metricPrefix: 'agg_link.'
+          },
+          exit: {
+            id: 'exit',
+            metricPrefix: 'export_link.'
+          }
+        };
+        var metricPrefix = (_connectTypeMap$linkC = connectTypeMap[linkConnectType]) === null || _connectTypeMap$linkC === void 0 ? void 0 : _connectTypeMap$linkC.metricPrefix;
+
+        if (!metricPrefix) {
+          return null;
+        }
+
+        var finalCode = null;
+
+        if (ciTypeMeta.metricMap[code]) {
+          finalCode = code;
+        } else if (ciTypeMeta.metricMap["" + metricPrefix + code]) {
+          finalCode = "" + metricPrefix + code;
+        }
+
+        return finalCode;
+      };
+
+      var formatItems = function formatItems(items) {
+        var newItems = [];
+        items.forEach(function (item) {
+          if (item.type === 'metric') {
+            var code = item.code;
+            var finalCode = getMetricCode(code);
+
+            if (finalCode) {
+              newItems.push((0, _extends2["default"])({}, item, {
+                code: finalCode
+              }));
+            }
+          } else {
+            newItems.push(item);
+          }
+        });
+        return newItems;
+      };
+
+      return formatItems(configItems);
+    }
+
+    function getItems(cfg) {
+      if (!ciTypeMeta || !cfg) {
+        return [];
+      }
+
+      var isCustom = cfg.isCustom,
+          data = cfg.data;
+      var configItems = (isCustom ? data[dataType] : data) || [];
+      var items = isNetworkLink ? getNetworkFieldItems(configItems) : configItems; // 过滤不存在的
+
+      return filterUnExistedFields(items, ciTypeMeta);
+    }
+
+    var defaultLinkTagTipConfig = this.topo.options.defaultLinkTagTipConfig;
+    return {
+      tags: getItems(linkTag || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tag)),
+      tips: getItems(linkTip || (defaultLinkTagTipConfig === null || defaultLinkTagTipConfig === void 0 ? void 0 : defaultLinkTagTipConfig.tip))
+    };
   };
 
   _proto.getLinksTagTipConfig = function getLinksTagTipConfig() {
@@ -596,10 +609,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                     });
                   });
                 } else {
-                  _rlog["default"].warn('推送属性指标数据：未查询到ciType', {
-                    ciData: ciData,
-                    ciType: ciType
-                  });
+                  _rlog["default"].warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
                 }
               });
               refIds = Object.keys(refIdMap);

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "3.1.5" === 'string' ? "3.1.5" : null;
+var version = typeof "3.1.6" === 'string' ? "3.1.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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