@riil-frontend/component-topology 13.0.5 → 13.0.8

package/es/core/hooks/useAlarm.js

@@ -2,18 +2,8 @@ import _extends from "@babel/runtime/helpers/extends";
 import { useEffect } from "react";
 import rlog from "@riil-frontend/component-topology-utils/es/rlog";
 import useGraphAlarmDisplay from "./useGraphAlarmDisplay";
-import useTopoEventListener from "./useTopoEventListener"; // 告警在活状态
-
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
-/**
- * 告警是否在活
- * @param {*} alarm 
- * @returns 
- */
-
-var isAlarmAlive = function isAlarmAlive(alarm) {
-  return showAlarmStatus.indexOf(alarm.status) >= 0;
-};
+import useTopoEventListener from "./useTopoEventListener";
+import { isAlarmAlive } from "../utils/alarmUtil";
 
 var handleRiskData = function handleRiskData(topo, receivedData) {
   var _risks, _topo$viewProps, _topo$viewProps2;
@@ -23,7 +13,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   // 已关闭 closed
   var prevRisks = topo.store.getModelState('topoAlarm').risks;
 
-  var isLiveRisk = function isLiveRisk(data) {
+  var isRiskAlive = function isRiskAlive(data) {
     return ['recovered', 'closed'].indexOf(data.status) === -1;
   };
 
@@ -52,7 +42,7 @@ var handleRiskData = function handleRiskData(topo, receivedData) {
   (_risks = risks).push.apply(_risks, addRisks); // 过滤掉无权限、非在活的
 
 
-  risks = risks.filter(isLiveRisk).filter(hasCiPermission).sort(function (a, b) {
+  risks = risks.filter(isRiskAlive).filter(hasCiPermission).sort(function (a, b) {
     return a.executeTime - b.executeTime;
   });
   rlog.debug('更新风险', {

package/es/core/hooks/useGraphAlarmDisplay.js

@@ -1,9 +1,10 @@
 import { useEffect, useMemo } from "react";
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import loglevel from 'loglevel';
 import { getElements } from "../../utils/htElementUtils";
 import { removeManageStatus, showManageStatus } from "../utils/showGraphManageStatusUtil";
-import useCmpLinkAlarm from "./useCmpLinkAlarm"; // import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
-
+import useCmpLinkAlarm from "./useCmpLinkAlarm";
+import useLinkAlarmDisplay from "./useLinkAlarmDisplay";
+var rlog = loglevel.getLogger('topo');
 /**
  * 获取ci的最高告警级别
  * @param {Array} alarmList
@@ -102,23 +103,27 @@ export default function useGraphAlarmDisplay(options) {
 
   var cmpRes = useMemo(function () {
     return addCmpLinkOfflineStatusForDisplayLineColor(oldResources, cmpLinkRunStatus);
-  }, [oldResources, cmpLinkRunStatus]);
-  var resources = [].concat(cmpRes); // 拓扑链路特殊处理 暂时屏蔽这部分处理
-  // const {
-  //   // linkAlarmLevels,
-  //   linkRunStatus,
-  //   getlinkAlarmLevels,
-  // } = useLinkAlarmDisplay({ topo, resources: cmpRes, graphLoaded, alarmList });
-  // const linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes);
-  // 排除掉处于断开状态的链路
-  // const resources = cmpRes.filter((item) => {
-  //   return !item.breakState;
-  // });
-  /// 屏蔽------------
+  }, [oldResources, cmpLinkRunStatus]); // const resources=[...cmpRes];
+  // 拓扑链路特殊处理 暂时屏蔽这部分处理
+
+  var _useLinkAlarmDisplay = useLinkAlarmDisplay({
+    topo: topo,
+    resources: cmpRes,
+    graphLoaded: graphLoaded,
+    alarmList: alarmList
+  }),
+      linkRunStatus = _useLinkAlarmDisplay.linkRunStatus,
+      getlinkAlarmLevels = _useLinkAlarmDisplay.getlinkAlarmLevels;
+
+  var linkAlarmLevels = getlinkAlarmLevels(alarmList, cmpRes); // 排除掉处于断开状态的链路
+
+  var resources = cmpRes.filter(function (item) {
+    return !item.breakState;
+  }); /// 屏蔽------------
   // ci告警级别
 
   var cisEventLevel = useMemo(function () {
-    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, risks.map(function (item) {
+    var levels = [].concat(alarmList || [], cmpLinkAlarmLevels, linkAlarmLevels, risks.map(function (item) {
       var _item$resourceId;
 
       return {

package/es/core/hooks/usePolling.js

@@ -124,6 +124,7 @@ var usePolling = function usePolling(props) {
                     position: 17,
                     icon: "resource.link.linkbreak"
                   });
+                  element === null || element === void 0 ? void 0 : element.a('linkbreak', true);
                   topo.dataModel.updateData([_extends({}, link, {
                     breakState: true
                   })]);

package/es/core/models/Alarm.js

@@ -1,9 +1,9 @@
 import _Dialog from "@alifd/next/es/dialog";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import topoService from '@riil-frontend/component-topology-common/es/services/topo';
-import { rlog } from '@riil-frontend/component-topology-utils';
+import loglevel from 'loglevel';
 import { isAvailableArray } from '@riil-frontend/utils';
+var rlog = loglevel.getLogger('topo');
 
 var Alarm = /*#__PURE__*/function () {
   function Alarm() {
@@ -456,7 +456,7 @@ var Alarm = /*#__PURE__*/function () {
             resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
             alarmDispatchers = this.topo.store.getModelDispatchers('topoAlarm'); // 添加事件
 
-            console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
+            rlog.debug("handleAlarmEvent-接收到推送的原始告警信息", alertData);
 
             if (!(isAvailableArray(alertData) && isAvailableArray(resIdsList))) {
               _context8.next = 25;

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

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

@@ -5,9 +5,11 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 /**
  * 告警
  */
-import rlog from "@riil-frontend/component-topology-utils/es/rlog";
+import loglevel from 'loglevel';
 import _ from "lodash";
-var showAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
+var rlog = loglevel.getLogger('topo'); // 在活告警状态
+
+var aliveAlarmStatus = ["toDeal", "dealing", "change", "woDealing"];
 
 var sortList = function sortList(a, b) {
   if (a.level === b.level) {
@@ -111,7 +113,7 @@ export default function (topo) {
 
                           if ((resIdsList || []).indexOf(rid) >= 0) {
                             if (record.indexOf(item.alertId) < 0) {
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 // rlog.debug("这是一条新告警", item);
                                 record.push(item.alertId);
 
@@ -141,7 +143,7 @@ export default function (topo) {
                               //   item
                               // );
 
-                              if (showAlarmStatus.indexOf(item.status) >= 0) {
+                              if (aliveAlarmStatus.indexOf(item.status) >= 0) {
                                 if (item.status === "change") {
                                   old = doc[rid][sliceTag];
 
@@ -210,7 +212,7 @@ export default function (topo) {
                       // rlog.debug('xxxxxxxxxxxxxxxxxxxx', doc[id][0], alarmObj.status);
 
 
-                      return showAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
+                      return aliveAlarmStatus.indexOf(alarmObj.status) >= 0 ? alarmObj : null;
                     } else {
                       return null;
                     }

package/es/core/utils/alarmUtil.js

@@ -0,0 +1,11 @@
+// 告警在活状态
+var Alarm_alive_Status = ["toDeal", "dealing", "change", "woDealing"];
+/**
+ * 告警是否在活
+ * @param {*} alarm 
+ * @returns 
+ */
+
+export var isAlarmAlive = function isAlarmAlive(alarm) {
+  return Alarm_alive_Status.includes(alarm.status);
+};

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

@@ -5,6 +5,7 @@ import _Icon from "@alifd/next/es/icon";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import moment from 'moment';
+import { history as iceHistory } from 'create-app-shared';
 import BlockBox from "./BlockBox";
 import Link from "../../../../../../../components/Link";
 import service from "../../../../../../services/overview";
@@ -37,7 +38,7 @@ function EventsCard(props) {
       log.debug('formatUrl(url)', url);
       topo.viewProps.jumpto(url);
     } else {
-      getHistory().push(formatUrl(url));
+      (getHistory() || iceHistory).push(formatUrl(url));
     }
   }; // 告警table列配置
 
@@ -47,34 +48,19 @@ function EventsCard(props) {
     dataIndex: "title",
     key: "title",
     cell: function cell(value, index, record) {
-      return (
-        /*#__PURE__*/
-        // <div
-        //   className={styles["alarm-title"]}
-        //   title={value}
-        //   onClick={closeDetailDrawer}
-        // >
-        //   <Icon
-        //     type={record.icon}
-        //     size="xs"
-        //     className={`${styles["alarm-color-icon"]} ${record.className}`}
-        //   />
-        //   <Link to={formatUrl(record.link)}>{value}</Link>
-        // </div>
-        React.createElement("div", {
-          className: styles['alarm-title'],
-          title: value,
-          onClick: function onClick() {
-            jumpTo(record.link);
-          }
-        }, /*#__PURE__*/React.createElement(_Icon, {
-          type: record.icon,
-          size: "xs",
-          className: styles['alarm-color-icon'] + " " + record.className
-        }), /*#__PURE__*/React.createElement("span", {
-          className: styles.link
-        }, value))
-      );
+      return /*#__PURE__*/React.createElement("div", {
+        className: styles['alarm-title'],
+        title: value,
+        onClick: function onClick() {
+          jumpTo(record.link);
+        }
+      }, /*#__PURE__*/React.createElement(_Icon, {
+        type: record.icon,
+        size: "xs",
+        className: styles['alarm-color-icon'] + " " + record.className
+      }), /*#__PURE__*/React.createElement("span", {
+        className: styles.link
+      }, value));
     }
   }, {
     title: "时间",

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

@@ -1,6 +1,4 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _Button from "@alifd/next/es/button";
-import _Icon from "@alifd/next/es/icon";
 import _Message from "@alifd/next/es/message";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 
@@ -277,8 +275,7 @@ export default function ResourceOverview(props) {
 
   function getAddressFormat(_x3) {
     return _getAddressFormat.apply(this, arguments);
-  } // 告警table列配置
-
+  }
 
   function _getAddressFormat() {
     _getAddressFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
@@ -324,102 +321,6 @@ export default function ResourceOverview(props) {
     return _getAddressFormat.apply(this, arguments);
   }
 
-  var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
-    cell: function cell(value, index, record) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: styles['alarm-title'],
-        title: value,
-        onClick: onClose
-      }, /*#__PURE__*/React.createElement(_Icon, {
-        type: record.icon,
-        size: "xs",
-        className: styles['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/React.createElement(Link, {
-        className: styles.link,
-        to: formatUrl(record.link)
-      }, value));
-    }
-  }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
-    width: 144,
-    cell: function cell(value, index, record) {
-      return /*#__PURE__*/React.createElement("div", {
-        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 '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
-
-  function alarmRiskOperation(_x4, _x5) {
-    return _alarmRiskOperation.apply(this, arguments);
-  }
-
-  function _alarmRiskOperation() {
-    _alarmRiskOperation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(type, params) {
-      var res;
-      return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            if (!(type === 'alarm')) {
-              _context4.next = 6;
-              break;
-            }
-
-            _context4.next = 3;
-            return service.handleAlarm(params);
-
-          case 3:
-            res = _context4.sent;
-
-            _Message.success('受理成功');
-
-            refreshAlarmData(id); // if (isAppTopo) {
-            //   const {
-            //     displayName: ciName,
-            //     attributeMap: modelAttributeMap,
-            //     domain,
-            //   } = topo.ciTyeCache.getCiType(ciType);
-            //   initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
-            // } else {
-            //   getAlarmRiskData(id);
-            // }
-
-          case 6:
-          case "end":
-            return _context4.stop();
-        }
-      }, _callee4);
-    }));
-    return _alarmRiskOperation.apply(this, arguments);
-  }
-
   var elementData = {
     id: id,
     ciType: ciType,
@@ -427,36 +328,36 @@ export default function ResourceOverview(props) {
     name: resourceData.name ? resourceData.name : resourceData.attributes.name
   }; // 基本信息设置改变
 
-  function baseInfoColChange(_x6) {
+  function baseInfoColChange(_x4) {
     return _baseInfoColChange.apply(this, arguments);
   } // 获取属性信息
 
 
   function _baseInfoColChange() {
-    _baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(col) {
+    _baseInfoColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(col) {
       var _col;
 
       var infoData, attributeMap, _loop, _iterator, _step;
 
-      return _regeneratorRuntime.wrap(function _callee5$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime.wrap(function _callee4$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if ((_col = col) !== null && _col !== void 0 && _col.length) {
-              _context6.next = 3;
+              _context5.next = 3;
               break;
             }
 
             setBaseInfo([]);
-            return _context6.abrupt("return");
+            return _context5.abrupt("return");
 
           case 3:
             settBaseInfoInitLoading(true);
             infoData = [];
-            _context6.next = 7;
+            _context5.next = 7;
             return getAttribute(id);
 
           case 7:
-            attributeMap = _context6.sent;
+            attributeMap = _context5.sent;
             // console.log('getAttribute', attributeMap);
             col = col.filter(function (item) {
               return !item.hidden;
@@ -464,14 +365,14 @@ export default function ResourceOverview(props) {
             _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
               var item, value, contentTitle, link, address, owned_computer_room, owned_cabinet, roomLink, node, data, _ref3, _ref3$, _item, _attributeMap, object, _object2, displayName, attr;
 
-              return _regeneratorRuntime.wrap(function _loop$(_context5) {
-                while (1) switch (_context5.prev = _context5.next) {
+              return _regeneratorRuntime.wrap(function _loop$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     item = _step.value;
                     value = formatMetric(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
                     contentTitle = value;
-                    _context5.t0 = item.dataIndex;
-                    _context5.next = _context5.t0 === 'display_name' ? 6 : _context5.t0 === 'ciName' ? 9 : _context5.t0 === 'res_address' ? 12 : _context5.t0 === 'imageName' ? 19 : 23;
+                    _context4.t0 = item.dataIndex;
+                    _context4.next = _context4.t0 === 'display_name' ? 6 : _context4.t0 === 'ciName' ? 9 : _context4.t0 === 'res_address' ? 12 : _context4.t0 === 'imageName' ? 19 : 23;
                     break;
 
                   case 6:
@@ -492,19 +393,19 @@ export default function ResourceOverview(props) {
                     }
 
                     contentTitle = attributeMap.display_name || '-';
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 9:
                     value = ciTypeMeta.displayName;
                     contentTitle = value;
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 12:
-                    _context5.next = 14;
+                    _context4.next = 14;
                     return getAddressFormat(attributeMap);
 
                   case 14:
-                    address = _context5.sent;
+                    address = _context4.sent;
                     owned_computer_room = attributeMap.owned_computer_room, owned_cabinet = attributeMap.owned_cabinet; // 跳转3D机房定位设备
 
                     if (owned_computer_room && owned_cabinet) {
@@ -523,16 +424,16 @@ export default function ResourceOverview(props) {
                     }
 
                     contentTitle = address;
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 19:
                     node = topo.getDataModel().getDataByTag(id);
                     value = (node === null || node === void 0 ? void 0 : node.a('customName')) || (node === null || node === void 0 ? void 0 : node.a('name')) || '-';
                     contentTitle = value;
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 23:
-                    return _context5.abrupt("break", 24);
+                    return _context4.abrupt("break", 24);
 
                   case 24:
                     // 拿翻译字段属性数据
@@ -572,7 +473,7 @@ export default function ResourceOverview(props) {
 
                   case 33:
                   case "end":
-                    return _context5.stop();
+                    return _context4.stop();
                 }
               }, _loop);
             });
@@ -580,14 +481,14 @@ export default function ResourceOverview(props) {
 
           case 11:
             if ((_step = _iterator()).done) {
-              _context6.next = 15;
+              _context5.next = 15;
               break;
             }
 
-            return _context6.delegateYield(_loop(), "t0", 13);
+            return _context5.delegateYield(_loop(), "t0", 13);
 
           case 13:
-            _context6.next = 11;
+            _context5.next = 11;
             break;
 
           case 15:
@@ -596,56 +497,56 @@ export default function ResourceOverview(props) {
 
           case 17:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee5);
+      }, _callee4);
     }));
     return _baseInfoColChange.apply(this, arguments);
   }
 
-  function getAttribute(_x7) {
+  function getAttribute(_x5) {
     return _getAttribute.apply(this, arguments);
   } // 指标设置改变
 
 
   function _getAttribute() {
-    _getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(id) {
+    _getAttribute = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id) {
       var _yield$resourceOvervi2, baseInfos, res, _ref4, attributes;
 
-      return _regeneratorRuntime.wrap(function _callee6$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime.wrap(function _callee5$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (id) {
-              _context7.next = 2;
+              _context6.next = 2;
               break;
             }
 
-            return _context7.abrupt("return");
+            return _context6.abrupt("return");
 
           case 2:
             if (!(resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getData)) {
-              _context7.next = 9;
+              _context6.next = 9;
               break;
             }
 
-            _context7.next = 5;
+            _context6.next = 5;
             return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
               id: id
             });
 
           case 5:
-            _yield$resourceOvervi2 = _context7.sent;
+            _yield$resourceOvervi2 = _context6.sent;
             baseInfos = _yield$resourceOvervi2.baseInfos;
 
             if (!baseInfos) {
-              _context7.next = 9;
+              _context6.next = 9;
               break;
             }
 
-            return _context7.abrupt("return", baseInfos);
+            return _context6.abrupt("return", baseInfos);
 
           case 9:
-            _context7.next = 11;
+            _context6.next = 11;
             return service.commonQueryCiData({
               condition: "id('" + id + "')",
               refAttribute: true,
@@ -658,31 +559,31 @@ export default function ResourceOverview(props) {
             });
 
           case 11:
-            res = _context7.sent;
+            res = _context6.sent;
             _ref4 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref4.attributes;
-            return _context7.abrupt("return", attributes || {});
+            return _context6.abrupt("return", attributes || {});
 
           case 14:
           case "end":
-            return _context7.stop();
+            return _context6.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
     return _getAttribute.apply(this, arguments);
   }
 
-  function metricColChange(_x8) {
+  function metricColChange(_x6) {
     return _metricColChange.apply(this, arguments);
   }
 
   function _metricColChange() {
-    _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(col) {
+    _metricColChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(col) {
       var _col2, _col3;
 
       var codes, endTime, params, _ref6, times, metricList, metricLists;
 
-      return _regeneratorRuntime.wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return _regeneratorRuntime.wrap(function _callee6$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             // console.log('metricColChange col', col);
             col = (_col2 = col) === null || _col2 === void 0 ? void 0 : _col2.filter(function (item) {
@@ -690,13 +591,13 @@ export default function ResourceOverview(props) {
             });
 
             if ((_col3 = col) !== null && _col3 !== void 0 && _col3.length) {
-              _context8.next = 4;
+              _context7.next = 4;
               break;
             }
 
             setMetric([]); // Message.error('指标未设置')
 
-            return _context8.abrupt("return");
+            return _context7.abrupt("return");
 
           case 4:
             codes = col.map(function (item) {
@@ -721,11 +622,11 @@ export default function ResourceOverview(props) {
             }
 
             setMetricInitLoading(true);
-            _context8.next = 11;
+            _context7.next = 11;
             return service.getMetricList(params);
 
           case 11:
-            metricList = _context8.sent;
+            metricList = _context7.sent;
             metricLists = metricList.concat(getNewMetricList());
             rlog.debug('metricColChange', metricLists, monitorMetricModels);
             setMetric(col.map(function (item, key) {
@@ -754,9 +655,9 @@ export default function ResourceOverview(props) {
 
           case 17:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee7);
+      }, _callee6);
     }));
     return _metricColChange.apply(this, arguments);
   }