@riil-frontend/component-topology 8.0.0-a.8 → 8.0.1

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

@@ -21,6 +21,8 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _rlog = require("@riil-frontend/component-topology-utils/lib/rlog");
+
 var _Link = _interopRequireDefault(require("../../../../../../../components/Link"));
 
 var _services = require("../../../../../../services");
@@ -35,6 +37,8 @@ var _BlockBox = _interopRequireDefault(require("./BlockBox"));
 
 var _useMetricModels2 = _interopRequireDefault(require("./hooks/useMetricModels"));
 
+var _useAlarmAndRiskData2 = _interopRequireDefault(require("./hooks/useAlarmAndRiskData"));
+
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _ResourceOverviewMetric = _interopRequireDefault(require("./ResourceOverviewMetric"));
@@ -47,8 +51,6 @@ var _attributeFormatter = require("../../../../../../models/attributeFormatter")
 
 var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTopoCard"));
 
-var _rlog = require("@riil-frontend/component-topology-utils/lib/rlog");
-
 var _EventsCard = _interopRequireDefault(require("./EventsCard"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -123,32 +125,38 @@ function ResourceOverview(props) {
       metric = _useState2[0],
       setMetric = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([]),
-      alarmRiskList = _useState3[0],
-      setAlarmRiskList = _useState3[1];
+  var _useState3 = (0, _react.useState)(false),
+      isDevice = _useState3[0],
+      setIsDevice = _useState3[1]; // 是否是可上架设备
 
-  var _useState4 = (0, _react.useState)(false),
-      isDevice = _useState4[0],
-      setIsDevice = _useState4[1]; // 是否是可上架设备
 
+  var _useState4 = (0, _react.useState)(false),
+      baseInfoInitLoading = _useState4[0],
+      settBaseInfoInitLoading = _useState4[1];
 
   var _useState5 = (0, _react.useState)(false),
-      baseInfoInitLoading = _useState5[0],
-      settBaseInfoInitLoading = _useState5[1];
-
-  var _useState6 = (0, _react.useState)(false),
-      metricInitLoading = _useState6[0],
-      setMetricInitLoading = _useState6[1];
+      metricInitLoading = _useState5[0],
+      setMetricInitLoading = _useState5[1];
 
-  var _useState7 = (0, _react.useState)(),
-      initFlag = _useState7[0],
-      setInitFlag = _useState7[1];
+  var _useState6 = (0, _react.useState)(),
+      initFlag = _useState6[0],
+      setInitFlag = _useState6[1];
 
   var ciTypeMeta = (0, _react.useMemo)(function () {
     var typeMeta = topo.ciTyeCache.getCiType(ciType);
     return typeMeta;
   }, [id]);
 
+  var _useAlarmAndRiskData = (0, _useAlarmAndRiskData2["default"])({
+    id: id,
+    resourceOverviewProps: resourceOverviewProps,
+    isAppTopo: isAppTopo,
+    childrenIds: childrenIds,
+    userId: userId
+  }),
+      alarmRiskList = _useAlarmAndRiskData.alarmRiskList,
+      refreshAlarmData = _useAlarmAndRiskData.refreshAlarmData;
+
   var _useMetricModels = (0, _useMetricModels2["default"])({
     data: {
       type: type,
@@ -164,10 +172,8 @@ function ResourceOverview(props) {
 
   topo.resourceOverviewDrawer = {
     refreshData: function refreshData() {
-      if (monitorMetricModels) {
-        init();
-        setInitFlag(new Date().getTime());
-      }
+      refreshAlarmData();
+      setInitFlag(new Date().getTime());
     }
   };
   (0, _react.useEffect)(function () {
@@ -178,18 +184,7 @@ function ResourceOverview(props) {
         window.topo_overview_metric_timer = null;
       }
     };
-  }, []);
-  (0, _react.useEffect)(function () {
-    if (monitorMetricModels) {
-      init();
-    }
-  }, [ciAttrAndMetricData, ciTypeMeta, monitorMetricModels, id]);
-
-  function init() {
-    getDevice();
-    getAlarmRiskData(id);
-  } // 跳转前调用关闭操作
-
+  }, []); // 跳转前调用关闭操作
 
   function onClose() {
     isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
@@ -245,42 +240,45 @@ function ResourceOverview(props) {
         dataIndex: item.code
       };
     })) || [];
-  }, [id, monitorMetricModels, initFlag]); // 获取上架设备类型，判断资源是否是上架设备
-
-  function getDevice() {
-    return _getDevice.apply(this, arguments);
-  } // 获取地址信息：机房 机柜 起始U-结束U
-
-
-  function _getDevice() {
-    _getDevice = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var list;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return _overview["default"].getDeviceTypeList();
-
-            case 2:
-              list = _context.sent;
-              setIsDevice(list.some(function (item) {
-                return item.code === ciType;
-              })); // console.log('getDevice', ciType, list);
+  }, [id, monitorMetricModels, initFlag]);
+  (0, _react.useEffect)(function () {
+    // 获取上架设备类型，判断资源是否是上架设备
+    function getDevice() {
+      return _getDevice.apply(this, arguments);
+    }
 
-            case 4:
-            case "end":
-              return _context.stop();
+    function _getDevice() {
+      _getDevice = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var list;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _overview["default"].getDeviceTypeList();
+
+              case 2:
+                list = _context.sent;
+                setIsDevice(list.some(function (item) {
+                  return item.code === ciType;
+                })); // console.log('getDevice', ciType, list);
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
           }
-        }
-      }, _callee);
-    }));
-    return _getDevice.apply(this, arguments);
-  }
+        }, _callee);
+      }));
+      return _getDevice.apply(this, arguments);
+    }
+
+    getDevice();
+  }, [ciType]); // 获取地址信息：机房 机柜 起始U-结束U
 
   function getAddressFormat(_x) {
     return _getAddressFormat.apply(this, arguments);
-  } // 获取告警/风险信息
+  } // 告警table列配置
 
 
   function _getAddressFormat() {
@@ -329,131 +327,6 @@ function ResourceOverview(props) {
     return _getAddressFormat.apply(this, arguments);
   }
 
-  function getAlarmRiskData(_x2) {
-    return _getAlarmRiskData.apply(this, arguments);
-  } // 告警table列配置
-
-
-  function _getAlarmRiskData() {
-    _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
-
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) {
-          switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!isAppTopo) {
-                _context3.next = 9;
-                break;
-              }
-
-              _context3.next = 3;
-              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
-                id: id // metrics: topModelMetrics,
-
-              });
-
-            case 3:
-              _yield$resourceOvervi = _context3.sent;
-              alarmList = _yield$resourceOvervi.alarms;
-              alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
-                return {
-                  type: 'alarm',
-                  icon: 'gaojing-3',
-                  className: "alarm-color-icon-lv" + item.alertLevel,
-                  title: "[" + item.alertObject + "] " + item.alertTitle,
-                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                  time: item.createTime,
-                  status: item.status,
-                  params: [{
-                    alertId: item.alertId,
-                    status: 'dealing',
-                    userId: userId,
-                    isBaseAlert: false
-                  }]
-                };
-              })) || [];
-              setAlarmRiskList(alarmList);
-              _context3.next = 24;
-              break;
-
-            case 9:
-              _context3.next = 11;
-              return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
-                alertStatusList: ['toDeal', 'woDealing', 'dealing'],
-                // toDeal: 待处理, dealing：处理中
-                pageNum: 1,
-                pageSize: 10000,
-                sortField: 'alertLevel',
-                sortOrder: 'asc'
-              });
-
-            case 11:
-              _yield$alarmService$g = _context3.sent;
-              _alarmList2 = _yield$alarmService$g.datas;
-              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
-              _alarmList2 = _alarmList2.sort(function (a, b) {
-                return b.createTime - a.createTime;
-              });
-              _alarmList2 = _alarmList2.map(function (item) {
-                return {
-                  type: 'alarm',
-                  icon: 'gaojing-3',
-                  className: "alarm-color-icon-lv" + item.alertLevel,
-                  title: "" + item.alertObject + item.alertTitle,
-                  link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
-                  time: item.createTime,
-                  status: item.status,
-                  params: [{
-                    alertId: item.alertId,
-                    status: 'dealing',
-                    userId: userId,
-                    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, AllComponentsByCiId.map(function (item) {
-                  return item.id;
-                })),
-                statusList: ['toDeal', 'dealing'],
-                current: 1,
-                pageSize: 10000
-              });
-
-            case 20:
-              _yield$service$getRis = _context3.sent;
-              riskList = _yield$service$getRis.content;
-              riskList = riskList.map(function (item) {
-                return {
-                  type: 'risk',
-                  icon: 'Overall_risk_full',
-                  className: 'risk-icon',
-                  title: "" + item.ciName + item.itemName,
-                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.reportName,
-                  time: item.firstFoundTime
-                };
-              }); // console.log('告警和风险', alarmList, riskList);
-
-              setAlarmRiskList([].concat(_alarmList2, riskList));
-
-            case 24:
-            case "end":
-              return _context3.stop();
-          }
-        }
-      }, _callee3);
-    }));
-    return _getAlarmRiskData.apply(this, arguments);
-  }
-
   var columns = [{
     title: '描述',
     dataIndex: 'title',
@@ -507,31 +380,31 @@ function ResourceOverview(props) {
     }
   }]; // 告警/风险 操作 (受理)
 
