@riil-frontend/component-topology 2.15.53 → 3.0.0-a.2

package/es/utils/topoData.js

@@ -263,40 +263,45 @@ export function parseTopoData(result) {
 }
 export function buildTopoGraphData() {// TODO 构造拓扑图数据移到这里
 }
-/**
- * 将从后端接收的数据转化为topo组件中需要的数据
- * 具体格式内容参考
- * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
- */
 
-export var combTopoData = function combTopoData(_ref2) {
-  var _result$config, _result$global2, _alarmSwitch, _engine$options$viewe, _engine$options$edito, _engine$options$edito2, _result$groups;
+function buildGlobal(_ref2) {
+  var _result$config, _result$global2, _engine$options$viewe, _engine$options$edito, _engine$options$edito2;
 
   var result = _ref2.data,
       permission = _ref2.permission,
       linkTo = _ref2.linkTo,
       globalConfig = _ref2.globalConfig,
-      ciTypeMap = _ref2.ciTypeMap,
       engine = _ref2.engine;
+  var edgeFlow;
 
-  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
-  var config = _extends({
-    type: "auto"
-  }, result.config); // global
+  if ((_result$config = result.config) !== null && _result$config !== void 0 && _result$config.enableLineFlow) {
+    edgeFlow = {
+      type: 'point',
+      // 必填，支持传送带drip、光点point、箭头arrow
+      direction: 'from' // 流动方向，可为空，默认源到目的
 
+    };
+  }
+
+  if (globalConfig.edgeFlow) {
+    edgeFlow = {
+      type: globalConfig.edgeFlow,
+      // 必填，支持传送带drip、光点point、箭头arrow
+      direction: globalConfig.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+
+    };
+  }
 
-  var global = _extends({
+  return _extends({
     // 背景图
-    backgroundImgUrl: getBackgroundImageUrl(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
+    backgroundImgUrl: engine.viewProps.hideBackground ? null : getBackgroundImageUrl(globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.background),
     control: _extends({
       editable: topoPermissionUtil.isEditable(permission),
       // 是否可编辑----控制[编辑]按钮
-      moveable: true,
-      // 节点是否可移动
-      enableLineFlow: ((_result$config = result.config) === null || _result$config === void 0 ? void 0 : _result$config.enableLineFlow) || (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.lineFlow) === "1"
+      moveable: true
     }, (result === null || result === void 0 ? void 0 : (_result$global2 = result.global) === null || _result$global2 === void 0 ? void 0 : _result$global2.control) || {}),
     topoDisplayConfig: _extends({
-      alarmSwitch: (_alarmSwitch = (result.global || {}).alarmSwitch) !== null && _alarmSwitch !== void 0 ? _alarmSwitch : true,
+      // alarmSwitch: (result.global || {}).alarmSwitch ?? true,
       showLog: false,
       // 是否在控制台显示打印内容
       showTips: true,
@@ -305,7 +310,7 @@ export var combTopoData = function combTopoData(_ref2) {
       // 是否显示tags
       showLinkName: false,
       // 是否显示链路名称
-      showLinkIF: false
+      edgeFlow: edgeFlow
     }, (globalConfig === null || globalConfig === void 0 ? void 0 : globalConfig.topoDisplayConfig) || {}),
     linkTo: linkTo
   }, result.global || {}, {
@@ -321,9 +326,39 @@ export var combTopoData = function combTopoData(_ref2) {
     icons: getEditorIcons(engine),
     // 获取默认节点图标，可选参数。如果无返回值则继续使用内部默认
     getDefaultNodeIcon: engine.options.getDefaultNodeIcon
-  }); // group
+  });
+}
+/**
+ * 将从后端接收的数据转化为topo组件中需要的数据
+ * 具体格式内容参考
+ * https://shimo.im/docs/yphCqyk9yqXWdp3Q/ 《拓扑数据结构》
+ */
+
+
+export var combTopoData = function combTopoData(_ref3) {
+  var _result$groups;
+
+  var result = _ref3.data,
+      permission = _ref3.permission,
+      linkTo = _ref3.linkTo,
+      globalConfig = _ref3.globalConfig,
+      ciTypeMap = _ref3.ciTypeMap,
+      engine = _ref3.engine;
+
+  // rlog.debug("combTopoData-接收到数据", result, engine, globalConfig);
+  var config = _extends({
+    type: 'auto'
+  }, result.config); // global
 
 
+  var global = buildGlobal({
+    data: result,
+    permission: permission,
+    linkTo: linkTo,
+    globalConfig: globalConfig,
+    engine: engine
+  }); // group
+
   var groups = formatGroups((_result$groups = result.groups) !== null && _result$groups !== void 0 ? _result$groups : []); // nodes
 
   var nodes = result.nodes.map(function (node) {
@@ -361,12 +396,6 @@ export var combTopoData = function combTopoData(_ref2) {
     // ci类型模型map
     metrics: [],
     // 所有指标
-    metricsDoc: {},
-    //
-    attrsDoc: {},
-    allMetrics: Object.values(ciTypeMap),
-    allAttrs: Object.values(ciTypeMap),
-    globalConfig: globalConfig,
     nodeIdsList: result.nodes.map(function (item) {
       return {
         ciId: item.id,
@@ -659,8 +688,8 @@ export var updateCiDoc = function updateCiDoc(dataType, doc, ciDoc, allCiSet) {
  * @param {} conditions
  */
 
-export var combSaveTopoData = function combSaveTopoData(_ref3) {
-  var global = _ref3.global;
+export var combSaveTopoData = function combSaveTopoData(_ref4) {
+  var global = _ref4.global;
   var topoDisplayConfig = global.topoDisplayConfig;
   rlog.debug("combSaveTopoData", global);
   var extraConfig = JSON.stringify({
@@ -668,7 +697,6 @@ export var combSaveTopoData = function combSaveTopoData(_ref3) {
   });
   return {
     alarmSwitch: global.topoDisplayConfig.alarmSwitch,
-    configDataList: [],
     extraConfig: extraConfig
   };
 };

package/lib/components/ResourceSelectDrawer/ResourceSelectList.js

@@ -34,7 +34,6 @@ function ResourceSelectList(props, ref) {
   });
   return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], {
     ref: ref,
-    innerTreeFilters: ['monitorable', 'discoverable'],
     limitTypes: limitTypes || _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
     defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
     request: (0, _componentTopologyCommon.getRequest)(),

package/lib/components/index.module.scss

@@ -3,10 +3,10 @@
 .topo-center-view {
   height: 100%;
 
-  border-radius: 4px;
-  box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.16);
-  box-shadow: $shadow-1;
-  background: #fff;
+  // border-radius: 4px;
+  // box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.16);
+  // box-shadow: $shadow-1;
+  // background: #fff;
   overflow: hidden;
   padding: 0;
 

package/lib/core/components/DisplaySettingDrawer/DisplaySetting.js

@@ -21,7 +21,7 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
 
 var _NodeTag = _interopRequireDefault(require("./NodeTag"));
 
-var _LineFlow = _interopRequireDefault(require("./LineFlow"));
+var _EdgeFlow = _interopRequireDefault(require("./EdgeFlow"));
 
 var _NodeTip = _interopRequireDefault(require("./NodeTip"));
 
@@ -31,6 +31,8 @@ var _LinkTag = _interopRequireDefault(require("./LinkTag"));
 
 var _LineExpandAllRadioGroup = _interopRequireDefault(require("./LineExpandAllRadioGroup"));
 
+var _EdgeFlowDirection = _interopRequireDefault(require("./EdgeFlowDirection"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -54,8 +56,9 @@ function DisplaySetting(props, ref) {
       nodeTip: displayConfig.nodeTip,
       linkTag: displayConfig.linkTag,
       linkTip: displayConfig.linkTip,
-      lineFlow: displayConfig.lineFlow,
-      expandAllEdges: displayConfig.expandAllEdges
+      expandAllEdges: displayConfig.expandAllEdges,
+      edgeFlow: displayConfig.edgeFlow,
+      edgeFlowDirection: displayConfig.edgeFlowDirection
     },
     onChange: function onChange(name, value) {
       _rlog["default"].debug('DisplaySetting-onChange', name, value);
@@ -128,6 +131,16 @@ function DisplaySetting(props, ref) {
     patternTrigger: "onChange"
   }, /*#__PURE__*/_react["default"].createElement(_LineExpandAllRadioGroup["default"], {
     name: "expandAllEdges"
+  })), showLinkConfig && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u94FE\u8DEF\u52A8\u6001\u6548\u679C",
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/_react["default"].createElement(_EdgeFlow["default"], {
+    name: "edgeFlow"
+  })), showLinkConfig && field.getValue('edgeFlow') && /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
+    label: "\u94FE\u8DEF\u6D41\u5411",
+    patternTrigger: "onChange"
+  }, /*#__PURE__*/_react["default"].createElement(_EdgeFlowDirection["default"], {
+    name: "edgeFlowDirection"
   }))));
 }
 

package/lib/core/components/DisplaySettingDrawer/EdgeFlow.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function EdgeFlow(props) {
+  var value = props.value,
+      onChange = props.onChange;
+
+  var handleTypeChange = function handleTypeChange(newValue) {
+    onChange(newValue === 'none' ? null : newValue);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
+    value: value || 'none',
+    onChange: handleTypeChange
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "none"
+  }, "\u65E0"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "drip"
+  }, "\u4F20\u9001\u5E26"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "point"
+  }, "\u5149\u70B9"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "arrow"
+  }, "\u7BAD\u5934"));
+}
+
+;
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(EdgeFlow);
+
+exports["default"] = _default;

package/lib/core/components/DisplaySettingDrawer/EdgeFlowDirection.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _radio = _interopRequireDefault(require("@alifd/next/lib/radio"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function EdgeFlowDirection(props) {
+  var value = props.value,
+      onChange = props.onChange;
+
+  var handleTypeChange = function handleTypeChange(newValue) {
+    onChange(newValue);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, {
+    value: value || 'from',
+    onChange: handleTypeChange
+  }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "from"
+  }, "\u4E0A\u884C"), /*#__PURE__*/_react["default"].createElement(_radio["default"], {
+    value: "to"
+  }, "\u4E0B\u884C"));
+}
+
+;
+
+var _default = /*#__PURE__*/_react["default"].forwardRef(EdgeFlowDirection);
+
+exports["default"] = _default;

package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js

@@ -20,6 +20,7 @@ var _default = function _default(props) {
 
   var executeByConfig = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(config) {
+      var edgeFlowConfig;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -38,9 +39,18 @@ var _default = function _default(props) {
                 if (topo.linkDynamicStyleExecutor) {
                   topo.linkDynamicStyleExecutor.execute();
                 }
-              }
+              } // 更新连线流动效果
 
-            case 2:
+
+              edgeFlowConfig = config.edgeFlow ? {
+                type: config.edgeFlow,
+                // 必填，支持传送带drip、光点point、箭头arrow
+                direction: config.edgeFlowDirection || 'from' // 流动方向，可为空，默认源到目的
+
+              } : null;
+              topo.getHtTopo().setGlobalEdgeFlow(edgeFlowConfig);
+
+            case 4:
             case "end":
               return _context.stop();
           }

package/lib/core/components/TopoView/topoView.js

@@ -66,6 +66,7 @@ var Topology = function Topology(props) {
       graphViewProps = _props$graphViewProps === void 0 ? {} : _props$graphViewProps,
       viewerProps = props.viewerProps,
       editorProps = props.editorProps;
+  topo.viewProps = props;
   var store = topo.store;
 
   var _store$useModel = store.useModel("topoMod"),
@@ -118,7 +119,7 @@ var Topology = function Topology(props) {
       _rlog["default"].debug("Topoget--AlertMesage------------", topo, data);
 
       if (data.type === "alarm") {
-        topo.alarm.getAlarmByEE(data.data);
+        topo.alarm.handleAlarmEvent(data.data);
       }
     }
   });

package/lib/core/models/Alarm.js

@@ -119,12 +119,6 @@ var Alarm = /*#__PURE__*/function () {
   };
 
   _proto.getAlarms = function getAlarms() {}
-  /**
-   * 处理告警推送事件
-   */
-  ;
-
-  _proto.handleAlarmEvent = function handleAlarmEvent() {}
   /**
    * 增加告警
    */
@@ -199,7 +193,7 @@ var Alarm = /*#__PURE__*/function () {
 
               _rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
               //   //this.topo.loadAlarm(result.datas);
-              //   this.getAlarmByEE({ type: "alarm", data: result.datas });
+              //   this.handleAlarmEvent({ type: "alarm", data: result.datas });
               // }
 
 
@@ -304,7 +298,7 @@ var Alarm = /*#__PURE__*/function () {
               _componentRiilEventEmitter.EE.on("topo", "topo", function (data, other) {
                 _rlog["default"].debug("openTopoAlarm 获取初始化告警------收到信息", data);
 
-                _this.getAlarmByEE(data);
+                _this.handleAlarmEvent(data);
               });
 
               this.updateState({
@@ -426,15 +420,14 @@ var Alarm = /*#__PURE__*/function () {
     return restart;
   }()
   /**
-   * 接收到推送的告警信息
-   * @param {} data
+   * 处理告警推送事件
    */
   ;
 
-  _proto.getAlarmByEE =
+  _proto.handleAlarmEvent =
   /*#__PURE__*/
   function () {
-    var _getAlarmByEE = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(alertData) {
+    var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(alertData) {
       var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
@@ -446,7 +439,7 @@ var Alarm = /*#__PURE__*/function () {
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件
 
-              console.log("getAlarmByEE-接收到推送的原始告警信息", alertData);
+              console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
               if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
                 _context7.next = 25;
@@ -502,6 +495,13 @@ var Alarm = /*#__PURE__*/function () {
               if (alarmIsOpened && !eqFlag) {
                 this.topo.loadAlarm(alarmlist);
                 this.hmGetTopoAlarm();
+
+                if (this.topo.viewProps.onAlarm) {
+                  // 通知所有告警
+                  this.topo.viewProps.onAlarm(sendAl.map(function (item) {
+                    return item.obj;
+                  }));
+                }
               }
 
               _context7.next = 25;
@@ -521,11 +521,11 @@ var Alarm = /*#__PURE__*/function () {
       }, _callee7, this, [[13, 22]]);
     }));
 
-    function getAlarmByEE(_x5) {
-      return _getAlarmByEE.apply(this, arguments);
+    function handleAlarmEvent(_x5) {
+      return _handleAlarmEvent.apply(this, arguments);
     }
 
-    return getAlarmByEE;
+    return handleAlarmEvent;
   }();
 
   _proto.setAlarms = function setAlarms(alarmList) {

package/lib/core/models/TopoApp.js

@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
 var _topoFactory = _interopRequireDefault(require("./topoFactory"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "2.15.53" === 'string' ? "2.15.53" : null;
+var version = typeof "3.0.0-a.2" === 'string' ? "3.0.0-a.2" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑
@@ -558,23 +558,27 @@ var Topo = /*#__PURE__*/function () {
           switch (_context12.prev = _context12.next) {
             case 0:
               topoDispatchers = this.store.getModelDispatchers('topoMod');
-              topoDispatchers.update({
+              _context12.next = 3;
+              return topoDispatchers.update({
                 viewState: 'edit'
               });
 
+            case 3:
+              this.fitContent();
+
               if (!this.options.onSwitchToEditModeBegin) {
-                _context12.next = 5;
+                _context12.next = 7;
                 break;
               }
 
-              _context12.next = 5;
+              _context12.next = 7;
               return this.options.onSwitchToEditModeBegin(this);
 
-            case 5:
-              _context12.next = 7;
+            case 7:
+              _context12.next = 9;
               return this.view.switchToEditMode();
 
-            case 7:
+            case 9:
               (0, _edgeUtil.updateEdgeExpanded)(this);
               editDispatchers = this.store.getModelDispatchers('topoConfig');
               editDispatchers.switchToEditMode();
@@ -587,7 +591,7 @@ var Topo = /*#__PURE__*/function () {
               iconManageDispatchers = this.store.getModelDispatchers('customIcon');
               iconManageDispatchers.loadEditorIcons();
 
-            case 13:
+            case 15:
             case "end":
               return _context12.stop();
           }

package/lib/core/models/topoData.js

@@ -15,8 +15,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _topo = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/topo"));
 
-var _topoData = require("../../utils/topoData");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/core/store/coreModels.js

@@ -33,14 +33,6 @@ var _resourceWebControllUrlSetting = _interopRequireDefault(require("../../model
 
 var _topoBaseInfoOverview = _interopRequireDefault(require("../../models/topoBaseInfoOverview"));
 
-var _topoCenter = _interopRequireDefault(require("../../topoCenter/store/topoCenter"));
-
-var _functionAuth = _interopRequireDefault(require("../../topoCenter/store/functionAuth"));
-
-var _topoLinkMod = _interopRequireDefault(require("../../topoCenter/store/topoLinkMod"));
-
-var _topoTreeMod = _interopRequireDefault(require("../../topoCenter/store/topoTreeMod"));
-
 var _default = {
   topoMod: _topoMod["default"],
   customIcon: _customIcon["default"],
@@ -48,7 +40,6 @@ var _default = {
   resourceWebControllUrlSetting: _resourceWebControllUrlSetting["default"],
   topoBizMod: _topoBizMod["default"],
   topoConfig: _topoConfig["default"],
-  topoLinkMod: _topoLinkMod["default"],
   topoView: _topoView["default"],
   background: _background["default"],
   topoGraphView: _topoGraphView["default"],
@@ -56,9 +47,6 @@ var _default = {
   displayConfig: _displayConfig["default"],
   topoBaseInfoOverview: _topoBaseInfoOverview["default"],
   ciModel: _ciModel["default"],
-  functionAuth: _functionAuth["default"],
-  topoEdit: _topoEdit["default"],
-  topoCenter: _topoCenter["default"],
-  topoTreeMod: _topoTreeMod["default"]
+  topoEdit: _topoEdit["default"]
 };
 exports["default"] = _default;

package/lib/hooks/usePolling.js

@@ -70,7 +70,7 @@ var usePolling = function usePolling(props) {
       map[attr.code] = attr.value;
     });
     return map;
-  } // 需要刷新数据的场景：资源变化、配置变化、开关变化
+  } // 需要刷新数据的场景：显示模式、资源变化、配置变化、开关开启、概览
 
 
   (0, _react.useEffect)(function () {

package/lib/models/topoAlarm.js

@@ -26,7 +26,7 @@ var _topoData = require("../utils/topoData");
 /**
  * 告警
  */
-var showAlarmStatus = ["toDeal", "dealing", "change"];
+var showAlarmStatus = ["toDeal", "dealing"];
 var _default = {
   // 定义 model 的初始 state
   state: {
@@ -141,22 +141,14 @@ var _default = {
                         // );
 
                         if (showAlarmStatus.indexOf(item.status) >= 0) {
-                          if (item.status === "change") {
-                            var old = doc[rid][sliceTag];
+                          if (doc[rid][sliceTag].level !== item.level) {
+                            var _newArr = [].concat(doc[rid]);
 
-                            if (old.level !== item.level) {
-                              var _newArr = [].concat(doc[rid]);
+                            _newArr.splice(sliceTag, 1, item);
 
-                              _newArr.splice(sliceTag, 1, (0, _extends2["default"])({}, item, {
-                                status: old.status
-                              }));
+                            doc[rid] = _newArr.sort(_topoData.sortList);
 
-                              doc[rid] = _newArr.sort(_topoData.sortList);
-
-                              _rlog["default"].debug("告警级别变更", doc[rid], item);
-                            } else {
-                              _rlog["default"].debug("接收到异常的重复告警", item);
-                            }
+                            _rlog["default"].debug("告警变更", doc[rid], item);
                           } else {// rlog.debug("重复告警", item);
                           }
                         } else {

package/lib/models/topoBizMod.js

@@ -55,17 +55,16 @@ function _default(engine) {
           var _this = this;
 
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-            var ciDoc, allMetrics, allAttrs, newCiDoc;
+            var ciDoc, newCiDoc;
             return _regenerator["default"].wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
-                    // const { res } = state.topoMod.resAndMetrics;
                     _this.update({
                       resAndMetrics: conditions
                     });
 
-                    ciDoc = conditions.ciDoc, allMetrics = conditions.allMetrics, allAttrs = conditions.allAttrs;
+                    ciDoc = conditions.ciDoc;
                     newCiDoc = (0, _extends2["default"])({}, ciDoc); // rlog.debug('topoBizMod.combBatchCiInfo getBatchCiInfo', conditions);
 
                     _this.update({
@@ -117,43 +116,6 @@ function _default(engine) {
             }, _callee2, null, [[1, 8]]);
           }))();
         },
-        // 初始化，统一获取指标和属性
-        getCiBizByIds: function getCiBizByIds(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-            var _conditions$ciIds, _conditions$codes;
-
-            var _state$topoBizMod$res, resIdsList, metrics, ciIds, codes, metricResult, arrResult;
-
-            return _regenerator["default"].wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    _state$topoBizMod$res = state.topoBizMod.resAndMetrics, resIdsList = _state$topoBizMod$res.resIdsList, metrics = _state$topoBizMod$res.metrics;
-                    ciIds = encodeURIComponent((_conditions$ciIds = conditions === null || conditions === void 0 ? void 0 : conditions.ciIds) !== null && _conditions$ciIds !== void 0 ? _conditions$ciIds : resIdsList);
-                    codes = encodeURIComponent((_conditions$codes = conditions === null || conditions === void 0 ? void 0 : conditions.codes) !== null && _conditions$codes !== void 0 ? _conditions$codes : metrics);
-                    _context3.next = 5;
-                    return (0, _metric.getLatestMetrics)(ciIds, codes);
-
-                  case 5:
-                    metricResult = _context3.sent;
-                    _context3.next = 8;
-                    return _topo["default"].getBatchCiArr(ciIds);
-
-                  case 8:
-                    arrResult = _context3.sent;
-                    return _context3.abrupt("return", {
-                      metricResult: metricResult,
-                      arrResult: arrResult
-                    });
-
-                  case 10:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _callee3);
-          }))();
-        },
 
         /**
         * 设置属性和指标

package/lib/models/topoConfig.js

@@ -367,7 +367,7 @@ function _default(topoApp) {
                       engine: topoApp,
                       data: data,
                       linkTo: null,
-                      globalConfig: state.topoBizMod.resAndMetrics.globalConfig,
+                      globalConfig: state.topoMod.globalConfig,
                       ciTypeMap: ciTypeMap
                     }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics;
                     dispatch.topoMod.update({