@riil-frontend/component-topology 7.0.4 → 7.0.6

package/es/core/models/TopoApp.js

@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.4" === 'string' ? "7.0.4" : null;
+var version = typeof "7.0.6" === 'string' ? "7.0.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -81,10 +81,6 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
-    if (ciData.id === '000000000381ef35') {
-      console.error(111, item, ciData);
-    }
-
     return this.commonTransform(item, ciData, 'metric');
   };
 

package/es/core/services/overview.js

@@ -29,17 +29,20 @@ export default {
   },
 
   /**
-   * 受理告警
-   * @param {*} params
+   * 查询主资源子组件，用于查风险
+   * @param {*} params 
+   * @returns 
    */
-  handleAlarm: function handleAlarm(params) {
+  queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return request.post('/alert/v1/api/alert/handleAlerts', params);
+              return request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
+                id: id
+              });
 
             case 2:
               return _context2.abrupt("return", _context2.sent);
@@ -54,16 +57,17 @@ export default {
   },
 
   /**
-   * 获取用户id
+   * 受理告警
+   * @param {*} params
    */
-  getUserId: function getUserId() {
+  handleAlarm: function handleAlarm(params) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return request.post('/auth-ui/v1/api/user/token/checkToken');
+              return request.post('/alert/v1/api/alert/handleAlerts', params);
 
             case 2:
               return _context3.abrupt("return", _context3.sent);
@@ -78,16 +82,16 @@ export default {
   },
 
   /**
-   * 查询概览设置
+   * 获取用户id
    */
-  getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
+  getUserId: function getUserId() {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
+              return request.post('/auth-ui/v1/api/user/token/checkToken');
 
             case 2:
               return _context4.abrupt("return", _context4.sent);
@@ -102,16 +106,16 @@ export default {
   },
 
   /**
-   * 保存概览设置
+   * 查询概览设置
    */
-  saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
+  getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
+              return request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
 
             case 2:
               return _context5.abrupt("return", _context5.sent);
@@ -126,16 +130,16 @@ export default {
   },
 
   /**
-   * 查询资源指标信息(批量)
+   * 保存概览设置
    */
-  getResMetricList: function getResMetricList(data) {
+  saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return request.post("/mdc/v1/api/metric/list", data);
+              return request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
 
             case 2:
               return _context6.abrupt("return", _context6.sent);
@@ -150,16 +154,16 @@ export default {
   },
 
   /**
-   * 查询上架设备类型
+   * 查询资源指标信息(批量)
    */
-  getDeviceTypeList: function getDeviceTypeList() {
+  getResMetricList: function getResMetricList(data) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7() {
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return request.post("/room/v1/api/device/type/list", {});
+              return request.post("/mdc/v1/api/metric/list", data);
 
             case 2:
               return _context7.abrupt("return", _context7.sent);
@@ -174,16 +178,16 @@ export default {
   },
 
   /**
-   * 批量查询指标数据
+   * 查询上架设备类型
    */
-  getMetricList: function getMetricList(data) {
+  getDeviceTypeList: function getDeviceTypeList() {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
       return _regeneratorRuntime.wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return request.post("/mdc/v1/api/metric/list", data);
+              return request.post("/room/v1/api/device/type/list", {});
 
             case 2:
               return _context8.abrupt("return", _context8.sent);
@@ -198,16 +202,16 @@ export default {
   },
 
   /**
-   * 查询CI信息（通用）
+   * 批量查询指标数据
    */
-  commonQueryCiData: function commonQueryCiData(params) {
+  getMetricList: function getMetricList(data) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
+              return request.post("/mdc/v1/api/metric/list", data);
 
             case 2:
               return _context9.abrupt("return", _context9.sent);
@@ -219,5 +223,29 @@ export default {
         }
       }, _callee9);
     }))();
+  },
+
+  /**
+   * 查询CI信息（通用）
+   */
+  commonQueryCiData: function commonQueryCiData(params) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+      return _regeneratorRuntime.wrap(function _callee10$(_context10) {
+        while (1) {
+          switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
+
+            case 2:
+              return _context10.abrupt("return", _context10.sent);
+
+            case 3:
+            case "end":
+              return _context10.stop();
+          }
+        }
+      }, _callee10);
+    }))();
   }
 };

package/es/core/utils/backgroundUtil.js

