@riil-frontend/component-topology 12.0.0-dev.30 → 12.0.0-dev.32

package/es/core/hooks/useAlarm.js

@@ -88,12 +88,25 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
     topo.viewProps.onResourceEvent(topo.alarm.getEvents());
   }
 };
+/**
+ * 关联拓扑告警级别消息处理
+ * @param {*} topo 
+ * @param {*} data 
+ */
+
 
 var handleRelateTopoAlarm = function handleRelateTopoAlarm(topo, data) {
   var relateTopoAlarm = _extends({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
 
   data.forEach(function (item) {
-    relateTopoAlarm[item.topoId] = item.alertLevel;
+    var alertLevel = item.alertLevel;
+
+    if (alertLevel === -1) {
+      // -1表示删除
+      delete relateTopoAlarm[item.topoId];
+    } else {
+      relateTopoAlarm[item.topoId] = item.alertLevel;
+    }
   });
   topo.store.getModelDispatchers('topoAlarm').update({
     relateTopoAlarm: relateTopoAlarm

package/es/core/hooks/useCmpLinkAlarm.js

@@ -41,9 +41,6 @@ export default function useCmpLinkAlarm(props) {
       resources = props.resources,
       graphLoaded = props.graphLoaded;
 
-  var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
-      attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
-
   var _useState = useState(getCmpLinIds(resources)),
       cmpLinkIds = _useState[0],
       setCmpLinkIds = _useState[1];

package/es/core/models/TopoApp.js

@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
 import SelectionModel from "./SelectionModel";
 import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
 
-var version = typeof "12.0.0-dev.30" === 'string' ? "12.0.0-dev.30" : null;
+var version = typeof "12.0.0-dev.32" === 'string' ? "12.0.0-dev.32" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/es/networkTopo/store/topoCenter.js

@@ -8,243 +8,280 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  *
  */
 import { rlog } from '@riil-frontend/component-topology-utils';
-export default {
-  // 定义 model 的初始 state
-  state: {
-    loading: true,
-    id: undefined,
-    viewState: 'view' // view, create, 2种模式
-
-  },
-  // 定义改变该模型状态的纯函数
-  reducers: {
-    update: function update(prevState, payload) {
-      return _extends({}, prevState, payload);
-    }
-  },
-  // 定义处理该模型副作用的函数
-  effects: function effects(dispatch) {
-    return {
-      /**
-       * 初始化。
-       */
-      initData: function initData(params, rootState) {
-        var _this = this;
-
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var topoModState, viewType, id, topoTreeModState;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                if (params === void 0) {
-                  params = {};
-                }
-
-                topoModState = rootState.topoMod;
-                viewType = params.type || 'view';
-                id = params.id || topoModState.topoId || '';
-
-                _this.update({
-                  loading: true,
-                  viewState: viewType
-                }); // 加载功能操作权限
-
-
-                _context.next = 7;
-                return dispatch.functionAuth.init();
-
-              case 7:
-                // 加载拓扑树数据
-                topoTreeModState = rootState.topoTreeMod;
-
-                if (topoTreeModState.loaded) {
-                  _context.next = 16;
+import { parseTopoData } from "../../utils/topoData";
+export default function (topo) {
+  return {
+    // 定义 model 的初始 state
+    state: {
+      loading: true,
+      id: undefined,
+      viewState: 'view' // view, create, 2种模式
+
+    },
+    // 定义改变该模型状态的纯函数
+    reducers: {
+      update: function update(prevState, payload) {
+        return _extends({}, prevState, payload);
+      }
+    },
+    // 定义处理该模型副作用的函数
+    effects: function effects(dispatch) {
+      return {
+        /**
+         * 初始化。
+         */
+        initData: function initData(params, rootState) {
+          var _this = this;
+
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+            var topoModState, viewType, id, topoTreeModState;
+            return _regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (params === void 0) {
+                    params = {};
+                  }
+
+                  topoModState = rootState.topoMod;
+                  viewType = params.type || 'view';
+                  id = params.id || topoModState.topoId || '';
+
+                  _this.update({
+                    loading: true,
+                    viewState: viewType
+                  }); // 加载功能操作权限
+
+
+                  _context.next = 7;
+                  return dispatch.functionAuth.init();
+
+                case 7:
+                  // 加载拓扑树数据
+                  topoTreeModState = rootState.topoTreeMod;
+
+                  if (topoTreeModState.loaded) {
+                    _context.next = 16;
+                    break;
+                  }
+
+                  _context.next = 11;
+                  return dispatch.topoTreeMod.fetchTopoTree({
+                    id: id
+                  });
+
+                case 11:
+                  _context.next = 13;
+                  return dispatch.topoTreeMod.getSelectedTopoId();
+
+                case 13:
+                  id = _context.sent;
+                  _context.next = 18;
                   break;
-                }
 
-                _context.next = 11;
-                return dispatch.topoTreeMod.fetchTopoTree({
-                  id: id
-                });
+                case 16:
+                  _context.next = 18;
+                  return _this.refreshTopoTree();
 
-              case 11:
-                _context.next = 13;
-                return dispatch.topoTreeMod.getSelectedTopoId();
+                case 18:
+                  if (id) {
+                    // 左侧树切换选中
+                    dispatch.topoTreeMod.selectNode(id);
+                  }
 
-              case 13:
-                id = _context.sent;
-                _context.next = 18;
-                break;
+                  if (!(viewType === 'create')) {
+                    _context.next = 24;
+                    break;
+                  }
 
-              case 16:
-                _context.next = 18;
-                return _this.refreshTopoTree();
-
-              case 18:
-                if (id) {
-                  // 左侧树切换选中
-                  dispatch.topoTreeMod.selectNode(id);
-                }
+                  _context.next = 22;
+                  return _this.openCreateTopoPage({
+                    id: id
+                  });
 
-                if (!(viewType === 'create')) {
-                  _context.next = 24;
+                case 22:
+                  _context.next = 29;
                   break;
-                }
 
-                _context.next = 22;
-                return _this.openCreateTopoPage({
-                  id: id
-                });
+                case 24:
+                  if (!params.selectedElementTag) {
+                    _context.next = 27;
+                    break;
+                  }
 
-              case 22:
-                _context.next = 29;
-                break;
-
-              case 24:
-                if (!params.selectedElementTag) {
                   _context.next = 27;
-                  break;
-                }
+                  return dispatch.selection.update({
+                    initSelectionId: params.selectedElementTag
+                  });
 
-                _context.next = 27;
-                return dispatch.selection.update({
-                  initSelectionId: params.selectedElementTag
-                });
+                case 27:
+                  _context.next = 29;
+                  return dispatch.topoMod.initData(_extends({}, params, {
+                    type: params.type,
+                    id: id
+                  }));
 
-              case 27:
-                _context.next = 29;
-                return dispatch.topoMod.initData(_extends({}, params, {
-                  type: params.type,
-                  id: id
-                }));
+                case 29:
+                  _this.update({
+                    loading: false
+                  }); // 是否打开概览
 
-              case 29:
-                _this.update({
-                  loading: false
-                }); // 是否打开概览
 
+                  if (!params.openResourceOverview) {
+                    _context.next = 33;
+                    break;
+                  }
 
-                if (!params.openResourceOverview) {
                   _context.next = 33;
+                  return dispatch.resourceDetail.update({
+                    visible: true,
+                    id: params.openResourceOverview
+                  });
+
+                case 33:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }))();
+        },
+
+        /**
+         * 退出。
+         */
+        exit: function exit(playload, rootState) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+            return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return dispatch.topoMod.exit(playload);
+
+                case 2:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          }))();
+        },
+        openCreateTopoPage: function openCreateTopoPage(playload, state) {
+          var _this2 = this;
+
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  if (playload === void 0) {
+                    playload = {};
+                  }
+
+                  _this2.update({
+                    viewState: 'create',
+                    id: playload.id
+                  });
+
+                  dispatch.topoCreate.init(playload); // history.replace(`/default/topoCenter?type=create&id=${playload.id}`);
+
+                case 3:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _callee3);
+          }))();
+        },
+
+        /**
+         *
+         * @param playload {{id: string, linkTo:?object}}
+         */
+        openTopoPage: function openTopoPage(playload, rootState) {
+          var _this3 = this;
+
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+            var id, viewState;
+            return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  id = playload.id, viewState = playload.viewState; // 左侧树切换选中
+
+                  dispatch.topoTreeMod.selectNode(id);
+
+                  _this3.update({
+                    viewState: viewState || 'view'
+                  });
+
+                  if (!id) {
+                    _context4.next = 8;
+                    break;
+                  }
+
+                  _context4.next = 6;
+                  return dispatch.topoMod.openTopoPage(playload);
+
+                case 6:
+                  _context4.next = 10;
                   break;
-                }
-
-                _context.next = 33;
-                return dispatch.resourceDetail.update({
-                  visible: true,
-                  id: params.openResourceOverview
-                });
-
-              case 33:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }))();
-      },
-
-      /**
-       * 退出。
-       */
-      exit: function exit(playload, rootState) {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return dispatch.topoMod.exit(playload);
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }, _callee2);
-        }))();
-      },
-      openCreateTopoPage: function openCreateTopoPage(playload, state) {
-        var _this2 = this;
-
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-          return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
-              case 0:
-                if (playload === void 0) {
-                  playload = {};
-                }
-
-                _this2.update({
-                  viewState: 'create',
-                  id: playload.id
-                });
-
-                dispatch.topoCreate.init(playload); // history.replace(`/default/topoCenter?type=create&id=${playload.id}`);
-
-              case 3:
-              case "end":
-                return _context3.stop();
-            }
-          }, _callee3);
-        }))();
-      },
-
-      /**
-       *
-       * @param playload {{id: string, linkTo:?object}}
-       */
-      openTopoPage: function openTopoPage(playload, rootState) {
-        var _this3 = this;
-
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-          var id, viewState;
-          return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
-              case 0:
-                id = playload.id, viewState = playload.viewState; // 左侧树切换选中
-
-                dispatch.topoTreeMod.selectNode(id);
-
-                _this3.update({
-                  viewState: viewState || 'view'
-                });
-
-                if (!id) {
-                  _context4.next = 8;
-                  break;
-                }
-
-                _context4.next = 6;
-                return dispatch.topoMod.openTopoPage(playload);
-
-              case 6:
-                _context4.next = 10;
-                break;
-
-              case 8:
-                _context4.next = 10;
-                return dispatch.topoMod.clearData();
-
-              case 10:
-              case "end":
-                return _context4.stop();
-            }
-          }, _callee4);
-        }))();
-      },
-      refreshTopoTree: function refreshTopoTree() {
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-            while (1) switch (_context5.prev = _context5.next) {
-              case 0:
-                _context5.next = 2;
-                return dispatch.topoTreeMod.refreshTree();
-
-              case 2:
-              case "end":
-                return _context5.stop();
-            }
-          }, _callee5);
-        }))();
-      }
-    };
-  }
-};
+
+                case 8:
+                  _context4.next = 10;
+                  return dispatch.topoMod.clearData();
+
+                case 10:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _callee4);
+          }))();
+        },
+        refreshTopoTree: function refreshTopoTree() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
+                case 0:
+                  _context5.next = 2;
+                  return dispatch.topoTreeMod.refreshTree();
+
+                case 2:
+                case "end":
+                  return _context5.stop();
+              }
+            }, _callee5);
+          }))();
+        },
+        refreshGlobalConfig: function refreshGlobalConfig() {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+            var result, extraConfig;
+            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
+                case 0:
+                  if (topo.id) {
+                    _context6.next = 2;
+                    break;
+                  }
+
+                  return _context6.abrupt("return");
+
+                case 2:
+                  _context6.next = 4;
+                  return topo.options.loadData(topo.id, topo.serverApi);
+
+                case 4:
+                  result = _context6.sent;
+                  result = parseTopoData(result);
+                  extraConfig = result.global.extraConfig;
+                  _context6.next = 9;
+                  return dispatch.displayConfig.setConfig(_extends({}, extraConfig, {
+                    alarmSwitch: result.global.alarmSwitch,
+                    alarmListDefaultOpen: result.global.alarmListDefaultOpen
+                  }));
+
+                case 9:
+                case "end":
+                  return _context6.stop();
+              }
+            }, _callee6);
+          }))();
+        }
+      };
+    }
+  };
+}