-  function alarmRiskOperation(_x3, _x4) {
+  function alarmRiskOperation(_x2, _x3) {
     return _alarmRiskOperation.apply(this, arguments);
   }
 
   function _alarmRiskOperation() {
-    _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(type, params) {
+    _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(type, params) {
       var res;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!(type === 'alarm')) {
-                _context4.next = 6;
+                _context3.next = 6;
                 break;
               }
 
-              _context4.next = 3;
+              _context3.next = 3;
               return _overview["default"].handleAlarm(params);
 
             case 3:
-              res = _context4.sent;
+              res = _context3.sent;
 
               _message["default"].success('受理成功');
 
-              getAlarmRiskData(id); // if (isAppTopo) {
+              refreshAlarmData(id); // if (isAppTopo) {
               //   const {
               //     displayName: ciName,
               //     attributeMap: modelAttributeMap,
@@ -544,10 +417,10 @@ function ResourceOverview(props) {
 
             case 6:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
         }
-      }, _callee4);
+      }, _callee3);
     }));
     return _alarmRiskOperation.apply(this, arguments);
   }
@@ -557,40 +430,40 @@ function ResourceOverview(props) {
     ciType: ciType,
     type: type,
     // name: '123'
-    name: props.name
+    name: props.name ? props.name : props.resourceData.attributes.name
   }; // 基本信息设置改变
 
