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

package/es/core/models/AttributeMetricDisplay.js

@@ -356,7 +356,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
+      var topo, _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, transformLinkData, result;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -383,7 +383,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
               };
 
               topo = this.topo;
-              _topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
+              _topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
               // 无资源，不查询
 
               if (resIdsList.length) {
@@ -636,8 +636,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
 
     var elementTagsAndTips = this.buildTagsTips() // 开锁状态下禁用悬停展示悬浮框
     .map(function (item) {
-      var _topo$store$getModelS = topo.store.getModelState('lock'),
-          lock = _topo$store$getModelS.lock;
+      var _topo$store$getModelS2 = topo.store.getModelState('lock'),
+          lock = _topo$store$getModelS2.lock;
 
       return lock ? item : _extends({}, item, {
         tips: []

package/es/core/models/TopoApp.js

@@ -1,10 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
 import { setRequest } from '@riil-frontend/component-topology-utils';
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 import { cloneDeep } from 'lodash';
+import topoService from "../services/topo";
 import CiTypeCache from "./cache/CiTypeCache";
 import Alarm from "./Alarm";
 import TopoGraphView from "./TopoGraphView";
@@ -23,7 +23,7 @@ import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel"; // eslint-disable-next-line no-undef
 
-var version = typeof "7.0.9" === 'string' ? "7.0.9" : null;
+var version = typeof "8.0.0-a.10" === 'string' ? "8.0.0-a.10" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/core/models/tagstips/ElementTagTipConfig.js

@@ -2,14 +2,14 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinkMtCodes, getMonitorTemplateCodesFromTopoData, getMtCodeCiTypeMap, getNodeMtCodes } from "./utils";
-import { getMetricsByMonitorTemplateCodes } from "../../services/topo";
+import { getMetricsByMonitorTemplateCodes } from "../../services/topo/tagtip";
 import rlog from '@riil-frontend/component-topology-utils/lib/rlog';
 
 var ElementTagTipConfig = /*#__PURE__*/function () {
   function ElementTagTipConfig(topo) {
     this.topoData = void 0;
     this.mtCodes = void 0;
-    this.mtMetricsMap = void 0;
+    this.mtMetricsMap = {};
     this.mtCiTypeMap = void 0;
     this.topo = topo;
   }
@@ -25,28 +25,36 @@ var ElementTagTipConfig = /*#__PURE__*/function () {
               this.topoData = topoData;
               this.mtCodes = getMonitorTemplateCodesFromTopoData(topoData);
               _context.prev = 2;
-              _context.next = 5;
+
+              if (!this.mtCodes.length) {
+                _context.next = 7;
+                break;
+              }
+
+              _context.next = 6;
               return getMetricsByMonitorTemplateCodes(this.mtCodes);
 
-            case 5:
+            case 6:
               this.mtMetricsMap = _context.sent;
-              _context.next = 11;
+
+            case 7:
+              _context.next = 12;
               break;
 
-            case 8:
-              _context.prev = 8;
+            case 9:
+              _context.prev = 9;
               _context.t0 = _context["catch"](2);
               rlog.error('查询监控模板指标失败', _context.t0);
 
-            case 11:
+            case 12:
               this.mtCiTypeMap = getMtCodeCiTypeMap(topoData);
 
-            case 12:
+            case 13:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, this, [[2, 8]]);
+      }, _callee, this, [[2, 9]]);
     }));
 
     function init(_x) {

package/es/core/models/topoData.js

@@ -4,8 +4,16 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 export function getLayoutId(layout) {
-  if (!layout || typeof layout === "string") {
+  if (!layout) {
     return layout;
+  } // 拖拽添加分层后点击保存ht传参不正确，临时适配
+
+
+  if (typeof layout === "string") {
+    return {
+      v: 'towardeast',
+      h: 'towardsouth'
+    }[layout] || layout;
   }
 
   var id = layout.id,

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

@@ -1,12 +1,12 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _extends from "@babel/runtime/helpers/extends";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from "@riil-frontend/component-topology-common/es/services/topo";
-import keyBy from "lodash/keyBy";
-import _ from "lodash";
+import keyBy from 'lodash/keyBy';
+import _ from 'lodash';
 import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
 
-import { getEdges } from "../../../utils/htElementUtils"; // const interfaceTypeMap = {
+import { getEdges } from "../../../utils/htElementUtils";
+import CiTypeCache from "../cache/CiTypeCache"; // const interfaceTypeMap = {
 //   "network.interface": {
 //     displayName: "网络接口",
 //   },
@@ -33,42 +33,8 @@ export function isCrucialLink(link) {
 export function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
-export var getInterfaceObject = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
-    var query, promises, result, ifDoc;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            query = _.compact(_.uniq(codes));
-            promises = query.map(queryModelAsset);
-            _context.next = 4;
-            return Promise.all(promises);
-
-          case 4:
-            result = _context.sent;
-            ifDoc = {};
-            result.map(function (ifItem) {
-              ifDoc[ifItem.code] = {
-                displayName: ifItem.displayName
-              };
-            });
-            return _context.abrupt("return", ifDoc);
-
-          case 8:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getInterfaceObject(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
 export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc) {
-  var linkCiMap = keyBy(linkCis, "id");
+  var linkCiMap = keyBy(links, 'id');
   return links.map(function (link) {
     var _interfaceCis$find, _interfaceCis$find2;
 
@@ -77,22 +43,19 @@ export function mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc
     var attributes = _extends({}, 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 _extends({}, 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: _extends({}, 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
         },
         // 源/目的接口类型
@@ -102,71 +65,70 @@ export 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']
         }
       })
     });
   });
 }
-export function getLinksDetail(_x2, _x3) {
+export function getLinksDetail(_x, _x2) {
   return _getLinksDetail.apply(this, arguments);
 }
 
 function _getLinksDetail() {
-  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(links, nodes) {
+  _getLinksDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(links, nodes) {
     var linkCis, interfaceIds, interfaceTypes, interfaceCis, interfaceDoc;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context.prev = _context.next) {
           case 0:
             if (!(!links || !links.length)) {
-              _context2.next = 2;
+              _context.next = 2;
               break;
             }
 
-            return _context2.abrupt("return", []);
+            return _context.abrupt("return", []);
 
           case 2:
-            _context2.next = 4;
-            return topoService.relation.batchQueryRelation(links.map(function (link) {
-              return link.id;
+            // const linkCis = await topoService.relation.batchQueryRelation(
+            //   links.map((link) => link.id)
+            // );
+            linkCis = links;
+            interfaceIds = [].concat(linkCis.map(function (item) {
+              return item.attributes.source_id;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_id;
             }));
-
-          case 4:
-            linkCis = _context2.sent;
-            interfaceIds = [];
-            interfaceTypes = [];
-            linkCis.map(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);
+            interfaceTypes = _.compact(_.uniq([].concat(linkCis.map(function (item) {
+              return item.attributes.source_type;
+            }), linkCis.map(function (item) {
+              return item.attributes.destination_type;
+            })))).filter(function (item) {
+              return item !== 'ip';
             });
-            _context2.next = 10;
+            _context.next = 7;
             return queryCisByIds(interfaceIds);
 
-          case 10:
-            interfaceCis = _context2.sent;
-            _context2.next = 13;
-            return getInterfaceObject(interfaceTypes.filter(function (item) {
-              return item !== 'ip';
-            }));
+          case 7:
+            interfaceCis = _context.sent;
+            _context.next = 10;
+            return CiTypeCache.getCiTypeMap(interfaceTypes);
 
-          case 13:
-            interfaceDoc = _context2.sent;
-            return _context2.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
+          case 10:
+            interfaceDoc = _context.sent;
+            return _context.abrupt("return", mergeLinksData(links, linkCis, nodes, interfaceCis, interfaceDoc));
 
-          case 15:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getLinksDetail.apply(this, arguments);
 }
@@ -188,10 +150,10 @@ export var compatibleWith = function compatibleWith(value) {
 
 export var plurals = {
   0: [],
-  1: ["phy"],
-  2: ["phy"],
-  3: ["agg"],
-  4: ["phy", "agg"]
+  1: ['phy'],
+  2: ['phy'],
+  3: ['agg'],
+  4: ['phy', 'agg']
 };
 export var showLinkByConfig = function showLinkByConfig(props) {
   var _plurals$compatibleWi;
@@ -206,25 +168,25 @@ export var showLinkByConfig = function showLinkByConfig(props) {
   var dm = gv.getDataModel();
   var edges = 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/es/core/services/topo/basic.js

@@ -0,0 +1,34 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { request } from '@riil-frontend/component-topology-utils';
+import { TOPO_API_ROOT } from "./constants";
+export default {
+  /**
+  * 保存拓扑绘制数据（第三方库内部结构，无需关心含义）
+  * @param {Number} id Topo ID
+  * @param {String} data ht拓扑序列化数据
+  * @returns
+  */
+  saveSerializeData: function saveSerializeData(id, data) {
+    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request.post(TOPO_API_ROOT + "/structure/" + id, {
+                data: data
+              });
+
+            case 2:
+              return _context.abrupt("return", _context.sent);
+
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+  }
+};

package/es/core/services/topo/constants.js

@@ -0,0 +1 @@
+export var TOPO_API_ROOT = '/topo/v1/api';

package/es/core/services/topo/index.js

@@ -0,0 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
+import topoService from '@riil-frontend/component-topology-common/es/services/topo';
+import basic from "./basic";
+export default _extends({}, topoService, basic);

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

@@ -11,7 +11,6 @@ export default function (engine) {
       metricDoc: {},
       attrDoc: {},
       allCiSet: {},
-      ciSetDoc: {},
       pollingSwitch: false,
 
       /**
@@ -32,7 +31,6 @@ export default function (engine) {
           var _this = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-            var ciDoc, newCiDoc;
             return _regeneratorRuntime.wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
@@ -41,17 +39,9 @@ export default function (engine) {
                       resAndMetrics: conditions
                     });
 
-                    ciDoc = conditions.ciDoc;
-                    newCiDoc = _extends({}, 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/es/core/store/models/topoConfig.js

@@ -13,7 +13,7 @@ import { removeFromArray } from "../../../utils/format";
 import { DEFAULT_GROUP } from "../../../utils/template";
 import { combTopoData, getCiTypes } from "../../../utils/topoData";
 import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../../../core/models/topoData";
-import { buildData as buildTopoData } from "../../../networkTopo/getTopoData";
+import { addLinkData, buildData as buildTopoData } from "../../../networkTopo/getTopoData";
 
 var newGroupWithUUID = function newGroupWithUUID(group) {
   if (group === void 0) {
@@ -308,7 +308,7 @@ export default function (topoApp) {
           var _this4 = this;
 
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee4$(_context4) {
               while (1) {
@@ -335,20 +335,19 @@ export default function (topoApp) {
                   case 8:
                     data = _context4.sent;
                     _context4.next = 11;
-                    return Promise.all([topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
+                    return Promise.all([addLinkData(data), topoApp.ciTyeCache.getCiTypeMap(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
 
                   case 11:
                     _yield$Promise$all = _context4.sent;
-                    ciTypeMap = _yield$Promise$all[0];
+                    dataWithLinkDetail = _yield$Promise$all[0];
                     _combTopoData = 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 = transformTopoElements(topoData);