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

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

package/es/core/models/topoData.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService, { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
+import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export function getLayoutId(layout) {
   if (!layout || typeof layout === "string") {
@@ -33,12 +33,12 @@ export function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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.debug("saveTopo", data); // 保存布局
 
             if (!(template && layout)) {

package/es/core/store/coreModels.js

@@ -11,6 +11,7 @@ import selection from "./models/selection"; // 显示模式
 
 import topoAlarm from "./models/topoAlarm";
 import displayConfig from "./models/displayConfig";
+import resourceDetail from "./models/viewer/resourceDetail";
 import topoBaseInfoOverview from "./models/topoBaseInfoOverview";
 import lock from "./models/viewer/lock";
 export default {
@@ -26,6 +27,7 @@ export default {
   // 显示模式
   topoAlarm: topoAlarm,
   displayConfig: displayConfig,
+  resourceDetail: resourceDetail,
   topoBaseInfoOverview: topoBaseInfoOverview,
   lock: lock
 };

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

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

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

@@ -177,7 +177,7 @@ export default function (topoApp) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return topoService.getConditions(topoApp.id);
+                    return topoApp.serverApi.getConditions(topoApp.id);
 
                   case 2:
                     data = _context.sent;
@@ -325,7 +325,7 @@ export default function (topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return topoService.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -391,7 +391,7 @@ export default function (topoApp) {
                     };
                     rlog.debug('saveGlobalConfig', config);
                     _context5.next = 5;
-                    return topoService.saveTopoSettings(topoApp.id, config);
+                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 
                   case 5:
                   case "end":
@@ -414,7 +414,9 @@ export default function (topoApp) {
                   case 0:
                     currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
-                    return _saveTopo(_extends({}, data, {
+                    return _saveTopo(_extends({
+                      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,
                       // 背景图
@@ -442,7 +444,7 @@ export default function (topoApp) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
                     _context7.next = 3;
-                    return topoService.addToBlocklist(topoId, ciIdList);
+                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":

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

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

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

@@ -0,0 +1,31 @@
+import _extends from "@babel/runtime/helpers/extends";
+
+/**
+ * 资源概览
+ */
+import rlog from '@riil-frontend/component-topology-utils/es/rlog';
+export default {
+  // 定义 model 的初始 state
+  state: {
+    visible: false,
+    id: null // 资源id
+
+  },
+  // 定义改变该模型状态的纯函数
+  reducers: {
+    update: function update(prevState, payload) {
+      return _extends({}, prevState, payload);
+    },
+    reset: function reset(prevState, payload) {
+      return {
+        visible: false,
+        id: null // 资源id
+
+      };
+    }
+  },
+  // 定义处理该模型副作用的函数
+  effects: function effects(dispatch) {
+    return {};
+  }
+};

package/es/core/utils/saveSerialize.js

@@ -1,12 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
+
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
  * @param {*} topo 
  */
-
 export default function saveSerialize(_x) {
   return _saveSerialize.apply(this, arguments);
 }
@@ -21,7 +20,7 @@ function _saveSerialize() {
             topoId = topo.getId();
             serialize = topo.getHtTopo().serialize();
             _context.next = 4;
-            return topoService.saveSerializeData(topoId, serialize);
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
           case 4:
           case "end":

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

@@ -11,10 +11,7 @@ export default 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.createElement(ResourceOverview, _extends({}, props, activeData, {
@@ -33,7 +30,7 @@ export default 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/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js

@@ -4,19 +4,16 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TopoEvent } from '@riil-frontend/component-topology-graph';
 import PropTypes from 'prop-types';
-import React, { useEffect, useId, useState } from 'react';
-import Tab from "../../../../../components/FullheightTab";
+import React, { useEffect, useMemo, useState } from 'react';
 import service from "../../../../services/overview";
-import ClusterMemberTable from "./components/ClusterMemberTable";
 import Title from "./components/DrawerTitle";
-import ResourceOverview from "./components/ResourceOverview";
-import WebConsole from "./components/WebConsole/WebConsoleContainer";
 import styles from "./index.module.scss";
 import ResourceDetail from "./ResourceDetail"; // 基本信息
 
 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],
@@ -29,26 +26,35 @@ function ResourceDetailDrawer(props) {
   var _topo$store$useModelS2 = topo.store.useModelState("lock"),
       lock = _topo$store$useModelS2.lock;
 
-  var _useState = useState(false),
-      visible = _useState[0],
-      setVisible = _useState[1];
-
-  var _useState2 = useState({
-    id: '',
-    name: '',
-    type: '',
-    // 类型： node、link
-    ciType: '',
-    ciName: ''
-  }),
-      activeData = _useState2[0],
-      setActiveData = _useState2[1];
-
-  var _useState3 = 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 = 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 = useState(''),
+      userId = _useState[0],
+      setUserId = _useState[1];
+
   useEffect(function () {
     var notifier = topo.view.topoClient.notifier;
     notifier.on(TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
@@ -62,10 +68,17 @@ function ResourceDetailDrawer(props) {
         metricCodes: []
       });
     };
-  }, [lock]); // 解决切换拓扑图隐藏概览
+  }, [lock]);
+  useEffect(function () {
+    return function () {
+      resourceDetailDispatchers.reset();
+    };
+  }, []); // 解决切换拓扑图隐藏概览
 
   useEffect(function () {
-    setVisible(false); // TODO 其他数据重置
+    resourceDetailDispatchers.update({
+      visible: false
+    }); // TODO 其他数据重置
   }, [topoId]);
 
   function getUser() {
@@ -164,28 +177,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.createElement(ResourceDetail, _extends({}, 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;
+    }
+
+    return /*#__PURE__*/React.createElement(ResourceDetailWidget, _extends({}, props, {
       topo: topo,
-      userId: useId,
+      userId: userId,
       activeData: activeData,
       resourceData: resourceData
     }));
@@ -202,7 +229,9 @@ function ResourceDetailDrawer(props) {
     width: 580,
     hasMask: false,
     onClose: function onClose() {
-      return setVisible(false);
+      return resourceDetailDispatchers.update({
+        visible: false
+      });
     }
   }, visible && resourceData && renderContent()));
 }

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

@@ -0,0 +1,136 @@
+import _Message from "@alifd/next/es/message";
+import _Table from "@alifd/next/es/table";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _Button from "@alifd/next/es/button";
+import _Icon from "@alifd/next/es/icon";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import React from 'react';
+import moment from 'moment';
+import BlockBox from "./BlockBox";
+import Link from "../../../../../../../components/Link";
+import service from "../../../../../../services/overview";
+import styles from "./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.createElement("div", {
+        className: styles['alarm-title'],
+        title: value,
+        onClick: closeDetailDrawer
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: record.icon,
+        size: "xs",
+        className: styles['alarm-color-icon'] + " " + record.className
+      }), /*#__PURE__*/React.createElement(Link, {
+        className: styles.link,
+        to: formatUrl(record.link)
+      }, value));
+    }
+  }, {
+    title: '时间',
+    dataIndex: 'time',
+    key: 'time',
+    width: 144,
+    cell: function cell(value, index, record) {
+      return /*#__PURE__*/React.createElement("div", {
+        title: moment(value).format('YYYY-MM-DD HH:mm:ss')
+      }, moment(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.createElement(_Button, {
+          text: true,
+          type: "primary",
+          onClick: function onClick() {
+            return alarmRiskOperation(record.type, record.params);
+          }
+        }, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
+          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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(type, params) {
+      var res;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(type === 'alarm')) {
+                _context.next = 6;
+                break;
+              }
+
+              _context.next = 3;
+              return service.handleAlarm(params);
+
+            case 3:
+              res = _context.sent;
+
+              _Message.success('受理成功');
+
+              onHandleAlarm();
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _alarmRiskOperation.apply(this, arguments);
+  }
+
+  return /*#__PURE__*/React.createElement(BlockBox, {
+    headerTitle: "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: styles.alarm
+  }, /*#__PURE__*/React.createElement(_Table, {
+    hasBorder: false,
+    fixedHeader: true,
+    columns: columns,
+    maxBodyHeight: "auto",
+    dataSource: alarmRiskList,
+    emptyContent: /*#__PURE__*/React.createElement("div", {
+      className: styles['no-data']
+    }, "\u6682\u65E0\u6570\u636E")
+  })));
+}
+
+export default EventsCard;

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

@@ -1,5 +1,4 @@
 import _Message from "@alifd/next/es/message";
-import _Table from "@alifd/next/es/table";
 import _extends from "@babel/runtime/helpers/extends";
 import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
@@ -28,7 +27,8 @@ import useCiAttrAndMetricData from "./useCiAttrAndMetricData";
 import Configurator from "./components/Configurator";
 import { formatMetric } from "../../../../../../models/attributeFormatter";
 import LinkTopoCard from "./components/LinkTopo/LinkTopoCard";
-import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog'; // url 处理，UICBB 的地址需截取前缀
+import { rlog } from '@riil-frontend/component-topology-utils/lib/rlog';
+import EventsCard from "./EventsCard"; // url 处理，UICBB 的地址需截取前缀
 
 function formatUrl(url) {
   var _window, _window$location;
@@ -943,18 +943,11 @@ export default function ResourceOverview(props) {
     },
     data: metric,
     loading: metricInitLoading
-  })), /*#__PURE__*/React.createElement(BlockBox, {
-    headerTitle: "\u6700\u8FD1\u7684\u544A\u8B66\u548C\u98CE\u9669"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: styles.alarm
-  }, /*#__PURE__*/React.createElement(_Table, {
-    hasBorder: false,
-    fixedHeader: true,
-    columns: columns,
-    maxBodyHeight: "auto",
-    dataSource: alarmRiskList,
-    emptyContent: /*#__PURE__*/React.createElement("div", {
-      className: styles['no-data']
-    }, "\u6682\u65E0\u6570\u636E")
-  }))));
+  })), /*#__PURE__*/React.createElement(EventsCard, {
+    alarmRiskList: alarmRiskList,
+    closeDetailDrawer: onClose,
+    onHandleAlarm: function onHandleAlarm() {
+      getAlarmRiskData(id);
+    }
+  }));
 }

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

@@ -120,7 +120,7 @@ export default 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