@riil-frontend/component-topology 7.0.9 → 8.0.0-a.10

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

@@ -23,12 +23,14 @@ var _tree = require("../../../utils/tree");
 
 var _topoPermissionUtil = _interopRequireDefault(require("../../../utils/topoPermissionUtil"));
 
+var _getTopoData = require("../../../networkTopo/getTopoData");
+
 // const clone = (data) => JSON.parse(JSON.stringify(data));
 function _default(topoApp) {
   return {
     state: {
       loading: true,
-      viewState: "view",
+      viewState: 'view',
       // view, create, 2种模式
       graphLoaded: false,
       graphLoaded2: false,
@@ -37,7 +39,7 @@ function _default(topoApp) {
       initParams: {},
       topoLoadError: false,
       id: undefined,
-      topoId: "",
+      topoId: '',
       type: undefined,
       // 拓扑类型
       currentTopo: undefined,
@@ -81,8 +83,8 @@ function _default(topoApp) {
 
                     topoModState = rootState.topoMod; // 处理URL参数
 
-                    type = params.type || "view";
-                    id = params.id || topoModState.topoId || "";
+                    type = params.type || 'view';
+                    id = params.id || topoModState.topoId || '';
 
                     _rlog["default"].debug("topoMod.init \u521D\u59CB\u5316(" + id + ")...", {
                       params: params,
@@ -116,7 +118,7 @@ function _default(topoApp) {
                       loading: false
                     });
 
-                    _rlog["default"].debug("topoMod.initTopoCenter 初始化完成", {
+                    _rlog["default"].debug('topoMod.initTopoCenter 初始化完成', {
                       rootState: rootState
                     });
 
@@ -161,7 +163,7 @@ function _default(topoApp) {
                 switch (_context2.prev = _context2.next) {
                   case 0:
                     id = playload.id, data = playload.data, linkTo = playload.linkTo;
-                    viewState = playload.mode || playload.viewState || "view";
+                    viewState = playload.mode || playload.viewState || 'view';
                     topoId = id || data.config.id;
 
                     _this2.update({
@@ -181,7 +183,7 @@ function _default(topoApp) {
                     });
 
                   case 6:
-                    if (viewState === "edit") {
+                    if (viewState === 'edit') {
                       // TODO 待优化进入编辑模式方式
                       _this2.enterEditMode();
                     }
@@ -208,7 +210,7 @@ function _default(topoApp) {
           this.update({
             graphLoaded: false,
             graphLoaded2: false,
-            topoId: "",
+            topoId: '',
             topoData: null,
             currentTopo: undefined,
             data: null,
@@ -218,7 +220,7 @@ function _default(topoApp) {
         },
         switchToViewMode: function switchToViewMode(playload, rootState) {
           this.update({
-            viewState: "view"
+            viewState: 'view'
           });
         },
         enterEditMode: function enterEditMode(playload, rootState) {
@@ -242,7 +244,7 @@ function _default(topoApp) {
                     if (!topoId) {
                       // 查找第一个
                       treeData = rootState.topoTreeMod.treeData;
-                      (0, _tree.loopTreeByKey)(treeData, "type", 1, function (item, index, arr) {
+                      (0, _tree.loopTreeByKey)(treeData, 'type', 1, function (item, index, arr) {
                         if (!topoId) {
                           topoId = item.id;
                         }
@@ -319,7 +321,7 @@ function _default(topoApp) {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var _result$config;
 
-            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, endTime;
+            var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, _yield$Promise$all, ciTypeMap, customIcons, xxx, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all2, newData, endTime;
 
             return _regenerator["default"].wrap(function _callee6$(_context6) {
               while (1) {
@@ -352,25 +354,28 @@ function _default(topoApp) {
 
                     _this5.update(startState);
 
+                    dispatch.topoBizMod.update({
+                      pollingSwitch: false
+                    });
                     topoApp.options.onLoadStart(); // TODO 待移到拓扑中心
 
-                    permission = "write";
+                    permission = 'write';
 
                     if (!topoApp.options.usePermission) {
-                      _context6.next = 18;
+                      _context6.next = 19;
                       break;
                     }
 
-                    _context6.next = 13;
+                    _context6.next = 14;
                     return _this5.getTopoPermission({
                       id: topoId
                     });
 
-                  case 13:
+                  case 14:
                     permission = _context6.sent;
 
                     if (_topoPermissionUtil["default"].isReadable(permission)) {
-                      _context6.next = 18;
+                      _context6.next = 19;
                       break;
                     }
 
@@ -385,23 +390,23 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 18:
+                  case 19:
                     if (!data) {
-                      _context6.next = 29;
+                      _context6.next = 30;
                       break;
                     }
 
                     graphConfig = {};
 
                     if (!topoId) {
-                      _context6.next = 26;
+                      _context6.next = 27;
                       break;
                     }
 
-                    _context6.next = 23;
+                    _context6.next = 24;
                     return _topo["default"].getTopoData(topoId);
 
-                  case 23:
+                  case 24:
                     topoConfig = _context6.sent;
                     if (!topoConfig) _rlog["default"].error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                     graphConfig = {
@@ -410,21 +415,21 @@ function _default(topoApp) {
                       serialize: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.serialize
                     };
 
-                  case 26:
+                  case 27:
                     result = (0, _extends2["default"])({}, data, graphConfig);
-                    _context6.next = 32;
+                    _context6.next = 33;
                     break;
 
-                  case 29:
-                    _context6.next = 31;
+                  case 30:
+                    _context6.next = 32;
                     return topoApp.options.loadData(topoId, topoApp.serverApi);
 
-                  case 31:
+                  case 32:
                     result = _context6.sent;
 
-                  case 32:
+                  case 33:
                     if (result) {
-                      _context6.next = 36;
+                      _context6.next = 37;
                       break;
                     }
 
@@ -439,23 +444,21 @@ function _default(topoApp) {
                     topoApp.options.onLoad();
                     return _context6.abrupt("return");
 
-                  case 36:
+                  case 37:
                     result = (0, _topoData.parseTopoData)(result);
 
-                    _rlog["default"].debug("topoMod.initTopoData 查询数据完成", topoId, linkTo, result);
+                    _rlog["default"].debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
 
-                    _context6.next = 40;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), dispatch.customIcon.loadCustomIcons(), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
+                    _context6.next = 41;
+                    return Promise.all([// topoApp.ciTyeCache.getCiTypeMap(getCiTypes(result)),
+                    dispatch.customIcon.loadCustomIcons() // topoApp.elementTagTipConfig.init(result), // 暂停新配置开发
                     ]);
 
-                  case 40:
+                  case 41:
                     _yield$Promise$all = _context6.sent;
                     ciTypeMap = _yield$Promise$all[0];
                     customIcons = _yield$Promise$all[1];
                     xxx = _yield$Promise$all[2];
-
-                    _rlog["default"].debug("topoMod.initTopoData Ci属性指标元数据", ciTypeMap);
-
                     extraConfig = result.global.extraConfig;
                     _context6.next = 48;
                     return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
@@ -468,13 +471,11 @@ function _default(topoApp) {
                       engine: topoApp,
                       data: result,
                       linkTo: linkTo,
-                      globalConfig: extraConfig,
-                      ciTypeMap: ciTypeMap,
-                      permission: permission
+                      globalConfig: extraConfig
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
-                    _this5.update({
-                      loading: false,
+                    _context6.next = 51;
+                    return _this5.update({
                       currentTopo: topoData.config,
                       data: result,
                       globalConfig: extraConfig,
@@ -483,18 +484,40 @@ function _default(topoApp) {
                       resAndMetrics: resAndMetrics
                     });
 
+                  case 51:
                     dispatch.topoBizMod.combBatchCiInfo(resAndMetrics);
                     dispatch.background.init(extraConfig); // TODO 优化打开拓扑图显示告警速度：打开拓扑图立即请求告警
 
-                    topoApp.alarm.open();
+                    topoApp.alarm.open(); // 加载标注悬浮框数据
+
+                    _context6.next = 56;
+                    return Promise.all([(0, _getTopoData.addLinkData)(result), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
+                    ]);
+
+                  case 56:
+                    _yield$Promise$all2 = _context6.sent;
+                    newData = _yield$Promise$all2[0];
+                    _context6.next = 60;
+                    return _this5.update({
+                      data: newData
+                    });
+
+                  case 60:
+                    dispatch.topoBizMod.update({
+                      pollingSwitch: true
+                    });
                     topoApp.onTopoDataLoaded(topoData);
                     endTime = (0, _moment["default"])();
 
-                    _rlog["default"].info("topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ", endTime.diff(startTime, "seconds", true));
+                    _rlog["default"].info('topoMod.initTopoData 初始化拓扑图数据完成. 耗时: ', endTime.diff(startTime, 'seconds', true));
 
                     topoApp.options.onLoad();
 
-                  case 57:
+                    _this5.update({
+                      loading: false
+                    });
+
+                  case 66:
                   case "end":
                     return _context6.stop();
                 }
@@ -550,13 +573,13 @@ function _default(topoApp) {
                     }
 
                     if (conditions.id === state.topoMod.topoId) {
-                      if (conditions.type === "delete") {
+                      if (conditions.type === 'delete') {
                         _this7.update({
                           topoId: conditions.defId
                         });
                       }
 
-                      if (conditions.type === "rename") {
+                      if (conditions.type === 'rename') {
                         td = (0, _extends2["default"])({}, state.topoMod.topoData, {
                           config: (0, _extends2["default"])({}, state.topoMod.topoData.config, {
                             name: conditions.name
@@ -600,10 +623,10 @@ function _default(topoApp) {
                 switch (_context10.prev = _context10.next) {
                   case 0:
                     if (conditions === void 0) {
-                      conditions = "";
+                      conditions = '';
                     }
 
-                    _rlog["default"].debug("updateDelId", conditions);
+                    _rlog["default"].debug('updateDelId', conditions);
 
                   case 2:
                   case "end":

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

@@ -557,7 +557,7 @@ function ResourceOverview(props) {
     ciType: ciType,
     type: type,
     // name: '123'
-    name: props.name
+    name: props.name ? props.name : props.resourceData.attributes.name
   }; // 基本信息设置改变
 
   function baseInfoColChange(_x5) {

package/lib/core/viewer/components/titlebar/widgets/SearchWidget.js

@@ -65,6 +65,10 @@ function SearchWidget(props) {
 
   var onChange = function onChange(value) {
     setSearchValue(value);
+
+    if (!value) {
+      topo.searchElements(searchType, value);
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement(_search["default"], {

package/lib/networkTopo/getTopoData.js

@@ -9,17 +9,31 @@ exports["default"] = getTopoData;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _linkUtils = require("../core/models/utils/linkUtils");
 
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
 // import "./utils/__tests__/resourcePermissionUtil.test";
-function addLinkData(_x, _x2) {
-  return _addLinkData.apply(this, arguments);
+// 过滤掉无两端节点数据的链路
+function filterLinkNoSourceTarget(data) {
+  var links = (data.links || []).filter(function (link) {
+    var sourceNode = (data.nodes || []).find(function (node) {
+      return node.id === link.source;
+    });
+
+    if (link.source && !sourceNode) {
+      return false;
+    }
+
+    return true;
+  });
+  return (0, _extends2["default"])({}, data, {
+    links: links
+  });
 }
 /**
  * 修正告警配置。因为：接口返回值没有全局告警配置时，返回null，代表开启
@@ -28,42 +42,65 @@ function addLinkData(_x, _x2) {
  */
 
 
+function fixAlarmConfig(data) {
+  var _data$global = data.global,
+      alarmSwitch = _data$global.alarmSwitch,
+      alarmListDefaultOpen = _data$global.alarmListDefaultOpen;
+  return (0, _extends2["default"])({}, data, {
+    global: (0, _extends2["default"])({}, data.global, {
+      alarmSwitch: alarmSwitch === null ? true : alarmSwitch,
+      alarmListDefaultOpen: alarmListDefaultOpen === null ? true : alarmListDefaultOpen
+    })
+  });
+} // 修正容器找不到时groupId设为空
+
+
+function fixNodeGroupId(data) {
+  var nodes = (data.nodes || [] // 修正容器找不到时groupId设为空
+  ).map(function (node) {
+    var groupExisted = !!(data.groups || []).filter(function (g) {
+      return g.id === node.groupId;
+    }).length;
+    return (0, _extends2["default"])({}, node, {
+      groupId: groupExisted ? node.groupId : null
+    });
+  });
+  return (0, _extends2["default"])({}, data, {
+    nodes: nodes
+  });
+}
+
+function addLinkData(_x) {
+  return _addLinkData.apply(this, arguments);
+} // FIXME 业务拓扑不需要链路相关逻辑
+
+
 function _addLinkData() {
-  _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLinks, nodes) {
-    var links, networkLinks, otherLinks;
+  _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
+    var links, nodes, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            // 过滤掉无两端节点数据的链路
-            links = oldLinks.filter(function (link) {
-              var sourceNode = nodes.find(function (node) {
-                return node.id === link.source;
-              });
-
-              if (link.source && !sourceNode) {
-                return false;
-              }
-
-              return true;
-            }); // 如果是网络链路，补充详情信息
+            links = data.links || [];
+            nodes = data.nodes || []; // 如果是网络链路，补充详情信息
 
-            _context.next = 3;
+            _context.next = 4;
             return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
-              return !link.ciType;
+              return link.ciType === 'network_link';
             }), nodes);
 
-          case 3:
+          case 4:
             networkLinks = _context.sent;
             otherLinks = links.filter(function (link) {
-              return !!link.ciType;
+              return link.ciType !== 'network_link';
             });
-            return _context.abrupt("return", {
+            return _context.abrupt("return", (0, _extends2["default"])({}, data, {
               links: [].concat(networkLinks, otherLinks),
               linkGroups: []
-            });
+            }));
 
-          case 6:
+          case 7:
           case "end":
             return _context.stop();
         }
@@ -73,54 +110,25 @@ function _addLinkData() {
   return _addLinkData.apply(this, arguments);
 }
 
-function fixAlarmConfig(data) {
-  var _data$global = data.global,
-      alarmSwitch = _data$global.alarmSwitch,
-      alarmListDefaultOpen = _data$global.alarmListDefaultOpen;
-  return (0, _extends2["default"])({}, data, {
-    global: (0, _extends2["default"])({}, data.global, {
-      alarmSwitch: alarmSwitch === null ? true : alarmSwitch,
-      alarmListDefaultOpen: alarmListDefaultOpen === null ? true : alarmListDefaultOpen
-    })
-  });
-} // FIXME 业务拓扑不需要链路相关逻辑
-
-
-function buildData(_x3) {
+function buildData(_x2) {
   return _buildData.apply(this, arguments);
 }
 
 function _buildData() {
-  _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, linkData;
-
+  _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(oldData) {
+    var data;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            newData = (0, _extends2["default"])({}, data);
-            nodes = (data.nodes || [] // 修正容器找不到时groupId设为空
-            ).map(function (node) {
-              var groupExisted = !!(data.groups || []).filter(function (g) {
-                return g.id === node.groupId;
-              }).length;
-              return (0, _extends2["default"])({}, node, {
-                groupId: groupExisted ? node.groupId : null
-              });
-            });
-            _context2.next = 4;
-            return Promise.all([addLinkData(data.links || [], nodes)]);
+            data = oldData;
+            data = fixNodeGroupId(data);
+            data = filterLinkNoSourceTarget(data); // data = await addLinkData(data)
 
-          case 4:
-            _yield$Promise$all = _context2.sent;
-            linkData = _yield$Promise$all[0];
-            newData = (0, _extends2["default"])({}, newData, {
-              nodes: nodes
-            }, linkData);
-            newData = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(newData);
-            return _context2.abrupt("return", newData);
-
-          case 9:
+            data = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(data);
+            return _context2.abrupt("return", data);
+
+          case 5:
           case "end":
             return _context2.stop();
         }
@@ -130,7 +138,7 @@ function _buildData() {
   return _buildData.apply(this, arguments);
 }
 
-function getTopoData(_x4, _x5) {
+function getTopoData(_x3, _x4) {
   return _getTopoData.apply(this, arguments);
 }
 

package/lib/networkTopo/models/TopoCenter.js

@@ -48,87 +48,7 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
           return _ResourceInfoDisplay.DEFAULT_TIP_COMMON_CONFIG;
         } // ExtElementTagTipBuilder: LinkTagsTipsBuilder,
 
-      },
-      onSwitchToEditModeBegin: function () {
-        var _onSwitchToEditModeBegin = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(topo) {
-          var topoDispatchers;
-          return _regenerator["default"].wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  topoDispatchers = topo.store.getModelDispatchers('topoMod'); // topoDispatchers.update({ topoData: null });
-
-                  _context.next = 3;
-                  return topoDispatchers.refreshTopo();
-
-                case 3:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }));
-
-        function onSwitchToEditModeBegin(_x) {
-          return _onSwitchToEditModeBegin.apply(this, arguments);
-        }
-
-        return onSwitchToEditModeBegin;
-      }(),
-      onSwitchToEditMode: function () {
-        var _onSwitchToEditMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(topo) {
-          return _regenerator["default"].wrap(function _callee2$(_context2) {
-            while (1) {
-              switch (_context2.prev = _context2.next) {
-                case 0:
-                  _context2.next = 2;
-                  return topo.resourceConfig.loadConfig();
-
-                case 2:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
-
-        function onSwitchToEditMode(_x2) {
-          return _onSwitchToEditMode.apply(this, arguments);
-        }
-
-        return onSwitchToEditMode;
-      }(),
-      onSwitchToViewMode: function () {
-        var _onSwitchToViewMode = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(topo) {
-          var topoModDispatchers;
-          return _regenerator["default"].wrap(function _callee3$(_context3) {
-            while (1) {
-              switch (_context3.prev = _context3.next) {
-                case 0:
-                  topoModDispatchers = topo.store.getModelDispatchers('topoMod');
-                  _context3.next = 3;
-                  return topoModDispatchers.openTopoPage({
-                    id: topo.id
-                  });
-
-                case 3:
-                  _context3.next = 5;
-                  return topoModDispatchers.refreshTopoTree();
-
-                case 5:
-                case "end":
-                  return _context3.stop();
-              }
-            }
-          }, _callee3);
-        }));
-
-        function onSwitchToViewMode(_x3) {
-          return _onSwitchToViewMode.apply(this, arguments);
-        }
-
-        return onSwitchToViewMode;
-      }()
+      }
     })) || this;
     _this.resourceConfig = null;
     var menuCommands = (0, _createMenuCommands["default"])((0, _assertThisInitialized2["default"])(_this));
@@ -149,25 +69,25 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.initData =
   /*#__PURE__*/
   function () {
-    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(params) {
+    var _initData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context.prev = _context.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context4.next = 3;
+              _context.next = 3;
               return topoDispatchers.initData(params);
 
             case 3:
             case "end":
-              return _context4.stop();
+              return _context.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee, this);
     }));
 
-    function initData(_x4) {
+    function initData(_x) {
       return _initData.apply(this, arguments);
     }
 
@@ -186,22 +106,22 @@ var TopoCenter = /*#__PURE__*/function (_TopoApp) {
   _proto.exit =
   /*#__PURE__*/
   function () {
-    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+    var _exit = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var topoDispatchers;
-      return _regenerator["default"].wrap(function _callee5$(_context5) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoCenter');
-              _context5.next = 3;
+              _context2.next = 3;
               return topoDispatchers.exit();
 
             case 3:
             case "end":
-              return _context5.stop();
+              return _context2.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee2, this);
     }));
 
     function exit() {