@riil-frontend/component-topology 7.0.0-dev.2 → 7.0.0-dev.20

package/lib/core/models/Alarm.js

@@ -237,23 +237,11 @@ var Alarm = /*#__PURE__*/function () {
 
   _proto.hmGetTopoAlarm = /*#__PURE__*/function () {
     var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
-      var _this$topo$store$getS, data, resAndMetrics, topoData, _this$getState2, alarmIsOpened, alarmOpening, nodeIdsList, linkIdsList, resIdsList, mainCiIdList, endTime, startTime, parms, result;
-
+      var mainCiIdList, endTime, startTime, parms, result;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
-              _this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
-              _this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
-
-              nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
-              //   "获取告警列表--resAndMetrics,topoData,data",
-              //   this.topo,
-              //   resAndMetrics,
-              //   topoData,
-              //   data
-              // );
-
               mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
                 return !!ci.operation;
               }) // 过滤掉权限
@@ -262,7 +250,7 @@ var Alarm = /*#__PURE__*/function () {
               });
 
               if (!(mainCiIdList.length === 0)) {
-                _context3.next = 7;
+                _context3.next = 4;
                 break;
               }
 
@@ -272,7 +260,7 @@ var Alarm = /*#__PURE__*/function () {
               });
               return _context3.abrupt("return");
 
-            case 7:
+            case 4:
               //rlog.debug("获取告警列表", mainCiIdList);
               endTime = null; // new Date().valueOf();
 
@@ -297,10 +285,10 @@ var Alarm = /*#__PURE__*/function () {
                   endTime: endTime
                 }
               };
-              _context3.next = 12;
+              _context3.next = 9;
               return _topo["default"].getAlarmByIds(parms);
 
-            case 12:
+            case 9:
               result = _context3.sent;
 
               _rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
