@riil-frontend/component-topology 2.15.24 → 2.15.25

package/es/core/models/AttributeMetricDisplay.js

@@ -24,7 +24,12 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-}
+} // 无权限不显示标注、悬浮框
+
+
+var filterByPermission = function filterByPermission(resource, items) {
+  return resource.operation ? items : [];
+};
 /**
  * 资源标注、悬浮框数据
  */
@@ -152,6 +157,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: []
     };
   }
+  /**
+   * 查询需要查询数据的连线
+   * @param {*} data 
+   * @returns 
+   */
+  ;
+
+  _proto.getEdges = function getEdges(data) {
+    // 获得图上业务节点、业务连线
+    var _ref2 = data || this.topo.dataModel.getData(),
+        links = _ref2.links,
+        linkGroups = _ref2.linkGroups;
+
+    return [].concat(links.map(function (link) {
+      return _extends({}, link, {
+        type: 'edge'
+      });
+    }), linkGroups.map(function (link) {
+      return _extends({}, link, {
+        type: 'edgeGroup'
+      });
+    })).filter(function (link) {
+      return link.ciType === 'network_link';
+    });
+  }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
    * 
@@ -165,15 +195,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this = this;
 
     // 获得图上业务节点、业务连线
-    var _ref2 = data || this.topo.store.getModelState('topoMod').data,
-        nodes = _ref2.nodes,
-        links = _ref2.links,
-        linkGroups = _ref2.linkGroups; // 无权限不显示标注、悬浮框
-
-
-    var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
-    };
+    var _ref3 = data || this.topo.dataModel.getData(),
+        nodes = _ref3.nodes;
 
     return [].concat(nodes.filter(function (node) {
       return !!node.ciType;
@@ -189,29 +212,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: filterByPermission(node, ciTypeConfig.tags),
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
-    }), links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      var ciType = link.ciType;
-
-      var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
-
-      return {
-        type: 'edge',
-        id: link.id,
-        ciType: ciType,
-        tags: filterByPermission(link, ciTypeConfig.tags),
-        tips: filterByPermission(link, ciTypeConfig.tips)
-      };
-    }), linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
+    }), this.getEdges().map(function (link) {
       var ciType = link.ciType;
 
       var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
 
       return {
-        type: 'edgeGroup',
+        type: link.type,
         id: link.id,
         ciType: ciType,
         tags: filterByPermission(link, ciTypeConfig.tags),
@@ -226,6 +233,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return this.getResourceTagTipConfig().map(function (ciConfig) {
       var fields = {
+        ciType: ciConfig.ciType,
+        type: ciConfig.type,
         id: ciConfig.id,
         attributes: [],
         metrics: []
@@ -314,9 +323,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
   _proto.updateNodesNameVisible = function updateNodesNameVisible() {
     var dm = this.topo.getDataModel();
-    this.getNodesNameVisible().forEach(function (_ref3) {
-      var id = _ref3.id,
-          visible = _ref3.visible;
+    this.getNodesNameVisible().forEach(function (_ref4) {
+      var id = _ref4.id,
+          visible = _ref4.visible;
       dm.getDataByTag(id).a('isShowName', visible);
     });
   }
@@ -333,14 +342,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this4 = this;
 
-      var _this$topo$store$getS, resIdsList, nodeIdsList, linkIdsList, _this$topo$store$getM, links, linkGroups, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               linkAdapter = function _linkAdapter(data) {
-                var link = findItem([].concat(links, linkGroups), 'id', data.id);
+                var link = topo.dataModel.getDataById(data.id);
 
                 if (!link) {
                   return data;
@@ -353,9 +362,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               };
 
-              _this$topo$store$getS = this.topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _this$topo$store$getS.resIdsList, nodeIdsList = _this$topo$store$getS.nodeIdsList, linkIdsList = _this$topo$store$getS.linkIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
-
-              _this$topo$store$getM = this.topo.store.getModelState('topoMod').data, links = _this$topo$store$getM.links, linkGroups = _this$topo$store$getM.linkGroups; // 无资源，不查询
+              topo = this.topo;
+              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              // 无资源，不查询
 
               if (resIdsList.length) {
                 _context.next = 5;
@@ -370,14 +379,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 7:
               // 需要查询的指标列表
-              codes = this.getResourceMetricCodes(); // if (!codes.length) {
-              //   return [];
-              // }
-
+              codes = this.getResourceMetricCodes();
               param = {
                 ciId: nodeIdsList,
                 codes: codes,
-                relationId: linkIdsList
+                // 过滤掉不需要查询的
+                relationId: this.getEdges().map(function (edge) {
+                  return {
+                    ciId: edge.id,
+                    operation: edge.operation
+                  };
+                })
               };
               /**
                * 链路属性适配
@@ -668,9 +680,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM2 = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM2.links,
-        linkGroups = _this$topo$store$getM2.linkGroups;
+    var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
+        links = _this$topo$store$getM.links,
+        linkGroups = _this$topo$store$getM.linkGroups;
 
     var getLinkUId = function getLinkUId(link) {
       return [link.source, link.target].sort().join('-');

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 "2.15.24" === 'string' ? "2.15.24" : null;
+var version = typeof "2.15.25" === 'string' ? "2.15.25" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/AttributeMetricDisplay.js

@@ -43,7 +43,12 @@ function filterUnExistedFields(fields, ciTypeMeta) {
   return fields.filter(function (item) {
     return isFieldExisted(item, ciTypeMeta);
   });
-}
+} // 无权限不显示标注、悬浮框
+
+
+var filterByPermission = function filterByPermission(resource, items) {
+  return resource.operation ? items : [];
+};
 /**
  * 资源标注、悬浮框数据
  */
@@ -171,6 +176,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
       tips: []
     };
   }
+  /**
+   * 查询需要查询数据的连线
+   * @param {*} data 
+   * @returns 
+   */
+  ;
+
+  _proto.getEdges = function getEdges(data) {
+    // 获得图上业务节点、业务连线
+    var _ref2 = data || this.topo.dataModel.getData(),
+        links = _ref2.links,
+        linkGroups = _ref2.linkGroups;
+
+    return [].concat(links.map(function (link) {
+      return (0, _extends2["default"])({}, link, {
+        type: 'edge'
+      });
+    }), linkGroups.map(function (link) {
+      return (0, _extends2["default"])({}, link, {
+        type: 'edgeGroup'
+      });
+    })).filter(function (link) {
+      return link.ciType === 'network_link';
+    });
+  }
   /**
    * 获取资源的标注、悬浮框配置，只包含属性和指标字段。无权限的资源无配置
    * 
@@ -184,15 +214,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this = this;
 
     // 获得图上业务节点、业务连线
-    var _ref2 = data || this.topo.store.getModelState('topoMod').data,
-        nodes = _ref2.nodes,
-        links = _ref2.links,
-        linkGroups = _ref2.linkGroups; // 无权限不显示标注、悬浮框
-
-
-    var filterByPermission = function filterByPermission(resource, items) {
-      return resource.operation ? items : [];
-    };
+    var _ref3 = data || this.topo.dataModel.getData(),
+        nodes = _ref3.nodes;
 
     return [].concat(nodes.filter(function (node) {
       return !!node.ciType;
@@ -208,29 +231,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
         tags: filterByPermission(node, ciTypeConfig.tags),
         tips: filterByPermission(node, ciTypeConfig.tips)
       };
-    }), links.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
-      var ciType = link.ciType;
-
-      var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
-
-      return {
-        type: 'edge',
-        id: link.id,
-        ciType: ciType,
-        tags: filterByPermission(link, ciTypeConfig.tags),
-        tips: filterByPermission(link, ciTypeConfig.tips)
-      };
-    }), linkGroups.filter(function (link) {
-      return link.ciType === 'network_link';
-    }).map(function (link) {
+    }), this.getEdges().map(function (link) {
       var ciType = link.ciType;
 
       var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
 
       return {
-        type: 'edgeGroup',
+        type: link.type,
         id: link.id,
         ciType: ciType,
         tags: filterByPermission(link, ciTypeConfig.tags),
@@ -245,6 +252,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     return this.getResourceTagTipConfig().map(function (ciConfig) {
       var fields = {
+        ciType: ciConfig.ciType,
+        type: ciConfig.type,
         id: ciConfig.id,
         attributes: [],
         metrics: []
@@ -333,9 +342,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
   _proto.updateNodesNameVisible = function updateNodesNameVisible() {
     var dm = this.topo.getDataModel();
-    this.getNodesNameVisible().forEach(function (_ref3) {
-      var id = _ref3.id,
-          visible = _ref3.visible;
+    this.getNodesNameVisible().forEach(function (_ref4) {
+      var id = _ref4.id,
+          visible = _ref4.visible;
       dm.getDataByTag(id).a('isShowName', visible);
     });
   }
@@ -352,14 +361,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this4 = this;
 
-      var _this$topo$store$getS, resIdsList, nodeIdsList, linkIdsList, _this$topo$store$getM, links, linkGroups, codes, param, linkAdapter, result;
+      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
 
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               linkAdapter = function _linkAdapter(data) {
-                var link = (0, _topoData.findItem)([].concat(links, linkGroups), 'id', data.id);
+                var link = topo.dataModel.getDataById(data.id);
 
                 if (!link) {
                   return data;
@@ -372,9 +381,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
                 });
               };
 
-              _this$topo$store$getS = this.topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _this$topo$store$getS.resIdsList, nodeIdsList = _this$topo$store$getS.nodeIdsList, linkIdsList = _this$topo$store$getS.linkIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
-
-              _this$topo$store$getM = this.topo.store.getModelState('topoMod').data, links = _this$topo$store$getM.links, linkGroups = _this$topo$store$getM.linkGroups; // 无资源，不查询
+              topo = this.topo;
+              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              // 无资源，不查询
 
               if (resIdsList.length) {
                 _context.next = 5;
@@ -389,14 +398,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
             case 7:
               // 需要查询的指标列表
-              codes = this.getResourceMetricCodes(); // if (!codes.length) {
-              //   return [];
-              // }
-
+              codes = this.getResourceMetricCodes();
               param = {
                 ciId: nodeIdsList,
                 codes: codes,
-                relationId: linkIdsList
+                // 过滤掉不需要查询的
+                relationId: this.getEdges().map(function (edge) {
+                  return {
+                    ciId: edge.id,
+                    operation: edge.operation
+                  };
+                })
               };
               /**
                * 链路属性适配
@@ -688,9 +700,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
     var _this6 = this;
 
     // 查询没有关联链路的连线组及对应子链路列表
-    var _this$topo$store$getM2 = this.topo.store.getModelState('topoMod').data,
-        links = _this$topo$store$getM2.links,
-        linkGroups = _this$topo$store$getM2.linkGroups;
+    var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
+        links = _this$topo$store$getM.links,
+        linkGroups = _this$topo$store$getM.linkGroups;
 
     var getLinkUId = function getLinkUId(link) {
       return [link.source, link.target].sort().join('-');

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 "2.15.24" === 'string' ? "2.15.24" : null;
+var version = typeof "2.15.25" === 'string' ? "2.15.25" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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