@riil-frontend/component-topology 4.0.0-beta.9 → 4.0.2

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

@@ -79,7 +79,7 @@ function formatUrl(url) {
 
 
 function ResourceOverview(props) {
-  var _viewerProps$resource, _baseInfo$resource;
+  var _viewerProps$resource, _data$attributes;
 
   var topo = props.topo,
       id = props.id,
@@ -90,18 +90,27 @@ function ResourceOverview(props) {
       style = props.style;
   var resourceOverviewProps = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.resourceOverviewProps) || {}; // 是否是业务拓扑
 
-  var isAppTopo = !!topo.options.resourceOverviewDrawer;
+  var isAppTopo = !!resourceOverviewProps.getData;
+  console.log('resourceOverviewProps', resourceOverviewProps);
 
   var _topo$store$useModelS = topo.store.useModelState('topoMod'),
       topoId = _topo$store$useModelS.topoId; // 拓扑id
 
 
-  var _topo$dataModel$useDa = topo.dataModel.useDataById(id),
-      support_templates = _topo$dataModel$useDa.attributes.support_templates; // 该资源监控模板
-
+  if (isAppTopo) {
+    // 业务拓扑，下端拓扑场景需要手动传入 topoId
+    topoId = topoId || resourceOverviewProps.topoId;
+  }
 
-  console.log('support_templates ', support_templates);
   var data = topo.dataModel.useDataById(id);
+  var datas = topo.dataModel.useDatas();
+  var childrenIds = datas.filter(function (item) {
+    return item.ownerId === data.id;
+  }).map(function (item) {
+    return item.id;
+  });
+  var support_templates = (data === null || data === void 0 ? void 0 : (_data$attributes = data.attributes) === null || _data$attributes === void 0 ? void 0 : _data$attributes.support_templates) || ''; // 该资源监控模板
+
   var ciAttrAndMetricData = (0, _useCiAttrAndMetricData["default"])({
     topo: topo,
     id: id
@@ -132,6 +141,10 @@ function ResourceOverview(props) {
       metricInitLoading = _useState6[0],
       setMetricInitLoading = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(),
+      initFlag = _useState7[0],
+      setInitFlag = _useState7[1];
+
   var ciTypeMeta = (0, _react.useMemo)(function () {
     var typeMeta;
 
@@ -161,7 +174,12 @@ function ResourceOverview(props) {
       monitorMetricModels = _useMetricModels.metricModels;
 
   topo.resourceOverviewDrawer = {
-    refreshData: init
+    refreshData: function refreshData() {
+      if (monitorMetricModels) {
+        init();
+        setInitFlag(new Date().getTime());
+      }
+    }
   };
   (0, _react.useEffect)(function () {
     return function () {
@@ -181,6 +199,11 @@ function ResourceOverview(props) {
   function init() {
     getDevice();
     getAlarmRiskData(id);
+  } // 跳转前调用关闭操作
+
+
+  function onClose() {
+    isAppTopo && resourceOverviewProps.onClose && resourceOverviewProps.onClose();
   } // 基本信息可选项
 
 
@@ -222,9 +245,8 @@ function ResourceOverview(props) {
       });
     }
 
-    console.log('baseInfoCol col', col);
     return col;
-  }, [ciTypeMeta, type, isDevice]); // 指标可选项
+  }, [id, ciTypeMeta, type, isDevice]); // 指标可选项
 
   var metricCol = (0, _react.useMemo)(function () {
     console.log('monitorMetricModels', monitorMetricModels);
@@ -234,7 +256,7 @@ function ResourceOverview(props) {
         dataIndex: item.code
       };
     })) || [];
-  }, [monitorMetricModels]); // 获取上架设备类型，判断资源是否是上架设备
+  }, [id, monitorMetricModels, initFlag]); // 获取上架设备类型，判断资源是否是上架设备
 
   function getDevice() {
     return _getDevice.apply(this, arguments);
@@ -325,7 +347,7 @@ function ResourceOverview(props) {
 
   function _getAlarmRiskData() {
     _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _topo$options$resourc3, _alarmList, _yield$topo$options$r, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
+      var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, _yield$service$getRis, riskList;
 
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
@@ -337,14 +359,14 @@ function ResourceOverview(props) {
               }
 
               _context3.next = 3;
-              return (_topo$options$resourc3 = topo.options.resourceOverviewDrawer) === null || _topo$options$resourc3 === void 0 ? void 0 : _topo$options$resourc3.getData({
-                id: id,
-                metrics: topModelMetrics
+              return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
+                id: id // metrics: topModelMetrics,
+
               });
 
             case 3:
-              _yield$topo$options$r = _context3.sent;
-              alarmList = _yield$topo$options$r.alarms;
+              _yield$resourceOvervi = _context3.sent;
+              alarmList = _yield$resourceOvervi.alarms;
               alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
                 return {
                   type: 'alarm',
@@ -363,29 +385,33 @@ function ResourceOverview(props) {
                 };
               })) || [];
               setAlarmRiskList(alarmList);
-              _context3.next = 20;
+              _context3.next = 21;
               break;
 
             case 9:
               _context3.next = 11;
-              return _alarm["default"].getAlarmByIds([id], {
+              return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
                 alertStatusList: ['toDeal', 'woDealing', 'dealing'],
                 // toDeal: 待处理, dealing：处理中
                 pageNum: 1,
                 pageSize: 999,
                 sortField: 'alertLevel',
-                sortOrder: 'desc'
+                sortOrder: 'asc'
               });
 
             case 11:
               _yield$alarmService$g = _context3.sent;
               _alarmList2 = _yield$alarmService$g.datas;
+              // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
+              _alarmList2 = _alarmList2.sort(function (a, b) {
+                return b.createTime - a.createTime;
+              });
               _alarmList2 = _alarmList2.map(function (item) {
                 return {
                   type: 'alarm',
                   icon: 'gaojing-3',
                   className: "alarm-color-icon-lv" + item.alertLevel,
-                  title: "[" + item.alertObject + "] " + item.alertTitle,
+                  title: "" + item.alertObject + item.alertTitle,
                   link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
                   time: item.createTime,
                   status: item.status,
@@ -397,15 +423,15 @@ function ResourceOverview(props) {
                   }]
                 };
               });
-              _context3.next = 16;
+              _context3.next = 17;
               return _overview["default"].getRiskByIds({
-                ciIdList: [id],
+                ciIdList: [id].concat(childrenIds),
                 statusList: ['toDeal', 'dealing'],
                 current: 1,
                 pageSize: 999
               });
 
-            case 16:
+            case 17:
               _yield$service$getRis = _context3.sent;
               riskList = _yield$service$getRis.content;
               riskList = riskList.map(function (item) {
@@ -413,15 +439,15 @@ function ResourceOverview(props) {
                   type: 'risk',
                   icon: 'Overall_risk_full',
                   className: 'risk-icon',
-                  title: item.itemName,
-                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.ciName,
+                  title: "" + item.ciName + item.itemName,
+                  link: "/default/inspectionTaskList/inspectionReport?title=" + item.ciName + "&reportId=" + item.executeId + "&reportTime=" + item.executeTime + "&reportType=" + item.viewType + "&reportName=" + item.reportName,
                   time: item.firstFoundTime
                 };
               }); // console.log('告警和风险', alarmList, riskList);
 
               setAlarmRiskList([].concat(_alarmList2, riskList));
 
-            case 20:
+            case 21:
             case "end":
               return _context3.stop();
           }