-  function baseInfoColChange(_x5) {
+  function baseInfoColChange(_x4) {
     return _baseInfoColChange.apply(this, arguments);
   } // 获取属性信息
 
 
   function _baseInfoColChange() {
-    _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(col) {
+    _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(col) {
       var _col;
 
       var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
 
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               if ((_col = col) !== null && _col !== void 0 && _col.length) {
-                _context5.next = 3;
+                _context4.next = 3;
                 break;
               }
 
               setBaseInfo([]);
-              return _context5.abrupt("return");
+              return _context4.abrupt("return");
 
             case 3:
               settBaseInfoInitLoading(true);
               infoData = [];
-              _context5.next = 7;
+              _context4.next = 7;
               return getAttribute(id);
 
             case 7:
-              attributeMap = _context5.sent;
+              attributeMap = _context4.sent;
               // console.log('getAttribute', attributeMap);
               col = col.filter(function (item) {
                 return !item.hidden;
@@ -599,15 +472,15 @@ function ResourceOverview(props) {
 
             case 10:
               if ((_step = _iterator()).done) {
-                _context5.next = 47;
+                _context4.next = 47;
                 break;
               }
 
               item = _step.value;
               value = (0, _attributeFormatter.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
               contentTitle = value;
-              _context5.t0 = item.dataIndex;
-              _context5.next = _context5.t0 === 'display_name' ? 17 : _context5.t0 === 'ciName' ? 21 : _context5.t0 === 'res_address' ? 24 : _context5.t0 === 'imageName' ? 31 : 35;
+              _context4.t0 = item.dataIndex;
+              _context4.next = _context4.t0 === 'display_name' ? 17 : _context4.t0 === 'ciName' ? 21 : _context4.t0 === 'res_address' ? 24 : _context4.t0 === 'imageName' ? 31 : 35;
               break;
 
             case 17:
@@ -621,19 +494,19 @@ function ResourceOverview(props) {
                 to: formatUrl(link)
               }, attributeMap.display_name || '-'));
               contentTitle = attributeMap.display_name || '-';
-              return _context5.abrupt("break", 36);
+              return _context4.abrupt("break", 36);
 
             case 21:
               value = ciTypeMeta.displayName;
               contentTitle = value;
-              return _context5.abrupt("break", 36);
+              return _context4.abrupt("break", 36);
 
             case 24:
-              _context5.next = 26;
+              _context4.next = 26;
               return getAddressFormat(attributeMap);
 
             case 26:
-              address = _context5.sent;
+              address = _context4.sent;
               owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
               if (owned_computer_room && owned_cabinet) {
@@ -652,16 +525,16 @@ function ResourceOverview(props) {
               }
 
               contentTitle = address;
-              return _context5.abrupt("break", 36);
+              return _context4.abrupt("break", 36);
 
             case 31:
               node = topo.getDataModel().getDataByTag(id);
               value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
               contentTitle = value;
-              return _context5.abrupt("break", 36);
+              return _context4.abrupt("break", 36);
 
             case 35:
-              return _context5.abrupt("break", 36);
+              return _context4.abrupt("break", 36);
 
             case 36:
               // 拿翻译字段属性数据
@@ -700,7 +573,7 @@ function ResourceOverview(props) {
               }));
 
             case 45:
-              _context5.next = 10;
+              _context4.next = 10;
               break;
 
             case 47:
@@ -709,58 +582,58 @@ function ResourceOverview(props) {
 
             case 49:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
         }
-      }, _callee5);
+      }, _callee4);
     }));
     return _baseInfoColChange.apply(this, arguments);
   }
 