package/lib/core/hooks/useAlarm.js

@@ -102,11 +102,24 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
     topo.viewProps.onResourceEvent(topo.alarm.getEvents());
   }
 };
+/**
+ * 关联拓扑告警级别消息处理
+ * @param {*} topo 
+ * @param {*} data 
+ */
+
 
 var handleRelateTopoAlarm = function handleRelateTopoAlarm(topo, data) {
   var relateTopoAlarm = (0, _extends2["default"])({}, topo.store.getModelState('topoAlarm').relateTopoAlarm);
   data.forEach(function (item) {
-    relateTopoAlarm[item.topoId] = item.alertLevel;
+    var alertLevel = item.alertLevel;
+
+    if (alertLevel === -1) {
+      // -1表示删除
+      delete relateTopoAlarm[item.topoId];
+    } else {
+      relateTopoAlarm[item.topoId] = item.alertLevel;
+    }
   });
   topo.store.getModelDispatchers('topoAlarm').update({
     relateTopoAlarm: relateTopoAlarm

package/lib/core/hooks/useCmpLinkAlarm.js

@@ -53,9 +53,6 @@ function useCmpLinkAlarm(props) {
       resources = props.resources,
       graphLoaded = props.graphLoaded;
 
-  var _topo$store$useModelS = topo.store.useModelState('topoBizMod'),
-      attrsAndMetrics = _topo$store$useModelS.attrsAndMetrics;
-
   var _useState = (0, _react.useState)(getCmpLinIds(resources)),
       cmpLinkIds = _useState[0],
       setCmpLinkIds = _useState[1];

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "12.0.0-dev.30" === 'string' ? "12.0.0-dev.30" : null;
+var version = typeof "12.0.0-dev.32" === 'string' ? "12.0.0-dev.32" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