@@ -438,7 +464,8 @@ function ResourceOverview(props) {
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: _indexModule["default"]['alarm-title'],
-        title: value
+        title: value,
+        onClick: onClose
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         type: record.icon,
         size: "xs",
@@ -489,8 +516,7 @@ function ResourceOverview(props) {
 
   function _alarmRiskOperation() {
     _alarmRiskOperation = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(type, params) {
-      var res, _topo$ciTyeCache$getC, ciName, modelAttributeMap, domain;
-
+      var res;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
@@ -508,12 +534,16 @@ function ResourceOverview(props) {
 
               _message["default"].success('受理成功');
 
-              if (isAppTopo) {
-                _topo$ciTyeCache$getC = topo.ciTyeCache.getCiType(ciType), ciName = _topo$ciTyeCache$getC.displayName, modelAttributeMap = _topo$ciTyeCache$getC.attributeMap, domain = _topo$ciTyeCache$getC.domain;
-                initAppTopo(monitorMetricModels, modelAttributeMap, ciName, domain);
-              } else {
-                getAlarmRiskData(id);
-              }
+              getAlarmRiskData(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":
@@ -529,7 +559,8 @@ function ResourceOverview(props) {
     id: id,
     ciType: ciType,
     type: type,
-    name: baseInfo === null || baseInfo === void 0 ? void 0 : (_baseInfo$resource = baseInfo.resource) === null || _baseInfo$resource === void 0 ? void 0 : _baseInfo$resource.display_name
+    // name: '123'
+    name: props.name
   }; // 基本信息设置改变
 
   function baseInfoColChange(_x5) {
@@ -541,27 +572,27 @@ function ResourceOverview(props) {
     _baseInfoColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(col) {
       var _col;
 
-      var data, attributeMap, _iterator, _step, item, value, link, node;
+      var infoData, attributeMap, _iterator, _step, item, value, contentTitle, link, node, _data, _ref2, _ref2$, _item, _attributeMap, object, _object, displayName, attr;
 
       return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               if ((_col = col) !== null && _col !== void 0 && _col.length) {
-                _context5.next = 2;
+                _context5.next = 3;
                 break;
               }
 
+              setBaseInfo([]);
               return _context5.abrupt("return");
 
-            case 2:
+            case 3:
               settBaseInfoInitLoading(true);
-              data = []; // const { attributeMap } = ciAttrAndMetricData;
-
-              _context5.next = 6;
+              infoData = [];
+              _context5.next = 7;
               return getAttribute(id);
 
-            case 6:
+            case 7:
               attributeMap = _context5.sent;
               console.log('getAttribute', attributeMap);
               col = col.filter(function (item) {
@@ -569,62 +600,100 @@ function ResourceOverview(props) {
               });
               _iterator = _createForOfIteratorHelperLoose(col);
 
-            case 10:
+            case 11:
               if ((_step = _iterator()).done) {
-                _context5.next = 32;
+                _context5.next = 46;
                 break;
               }
 
               item = _step.value;
               value = (0, _attributeFormatter.formatMetric)(attributeMap[item.dataIndex], ciTypeMeta.attributeMap[item.dataIndex]);
+              contentTitle = value;
               _context5.t0 = item.dataIndex;
-              _context5.next = _context5.t0 === 'display_name' ? 16 : _context5.t0 === 'ciName' ? 19 : _context5.t0 === 'res_address' ? 21 : _context5.t0 === 'imageName' ? 25 : 28;
+              _context5.next = _context5.t0 === 'display_name' ? 18 : _context5.t0 === 'ciName' ? 22 : _context5.t0 === 'res_address' ? 25 : _context5.t0 === 'imageName' ? 30 : 34;
               break;
 
-            case 16:
+            case 18:
               link = "/default/pagecenter/resDetail/view/" + id + "?resId=" + id + "&domainCode=" + ciTypeMeta.domain + "&title=" + attributeMap.display_name + "&ciCode=" + ciType; // 资源跳转链接
 
-              value = /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+              value = /*#__PURE__*/_react["default"].createElement("span", {
+                onClick: onClose
+              }, /*#__PURE__*/_react["default"].createElement(_Link["default"], {
                 className: _indexModule["default"].link,
                 title: attributeMap.display_name || "",
                 to: formatUrl(link)
-              }, attributeMap.display_name || "-");
-              return _context5.abrupt("break", 29);
+              }, attributeMap.display_name || "-"));
+              contentTitle = attributeMap.display_name || "-";
+              return _context5.abrupt("break", 35);
 
-            case 19:
+            case 22:
               value = ciTypeMeta.displayName;
-              return _context5.abrupt("break", 29);
+              contentTitle = value;
+              return _context5.abrupt("break", 35);
 
-            case 21:
-              _context5.next = 23;
+            case 25:
+              _context5.next = 27;
               return getAddressFormat(attributeMap);
 
-            case 23:
+            case 27:
               value = _context5.sent;
-              return _context5.abrupt("break", 29);
+              contentTitle = value;
+              return _context5.abrupt("break", 35);
 
-            case 25:
+            case 30:
               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')) || '-';
-              return _context5.abrupt("break", 29);
+              contentTitle = value;
+              return _context5.abrupt("break", 35);
+
+            case 34:
+              return _context5.abrupt("break", 35);
+
+            case 35:
+              // 拿翻译字段属性数据
+              if (attributeMap[item.dataIndex] && attributeMap[item.dataIndex + ".name"]) {
+                value = attributeMap[item.dataIndex + ".name"];
+                contentTitle = value;
+              }
+
+              _data = topo.attributeMetricDisplay.getData() || [];
+              _ref2 = [].concat(_data.filter(function (m) {
+                return m.id === id;
+              })), _ref2$ = _ref2[0], _item = _ref2$ === void 0 ? {} : _ref2$;
+              _attributeMap = _item.attributeMap || {};
+              object = _attributeMap[item.dataIndex + "_object"] || {};
+
+              if (!attributeMap[item.dataIndex + ".name"] && JSON.stringify(object) !== '{}') {
+                _object = (0, _extends2["default"])({}, object), displayName = _object.displayName;
+                value = displayName || _attributeMap["" + item.dataIndex];
+                contentTitle = value;
+              }
+
+              if (item.dataIndex === 'ipv6_address') {
+                value = _attributeMap["" + item.dataIndex];
+                contentTitle = value;
+              }
 
-            case 28:
-              return _context5.abrupt("break", 29);
+              if (isAppTopo && (item.dataIndex === 'source_type' || item.dataIndex === 'destination_type')) {
+                attr = topo.ciTyeCache.getCiType(attributeMap["" + item.dataIndex]) || {};
+                value = attr.displayName || attributeMap["" + item.dataIndex];
+                contentTitle = value;
+              }
 
-            case 29:
-              data.push((0, _extends2["default"])({}, item, {
-                value: value
+              infoData.push((0, _extends2["default"])({}, item, {
+                value: value,
+                contentTitle: contentTitle
               }));
 
-            case 30:
-              _context5.next = 10;
+            case 44:
+              _context5.next = 11;
               break;
 
-            case 32:
+            case 46:
               settBaseInfoInitLoading(false);
-              setBaseInfo(data);
+              setBaseInfo(infoData);
 
-            case 34:
+            case 48:
             case "end":
               return _context5.stop();
           }
@@ -641,7 +710,7 @@ function ResourceOverview(props) {
 
   function _getAttribute() {
     _getAttribute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
-      var res, _ref2, attributes;
+      var res, _ref3, attributes;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
@@ -670,7 +739,7 @@ function ResourceOverview(props) {
             case 4:
               res = _context6.sent;
               console.log('getAttribute res', res);
-              _ref2 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref2.attributes;
+              _ref3 = (res === null || res === void 0 ? void 0 : res.data[0]) || {}, attributes = _ref3.attributes;
               return _context6.abrupt("return", attributes);
 
             case 8:
@@ -691,7 +760,7 @@ function ResourceOverview(props) {
     _metricColChange = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(col) {
       var _col2, _col3;
 
-      var codes, endTime, params, _topo$options, _topo$options$resourc4, times, metricList;
+      var codes, endTime, params, _ref4, times, metricList;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
@@ -725,7 +794,7 @@ function ResourceOverview(props) {
               };
 
               if (isAppTopo) {
-                _topo$options$resourc4 = (_topo$options = topo.options) === null || _topo$options === void 0 ? void 0 : _topo$options.resourceOverviewDrawer.metricProps, times = _topo$options$resourc4.times;
+                _ref4 = resourceOverviewProps.metricProps || {}, times = _ref4.times;
 
                 if (times !== null && times !== void 0 && times.length) {
                   params.startTime = times[0];
@@ -761,7 +830,7 @@ function ResourceOverview(props) {
                 window.topo_overview_metric_timer && clearInterval(window.topo_overview_metric_timer);
                 window.topo_overview_metric_timer = setInterval(function () {
                   metricColChange(col);
-                }, 5000);
+                }, 60000);
               }
 
             case 17:
@@ -791,26 +860,36 @@ function ResourceOverview(props) {
     }
 
     if (isAppTopo) {
-      if (topo.options.resourceOverviewDrawer.baseInfoProps.defaultCols) {
-        baseInfo = topo.options.resourceOverviewDrawer.baseInfoProps.defaultCols(type, {
-          id: id,
-          ciType: ciType
-        });
+      var _resourceOverviewProp, _resourceOverviewProp2;
+
+      if ((_resourceOverviewProp = resourceOverviewProps.baseInfoProps) !== null && _resourceOverviewProp !== void 0 && _resourceOverviewProp.defaultCols) {
+        baseInfo = resourceOverviewProps.baseInfoProps.defaultCols({
+          type: type,
+          data: {
+            id: id,
+            ciType: ciType
+          }
+        }) || baseInfo;
+        if (baseInfo.indexOf('display_name') === -1) baseInfo = ['display_name'].concat(baseInfo);
       }
 
-      if (topo.options.resourceOverviewDrawer.defaultMetricCodes) {
-        keyIndicators = topo.options.resourceOverviewDrawer.defaultMetricCodes(type, {
-          id: id,
-          ciType: ciType
-        });
+      if ((_resourceOverviewProp2 = resourceOverviewProps.metricProps) !== null && _resourceOverviewProp2 !== void 0 && _resourceOverviewProp2.defaultCols) {
+        keyIndicators = resourceOverviewProps.metricProps.defaultCols({
+          type: type,
+          data: {
+            id: id,
+            ciType: ciType
+          }
+        }) || keyIndicators;
       }
     }
 
+    console.log('defaultCols', type, ciType, baseInfo, keyIndicators);
     return {
       baseInfo: baseInfo,
       keyIndicators: keyIndicators
     };
-  }, [type, topo, metricCol]);
+  }, [id, type, topo, metricCol]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: _indexModule["default"]['resource-overview'],
     style: style
@@ -819,17 +898,15 @@ function ResourceOverview(props) {
     data: elementData,
     ciTypeMeta: ciTypeMeta,
     baseInfo: baseInfo,
+    isAppTopo: isAppTopo,
     headerExtra: function headerExtra(p) {
-      var _resourceOverviewProp, _topo$options$resourc, _topo$options$resourc2;
+      var _resourceOverviewProp3;
 
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           display: 'flex'
         }
-      }, (resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : (_resourceOverviewProp = resourceOverviewProps.baseInfoProps) === null || _resourceOverviewProp === void 0 ? void 0 : _resourceOverviewProp.headerExtra(p)) || '', (_topo$options$resourc = topo.options.resourceOverviewDrawer) !== null && _topo$options$resourc !== void 0 && (_topo$options$resourc2 = _topo$options$resourc.baseInfoProps) !== null && _topo$options$resourc2 !== void 0 && _topo$options$resourc2.defaultCols ? topo.options.resourceOverviewDrawer.baseInfoProps.defaultCols(type, {
-        id: id,
-        ciType: ciType
-      }) : '', /*#__PURE__*/_react["default"].createElement(_Configurator["default"], {
+      }, (resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : (_resourceOverviewProp3 = resourceOverviewProps.baseInfoProps) === null || _resourceOverviewProp3 === void 0 ? void 0 : _resourceOverviewProp3.headerExtra(p)) || '', /*#__PURE__*/_react["default"].createElement(_Configurator["default"], {
         btnStyle: {
           marginLeft: 5
         },

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverviewMetric.js

@@ -100,21 +100,14 @@ function ResourceOverviewMetric(props) {
   function formatChart(itemData) {
     var code = itemData.code,
         metricItem = itemData.metricItem,
-        list = itemData.list;
+        list = itemData.list; // -2 为异常值，异常记录不显示
 
-    if (list.some(function (item) {
-      return item.metricValue == -2;
-    })) {
-      // 出现 -2 为异常值，不显示趋势图
-      return [];
-    } else {
-      return list.map(function (item) {
-        return {
-          time: item.ts,
-          value: Number(item.metricValue)
-        };
-      });
-    }
+    return list.map(function (item) {
+      return {
+        time: item.ts,
+        value: item.metricValue == -2 ? null : Number(item.metricValue)
+      };
+    });
   }
 
   console.log('ResourceOverviewMetric', data);

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js

@@ -75,7 +75,13 @@ function Configurator(props) {
       setOrgColumns = _useState3[1];
 
   (0, _react.useEffect)(function () {
-    if (columns && topoId && templateCode && type) init();
+    if (columns !== null && columns !== void 0 && columns.length && type) {
+      init();
+    } else {
+      setColumnState([]);
+      setOrgColumns([]);
+      onChange([]);
+    }
   }, [columns, topoId, templateCode, type]);
 
   function init() {
@@ -95,13 +101,26 @@ function Configurator(props) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.next = 2;
+              if (!(topoId && templateCode)) {
+                _context3.next = 6;
+                break;
+              }
+
+              _context3.next = 3;
               return _overview["default"].getOverviewConfig(topoId, templateCode);
 
-            case 2:
-              overviewConfig = _context3.sent;
-              console.log('overviewConfig', overviewConfig); // const overviewConfig = ''
+            case 3:
+              _context3.t0 = _context3.sent;
+              _context3.next = 7;
+              break;
 
+            case 6:
+              _context3.t0 = {};
+
+            case 7:
+              overviewConfig = _context3.t0;
+              // console.log('overviewConfig', overviewConfig);
+              // const overviewConfig = ''
               newPrevCols = [];
               newNextCols = [];
 
@@ -123,6 +142,10 @@ function Configurator(props) {
                   return !oldCols.find(function (old_item) {
                     return c_item.dataIndex === old_item.dataIndex;
                   });
+                }).map(function (item) {
+                  return (0, _extends2["default"])({}, item, {
+                    hidden: true
+                  });
                 });
               } else {
                 // 未设置
@@ -151,7 +174,7 @@ function Configurator(props) {
               setOrgColumns(newCols);
               onChange(newCols);
 
-            case 11:
+            case 15:
             case "end":
               return _context3.stop();
           }
@@ -230,19 +253,21 @@ function Configurator(props) {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
       var _service$saveOverview;
 
-      var res;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
-              return _overview["default"].saveOverviewConfig(topoId, templateCode, (_service$saveOverview = {}, _service$saveOverview[type] = JSON.stringify(columnsState), _service$saveOverview));
-
-            case 2:
-              res = _context2.sent;
               onChange(columnsState);
               setVisible(false);
 
+              if (!(topoId && templateCode)) {
+                _context2.next = 5;
+                break;
+              }
+
+              _context2.next = 5;
+              return _overview["default"].saveOverviewConfig(topoId, templateCode, (_service$saveOverview = {}, _service$saveOverview[type] = JSON.stringify(columnsState), _service$saveOverview));
+
             case 5:
             case "end":
               return _context2.stop();
@@ -327,7 +352,7 @@ function Configurator(props) {
     onClick: onOk,
     type: "primary",
     size: "medium",
-    disabled: !templateCode
+    disabled: !columnsState.length
   }, "\u786E\u5B9A"), /*#__PURE__*/_react["default"].createElement(_button["default"], (_React$createElement = {
     size: "small",
     onClick: onClose