-  function getAttribute(_x6) {
+  function getAttribute(_x5) {
     return _getAttribute.apply(this, arguments);
   } // 指标设置改变
 
 
   function _getAttribute() {
-    _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var _yield$resourceOvervi2, baseInfos, res, _ref3, attributes;
+    _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(id) {
+      var _yield$resourceOvervi, baseInfos, res, _ref3, attributes;
 
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               if (id) {
-                _context6.next = 2;
+                _context5.next = 2;
                 break;
               }
 
-              return _context6.abrupt("return");
+              return _context5.abrupt("return");
 
             case 2:
               if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
-                _context6.next = 9;
+                _context5.next = 9;
                 break;
               }
 
-              _context6.next = 5;
+              _context5.next = 5;
               return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
                 id: id
               });
 
             case 5:
-              _yield$resourceOvervi2 = _context6.sent;
-              baseInfos = _yield$resourceOvervi2.baseInfos;
+              _yield$resourceOvervi = _context5.sent;
+              baseInfos = _yield$resourceOvervi.baseInfos;
 
               if (!baseInfos) {
-                _context6.next = 9;
+                _context5.next = 9;
                 break;
               }
 
-              return _context6.abrupt("return", baseInfos);
+              return _context5.abrupt("return", baseInfos);
 
             case 9:
-              _context6.next = 11;
+              _context5.next = 11;
               return _overview["default"].commonQueryCiData({
                 condition: "id('" + id + "')",
                 refAttribute: true,
@@ -773,33 +646,33 @@ function ResourceOverview(props) {
               });
 
             case 11:
-              res = _context6.sent;
+              res = _context5.sent;
               _ref3 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref3.attributes;
-              return _context6.abrupt("return", attributes || {});
+              return _context5.abrupt("return", attributes || {});
 
             case 14:
             case "end":
-              return _context6.stop();
+              return _context5.stop();
           }
         }
-      }, _callee6);
+      }, _callee5);
     }));
     return _getAttribute.apply(this, arguments);
   }
 
-  function metricColChange(_x7) {
+  function metricColChange(_x6) {
     return _metricColChange.apply(this, arguments);
   }
 
   function _metricColChange() {
-    _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(col) {
+    _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(col) {
       var _col2, _col3;
 
       var codes, endTime, params, _ref4, times, metricList;
 
-      return _regenerator["default"].wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               // console.log('metricColChange col', col);
               col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
@@ -807,13 +680,13 @@ function ResourceOverview(props) {
               });
 
               if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
-                _context7.next = 4;
+                _context6.next = 4;
                 break;
               }
 
               setMetric([]); // Message.error('指标未设置')
 
-              return _context7.abrupt("return");
+              return _context6.abrupt("return");
 
             case 4:
               codes = col.map(function (item) {
@@ -838,11 +711,11 @@ function ResourceOverview(props) {
               }
 
               setMetricInitLoading(true);
-              _context7.next = 11;
+              _context6.next = 11;
               return _overview["default"].getMetricList(params);
 
             case 11:
-              metricList = _context7.sent;
+              metricList = _context6.sent;
 
               _rlog.rlog.debug('metricColChange', metricList, monitorMetricModels);
 
@@ -872,10 +745,10 @@ function ResourceOverview(props) {
 
             case 16:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
         }
-      }, _callee7);
+      }, _callee6);
     }));
     return _metricColChange.apply(this, arguments);
   }
@@ -989,12 +862,13 @@ function ResourceOverview(props) {
       ciAttrAndMetricData: ciAttrAndMetricData
     },
     data: metric,
-    loading: metricInitLoading
+    loading: metricInitLoading,
+    formatMetricLatestValue: resourceOverviewProps.formatMetricLatestValue
   })), /*#__PURE__*/_react["default"].createElement(_EventsCard["default"], {
     alarmRiskList: alarmRiskList,
     closeDetailDrawer: onClose,
     onHandleAlarm: function onHandleAlarm() {
-      getAlarmRiskData(id);
+      refreshAlarmData(id);
     }
   }));
 }