@riil-frontend/component-topology 7.0.0-dev.1 → 7.0.0-dev.10

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

package/lib/core/models/topoData.js

@@ -13,14 +13,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-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); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function getLayoutId(layout) {
   if (!layout || typeof layout === "string") {
     return layout;
@@ -53,12 +49,12 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+            topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
 
             _rlog["default"].debug("saveTopo", data); // 保存布局
 
@@ -69,7 +65,7 @@ function _saveTopo() {
             }
 
             _context.next = 5;
-            return _topo["default"].changeLayout({
+            return topoService.changeLayout({
               id: topoId,
               template: template,
               layout: getLayoutId(layout),
@@ -83,7 +79,7 @@ function _saveTopo() {
             }
 
             _context.next = 8;
-            return _topo["default"].saveTopoSettings(topoId, globalConfig);
+            return topoService.saveTopoSettings(topoId, globalConfig);
 
           case 8:
             if (!(resources || groups)) {
@@ -112,7 +108,7 @@ function _saveTopo() {
             _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
             _context.next = 15;
-            return _topo["default"].bindResourceToTopo(topoId, {
+            return topoService.bindResourceToTopo(topoId, {
               groups: groupInfo,
               exportLinkIdList: exportLinkIdList,
               relateTopoIdList: relateTopoIdList
@@ -125,7 +121,7 @@ function _saveTopo() {
             }
 
             _context.next = 18;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topoService.saveSerializeData(topoId, serialize);
 
           case 18:
           case "end":

package/lib/core/store/coreModels.js

@@ -27,6 +27,8 @@ var _topoAlarm = _interopRequireDefault(require("./models/topoAlarm"));
 
 var _displayConfig = _interopRequireDefault(require("./models/displayConfig"));
 
+var _resourceDetail = _interopRequireDefault(require("./models/viewer/resourceDetail"));
+
 var _topoBaseInfoOverview = _interopRequireDefault(require("./models/topoBaseInfoOverview"));
 
 var _lock = _interopRequireDefault(require("./models/viewer/lock"));
@@ -46,6 +48,7 @@ var _default = {
   // 显示模式
   topoAlarm: _topoAlarm["default"],
   displayConfig: _displayConfig["default"],
+  resourceDetail: _resourceDetail["default"],
   topoBaseInfoOverview: _topoBaseInfoOverview["default"],
   lock: _lock["default"]
 };

package/lib/core/store/models/selection.js

@@ -20,7 +20,9 @@ var _default = {
   // 定义 model 的初始 state
   state: {
     selection: [],
-    selectionIds: []
+    selectionIds: [],
+    initSelectionId: null // 初始化选中元素
+
   },
   // 定义改变该模型状态的纯函数
   reducers: {

package/lib/core/store/models/topoConfig.js

@@ -197,7 +197,7 @@ function _default(topoApp) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return _topo["default"].getConditions(topoApp.id);
+                    return topoApp.serverApi.getConditions(topoApp.id);
 
                   case 2:
                     data = _context.sent;
@@ -347,7 +347,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -415,7 +415,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('saveGlobalConfig', config);
 
                     _context5.next = 5;
-                    return _topo["default"].saveTopoSettings(topoApp.id, config);
+                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 
                   case 5:
                   case "end":
@@ -438,7 +438,9 @@ function _default(topoApp) {
                   case 0:
                     currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
-                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({}, data, {
+                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({
+                      topoService: topoApp.serverApi
+                    }, data, {
                       viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图
@@ -466,7 +468,7 @@ function _default(topoApp) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
                     _context7.next = 3;
-                    return _topo["default"].addToBlocklist(topoId, ciIdList);
+                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":

package/lib/core/store/models/topoMod.js

@@ -417,7 +417,7 @@ function _default(topoApp) {
 
                   case 29:
                     _context6.next = 31;
-                    return topoApp.options.loadData(topoId);
+                    return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                   case 31:
                     result = _context6.sent;

package/lib/core/store/models/viewer/resourceDetail.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
+
+/**
+ * 资源概览
+ */
+var _default = {
+  // 定义 model 的初始 state
+  state: {
+    visible: false,
+    id: null // 资源id
+
+  },
+  // 定义改变该模型状态的纯函数
+  reducers: {
+    update: function update(prevState, payload) {
+      return (0, _extends2["default"])({}, prevState, payload);
+    },
+    reset: function reset(prevState, payload) {
+      return {
+        visible: false,
+        id: null // 资源id
+
+      };
+    }
+  },
+  // 定义处理该模型副作用的函数
+  effects: function effects(dispatch) {
+    return {};
+  }
+};
+exports["default"] = _default;

package/lib/core/utils/saveSerialize.js

@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
@@ -30,7 +28,7 @@ function _saveSerialize() {
             topoId = topo.getId();
             serialize = topo.getHtTopo().serialize();
             _context.next = 4;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
           case 4:
           case "end":

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

@@ -25,10 +25,7 @@ function ResourceDetail(props) {
   var topo = props.topo,
       userId = props.userId,
       activeData = props.activeData,
-      resourceData = props.resourceData; // {/* <Tab.Item title="操作" key="2">操作</Tab.Item>
-  //     <Tab.Item title="网络信息表" key="3">网络信息表</Tab.Item>
-  //     <Tab.Item title="Web工作台" key="4">Web工作台</Tab.Item> */}
-
+      resourceData = props.resourceData;
   var tabBodys = [{
     title: '资源概览',
     content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
@@ -47,7 +44,7 @@ function ResourceDetail(props) {
       data: resourceData,
       topo: topo
     }),
-    visible: activeData.type === 'node' && !!((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && (_topo$viewProps$topoC = _topo$viewProps.topoContext) !== null && _topo$viewProps$topoC !== void 0 && _topo$viewProps$topoC.isNetworkTopo)
+    visible: resourceData.type === 'node' && !!((_topo$viewProps = topo.viewProps) !== null && _topo$viewProps !== void 0 && (_topo$viewProps$topoC = _topo$viewProps.topoContext) !== null && _topo$viewProps$topoC !== void 0 && _topo$viewProps$topoC.isNetworkTopo)
   }].filter(function (item) {
     return item.visible !== false;
   });

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

@@ -19,18 +19,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _FullheightTab = _interopRequireDefault(require("../../../../../components/FullheightTab"));
-
 var _overview = _interopRequireDefault(require("../../../../services/overview"));
 
-var _ClusterMemberTable = _interopRequireDefault(require("./components/ClusterMemberTable"));
-
 var _DrawerTitle = _interopRequireDefault(require("./components/DrawerTitle"));
 
-var _ResourceOverview = _interopRequireDefault(require("./components/ResourceOverview"));
-
-var _WebConsoleContainer = _interopRequireDefault(require("./components/WebConsole/WebConsoleContainer"));
-
 var _indexModule = _interopRequireDefault(require("./index.module.scss"));
 
 var _ResourceDetail = _interopRequireDefault(require("./ResourceDetail"));
@@ -42,7 +34,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 基本信息
 function ResourceDetailDrawer(props) {
   var topo = props.topo,
-      canShow = props.canShow;
+      canShow = props.canShow,
+      viewerProps = props.viewerProps;
 
   var _topo$store$useModel = topo.store.useModel('topoBaseInfoOverview'),
       topoState = _topo$store$useModel[0],
@@ -55,26 +48,35 @@ function ResourceDetailDrawer(props) {
   var _topo$store$useModelS2 = topo.store.useModelState("lock"),
       lock = _topo$store$useModelS2.lock;
 
-  var _useState = (0, _react.useState)(false),
-      visible = _useState[0],
-      setVisible = _useState[1];
-
-  var _useState2 = (0, _react.useState)({
-    id: '',
-    name: '',
-    type: '',
-    // 类型： node、link
-    ciType: '',
-    ciName: ''
-  }),
-      activeData = _useState2[0],
-      setActiveData = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(''),
-      userId = _useState3[0],
-      setUserId = _useState3[1];
-
-  var resourceData = topo.dataModel.useDataById(activeData.id);
+  var _topo$store$useModel2 = topo.store.useModel('resourceDetail'),
+      resourceDetailState = _topo$store$useModel2[0],
+      resourceDetailDispatchers = _topo$store$useModel2[1];
+
+  var visible = resourceDetailState.visible,
+      id = resourceDetailState.id;
+  var resourceData = topo.dataModel.useDataById(id);
+  var activeData = (0, _react.useMemo)(function () {
+    return resourceData ? {
+      id: resourceData.id,
+      name: resourceData.name,
+      type: resourceData.type === 'node' ? 'node' : 'link',
+      // 类型： node、link
+      ciType: resourceData.ciType,
+      ciName: resourceData.ciName
+    } : {
+      id: '',
+      name: '',
+      type: '',
+      // 类型： node、link
+      ciType: '',
+      ciName: ''
+    };
+  }, [resourceData]);
+
+  var _useState = (0, _react.useState)(''),
+      userId = _useState[0],
+      setUserId = _useState[1];
+
   (0, _react.useEffect)(function () {
     var notifier = topo.view.topoClient.notifier;
     notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
@@ -88,10 +90,17 @@ function ResourceDetailDrawer(props) {
         metricCodes: []
       });
     };
-  }, [lock]); // 解决切换拓扑图隐藏概览
+  }, [lock]);
+  (0, _react.useEffect)(function () {
+    return function () {
+      resourceDetailDispatchers.reset();
+    };
+  }, []); // 解决切换拓扑图隐藏概览
 
   (0, _react.useEffect)(function () {
-    setVisible(false); // TODO 其他数据重置
+    resourceDetailDispatchers.update({
+      visible: false
+    }); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -190,28 +199,42 @@ function ResourceDetailDrawer(props) {
 
     if (!canShow(htElement)) {
       return;
-    }
+    } // 显示隐藏
 
-    setActiveData({
-      id: id,
-      name: name,
-      type: {
-        linkGroup: 'link',
-        group: 'node'
-      }[type] || type,
-      ciType: ciType,
-      ciName: ciName
-    }); // 显示隐藏
 
-    targetType === 'doubleClick' && setVisible(true); // userId
+    if (targetType === 'doubleClick') {
+      resourceDetailDispatchers.update({
+        visible: true,
+        id: id
+      });
+    } else {
+      resourceDetailDispatchers.update({
+        id: id
+      });
+    } // userId
+
 
     getUser();
   }
 
   var renderContent = function renderContent() {
-    return /*#__PURE__*/_react["default"].createElement(_ResourceDetail["default"], (0, _extends2["default"])({}, props, {
+    // 支持自定义概览
+    var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps) || {},
+        getResourceDetail = _ref.getResourceDetail;
+
+    var ResourceDetailWidget;
+
+    if (getResourceDetail) {
+      ResourceDetailWidget = getResourceDetail(resourceData);
+    }
+
+    if (!ResourceDetailWidget) {
+      ResourceDetailWidget = _ResourceDetail["default"];
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(ResourceDetailWidget, (0, _extends2["default"])({}, props, {
       topo: topo,
-      userId: _react.useId,
+      userId: userId,
       activeData: activeData,
       resourceData: resourceData
     }));
@@ -228,7 +251,9 @@ function ResourceDetailDrawer(props) {
     width: 580,
     hasMask: false,
     onClose: function onClose() {
-      return setVisible(false);
+      return resourceDetailDispatchers.update({
+        visible: false
+      });
     }
   }, visible && resourceData && renderContent()));
 }

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

@@ -0,0 +1,156 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
+
+var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
+
+var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _moment = _interopRequireDefault(require("moment"));
+
+var _BlockBox = _interopRequireDefault(require("./BlockBox"));
+
+var _Link = _interopRequireDefault(require("../../../../../../../components/Link"));
+
+var _overview = _interopRequireDefault(require("../../../../../../services/overview"));
+
+var _indexModule = _interopRequireDefault(require("./index.module.scss"));
+
+// url 处理，UICBB 的地址需截取前缀
+function formatUrl(url) {
+  var _window, _window$location;
+
+  var prefix = '/default/pagecenter';
+
+  if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
+    return url.split(prefix)[1];
+  } else {
+    return url;
+  }
+}
+
+function EventsCard(props) {
+  var alarmRiskList = props.alarmRiskList,
+      closeDetailDrawer = props.closeDetailDrawer,
+      onHandleAlarm = props.onHandleAlarm; // 告警table列配置
+
+  var columns = [{
+    title: '描述',
+    dataIndex: 'title',
+    key: 'title',
+    cell: function cell(value, index, record) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: _indexModule["default"]['alarm-title'],
+        title: value,
+        onClick: closeDetailDrawer
+      }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: record.icon,
+        size: "xs",
+        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
+      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        className: _indexModule["default"].link,
+        to: formatUrl(record.link)
+      }, value));
+    }
+  }, {
+    title: '时间',
+    dataIndex: 'time',
+    key: 'time',
+    width: 144,
+    cell: function cell(value, index, record) {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
+      }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
+    }
+  }, {
+    title: '操作',
+    dataIndex: 'status',
+    key: 'status',
+    width: 64,
+    cell: function cell(status, index, record) {
+      if (record.type === 'alarm') {
+        return status === 'toDeal' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
+          text: true,
+          type: "primary",
+          onClick: function onClick() {
+            return alarmRiskOperation(record.type, record.params);
+          }
+        }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
+          disabled: true,
+          text: true,
+          type: "primary"
+        }, "\u5DF2\u53D7\u7406");
+      } else {
+        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+        return '';
+      }
+    }
+  }]; // 告警/风险 操作 (受理)
+
+  function alarmRiskOperation(_x, _x2) {
+    return _alarmRiskOperation.apply(this, arguments);
+  }
+
+  function _alarmRiskOperation() {
+    _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(type, params) {
+      var res;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(type === 'alarm')) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 3;
+              return _overview["default"].handleAlarm(params);
+
+            case 3:
+              res = _context.sent;
+
+              _message["default"].success('受理成功');
+
+              onHandleAlarm();
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _alarmRiskOperation.apply(this, arguments);
+  }
+
+  return /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
+    headerTitle: "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].alarm
+  }, /*#__PURE__*/_react["default"].createElement(_table["default"], {
+    hasBorder: false,
+    fixedHeader: true,
+    columns: columns,
+    maxBodyHeight: "auto",
+    dataSource: alarmRiskList,
+    emptyContent: /*#__PURE__*/_react["default"].createElement("div", {
+      className: _indexModule["default"]['no-data']
+    }, "\u6682\u65E0\u6570\u636E")
+  })));
+}
+
+var _default = EventsCard;
+exports["default"] = _default;

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

@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _message = _interopRequireDefault(require("@alifd/next/lib/message"));
 
-var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
@@ -51,6 +49,8 @@ var _LinkTopoCard = _interopRequireDefault(require("./components/LinkTopo/LinkTo
 
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -978,18 +978,11 @@ function ResourceOverview(props) {
     },
     data: metric,
     loading: metricInitLoading
-  })), /*#__PURE__*/_react["default"].createElement(_BlockBox["default"], {
-    headerTitle: "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: _indexModule["default"].alarm
-  }, /*#__PURE__*/_react["default"].createElement(_table["default"], {
-    hasBorder: false,
-    fixedHeader: true,
-    columns: columns,
-    maxBodyHeight: "auto",
-    dataSource: alarmRiskList,
-    emptyContent: /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"]['no-data']
-    }, "\u6682\u65E0\u6570\u636E")
-  }))));
+  })), /*#__PURE__*/_react["default"].createElement(_EventsCard["default"], {
+    alarmRiskList: alarmRiskList,
+    closeDetailDrawer: onClose,
+    onHandleAlarm: function onHandleAlarm() {
+      getAlarmRiskData(id);
+    }
+  }));
 }

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

@@ -138,7 +138,7 @@ function ResourceOverviewMetric(props) {
         padding: 0,
         appendPadding: [2, 0],
         smooth: true,
-        tooltip: false,
+        tooltip: true,
         line: {
           color: "l(0) 0:" + hexToRgb(rgbToHex(color).hex, 0.05).rgba + " 0.5:" + color + " 1:" + color,
           size: 2