@riil-frontend/component-topology 7.0.0-dev.12 → 7.0.0-dev.14

package/es/core/editor/components/Toolbar/buttons.js

@@ -32,7 +32,7 @@ export default function getButtons(isNetworkTopo) {
   Divider, NodeImageButton, // 替换图片
   NodeSizeButton, // 图片尺寸
   Divider, Layout, // 布局方式
-  NodeAlignWidget // 对齐方式
-  // SearchWidget, // 搜索
+  NodeAlignWidget, // 对齐方式
+  SearchWidget // 搜索
   ]);
 }

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -1,16 +1,23 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/extends";
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
-import fontStyleUtil from "../../../../../../settings/common/text/fontStyleUtil";
 import { formatBackgroundRgbaColor, parseBackground, parseColor } from "../colorUtil";
 export function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return _extends({
     color: parseColor(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
     fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
     italic: !!element.a('edge.tag.fontItalic')
-  }, parseBackground(element.a('edge.tag.background')));
+  }, parseBackground(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 export function setTextStyle(element, style, topo) {
   var color = style.color,

package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -86,6 +86,11 @@ export function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

package/es/core/hooks/usePolling.js

@@ -13,12 +13,7 @@ import rlog from '@riil-frontend/component-topology-utils/es/rlog';
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');

package/es/core/hooks/useTopoEdit.js

@@ -53,8 +53,10 @@ var useTopoEdit = function useTopoEdit(params) {
       setComboResData = _useState2[1];
 
   var reset = function reset() {
+    var _topo$historyManager;
+
     topoEditDispatchers.reset();
-    topo.historyManager.destroy();
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.destroy();
   };
   /**
    * 增加资源到视图

package/es/core/models/Alarm.js

@@ -220,23 +220,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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;
               }) // 过滤掉权限
@@ -245,7 +233,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -255,7 +243,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -280,10 +268,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return topoService.getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
               rlog.debug("getAlarmById-result", result); // if (alarmIsOpened) {
               //   //this.topo.loadAlarm(result.datas);
@@ -294,7 +282,7 @@ var Alarm = /*#__PURE__*/function () {
               //   alarmPanelIsOpen: result.datas.length > 0,
               // });
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -389,14 +377,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regeneratorRuntime.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;
@@ -456,14 +444,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regeneratorRuntime.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;
@@ -550,13 +538,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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/es/core/models/TopoApp.js

@@ -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.0-dev.12" === 'string' ? "7.0.0-dev.12" : null;
+var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

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

@@ -33,9 +33,6 @@ 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 function isAggLink(link) {
-  return link.attributes["network_link.connect_type"] === "agg";
-}
 export var getInterfaceObject = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(codes) {
     var query, promises, result, ifDoc;

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

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

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js

@@ -1,7 +1,6 @@
 import _Message from "@alifd/next/es/message";
 import _Table from "@alifd/next/es/table";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _Button from "@alifd/next/es/button";
 import _Icon from "@alifd/next/es/icon";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
@@ -56,30 +55,34 @@ function EventsCard(props) {
         title: moment(value).format('YYYY-MM-DD HH:mm:ss')
       }, moment(value).format('YYYY-MM-DD HH:mm:ss'));
     }
-  }, {
-    title: '操作',
-    dataIndex: 'status',
-    key: 'status',
-    width: 64,
-    cell: function cell(status, index, record) {
-      if (record.type === 'alarm') {
-        return status === 'toDeal' ? /*#__PURE__*/React.createElement(_Button, {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/React.createElement(_Button, {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
+  // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
     return _alarmRiskOperation.apply(this, arguments);

package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -101,6 +101,7 @@
 }
 .alarm {
   margin-top: 12px;
+  margin-bottom: 16px;
   .alarm-title {
     overflow: hidden;
     text-overflow: ellipsis;

package/es/networkTopo/getTopoData.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { getLinksDetail } from "../core/models/utils/linkUtils";
-import { queryCisByIds } from "../core/services";
 import { addTopoDataResourcePermission } from "./utils/resourcePermissionUtil"; // import "./utils/__tests__/resourcePermissionUtil.test";
 
 export function addLinkData(_x, _x2) {
@@ -16,7 +15,7 @@ export function addLinkData(_x, _x2) {
 
 function _addLinkData() {
   _addLinkData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(oldLinks, nodes) {
-    var links;
+    var links, networkLinks, otherLinks;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -32,18 +31,24 @@ function _addLinkData() {
               }
 
               return true;
-            });
+            }); // 如果是网络链路，补充详情信息
+
             _context.next = 3;
-            return getLinksDetail(links, nodes);
+            return 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();
         }
@@ -72,7 +77,7 @@ export function buildData(_x3) {
 
 function _buildData() {
   _buildData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
-    var newData, nodes, _yield$Promise$all, nodeCis, linkData;
+    var newData, nodes, _yield$Promise$all, linkData;
 
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
@@ -89,34 +94,18 @@ function _buildData() {
               });
             });
             _context2.next = 4;
-            return Promise.all([// 查询节点属性
-            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 _extends({}, 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 = _extends({}, newData, {
               nodes: nodes
             }, linkData);
             newData = addTopoDataResourcePermission(newData);
             return _context2.abrupt("return", newData);
 
-          case 11:
+          case 9:
           case "end":
             return _context2.stop();
         }

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

@@ -4,7 +4,6 @@ import _Message from "@alifd/next/es/message";
 import _Dialog from "@alifd/next/es/dialog";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import rlog from '@riil-frontend/component-topology-utils/es/rlog';
-import { isAggLink } from "../../../core/models/utils/linkUtils";
 import linkService from "../../services/link";
 import { getLinkPermission } from "../../utils/resourcePermissionUtil";
 /**
@@ -49,8 +48,7 @@ export default (function (_ref) {
           switch (_context.prev = _context.next) {
             case 0:
               id = link.id;
-              isGroup = false; // isAggLink(link);
-
+              isGroup = false;
               _context.next = 4;
               return linkService.deleteLink(id);
 

package/lib/core/editor/components/Toolbar/buttons.js

@@ -57,7 +57,7 @@ function getButtons(isNetworkTopo) {
   _Divider["default"], _NodeImageButton["default"], // 替换图片
   _NodeSizeButton["default"], // 图片尺寸
   _Divider["default"], _Layout["default"], // 布局方式
-  _NodeAlignWidget["default"] // 对齐方式
-  // SearchWidget, // 搜索
+  _NodeAlignWidget["default"], // 对齐方式
+  _SearchWidget["default"] // 搜索
   ]);
 }

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js

@@ -13,20 +13,26 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _fontStyleUtil = _interopRequireDefault(require("../../../../../../settings/common/text/fontStyleUtil"));
-
 var _colorUtil = require("../colorUtil");
 
 var _excluded = ["color", "background", "opacity", "bold", "italic"];
 
 function getTextStyle(element) {
+  var opacity = element.a('edge.tag.opacity');
+
+  if (opacity === null || opacity === undefined) {
+    opacity = 1;
+  }
+
   return (0, _extends2["default"])({
     color: (0, _colorUtil.parseColor)(element.a('edge.tag.color')),
     fontFamily: element.a('edge.tag.fontFamily') || '微软雅黑',
     fontSize: element.a('edge.tag.fontSize'),
     bold: !!element.a('edge.tag.fontBold'),
     italic: !!element.a('edge.tag.fontItalic')
-  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')));
+  }, (0, _colorUtil.parseBackground)(element.a('edge.tag.background')), {
+    opacity: opacity
+  });
 }
 
 function setTextStyle(element, style, topo) {

package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js

@@ -102,6 +102,11 @@ function getTextStyle(htSelection, styleNames) {
 
     var val = fieldValueList[0];
     var different = fieldValueList.filter(function (item) {
+      // 如果是颜色，特殊处理
+      if (item && val && item.rgb) {
+        return item.rgb.r + "," + item.rgb.g + "," + item.rgb.b + "," + item.rgb.a !== val.rgb.r + "," + val.rgb.g + "," + val.rgb.b + "," + val.rgb.a;
+      }
+
       return item !== val;
     });
 

package/lib/core/hooks/usePolling.js

@@ -26,12 +26,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 var usePolling = function usePolling(props) {
   var topo = props.topo;
   var store = topo.store;
-  var topoState = store.useModelState('topoMod');
-
-  var _store$useModel = store.useModel('topoBizMod'),
-      bizState = _store$useModel[0],
-      bizDispatchers = _store$useModel[1];
-
+  var bizState = store.useModelState('topoBizMod');
   var resAndMetrics = bizState.resAndMetrics,
       pollingSwitch = bizState.pollingSwitch;
   var displayConfig = topo.store.useModelState('displayConfig');

package/lib/core/hooks/useTopoEdit.js

@@ -75,8 +75,10 @@ var useTopoEdit = function useTopoEdit(params) {
       setComboResData = _useState2[1];
 
   var reset = function reset() {
+    var _topo$historyManager;
+
     topoEditDispatchers.reset();
-    topo.historyManager.destroy();
+    (_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.destroy();
   };
   /**
    * 增加资源到视图

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.12" === 'string' ? "7.0.0-dev.12" : null;
+var version = typeof "7.0.0-dev.14" === 'string' ? "7.0.0-dev.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