@riil-frontend/component-topology 2.15.42 → 2.15.45

package/lib/core/viewer/contextmenu/buildNodeContextmenu.js

@@ -11,70 +11,71 @@ function buildNodeContextmenu(topoApp) {
   return {
     enable: true,
     items: [// {
-    //   label: '概览',
-    //   id: 'Resource.detail',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
-    //   visible: (data) => {
-    //     return isResource(data) && !!data.operation;
-    //   }
-    // },
-    {
-      label: 'Web控制台',
-      icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
-      visible: function visible(data) {
-        return isResource(data) && !!data.operation;
-      },
-      items: [{
-        label: '访问',
-        id: 'Resource.WebConsole.open',
-        disable: function disable(data) {
-          var resourceWebControllUrl = topoApp.pluginManager.pluginMap.resourceWebControllUrl;
-          return !resourceWebControllUrl.getResourceUrl(data.id);
-        }
-      }, {
-        label: '设置',
-        id: 'Resource.WebConsole.setting'
-      }]
-    } // {
-    //   label: '资源操作',
-    //   id: 'Resource.Operate',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // {
-    //   label: 'Syslog',
-    //   id: 'Resource.Syslog',
-    //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
-    //   visible: (data) => {
-    //     if (!isResource(data)) {
-    //       return false;
-    //     }
-    //     const {ciType} = data;
-    //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
-    //     if (!ciMeta) {
-    //       return false;
-    //     }
-    //     const {domain} = ciMeta;
-    //     // 是否有该页签，与资源详情保持一致
-    //     const hasTab = domain === 'network' || domain === 'server';
-    //     return !!data.operation && hasTab;
-    //   }
-    // },
-    // { label: '打开属性设置', id: 'openSet' },
-    // { label: '打开全局属性设置', id: 'openAllSet' },
+      //   label: '概览',
+      //   id: 'Resource.detail',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_overview.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   }
+      // },
+      // {
+      //   label: 'Web控制台',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_webconsole.svg',
+      //   visible: (data) => {
+      //     return isResource(data) && !!data.operation;
+      //   },
+      //   items: [
+      //     {
+      //       label: '访问',
+      //       id: 'Resource.WebConsole.open',
+      //       disable: (data) => {
+      //         const {resourceWebControllUrl} = topoApp.pluginManager.pluginMap;
+      //         return !resourceWebControllUrl.getResourceUrl(data.id)
+      //       },
+      //     },
+      //     { label: '设置', id: 'Resource.WebConsole.setting' },
+      //   ]
+      // },
+      // {
+      //   label: '资源操作',
+      //   id: 'Resource.Operate',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_operands.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // {
+      //   label: 'Syslog',
+      //   id: 'Resource.Syslog',
+      //   icon: '/img/topo/contextmenu/Topology_resources_menu_icon_syslog.svg',
+      //   visible: (data) => {
+      //     if (!isResource(data)) {
+      //       return false;
+      //     }
+      //     const {ciType} = data;
+      //     const ciMeta = topoApp.ciTyeCache.getCiType(ciType);
+      //     if (!ciMeta) {
+      //       return false;
+      //     }
+      //     const {domain} = ciMeta;
+      //     // 是否有该页签，与资源详情保持一致
+      //     const hasTab = domain === 'network' || domain === 'server';
+      //     return !!data.operation && hasTab;
+      //   }
+      // },
+      // { label: '打开属性设置', id: 'openSet' },
+      // { label: '打开全局属性设置', id: 'openAllSet' },
     ]
   };
 }

package/lib/createTopo.js

@@ -8,7 +8,7 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _createTopoApp = require("./core/models/createTopoApp");
+var _createTopoApp = require("./core/createTopoApp");
 
 var _createMenuCommands = _interopRequireDefault(require("./contextmenu/createMenuCommands"));
 

package/lib/hooks/useAlarm.js