@@ -313,7 +301,7 @@ var Alarm = /*#__PURE__*/function () {
               // });
 
 
-            case 14:
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -408,14 +396,14 @@ var Alarm = /*#__PURE__*/function () {
     var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
       var _this2 = this;
 
-      var _this$getState3, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
+      var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
 
       return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
               // 如果当前拓扑图开启中或已开启则退出
-              _this$getState3 = this.getState(), alarmOpening = _this$getState3.alarmOpening, topoAlarmIsOpen = _this$getState3.topoAlarmIsOpen;
+              _this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
 
               if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
                 _context6.next = 3;
@@ -477,14 +465,14 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
-      var _this$getState4, alarmIsOpened, alarmOpening;
+      var _this$getState3, alarmIsOpened, alarmOpening;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
               // 如果未开启则退出
-              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened, alarmOpening = _this$getState4.alarmOpening;
+              _this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
 
               if (!(!alarmIsOpened && !alarmOpening)) {
                 _context7.next = 3;
@@ -574,13 +562,13 @@ var Alarm = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
-      var _this$getState5, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
+      var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
 
       return _regenerator["default"].wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
             case 0:
-              _this$getState5 = this.getState(), alarmIsOpened = _this$getState5.alarmIsOpened;
+              _this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
               resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
               resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
               alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件

package/lib/core/models/TopoApp.js

@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
 var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
 
 // eslint-disable-next-line no-undef
-var version = typeof "7.0.0-dev.2" === 'string' ? "7.0.0-dev.2" : null;
+var version = typeof "7.0.0-dev.20" === 'string' ? "7.0.0-dev.20" : null;
 console.info("\u62D3\u6251\u7248\u672C: " + version);
 /**
  * 拓扑显示和编辑

package/lib/core/models/topoData.js

@@ -13,14 +13,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireWildcard(require("@riil-frontend/component-topology-common/es/services/topo"));
+var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
-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; }
-
 function getLayoutId(layout) {
   if (!layout || typeof layout === "string") {
     return layout;
@@ -53,12 +49,12 @@ function saveTopo(_x) {
 
 function _saveTopo() {
   _saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
-    var topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
+    var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
+            topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
 
             _rlog["default"].debug("saveTopo", data); // 保存布局
 
@@ -69,7 +65,7 @@ function _saveTopo() {
             }
 
             _context.next = 5;
-            return _topo["default"].changeLayout({
+            return topoService.changeLayout({
               id: topoId,
               template: template,
               layout: getLayoutId(layout),
@@ -83,7 +79,7 @@ function _saveTopo() {
             }
 
             _context.next = 8;
-            return _topo["default"].saveTopoSettings(topoId, globalConfig);
+            return topoService.saveTopoSettings(topoId, globalConfig);
 
           case 8:
             if (!(resources || groups)) {
@@ -112,7 +108,7 @@ function _saveTopo() {
             _rlog["default"].debug("saveTopo-groupInfo", groupInfo);
 
             _context.next = 15;
-            return _topo["default"].bindResourceToTopo(topoId, {
+            return topoService.bindResourceToTopo(topoId, {
               groups: groupInfo,
               exportLinkIdList: exportLinkIdList,
               relateTopoIdList: relateTopoIdList
@@ -125,7 +121,7 @@ function _saveTopo() {
             }
 
             _context.next = 18;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topoService.saveSerializeData(topoId, serialize);
 
           case 18:
           case "end":

package/lib/core/models/utils/linkUtils.js

@@ -6,7 +6,6 @@ exports.__esModule = true;
 exports.buildTopoLinkData = buildTopoLinkData;
 exports.getInterfaceObject = exports.compatibleWith = void 0;
 exports.getLinksDetail = getLinksDetail;
-exports.isAggLink = isAggLink;
 exports.isCrucialLink = isCrucialLink;
 exports.isExitLink = isExitLink;
 exports.mergeLinksData = mergeLinksData;
@@ -57,10 +56,6 @@ function isExitLink(link) {
   return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
 }
 
-function isAggLink(link) {
-  return link.attributes["network_link.connect_type"] === "agg";
-}
-
 var getInterfaceObject = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
     var query, promises, result, ifDoc;

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

@@ -197,7 +197,7 @@ function _default(topoApp) {
                 switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return _topo["default"].getConditions(topoApp.id);
+                    return topoApp.serverApi.getConditions(topoApp.id);
 
                   case 2:
                     data = _context.sent;
@@ -347,7 +347,7 @@ function _default(topoApp) {
                     }); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
 
                     _context4.next = 5;
-                    return _topo["default"].getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
+                    return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
 
                   case 5:
                     data = _context4.sent;
@@ -415,7 +415,7 @@ function _default(topoApp) {
                     _rlog["default"].debug('saveGlobalConfig', config);
 
                     _context5.next = 5;
-                    return _topo["default"].saveTopoSettings(topoApp.id, config);
+                    return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
 
                   case 5:
                   case "end":
@@ -438,7 +438,9 @@ function _default(topoApp) {
                   case 0:
                     currentBackground = topoApp.store.getModelState("background").current;
                     _context6.next = 3;
-                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({}, data, {
+                    return (0, _topoData2.saveTopo)((0, _extends2["default"])({
+                      topoService: topoApp.serverApi
+                    }, data, {
                       viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
                       template: state.topoMod.type,
                       // 背景图
@@ -466,7 +468,7 @@ function _default(topoApp) {
                   case 0:
                     topoId = data.id, ciIdList = data.ciIdList;
                     _context7.next = 3;
-                    return _topo["default"].addToBlocklist(topoId, ciIdList);
+                    return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
 
                   case 3:
                   case "end":

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

@@ -417,7 +417,7 @@ function _default(topoApp) {
 
                   case 29:
                     _context6.next = 31;
-                    return topoApp.options.loadData(topoId);
+                    return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                   case 31:
                     result = _context6.sent;
@@ -629,17 +629,20 @@ function _default(topoApp) {
 
                   case 4:
                     topoPermission = _context11.sent;
-                    _context11.next = 10;
+
+                    _rlog["default"].debug('查询拓扑权限', topoPermission);
+
+                    _context11.next = 11;
                     break;
 
-                  case 7:
-                    _context11.prev = 7;
+                  case 8:
+                    _context11.prev = 8;
                     _context11.t0 = _context11["catch"](1);
 
                     _rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
-                  case 10:
+                  case 11:
                     if (update !== false) {
                       _this8.update({
                         topoPermission: topoPermission
@@ -648,12 +651,12 @@ function _default(topoApp) {
 
                     return _context11.abrupt("return", topoPermission);
 
-                  case 12:
+                  case 13:
                   case "end":
                     return _context11.stop();
                 }
               }
-            }, _callee11, null, [[1, 7]]);
+            }, _callee11, null, [[1, 8]]);
           }))();
         }
       };

package/lib/core/utils/saveSerialize.js

@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
-
 /**
  * 增加保存拓扑序列化数据方法，以便于拓扑中心和业务拓扑使用
  * 
@@ -30,7 +28,7 @@ function _saveSerialize() {
             topoId = topo.getId();
             serialize = topo.getHtTopo().serialize();
             _context.next = 4;
-            return _topo["default"].saveSerializeData(topoId, serialize);
+            return topo.serverApi.saveSerializeData(topoId, serialize);
 
           case 4:
           case "end":

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

@@ -218,9 +218,20 @@ function ResourceDetailDrawer(props) {
   }
 
   var renderContent = function renderContent() {
-    var _viewerProps$resource;
+    // 支持自定义概览
+    var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps) || {},
+        getResourceDetail = _ref.getResourceDetail;
+
+    var ResourceDetailWidget;
+
+    if (getResourceDetail) {
+      ResourceDetailWidget = getResourceDetail(resourceData);
+    }
+
+    if (!ResourceDetailWidget) {
+      ResourceDetailWidget = _ResourceDetail["default"];
+    }
 
-    var ResourceDetailWidget = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.ResourceDetailWidget) || _ResourceDetail["default"];
     return /*#__PURE__*/_react["default"].createElement(ResourceDetailWidget, (0, _extends2["default"])({}, props, {
       topo: topo,
       userId: userId,

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

@@ -13,8 +13,6 @@ var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
-
 var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
 
 var _react = _interopRequireDefault(require("react"));
@@ -75,30 +73,34 @@ function EventsCard(props) {
         title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
       }, (0, _moment["default"])(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["default"].createElement(_button["default"], {
-          text: true,
-          type: "primary",
-          onClick: function onClick() {
-            return alarmRiskOperation(record.type, record.params);
-          }
-        }, "\u53D7\u7406") : /*#__PURE__*/_react["default"].createElement(_button["default"], {
-          disabled: true,
-          text: true,
-          type: "primary"
-        }, "\u5DF2\u53D7\u7406");
-      } else {
-        // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
-        return '';
-      }
-    }
-  }]; // 告警/风险 操作 (受理)
+  } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
+  // {
+  //   title: '操作',
+  //   dataIndex: 'status',
+  //   key: 'status',
+  //   width: 64,
+  //   cell: (status, index, record) => {
+  //     if (record.type === 'alarm') {
+  //       return status === 'toDeal' ? (
+  //         <Button
+  //           text
+  //           type="primary"
+  //           onClick={() => alarmRiskOperation(record.type, record.params)}
+  //         >
+  //           受理
+  //         </Button>
+  //       ) : (
+  //         <Button disabled text type="primary">
+  //           已受理
+  //         </Button>
+  //       );
+  //     } else {
+  //       // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
+  //       return '';
+  //     }
+  //   },
+  // },
+  ]; // 告警/风险 操作 (受理)
 
   function alarmRiskOperation(_x, _x2) {
     return _alarmRiskOperation.apply(this, arguments);

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

@@ -947,6 +947,8 @@ function ResourceOverview(props) {
         defaultDisabledCol: ['display_name'],
         max: 6,
         columns: baseInfoCol,
+        getOverviewConfig: resourceOverviewProps.getOverviewConfig,
+        saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
         onChange: baseInfoColChange
       }));
     }
