@riil-frontend/component-topology 7.0.9 → 7.0.10

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

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

@@ -7,8 +7,16 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import _ from "lodash";
-import { sortList } from "../../../utils/topoData";
 var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+
+var sortList = function sortList(a, b) {
+  if (a.level === b.level) {
+    return a.obj.createTime - b.obj.createTime;
+  } else {
+    return a.level - b.level;
+  }
+};
+
 export default function (topo) {
   return {
     // 定义 model 的初始 state

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

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

@@ -15,13 +15,19 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _topoData = require("../../../utils/topoData");
-
 /**
  * 告警
  */
 var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
+var sortList = function sortList(a, b) {
+  if (a.level === b.level) {
+    return a.obj.createTime - b.obj.createTime;
+  } else {
+    return a.level - b.level;
+  }
+};
+
 function _default(topo) {
   return {
     // 定义 model 的初始 state
@@ -124,7 +130,7 @@ function _default(topo) {
                               }) < 0) {
                                 var newArr = [].concat(doc[rid]);
                                 newArr.push(item);
-                                doc[rid] = newArr.sort(_topoData.sortList);
+                                doc[rid] = newArr.sort(sortList);
                               }
                             } else {
                               doc[rid] = [item];
@@ -155,7 +161,7 @@ function _default(topo) {
                                   status: old.status
                                 }));
 
-                                doc[rid] = _newArr.sort(_topoData.sortList);
+                                doc[rid] = _newArr.sort(sortList);
 
                                 _rlog["default"].debug("告警级别变更", doc[rid], item);
                               } else {

package/package.json

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