@riil-frontend/component-topology 7.0.0-dev.13 → 7.0.0-dev.15

package/lib/core/models/Alarm.js

@@ -237,23 +237,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState2, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
-
+      var mainCiIdList, endTime, startTime, parms, result;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
-              _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
-
-              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
-              //   "获取告警列表--resAndMetrics,topoData,data",
-              //   this.topo,
-              //   resAndMetrics,
-              //   topoData,
-              //   data
-              // );
-
               mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
                 return !!ci.operation;
               }) // 过滤掉权限
@@ -262,7 +250,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -272,7 +260,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -297,10 +285,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return _topo["default"].getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
 
               _rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
@@ -313,7 +301,7 @@ var Alarm = /*#__PURE__*/function () {
               // });
 
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -408,14 +396,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
-              _this$getState3 = this.getState(), alarmOpening = _this$getState3.alarmOpening, topoAlarmIsOpen = _this$getState3.topoAlarmIsOpen;
+              _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
                 _context6.next = 3;
@@ -477,14 +465,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               // 如果未开启则退出
-              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened, alarmOpening = _this$getState4.alarmOpening;
+              _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
                 _context7.next = 3;
@@ -574,13 +562,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
-      var _this$getState5, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
+      var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
       return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
-              _this$getState5 = this.getState(), alarmIsOpened = _this$getState5.alarmIsOpened;
+              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.13" === 'string' ? "7.0.0-dev.13" : null;
+var version = typeof "7.0.0-dev.15" === 'string' ? "7.0.0-dev.15" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -6,7 +6,6 @@ exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.getInterfaceObject = exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
-exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeLinksData = mergeLinksData;
@@ -57,10 +56,6 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-function isAggLink(link) {
-  return link.attributes["network_link.connect_type"] === "agg";
-}
-
 var getInterfaceObject = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
     var query, promises, result, ifDoc;

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

@@ -629,17 +629,20 @@ function _default(topoApp) {
 
                   case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 10;
+
+                    _rlog["default"].debug('查询拓扑权限', topoPermission);
+
+                    _context11.next = 11;
                     break;
 
-                  case 7:
-                    _context11.prev = 7;
+                  case 8:
+                    _context11.prev = 8;
                     _context11.t0 = _context11["catch"](1);
 
                     _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
-                  case 10:
+                  case 11:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -648,12 +651,12 @@ function _default(topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 12:
+                  case 13:
                   case "end":
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 7]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/lib/networkTopo/getTopoData.js

@@ -15,8 +15,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _linkUtils = require("../core/models/utils/linkUtils");
 
-var _services = require("../core/services");
-
 var _resourcePermissionUtil = require("./utils/resourcePermissionUtil");
 
 // import "./utils/__tests__/resourcePermissionUtil.test";
@@ -32,7 +30,7 @@ function addLinkData(_x, _x2) {
 
 function _addLinkData() {
   _addLinkData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(oldLinks, nodes) {
-    var links;
+    var links, networkLinks, otherLinks;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -48,18 +46,24 @@ function _addLinkData() {
               }
 
               return true;
-            });
+            }); // 如果是网络链路，补充详情信息
+
             _context.next = 3;
-            return (0, _linkUtils.getLinksDetail)(links, nodes);
+            return (0, _linkUtils.getLinksDetail)(links.filter(function (link) {
+              return !link.ciType;
+            }), nodes);
 
           case 3:
-            links = _context.sent;
+            networkLinks = _context.sent;
+            otherLinks = links.filter(function (link) {
+              return !!link.ciType;
+            });
             return _context.abrupt("return", {
-              links: links,
+              links: [].concat(networkLinks, otherLinks),
               linkGroups: []
             });
 
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -88,7 +92,7 @@ function buildData(_x3) {
 
 function _buildData() {
   _buildData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, nodeCis, linkData;
+    var newData, nodes, _yield$Promise$all, linkData;
 
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
@@ -105,34 +109,18 @@ function _buildData() {
               });
             });
             _context2.next = 4;
-            return Promise.all([// 查询节点属性
-            (0, _services.queryCisByIds)(nodes.map(function (node) {
-              return node.id;
-            })), addLinkData(data.links || [], nodes)]);
+            return Promise.all([addLinkData(data.links || [], nodes)]);
 
           case 4:
             _yield$Promise$all = _context2.sent;
-            nodeCis = _yield$Promise$all[0];
-            linkData = _yield$Promise$all[1];
-            nodes = nodes.map(function (node) {
-              var _node$attributes$find;
-
-              return (0, _extends2["default"])({}, node, {
-                ipAddress: Array.isArray(node.attributes) ? (_node$attributes$find = node.attributes.find(function (item) {
-                  return item.code === 'ipAddress';
-                })) === null || _node$attributes$find === void 0 ? void 0 : _node$attributes$find.value : null,
-                attributes: nodeCis.find(function (ci) {
-                  return ci.id === node.id;
-                }).attributes
-              });
-            });
+            linkData = _yield$Promise$all[0];
             newData = (0, _extends2["default"])({}, newData, {
               nodes: nodes
             }, linkData);
             newData = (0, _resourcePermissionUtil.addTopoDataResourcePermission)(newData);
             return _context2.abrupt("return", newData);
 
-          case 11:
+          case 9:
           case "end":
             return _context2.stop();
         }

package/lib/networkTopo/hooks/editor/useDeleteEdges.js

@@ -17,8 +17,6 @@ var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-var _linkUtils = require("../../../core/models/utils/linkUtils");
-
 var _link = _interopRequireDefault(require("../../services/link"));
 
 var _resourcePermissionUtil = require("../../utils/resourcePermissionUtil");
@@ -64,8 +62,7 @@ var _default = function _default(_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isGroup = false; // isAggLink(link);
-
+              isGroup = false;
               _context.next = 4;
               return _link["default"].deleteLink(id);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riil-frontend/component-topology",
-  "version": "7.0.0-dev.13",
+  "version": "7.0.0-dev.15",
   "description": "拓扑",
   "scripts": {
     "start": "build-scripts start",
@@ -116,6 +116,6 @@
     "access": "public"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.13/build/index.html",
+  "homepage": "https://unpkg.com/@riil-frontend/component-topology@7.0.0-dev.15/build/index.html",
   "gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
 }

package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -1,10 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
-export default function addEdgeProps(Component) {
-  return function AdapterEdgeProps(props) {
-    var selectionElement = props.selectionElement;
-    return /*#__PURE__*/React.createElement(Component, _extends({}, props, {
-      edge: selectionElement
-    }));
-  };
-}

package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js

@@ -1,19 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports["default"] = addEdgeProps;
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _react = _interopRequireDefault(require("react"));
-
-function addEdgeProps(Component) {
-  return function AdapterEdgeProps(props) {
-    var selectionElement = props.selectionElement;
-    return /*#__PURE__*/_react["default"].createElement(Component, (0, _extends2["default"])({}, props, {
-      edge: selectionElement
-    }));
-  };
-}