@riil-frontend/component-topology 7.0.8 → 8.0.0-a.2

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

@@ -94,29 +94,26 @@ var getInterfaceObject = /*#__PURE__*/function () {
 exports.getInterfaceObject = getInterfaceObject;
 
 function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
-  var linkCiMap = (0, _keyBy["default"])(linkCis, "id");
+  var linkCiMap = (0, _keyBy["default"])(links, 'id');
   return links.map(function (link) {
     var _interfaceCis$find, _interfaceCis$find2;
 
     var linkCi = linkCiMap[link.id];
     var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
     var sourceNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.source_device_id"];
+      return node.id === attributes['network_link.source_device_id'];
     });
     var targetNode = nodes.find(function (node) {
-      return node.id === attributes["network_link.destination_device_id"];
+      return node.id === attributes['network_link.destination_device_id'];
     }); // 翻译
 
     return (0, _extends2["default"])({}, link, {
-      id: linkCi.id,
-      ciType: linkCi === null || linkCi === void 0 ? void 0 : linkCi.typeCode,
-      name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
       attributes: (0, _extends2["default"])({}, attributes, {
         // 源/目的设备
-        "network_link.source_device_id_object": {
+        'network_link.source_device_id_object': {
           displayName: sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.name
         },
-        "network_link.destination_device_id_object": {
+        'network_link.destination_device_id_object': {
           displayName: targetNode === null || targetNode === void 0 ? void 0 : targetNode.name
         },
         // 源/目的接口类型
@@ -126,12 +123,12 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
         source_id_object: {
           displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
             return node.id === attributes.source_id;
-          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
+          })) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes['display_name']
         },
         destination_id_object: {
           displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
             return node.id === attributes.destination_id;
-          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
+          })) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes['display_name']
         }
       })
     });
@@ -157,36 +154,33 @@ function _getLinksDetail() {
             return _context2.abrupt("return", []);
 
           case 2:
-            _context2.next = 4;
-            return _topo["default"].relation.batchQueryRelation(links.map(function (link) {
-              return link.id;
-            }));
-
-          case 4:
-            linkCis = _context2.sent;
+            // const linkCis = await topoService.relation.batchQueryRelation(
+            //   links.map((link) => link.id)
+            // );
+            linkCis = links;
             interfaceIds = [];
             interfaceTypes = [];
-            linkCis.map(function (item) {
+            linkCis.forEach(function (item) {
               interfaceIds.push(item.attributes.source_id);
               interfaceIds.push(item.attributes.destination_id);
               interfaceTypes.push(item.attributes.source_type);
               interfaceTypes.push(item.attributes.destination_type);
             });
-            _context2.next = 10;
+            _context2.next = 8;
             return (0, _services.queryCisByIds)(interfaceIds);
 
-          case 10:
+          case 8:
             interfaceCis = _context2.sent;
-            _context2.next = 13;
+            _context2.next = 11;
             return getInterfaceObject(interfaceTypes.filter(function (item) {
               return item !== 'ip';
             }));
 
-          case 13:
+          case 11:
             interfaceDoc = _context2.sent;
             return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 15:
+          case 13:
           case "end":
             return _context2.stop();
         }
@@ -216,10 +210,10 @@ var compatibleWith = function compatibleWith(value) {
 exports.compatibleWith = compatibleWith;
 var plurals = {
   0: [],
-  1: ["phy"],
-  2: ["phy"],
-  3: ["agg"],
-  4: ["phy", "agg"]
+  1: ['phy'],
+  2: ['phy'],
+  3: ['agg'],
+  4: ['phy', 'agg']
 };
 exports.plurals = plurals;
 
@@ -236,25 +230,25 @@ var showLinkByConfig = function showLinkByConfig(props) {
   var dm = gv.getDataModel();
   var edges = (0, _htElementUtils.getEdges)(dm); // console.log("edges", edges);
 
-  var showPhy = types.indexOf("phy") >= 0;
-  var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
+  var showPhy = types.indexOf('phy') >= 0;
+  var showAgg = types.indexOf('agg') >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
 
   if (Array.isArray(edges) && edges.length > 0) {
     edges.map(function (edge) {
       if (showType === 1 || showType === true) {
         // 单链路全部显示
         // console.log("单链路全部显示", edge);
-        edge.s("2d.visible", true);
+        edge.s('2d.visible', true);
       } else {
         var _d$attributes, _d$attributes2;
 
         var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
 
-        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === "network.agg_interface" && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === "network.agg_interface") {
-          edge.s("2d.visible", showAgg);
+        if ((d === null || d === void 0 ? void 0 : (_d$attributes = d.attributes) === null || _d$attributes === void 0 ? void 0 : _d$attributes.destination_type) === 'network.agg_interface' && (d === null || d === void 0 ? void 0 : (_d$attributes2 = d.attributes) === null || _d$attributes2 === void 0 ? void 0 : _d$attributes2.source_type) === 'network.agg_interface') {
+          edge.s('2d.visible', showAgg);
         } else {
           // console.log("edge", edge, d, showAgg);
-          edge.s("2d.visible", showPhy);
+          edge.s('2d.visible', showPhy);
         }
       }
     });

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

@@ -23,7 +23,6 @@ function _default(engine) {
       metricDoc: {},
       attrDoc: {},
       allCiSet: {},
-      ciSetDoc: {},
       pollingSwitch: false,
 
       /**
@@ -44,7 +43,6 @@ function _default(engine) {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var ciDoc, newCiDoc;
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -53,17 +51,9 @@ function _default(engine) {
                       resAndMetrics: conditions
                     });
 
-                    ciDoc = conditions.ciDoc;
-                    newCiDoc = (0, _extends2["default"])({}, ciDoc); // rlog.debug('topoBizMod.combBatchCiInfo getBatchCiInfo', conditions);
-
-                    _this.update({
-                      ciSetDoc: newCiDoc,
-                      pollingSwitch: true
-                    });
-
                     return _context.abrupt("return", {});
 
-                  case 5:
+                  case 2:
                   case "end":
                     return _context.stop();
                 }

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

@@ -330,7 +330,7 @@ function _default(topoApp) {
           var _this4 = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, ciTypeMap, _combTopoData, topoData, resAndMetrics, topoDataTrans;
+            var topoId, resources, groups, exportLinkIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
 
             return _regenerator["default"].wrap(function _callee4$(_context4) {
               while (1) {
@@ -357,20 +357,19 @@ function _default(topoApp) {
                   case 8:
                     data = _context4.sent;
                     _context4.next = 11;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
+                    return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.getCiTypeMap((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 11:
                     _yield$Promise$all = _context4.sent;
-                    ciTypeMap = _yield$Promise$all[0];
+                    dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = (0, _topoData.combTopoData)({
                       engine: topoApp,
                       data: data,
                       linkTo: null,
-                      globalConfig: state.topoMod.globalConfig,
-                      ciTypeMap: ciTypeMap
+                      globalConfig: state.topoMod.globalConfig
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
                     dispatch.topoMod.update({
-                      data: data
+                      data: dataWithLinkDetail
                     });
                     topoDataTrans = (0, _utils2.transformTopoElements)(topoData);
 

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":