@@ -39,9 +39,7 @@ function useAlarm(options) {
 
   var _store$useModel2 = store.useModel("topoBizMod"),
       bizState = _store$useModel2[0],
-      bizDispatchers = _store$useModel2[1];
-
-  var linkDynamicStyleDispatcher = store.getModel("linkDynamicStyle")[1]; // rlog.debug(
+      bizDispatchers = _store$useModel2[1]; // rlog.debug(
   //   "useAlarm.useEffect 获取初始化告警----------init",
   //   topo,
   //   allData,
@@ -76,6 +74,7 @@ function useAlarm(options) {
   //   };
   // }, [alarmIsOpened]);
 
+
   function getAlarmByEE(_x) {
     return _getAlarmByEE.apply(this, arguments);
   }
@@ -127,9 +126,7 @@ function useAlarm(options) {
               _rlog["default"].debug("useAlarm.getAlarmByEE 推送告警到ht", alarmList, bizState);
 
               if (alarmIsOpened) {
-                topo.loadAlarm(alarmList); // 告警变化后，刷新链路动态样式
-
-                linkDynamicStyleDispatcher.execute();
+                topo.loadAlarm(alarmList);
               }
 
             case 12:

package/lib/hooks/useResourceConfig.js

@@ -24,7 +24,7 @@ var _htElementUtils = require("../utils/htElementUtils");
 function _default(props) {
   var topo = props.topo;
   var store = topo.store;
-  var editDispatchers = store.useModelDispatchers('topoCreateMod');
+  var editDispatchers = store.useModelDispatchers('topoConfig');
 
   var loadConfig = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {

package/lib/hooks/useTopoEdit.js

@@ -59,7 +59,7 @@ var useTopoEdit = function useTopoEdit(params) {
       topoEditState = _store$useModel[0],
       topoEditDispatchers = _store$useModel[1];
 
-  var _store$useModel2 = store.useModel('topoCreateMod'),
+  var _store$useModel2 = store.useModel('topoConfig'),
       editState = _store$useModel2[0],
       editDispatchers = _store$useModel2[1];
 
@@ -128,9 +128,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
     if (!isLayerTopo && config.layers.length) {
-      topoDispatchers.update({
-        type: _template.TPL_TREE
-      });
+      topoDispatchers.setTopoType(_template.TPL_TREE);
     } // 更新配置
 
 
@@ -150,9 +148,7 @@ var useTopoEdit = function useTopoEdit(params) {
 
 
     if (!config.layers.length) {
-      topoDispatchers.update({
-        type: _template.TPL_BLANK
-      });
+      topoDispatchers.setTopoType(_template.TPL_BLANK);
     } // 更新配置
 
 
@@ -957,7 +953,7 @@ var useTopoEdit = function useTopoEdit(params) {
     }
   };
 
-  var effectsState = store.useModelEffectsState('topoCreateMod');
+  var effectsState = store.useModelEffectsState('topoConfig');
   var topoLoading = effectsState.getTopoByConditions.isLoading;
   return {
     resourceConfig: resourceConfig,

package/lib/models/{iconManage.js → customIcon.js}

@@ -177,7 +177,7 @@ function _default(engine) {
                     _this3.update({
                       visible: false,
                       icons: {
-                        node: [].concat(rootState.iconManage.icons.node, data.map(addIconUrlData)),
+                        node: [].concat(rootState.customIcon.icons.node, data.map(addIconUrlData)),
                         container: []
                       }
                     });

package/lib/models/topoBizMod.js

@@ -83,105 +83,75 @@ function _default(engine) {
             }, _callee);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
-          var _this2 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var result;
-            return _regenerator["default"].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return (0, _model.getCiMeta)(conditions);
-
-                  case 2:
-                    result = _context2.sent;
-
-                    // rlog.debug('getCiInfo', result);
-                    _this2.update({
-                      // alarmList: result.datas,
-                      currentCiInfo: result // drawerAlarmPageInfo,
-
-                    });
-
-                  case 4:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }))();
-        },
         // 根据ci的id获取属性的值
         getCiArrByIds: function getCiArrByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
             var resIdsList, result;
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
+            return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) {
-                switch (_context3.prev = _context3.next) {
+                switch (_context2.prev = _context2.next) {
                   case 0:
                     resIdsList = state.topoBizMod.resAndMetrics.resIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList);
                     // const ciIds = encodeURIComponent(resIdsList);
 
-                    _context3.prev = 1;
-                    _context3.next = 4;
+                    _context2.prev = 1;
+                    _context2.next = 4;
                     return _topo["default"].getBatchCiArr({
                       ids: resIdsList
                     });
 
                   case 4:
-                    result = _context3.sent;
-                    return _context3.abrupt("return", result.content);
+                    result = _context2.sent;
+                    return _context2.abrupt("return", result.content);
 
                   case 8:
-                    _context3.prev = 8;
-                    _context3.t0 = _context3["catch"](1);
-                    return _context3.abrupt("return", null);
+                    _context2.prev = 8;
+                    _context2.t0 = _context2["catch"](1);
+                    return _context2.abrupt("return", null);
 
                   case 11:
                   case "end":
-                    return _context3.stop();
+                    return _context2.stop();
                 }
               }
-            }, _callee3, null, [[1, 8]]);
+            }, _callee2, null, [[1, 8]]);
           }))();
         },
         // 初始化，统一获取指标和属性
         getCiBizByIds: function getCiBizByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
             var _conditions$ciIds, _conditions$codes;
 
             var _state$topoBizMod$res, resIdsList, metrics, ciIds, codes, metricResult, arrResult;
 
