@riil-frontend/component-topology 5.0.0-alpha.9 → 5.0.2

package/lib/core/models/topoData.js

@@ -53,12 +53,12 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoId, template, layout, backgroundId, exportLinkIdList, globalConfig, serialize, resources, groups, viewGroupId, groupInfo, viewResources;
+    var 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, exportLinkIdList = data.exportLinkIdList, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, viewGroupId = data.viewGroupId;
+            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); // 保存布局
 
@@ -112,7 +112,11 @@ function _saveTopo() {
             _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
             _context.next = 15;
-            return _topo["default"].bindResourceToTopo(topoId, null, groupInfo, exportLinkIdList);
+            return _topo["default"].bindResourceToTopo(topoId, {
+              groups: groupInfo,
+              exportLinkIdList: exportLinkIdList,
+              relateTopoIdList: relateTopoIdList
+            });
 
           case 15:
             if (!serialize) {

package/lib/core/models/utils/linkUtils.js

@@ -7,6 +7,8 @@ exports.buildTopoLinkData = buildTopoLinkData;
 exports.getInterfaceObject = void 0;
 exports.getLinksDetail = getLinksDetail;
 exports.isAggLink = isAggLink;
+exports.isCrucialLink = isCrucialLink;
+exports.isExitLink = isExitLink;
 exports.mergeLinksData = mergeLinksData;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -31,6 +33,26 @@ var _services = require("../../services");
 //     displayName: "聚合接口",
 //   },
 // };
+
+/**
+ * 是否关键链路
+ * @param {*} link 
+ * @returns 
+ */
+function isCrucialLink(link) {
+  return !!link.attributes['network_link.is_crucial'];
+}
+/**
+ * 是否出口链路
+ * @param {*} link 
+ * @returns 
+ */
+
+
+function isExitLink(link) {
+  return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['network_link.destination_device_id']);
+}
+
 function isAggLink(link) {
   return link.attributes["network_link.connect_type"] === "agg";
 }

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

@@ -34,6 +34,9 @@ function _default(topo) {
       alarmDatas: [],
       alarmPanelIsOpen: false,
       risks: [],
+      // 风险
+      // 关联拓扑最高告警级别
+      relateTopoAlarm: {},
       currentTopoId: undefined
     },
     // 定义改变该模型状态的纯函数
@@ -57,7 +60,8 @@ function _default(topo) {
                       alarmDoc: {},
                       alarmList: [],
                       alarmRecord: [],
-                      risks: []
+                      risks: [],
+                      relateTopoAlarm: {}
                     });
 
                     return _context.abrupt("return", "resetAlarmDoc Over");

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

@@ -79,16 +79,16 @@ function _default(topoApp) {
                       params = {};
                     }
 
-                    _rlog["default"].debug("topoMod.init 初始化...", {
-                      params: params,
-                      rootState: rootState
-                    });
-
                     topoModState = rootState.topoMod; // 处理URL参数
 
                     type = params.type || "view";
                     id = params.id || topoModState.topoId || "";
 
