@riil-frontend/component-topology 4.0.13 → 4.0.14

package/es/core/models/Alarm.js

@@ -38,6 +38,7 @@ var Alarm = /*#__PURE__*/function () {
     var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _this = this;
 
+      var nodeCount;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -50,23 +51,17 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 2:
-              this.confirmLargeResourceCount(function () {
-                // 获得拓扑id
-                var id = _this.topo.id;
-
-                if (!id) {
-                  return;
-                }
-
-                rlog.info("Alarm.open 打开告警通道", id);
-
-                _this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
-
-                _this.hmGetTopoAlarmByDoc(id);
-              });
+              nodeCount = this.topo.dataModel.getNodes().length;
+
+              if (nodeCount < 1500 || this.topo.isEditMode()) {
+                this.doOpen();
+              } else {
+                this.confirmOpenWhenLargeResource(function () {
+                  _this.doOpen();
+                });
+              }
 
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -79,7 +74,21 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return open;
-  }()
+  }();
+
+  _proto.doOpen = function doOpen() {
+    // 获得拓扑id
+    var id = this.topo.id;
+
+    if (!id) {
+      return;
+    }
+
+    rlog.info("Alarm.open 打开告警通道", id);
+    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
+
+    this.hmGetTopoAlarmByDoc(id);
+  }
   /**
    * 关闭告警。
    *
@@ -88,7 +97,14 @@ var Alarm = /*#__PURE__*/function () {
   ;
 
   _proto.close = function close() {
-    // 获得拓扑id
+    this.updateState({
+      alarmPanelIsOpen: false,
+      alarmData: [],
+      alarmList: [],
+      risks: [],
+      alarmRecord: []
+    }); // 获得拓扑id
+
     var currentTopoId = this.currentTopoId;
 
     if (!currentTopoId) {
@@ -98,31 +114,22 @@ var Alarm = /*#__PURE__*/function () {
     rlog.info("关闭告警通道", currentTopoId); // 取消订阅告警推送
     // 关闭告警推送通道
 
-    this.updateState({
-      alarmData: [],
-      alarmPanelIsOpen: false
-    });
     this.closeTopoAlarm(currentTopoId);
   } // 资源数量多时确认是否开启
+  // eslint-disable-next-line class-methods-use-this
   ;
 
-  _proto.confirmLargeResourceCount = function confirmLargeResourceCount(cb) {
-    var nodeCount = this.topo.dataModel.getNodes().length;
-
-    if (nodeCount < 1500 || this.topo.isEditMode()) {
-      cb();
-    } else {
-      _Dialog.confirm({
-        title: "提示",
-        messageProps: {
-          type: "warning"
-        },
-        content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
-        onCancel: function onCancel() {
-          cb();
-        }
-      });
-    }
+  _proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
+    _Dialog.confirm({
+      title: "提示",
+      messageProps: {
+        type: "warning"
+      },
+      content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
+      onCancel: function onCancel() {
+        cb();
+      }
+    });
   }
   /**
    * 查询当前拓扑图有权限资源的告警列表

package/es/core/models/TopoApp.js

@@ -21,7 +21,7 @@ import PluginManager from "./PluginManager";
 import topoFactory from "./topoFactory";
 import ElementTagTipConfig from "./tagstips/ElementTagTipConfig"; // eslint-disable-next-line no-undef
 
-var version = typeof "4.0.13" === 'string' ? "4.0.13" : null;
+var version = typeof "4.0.14" === 'string' ? "4.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/Alarm.js

@@ -51,6 +51,7 @@ var Alarm = /*#__PURE__*/function () {
     var _open = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _this = this;
 
+      var nodeCount;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -63,23 +64,17 @@ var Alarm = /*#__PURE__*/function () {
               return _context.abrupt("return");
 
             case 2:
-              this.confirmLargeResourceCount(function () {
-                // 获得拓扑id
-                var id = _this.topo.id;
-
-                if (!id) {
-                  return;
-                }
-
-                _rlog["default"].info("Alarm.open 打开告警通道", id);
-
-                _this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
-
-
-                _this.hmGetTopoAlarmByDoc(id);
-              });
+              nodeCount = this.topo.dataModel.getNodes().length;
+
+              if (nodeCount < 1500 || this.topo.isEditMode()) {
+                this.doOpen();
+              } else {
+                this.confirmOpenWhenLargeResource(function () {
+                  _this.doOpen();
+                });
+              }
 
-            case 3:
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -92,7 +87,22 @@ var Alarm = /*#__PURE__*/function () {
     }
 
     return open;
-  }()
+  }();
+
+  _proto.doOpen = function doOpen() {
+    // 获得拓扑id
+    var id = this.topo.id;
+
+    if (!id) {
+      return;
+    }
+
+    _rlog["default"].info("Alarm.open 打开告警通道", id);
+
+    this.openTopoAlarm(id); // this.hmGetTopoAlarm(id);
+
+    this.hmGetTopoAlarmByDoc(id);
+  }
   /**
    * 关闭告警。
    *
@@ -101,7 +111,14 @@ var Alarm = /*#__PURE__*/function () {
   ;
 
   _proto.close = function close() {
-    // 获得拓扑id
+    this.updateState({
+      alarmPanelIsOpen: false,
+      alarmData: [],
+      alarmList: [],
+      risks: [],
+      alarmRecord: []
+    }); // 获得拓扑id
+
     var currentTopoId = this.currentTopoId;
 
     if (!currentTopoId) {
@@ -112,31 +129,22 @@ var Alarm = /*#__PURE__*/function () {
     // 关闭告警推送通道
 
 
-    this.updateState({
-      alarmData: [],
-      alarmPanelIsOpen: false
-    });
     this.closeTopoAlarm(currentTopoId);
   } // 资源数量多时确认是否开启
+  // eslint-disable-next-line class-methods-use-this
   ;
 
-  _proto.confirmLargeResourceCount = function confirmLargeResourceCount(cb) {
-    var nodeCount = this.topo.dataModel.getNodes().length;
-
-    if (nodeCount < 1500 || this.topo.isEditMode()) {
-      cb();
-    } else {
-      _dialog["default"].confirm({
-        title: "提示",
-        messageProps: {
-          type: "warning"
-        },
-        content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
-        onCancel: function onCancel() {
-          cb();
-        }
-      });
-    }
+  _proto.confirmOpenWhenLargeResource = function confirmOpenWhenLargeResource(cb) {
+    _dialog["default"].confirm({
+      title: "提示",
+      messageProps: {
+        type: "warning"
+      },
+      content: "该拓扑图上节点较多，继续查询告警可能影响系统整体性能，是否暂不显示告警？",
+      onCancel: function onCancel() {
+        cb();
+      }
+    });
   }
   /**
    * 查询当前拓扑图有权限资源的告警列表

package/lib/core/models/TopoApp.js

@@ -50,7 +50,7 @@ var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTagTipConfig"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "4.0.13" === 'string' ? "4.0.13" : null;
+var version = typeof "4.0.14" === 'string' ? "4.0.14" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/package.json

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