@@ -15,7 +15,7 @@ export function getBackgroundImageUrl(data) {
   var id = data.id,
       isSystem = data.isSystem,
       fileCode = data.fileCode;
-  return isSystem ? "/img/topo/background/" + fileCode + ".jpg" : "/topo/v1/api/background/download/whole/" + id;
+  return isSystem ? "/img/topo/background/" + fileCode + ".svg" : "/topo/v1/api/background/download/whole/" + id;
 }
 /**
  * 获得背景图缩略图URL

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -304,7 +304,7 @@ export default function ResourceOverview(props) {
 
   function _getAlarmRiskData() {
     _getAlarmRiskData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(id) {
-      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
 
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
@@ -342,7 +342,7 @@ export default function ResourceOverview(props) {
                 };
               })) || [];
               setAlarmRiskList(alarmList);
-              _context3.next = 21;
+              _context3.next = 24;
               break;
 
             case 9:
@@ -379,16 +379,24 @@ export default function ResourceOverview(props) {
                     isBaseAlert: false
                   }]
                 };
-              });
+              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
               _context3.next = 17;
+              return service.queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context3.sent;
+              _context3.next = 20;
               return service.getRiskByIds({
-                ciIdList: [id].concat(childrenIds),
+                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                  return item.id;
+                })),
                 statusList: ['toDeal', 'dealing'],
                 current: 1,
                 pageSize: 10000
               });
 
-            case 17:
+            case 20:
               _yield$service$getRis = _context3.sent;
               riskList = _yield$service$getRis.content;
               riskList = riskList.map(function (item) {
@@ -404,7 +412,7 @@ export default function ResourceOverview(props) {
 
               setAlarmRiskList([].concat(_alarmList2, riskList));
 
-            case 21:
+            case 24:
             case "end":
               return _context3.stop();
           }

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.4" === 'string' ? "7.0.4" : null;
+var version = typeof "7.0.6" === 'string' ? "7.0.6" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -93,10 +93,6 @@ var AttributeFormatter = /*#__PURE__*/function () {
   };
 
   _proto.metricTransform = function metricTransform(item, ciData) {
-    if (ciData.id === '000000000381ef35') {
-      console.error(111, item, ciData);
-    }
-
     return this.commonTransform(item, ciData, 'metric');
   };
 

package/lib/core/services/overview.js

@@ -40,17 +40,20 @@ var _default = {
   },
 
   /**
-   * 受理告警
-   * @param {*} params
+   * 查询主资源子组件，用于查风险
+   * @param {*} params 
+   * @returns 
    */