+                    _rlog["default"].debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
+                      params: params,
+                      rootState: rootState
+                    });
+
                     _this.update({
                       viewState: type,
                       currentTopo: id ? {
@@ -447,7 +447,7 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
                     _context6.next = 41;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons() // topoApp.elementTagTipConfig.init(result), // 暂停新配置开发
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                     ]);
 
                   case 41:
@@ -642,31 +642,6 @@ function _default(topoApp) {
 
 
                   case 10:
-                    if (!topoPermission) {
-                      _context11.next = 19;
-                      break;
-                    }
-
-                    _context11.next = 13;
-                    return dispatch.functionAuth.checkAuth('createTopo');
-
-                  case 13:
-                    if (!_context11.sent) {
-                      _context11.next = 17;
-                      break;
-                    }
-
-                    _context11.t1 = 'delete';
-                    _context11.next = 18;
-                    break;
-
-                  case 17:
-                    _context11.t1 = 'read';
-
-                  case 18:
-                    topoPermission = _context11.t1;
-
-                  case 19:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -675,7 +650,7 @@ function _default(topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 21:
+                  case 12:
                   case "end":
                     return _context11.stop();
                 }

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

@@ -3,283 +3,73 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports["default"] = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _drawer = _interopRequireDefault(require("@alifd/next/lib/drawer"));
+exports["default"] = ResourceDetail;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(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"));
 
-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 ResourceDetail(props) {
-  var topo = props.topo,
-      canShow = props.canShow;
-
-  var _topo$store$useModel = topo.store.useModel('topoBaseInfoOverview'),
-      topoState = _topo$store$useModel[0],
-      topoDispatchers = _topo$store$useModel[1];
-
-  var _topo$store$useModelS = topo.store.useModelState('topoMod'),
-      topoId = _topo$store$useModelS.topoId,
-      topoModData = _topo$store$useModelS.data;
-
-  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);
-  (0, _react.useEffect)(function () {
-    var notifier = topo.view.topoClient.notifier;
-    notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
-    notifier.on('topo_element_click', changeOverview);
-    return function () {
-      notifier.off(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
-      notifier.off('topo_element_click', changeOverview); // 清除数据
-
-      topoDispatchers.update({
-        id: '',
-        metricCodes: []
-      });
-    };
-  }, [lock]); // 解决切换拓扑图隐藏概览
-
-  (0, _react.useEffect)(function () {
-    setVisible(false); // TODO 其他数据重置
-  }, [topoId]);
-
-  function getUser() {
-    return _getUser.apply(this, arguments);
-  } // select切换
-
-
-  function _getUser() {
-    _getUser = (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:
-              setUserId(function (prev) {
-                console.log('获取用户id', prev); // 如果已经获取过，就不再重新获取
-
-                if (!prev) {
-                  (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                    var res;
-                    return _regenerator["default"].wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            _context.next = 2;
-                            return _overview["default"].getUserId();
-
-                          case 2:
-                            res = _context.sent;
-                            setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
-
-                          case 4:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }))();
-                }
+  var _topo$viewProps, _topo$viewProps$topoC;
 
-                return prev;
-              });
-
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
+  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> */}
+
+  var tabBodys = [{
+    title: '资源概览',
+    content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+      userId: userId
+    }))
+  }, {
+    title: '集群成员',
+    content: /*#__PURE__*/_react["default"].createElement(_ClusterMemberTable["default"], {
+      data: resourceData,
+      topo: topo
+    }),
+    visible: !!resourceData.cluster
+  }, {
+    title: 'Web工作台',
+    content: /*#__PURE__*/_react["default"].createElement(_WebConsoleContainer["default"], {
+      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)
+  }].filter(function (item) {
+    return item.visible !== false;
+  });
+
+  if (tabBodys.length === 1) {
+    return /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
+      userId: userId,
+      style: {
+        overflowY: 'auto',
+        height: '100%'
+      }
     }));
-    return _getUser.apply(this, arguments);
   }
 