-            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:
                     _state$topoBizMod$res = state.topoBizMod.resAndMetrics, resIdsList = _state$topoBizMod$res.resIdsList, metrics = _state$topoBizMod$res.metrics;
                     ciIds = encodeURIComponent((_conditions$ciIds = conditions === null || conditions === void 0 ? void 0 : conditions.ciIds) !== null && _conditions$ciIds !== void 0 ? _conditions$ciIds : resIdsList);
                     codes = encodeURIComponent((_conditions$codes = conditions === null || conditions === void 0 ? void 0 : conditions.codes) !== null && _conditions$codes !== void 0 ? _conditions$codes : metrics);
-                    _context4.next = 5;
+                    _context3.next = 5;
                     return (0, _metric.getLatestMetrics)(ciIds, codes);
 
                   case 5:
-                    metricResult = _context4.sent;
-                    _context4.next = 8;
+                    metricResult = _context3.sent;
+                    _context3.next = 8;
                     return _topo["default"].getBatchCiArr(ciIds);
 
                   case 8:
-                    arrResult = _context4.sent;
-                    return _context4.abrupt("return", {
+                    arrResult = _context3.sent;
+                    return _context3.abrupt("return", {
                       metricResult: metricResult,
                       arrResult: arrResult
                     });
 
                   case 10:
                   case "end":
-                    return _context4.stop();
+                    return _context3.stop();
                 }
               }
-            }, _callee4);
+            }, _callee3);
           }))();
         },
 

package/lib/models/{topoCreateMod.js → topoConfig.js}

@@ -33,6 +33,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+/**
+ * 拓扑配置
+ */
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
     group = _template.DEFAULT_GROUP;