@@ -967,6 +969,8 @@ function ResourceOverview(props) {
       defaultCol: defaultCols.keyIndicators,
       max: 6,
       columns: metricCol,
+      getOverviewConfig: resourceOverviewProps.getOverviewConfig,
+      saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
       onChange: metricColChange
     })
   }, /*#__PURE__*/_react["default"].createElement(_ResourceOverviewMetric["default"], {

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

@@ -58,7 +58,9 @@ function Configurator(props) {
       type = props.type,
       max = props.max,
       _props$btnStyle = props.btnStyle,
-      btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle; // console.log('Configurator props', props);
+      btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle,
+      getOverviewConfig = props.getOverviewConfig,
+      saveOverviewConfig = props.saveOverviewConfig; // console.log('Configurator props', props);
 
   var buttonRef = (0, _react.useRef)(null);
 
@@ -96,35 +98,33 @@ function Configurator(props) {
 
   function _init() {
     _init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _overviewConfig;
+
       var overviewConfig, newPrevCols, newNextCols, oldCols, newCols;
       return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
+              overviewConfig = {};
+
               if (!(topoId && templateCode)) {
-                _context3.next = 6;
+                _context3.next = 5;
                 break;
               }
 
-              _context3.next = 3;
-              return _overview["default"].getOverviewConfig(topoId, templateCode);
+              _context3.next = 4;
+              return (getOverviewConfig || _overview["default"].getOverviewConfig)(topoId, templateCode);
 
-            case 3:
-              _context3.t0 = _context3.sent;
-              _context3.next = 7;
-              break;
+            case 4:
+              overviewConfig = _context3.sent;
 
-            case 6:
-              _context3.t0 = {};
-
-            case 7:
-              overviewConfig = _context3.t0;
+            case 5:
               // console.log('overviewConfig', overviewConfig);
               // const overviewConfig = ''
               newPrevCols = [];
               newNextCols = [];
 
-              if (overviewConfig !== null && overviewConfig !== void 0 && overviewConfig[type]) {
+              if ((_overviewConfig = overviewConfig) !== null && _overviewConfig !== void 0 && _overviewConfig[type]) {
                 oldCols = JSON.parse(overviewConfig[type]) || []; // 已设置
 
                 oldCols.forEach(function (old_item) {
@@ -174,7 +174,7 @@ function Configurator(props) {
               setOrgColumns(newCols);
               onChange(newCols);
 
-            case 15:
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -251,7 +251,7 @@ function Configurator(props) {
 
   var onOk = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-      var _service$saveOverview;
+      var _ref3;
 
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
@@ -266,7 +266,7 @@ function Configurator(props) {
               }
 
               _context2.next = 5;
-              return _overview["default"].saveOverviewConfig(topoId, templateCode, (_service$saveOverview = {}, _service$saveOverview[type] = JSON.stringify(columnsState), _service$saveOverview));
+              return (saveOverviewConfig || _overview["default"].saveOverviewConfig)(topoId, templateCode, (_ref3 = {}, _ref3[type] = JSON.stringify(columnsState), _ref3));
 
             case 5:
             case "end":

package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss

@@ -101,6 +101,7 @@
 }
 .alarm {
   margin-top: 12px;
+  margin-bottom: 16px;
   .alarm-title {
     overflow: hidden;
     text-overflow: ellipsis;

package/lib/core/viewer/components/titlebar/BasicTools.js

@@ -15,37 +15,23 @@ var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
 
 var _NodesDragSwitchWrapper = _interopRequireDefault(require("./widgets/NodesDragSwitchWrapper"));
 
-var _AlarmListShowButton = _interopRequireDefault(require("./widgets/AlarmListShowButton"));
-
 var _SettingButtonWidget = _interopRequireDefault(require("./widgets/SettingButtonWidget"));
 
-var _useEventData = _interopRequireDefault(require("../../../hooks/useEventData"));
+var _AlarmButton = _interopRequireDefault(require("./widgets/AlarmButton"));
 
 function BasicTools(props) {
   var topo = props.topo,
       _props$showEditButton = props.showEditButton,
       showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton,
       children = props.children;
-
-  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
-      alarmState = _topo$store$useModel[0],
-      alarmDispatchers = _topo$store$useModel[1];
-
-  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
-  var alarmData = (0, _useEventData["default"])({
-    topo: topo
-  });
   return /*#__PURE__*/_react["default"].createElement(_box["default"], {
     direction: "row",
     spacing: 8
   }, showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_AlarmButton["default"], (0, _extends2["default"])({
     topo: topo
-  }, props, {
-    alarmPanelIsOpen: alarmPanelIsOpen,
-    alarmData: alarmData
-  })), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
+  }, props)), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
     topo: topo
   }, props)), children);
 }

package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js

@@ -0,0 +1,36 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _AlarmListShowButton = _interopRequireDefault(require("./AlarmListShowButton"));
+
+var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventData"));
+
+function AlarmButton(props) {
+  var topo = props.topo;
+
+  var _topo$store$useModel = topo.store.useModel("topoAlarm"),
+      alarmState = _topo$store$useModel[0],
+      alarmDispatchers = _topo$store$useModel[1];
+
+  var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
+  var alarmData = (0, _useEventData["default"])({
+    topo: topo
+  });
+  return /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
+    topo: topo
+  }, props, {
+    alarmPanelIsOpen: alarmPanelIsOpen,
+    alarmData: alarmData
+  }));
+}
+
+var _default = AlarmButton;
+exports["default"] = _default;

package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js

@@ -24,7 +24,10 @@ function LinkDataTab(props) {
 
   var topo = props.topo,
       edge = props.edge,
-      link = props.link;
+      link = props.link,
+      source = props.source,
+      target = props.target,
+      editorProps = props.editorProps;
 
   var _topo$store$useModel = topo.store.useModel("topoConfig"),
       editState = _topo$store$useModel[0],
@@ -41,8 +44,11 @@ function LinkDataTab(props) {
     className: _LinkInfoPreviewModule["default"].panelFullHeight
   }, /*#__PURE__*/_react["default"].createElement(_LinkInfoPreview["default"], {
     className: _LinkInfoPreviewModule["default"].lindInfoPreview,
+    topo: topo,
     data: link,
-    topo: topo
+    source: source,
+    target: target,
+    isCmpTopo: (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo'
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: _LinkInfoPreviewModule["default"].footer
   }, /*#__PURE__*/_react["default"].createElement(_button["default"], {