-  function onChangeActive(activeNode) {
-    activeNode && init((0, _extends2["default"])({}, activeNode, {
-      type: 'node'
-    }), 'select');
-  } // 单击切换
-
-
-  function changeOverview(node) {
-    var data = node.getAttrObject();
-    init(data, 'click');
-  }
-
-  function openOverviewByHtElement(element) {
-    openOverview(element.getAttrObject());
-  } // 双击打开
-
-
-  function openOverview(data) {
-    if (lock) {
-      init(data, 'doubleClick');
-    }
-  }
-
-  function init(data, targetType) {
-    console.log('初始化基本信息', data, targetType);
-    var id = data.id,
-        name = data.name,
-        type = data.type,
-        ciType = data.ciType,
-        ciName = data.ciName; // 仅展示资源和链路的概览
-
-    var resourceData = topo.dataModel.getDataById(id);
-
-    if (!resourceData) {
-      return;
-    }
-
-    var operation = resourceData.operation,
-        permission = resourceData.permission;
-    if ( // 没有权限不显示
-    !operation && !(permission !== null && permission !== void 0 && permission.readable) || // 没有citype不显示
-    !ciType) return;
-    var htElement = topo.getDataModel().getDataByTag(id);
-
-    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
-
-    getUser();
-  }
-
-  var renderContent = function renderContent() {
-    var _topo$viewProps, _topo$viewProps$viewe, _topo$viewProps$viewe2;
-
-    // {/* <Tab.Item title="操作" key="2">操作</Tab.Item>
-    //     <Tab.Item title="网络信息表" key="3">网络信息表</Tab.Item>
-    //     <Tab.Item title="Web工作台" key="4">Web工作台</Tab.Item> */}
-    var tabBodys = [{
-      title: '资源概览',
-      content: /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
-        userId: userId
-      }))
-    }, {
-      title: '集群成员',
-      content: /*#__PURE__*/_react["default"].createElement(_ClusterMemberTable["default"], {
-        data: resourceData,
-        topo: topo
-      }),
-      visible: resourceData.cluster
-    }, {
-      title: 'Web工作台',
-      content: /*#__PURE__*/_react["default"].createElement(_WebConsoleContainer["default"], {
-        data: resourceData,
-        topo: topo
-      }),
-      visible: (_topo$viewProps = topo.viewProps) === null || _topo$viewProps === void 0 ? void 0 : (_topo$viewProps$viewe = _topo$viewProps.viewerProps) === null || _topo$viewProps$viewe === void 0 ? void 0 : (_topo$viewProps$viewe2 = _topo$viewProps$viewe.topoContext) === null || _topo$viewProps$viewe2 === void 0 ? void 0 : _topo$viewProps$viewe2.isNetworkTopo
-    }].filter(function (item) {
-      return item.visible !== false;
-    });
-
-    if (tabBodys.length === 1) {
-      return /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
-        userId: userId,
-        style: {
-          overflowY: 'auto',
-          height: '100%'
-        }
-      }));
-    }
-
-    return /*#__PURE__*/_react["default"].createElement("div", {
-      className: _indexModule["default"].tabContainer
-    }, /*#__PURE__*/_react["default"].createElement(_FullheightTab["default"], {
-      className: _indexModule["default"].tab
-    }, tabBodys.map(function (item, key) {
-      return /*#__PURE__*/_react["default"].createElement(_FullheightTab["default"].Item, {
-        title: item.title,
-        key: item.title
-      }, item.content);
-    })));
-  };
-
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
-    className: _indexModule["default"].baseInfo,
-    closeMode: ['close', 'esc'],
-    visible: visible,
-    title: /*#__PURE__*/_react["default"].createElement(_DrawerTitle["default"], (0, _extends2["default"])({}, activeData, {
-      topo: topo,
-      onChange: onChangeActive
-    })),
-    width: 580,
-    hasMask: false,
-    onClose: function onClose() {
-      return setVisible(false);
-    }
-  }, visible && resourceData && renderContent()));
-}
-
-ResourceDetail.propTypes = {
-  canShow: _propTypes["default"].func
-};
-ResourceDetail.defaultProps = {
-  canShow: function canShow(htElement) {
-    return true;
-  }
-};
-var _default = ResourceDetail;
-exports["default"] = _default;
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: _indexModule["default"].tabContainer
+  }, /*#__PURE__*/_react["default"].createElement(_FullheightTab["default"], {
+    className: _indexModule["default"].tab
+  }, tabBodys.map(function (item, key) {
+    return /*#__PURE__*/_react["default"].createElement(_FullheightTab["default"].Item, {
+      title: item.title,
+      key: item.title
+    }, item.content);
+  })));
+}