@@ -266,7 +269,7 @@ function _default(topoApp) {
               while (1) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
-                    editState = rootState.topoCreateMod;
+                    editState = rootState.topoConfig;
                     resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
                     query = {
                       id: rootState.topoMod.topoId,
@@ -355,7 +358,7 @@ function _default(topoApp) {
                     _rlog["default"].debug("getTopoByConditions--------", data, groupInfo);
 
                     _context4.next = 13;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 13:
                     _yield$Promise$all = _context4.sent;
@@ -423,7 +426,7 @@ function _default(topoApp) {
           var _this5 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
-            var _state$topoCreateMod$;
+            var _state$topoConfig$vie;
 
             var currentBackground;
             return _regenerator["default"].wrap(function _callee6$(_context6) {
@@ -433,7 +436,7 @@ function _default(topoApp) {
                     currentBackground = topoApp.store.getModelState('background').current;
                     _context6.next = 3;
                     return (0, _topoData2.saveTopo)((0, _extends2["default"])({}, data, {
-                      viewGroupId: (_state$topoCreateMod$ = state.topoCreateMod.viewGroup) === null || _state$topoCreateMod$ === void 0 ? void 0 : _state$topoCreateMod$.id,
+                      viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图
                       backgroundId: currentBackground ? currentBackground.id : null

package/lib/models/topoMod.js

@@ -38,7 +38,6 @@ function _default(topoApp) {
       topoLoadError: false,
       id: undefined,
       topoId: "",
-      topoName: "",
       type: undefined,
       data: null,
       // 后端返回的分组、连线、节点数据
@@ -46,22 +45,6 @@ function _default(topoApp) {
       // ht 拓扑数据，用于首次load
       currentTopo: undefined,
       topoPermission: undefined,
-      currentNode: {
-        id: "",
-        name: "无数据"
-      },
-      topoAlarmIsOpen: false,
-      // 拓扑通道是否打开
-      alarmPanelIsOpen: false,
-      // 告警弹窗是否打开
-      alarmData: null,
-      // 概览抽屉中告警列表相关数据 TODO 抽取
-      currentCiInfo: null,
-      // 概览抽屉当前CI元数据 TODO 抽取
-      addLinkIsOpen: false,
-      // 添加链路抽屉显示
-      ciConnectable: [],
-      // 可创建联系ci列表
       resAndMetrics: {
         res: [],
         metrics: [],
@@ -206,10 +189,19 @@ function _default(topoApp) {
             }, _callee2);
           }))();
         },
+
+        /**
+         * 设置拓扑类型
+         * @param {*} type 
+         */
+        setTopoType: function setTopoType(type) {
+          this.update({
+            type: type
+          });
+        },
         clearData: function clearData() {
           this.update({
             topoId: "",
-            topoName: "",
             topoData: null,
             graphLoaded: false,
             data: null,
@@ -438,7 +430,7 @@ function _default(topoApp) {
                     _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
 
                     _context6.next = 40;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.iconManage.loadCustomIcons()]);
+                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 40:
                     _yield$Promise$all = _context6.sent;
@@ -463,6 +455,7 @@ function _default(topoApp) {
 
                     _this5.update({
                       type: (_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.showType,
+                      currentTopo: topoData.config,
                       data: result,
                       topoData: topoData,
                       resAndMetrics: resAndMetrics,
@@ -602,97 +595,67 @@ function _default(topoApp) {
             }, _callee10);
           }))();
         },
-        getCiInfo: function getCiInfo(conditions, state) {
+        getTopoPermission: function getTopoPermission(playload, rootState) {
           var _this8 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
-            var result;
+            var id, update, topoPermission, getTopoPermission;
             return _regenerator["default"].wrap(function _callee11$(_context11) {
               while (1) {
                 switch (_context11.prev = _context11.next) {
-                  case 0:
-                    _context11.next = 2;
-                    return (0, _model.getCiMeta)(conditions);
-
-                  case 2:
-                    result = _context11.sent;
-
-                    // rlog.debug("getCiInfo", result);
-                    _this8.update({
-                      // alarmList: result.datas,
-                      currentCiInfo: result // drawerAlarmPageInfo,
-
-                    });
-
-                  case 4:
-                  case "end":
-                    return _context11.stop();
-                }
-              }
-            }, _callee11);
-          }))();
-        },
-        getTopoPermission: function getTopoPermission(playload, rootState) {
-          var _this9 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12() {
-            var id, update, topoPermission, getTopoPermission;
-            return _regenerator["default"].wrap(function _callee12$(_context12) {
-              while (1) {
-                switch (_context12.prev = _context12.next) {
                   case 0:
                     id = playload.id, update = playload.update;
-                    _context12.prev = 1;
+                    _context11.prev = 1;
                     getTopoPermission = topoApp.options.getTopoPermission || _topo["default"].auth.getTopoPermission;
-                    _context12.next = 5;
+                    _context11.next = 5;
                     return getTopoPermission(id);
 
                   case 5:
-                    topoPermission = _context12.sent;
-                    _context12.next = 11;
+                    topoPermission = _context11.sent;
+                    _context11.next = 11;
                     break;
 
                   case 8:
-                    _context12.prev = 8;
-                    _context12.t0 = _context12["catch"](1);
+                    _context11.prev = 8;
+                    _context11.t0 = _context11["catch"](1);
 
-                    _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context12.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                    _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
                   case 11:
-                    _context12.next = 13;
+                    _context11.next = 13;
                     return dispatch.functionAuth.checkAuth('createTopo');
 
                   case 13:
-                    if (!_context12.sent) {
-                      _context12.next = 17;
+                    if (!_context11.sent) {
+                      _context11.next = 17;
                       break;
                     }
 
-                    _context12.t1 = 'delete';
-                    _context12.next = 18;
+                    _context11.t1 = 'delete';
+                    _context11.next = 18;
                     break;
 
                   case 17:
-                    _context12.t1 = 'read';
+                    _context11.t1 = 'read';
 
                   case 18:
-                    topoPermission = _context12.t1;
+                    topoPermission = _context11.t1;
 
                     if (update !== false) {
-                      _this9.update({
+                      _this8.update({
                         topoPermission: topoPermission
                       });
                     }
 
-                    return _context12.abrupt("return", topoPermission);
+                    return _context11.abrupt("return", topoPermission);
 
                   case 21:
                   case "end":
-                    return _context12.stop();
+                    return _context11.stop();
                 }
               }
-            }, _callee12, null, [[1, 8]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/lib/{components → topoCenter/components}/Link/index copy.js

@@ -38,7 +38,7 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoCreateMod'),
+  var _store$useModel = store.useModel('topoConfig'),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];
 

package/lib/{components → topoCenter/components}/Link/index.js

@@ -38,7 +38,7 @@ var LinkDrawer = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       topo = props.topo;
   var store = topo.store;
 
-  var _store$useModel = store.useModel('topoCreateMod'),
+  var _store$useModel = store.useModel('topoConfig'),
       editState = _store$useModel[0],
       editDispatchers = _store$useModel[1];