-  handleAlarm: function handleAlarm(params) {
+  queryAllComponentsByCiId: function queryAllComponentsByCiId(id) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return _componentTopologyUtils.request.post('/alert/v1/api/alert/handleAlerts', params);
+              return _componentTopologyUtils.request.post('/mdc/v1/api/cmdb/queryAllComponentsByCiId', {
+                id: id
+              });
 
             case 2:
               return _context2.abrupt("return", _context2.sent);
@@ -65,16 +68,17 @@ var _default = {
   },
 
   /**
-   * 获取用户id
+   * 受理告警
+   * @param {*} params
    */
-  getUserId: function getUserId() {
+  handleAlarm: function handleAlarm(params) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return _componentTopologyUtils.request.post('/auth-ui/v1/api/user/token/checkToken');
+              return _componentTopologyUtils.request.post('/alert/v1/api/alert/handleAlerts', params);
 
             case 2:
               return _context3.abrupt("return", _context3.sent);
@@ -89,16 +93,16 @@ var _default = {
   },
 
   /**
-   * 查询概览设置
+   * 获取用户id
    */
-  getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
+  getUserId: function getUserId() {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return _componentTopologyUtils.request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
+              return _componentTopologyUtils.request.post('/auth-ui/v1/api/user/token/checkToken');
 
             case 2:
               return _context4.abrupt("return", _context4.sent);
@@ -113,16 +117,16 @@ var _default = {
   },
 
   /**
-   * 保存概览设置
+   * 查询概览设置
    */
-  saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
+  getOverviewConfig: function getOverviewConfig(topoId, templateCode) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return _componentTopologyUtils.request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
+              return _componentTopologyUtils.request.get("/topo/v1/api/config/overview/" + topoId + "/" + templateCode);
 
             case 2:
               return _context5.abrupt("return", _context5.sent);
@@ -137,16 +141,16 @@ var _default = {
   },
 
   /**
-   * 查询资源指标信息(批量)
+   * 保存概览设置
    */
-  getResMetricList: function getResMetricList(data) {
+  saveOverviewConfig: function saveOverviewConfig(topoId, templateCode, data) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
+              return _componentTopologyUtils.request.post("/topo/v1/api/config/overview/" + topoId + "/" + templateCode, data);
 
             case 2:
               return _context6.abrupt("return", _context6.sent);
@@ -161,16 +165,16 @@ var _default = {
   },
 
   /**
-   * 查询上架设备类型
+   * 查询资源指标信息(批量)
    */
-  getDeviceTypeList: function getDeviceTypeList() {
+  getResMetricList: function getResMetricList(data) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               _context7.next = 2;
-              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
+              return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
 
             case 2:
               return _context7.abrupt("return", _context7.sent);
@@ -185,16 +189,16 @@ var _default = {
   },
 
   /**
-   * 批量查询指标数据
+   * 查询上架设备类型
    */
-  getMetricList: function getMetricList(data) {
+  getDeviceTypeList: function getDeviceTypeList() {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
       return _regenerator["default"].wrap(function _callee8$(_context8) {
         while (1) {
           switch (_context8.prev = _context8.next) {
             case 0:
               _context8.next = 2;
-              return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
+              return _componentTopologyUtils.request.post("/room/v1/api/device/type/list", {});
 
             case 2:
               return _context8.abrupt("return", _context8.sent);
@@ -209,16 +213,16 @@ var _default = {
   },
 
   /**
-   * 查询CI信息（通用）
+   * 批量查询指标数据
    */
-  commonQueryCiData: function commonQueryCiData(params) {
+  getMetricList: function getMetricList(data) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
       return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
-              return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
+              return _componentTopologyUtils.request.post("/mdc/v1/api/metric/list", data);
 
             case 2:
               return _context9.abrupt("return", _context9.sent);
@@ -230,6 +234,30 @@ var _default = {
         }
       }, _callee9);
     }))();
+  },
+
+  /**
+   * 查询CI信息（通用）
+   */
+  commonQueryCiData: function commonQueryCiData(params) {
+    return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
+      return _regenerator["default"].wrap(function _callee10$(_context10) {
+        while (1) {
+          switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return _componentTopologyUtils.request.post("/mdc/v1/api/cmdb/commonQueryCiData", params);
+
+            case 2:
+              return _context10.abrupt("return", _context10.sent);
+
+            case 3:
+            case "end":
+              return _context10.stop();
+          }
+        }
+      }, _callee10);
+    }))();
   }
 };
 exports["default"] = _default;

package/lib/core/utils/backgroundUtil.js

@@ -21,7 +21,7 @@ function getBackgroundImageUrl(data) {
   var id = data.id,
       isSystem = data.isSystem,
       fileCode = data.fileCode;
-  return isSystem ? "/img/topo/background/" + fileCode + ".jpg" : "/topo/v1/api/background/download/whole/" + id;
+  return isSystem ? "/img/topo/background/" + fileCode + ".svg" : "/topo/v1/api/background/download/whole/" + id;
 }
 /**
  * 获得背景图缩略图URL

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js

@@ -336,7 +336,7 @@ function ResourceOverview(props) {
 
   function _getAlarmRiskData() {
     _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
 
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
@@ -374,7 +374,7 @@ function ResourceOverview(props) {
                 };
               })) || [];
               setAlarmRiskList(alarmList);
-              _context3.next = 21;
+              _context3.next = 24;
               break;
 
             case 9:
@@ -411,16 +411,24 @@ function ResourceOverview(props) {
                     isBaseAlert: false
                   }]
                 };
-              });
+              }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
+
               _context3.next = 17;
+              return _overview["default"].queryAllComponentsByCiId(id);
+
+            case 17:
+              AllComponentsByCiId = _context3.sent;
+              _context3.next = 20;
               return _overview["default"].getRiskByIds({
-                ciIdList: [id].concat(childrenIds),
+                ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
+                  return item.id;
+                })),
                 statusList: ['toDeal', 'dealing'],
                 current: 1,
                 pageSize: 10000
               });
 
-            case 17:
+            case 20:
               _yield$service$getRis = _context3.sent;
               riskList = _yield$service$getRis.content;
               riskList = riskList.map(function (item) {
@@ -436,7 +444,7 @@ function ResourceOverview(props) {
 
               setAlarmRiskList([].concat(_alarmList2, riskList));
 
-            case 21:
+            case 24:
             case "end":
               return _context3.stop();
           }

package/package.json

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