@riil-frontend/component-topology 12.0.0-dev.8 → 12.1.0-dev.1

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

@@ -226,76 +226,23 @@ function _default(topoApp) {
         enterEditMode: function enterEditMode(playload, rootState) {
           topoApp.enterEditMode();
         },
-        openDefaultTopoPage: function openDefaultTopoPage(conditions, rootState) {
-          var _this3 = this;
-
+        refreshPermission: function refreshPermission() {
           return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-            var topoId, treeData;
             return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
-                  if (conditions === void 0) {
-                    conditions = {};
-                  }
-
-                  topoId = rootState.topoTreeMod.defId;
-
-                  if (!topoId) {
-                    // 查找第一个
-                    treeData = rootState.topoTreeMod.treeData;
-                    (0, _tree.loopTreeByKey)(treeData, 'type', 1, function (item, index, arr) {
-                      if (!topoId) {
-                        topoId = item.id;
-                      }
-                    });
-                  } // 右侧切换拓扑图
-
-
-                  _this3.openTopoPage({
-                    id: topoId
-                  });
-
-                case 4:
-                case "end":
-                  return _context3.stop();
-              }
-            }, _callee3);
-          }))();
-        },
-        refreshPermission: function refreshPermission() {
-          var _this4 = this;
-
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-            return _regenerator["default"].wrap(function _callee4$(_context4) {
-              while (1) switch (_context4.prev = _context4.next) {
-                case 0:
-                  _context4.next = 2;
+                  _context3.next = 2;
                   return dispatch.functionAuth.refresh();
 
                 case 2:
-                  _context4.next = 4;
-                  return _this4.refreshTopoTree();
-
-                case 4:
-                case "end":
-                  return _context4.stop();
-              }
-            }, _callee4);
-          }))();
-        },
-        refreshTopoTree: function refreshTopoTree() {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-            return _regenerator["default"].wrap(function _callee5$(_context5) {
-              while (1) switch (_context5.prev = _context5.next) {
-                case 0:
-                  _context5.next = 2;
+                  _context3.next = 4;
                   return dispatch.topoTreeMod.refreshTree();
 
-                case 2:
+                case 4:
                 case "end":
-                  return _context5.stop();
+                  return _context3.stop();
               }
-            }, _callee5);
+            }, _callee3);
           }))();
         },
 
@@ -310,19 +257,19 @@ function _default(topoApp) {
          * @return {Promise<void>}
          */
         initTopoData: function initTopoData(props, state) {
-          var _this5 = this;
+          var _this3 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
             var _result$config;
 
             var startTime, topoId, data, linkToData, refresh, clear, linkTo, startState, permission, result, graphConfig, topoConfig, extraConfig, _combTopoData, topoData, resAndMetrics, _yield$Promise$all, newData, endTime;
 
-            return _regenerator["default"].wrap(function _callee6$(_context6) {
-              while (1) switch (_context6.prev = _context6.next) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
                 case 0:
                   startTime = (0, _moment["default"])();
                   topoId = props.topoId, data = props.data, linkToData = props.linkTo, refresh = props.refresh, clear = props.clear;
-                  _context6.next = 4;
+                  _context4.next = 4;
                   return topoApp.open(topoId);
 
                 case 4:
@@ -345,7 +292,7 @@ function _default(topoApp) {
                     });
                   }
 
-                  _this5.update(startState);
+                  _this3.update(startState);
 
                   dispatch.topoBizMod.update({
                     pollingSwitch: false
@@ -355,24 +302,24 @@ function _default(topoApp) {
                   permission = 'write';
 
                   if (!topoApp.options.usePermission) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _context6.next = 14;
-                  return _this5.getTopoPermission({
+                  _context4.next = 14;
+                  return _this3.getTopoPermission({
                     id: topoId
                   });
 
                 case 14:
-                  permission = _context6.sent;
+                  permission = _context4.sent;
 
                   if (_topoPermissionUtil["default"].isReadable(permission)) {
-                    _context6.next = 19;
+                    _context4.next = 19;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     topoData: null,
                     data: null,
@@ -381,26 +328,26 @@ function _default(topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 19:
                   if (!data) {
-                    _context6.next = 30;
+                    _context4.next = 30;
                     break;
                   }
 
                   graphConfig = {};
 
                   if (!topoId) {
-                    _context6.next = 27;
+                    _context4.next = 27;
                     break;
                   }
 
-                  _context6.next = 24;
+                  _context4.next = 24;
                   return _topo["default"].getTopoData(topoId);
 
                 case 24:
-                  topoConfig = _context6.sent;
+                  topoConfig = _context4.sent;
                   if (!topoConfig) _componentTopologyUtils.rlog.error("\u672A\u67E5\u8BE2\u5230\u62D3\u6251id " + topoId + " \u7684\u6570\u636E\uFF0C\u8BF7\u68C0\u67E5");
                   graphConfig = {
                     global: topoConfig === null || topoConfig === void 0 ? void 0 : topoConfig.global,
@@ -410,23 +357,23 @@ function _default(topoApp) {
 
                 case 27:
                   result = (0, _extends2["default"])({}, data, graphConfig);
-                  _context6.next = 33;
+                  _context4.next = 33;
                   break;
 
                 case 30:
-                  _context6.next = 32;
+                  _context4.next = 32;
                   return topoApp.options.loadData(topoId, topoApp.serverApi);
 
                 case 32:
-                  result = _context6.sent;
+                  result = _context4.sent;
 
                 case 33:
                   if (result) {
-                    _context6.next = 37;
+                    _context4.next = 37;
                     break;
                   }
 
-                  _this5.update({
+                  _this3.update({
                     loading: false,
                     data: null,
                     globalConfig: null,
@@ -435,19 +382,19 @@ function _default(topoApp) {
                   });
 
                   topoApp.options.onLoad();
-                  return _context6.abrupt("return");
+                  return _context4.abrupt("return");
 
                 case 37:
                   result = (0, _topoData.parseTopoData)(result);
 
                   _componentTopologyUtils.rlog.debug('topoMod.initTopoData 查询数据完成', topoId, linkTo, result);
 
-                  _context6.next = 41;
+                  _context4.next = 41;
                   return dispatch.customIcon.loadCustomIcons();
 
                 case 41:
                   extraConfig = result.global.extraConfig;
-                  _context6.next = 44;
+                  _context4.next = 44;
                   return dispatch.displayConfig.setConfig((0, _extends2["default"])({}, extraConfig, {
                     alarmSwitch: result.global.alarmSwitch,
                     alarmListDefaultOpen: result.global.alarmListDefaultOpen
@@ -461,8 +408,8 @@ function _default(topoApp) {
                     globalConfig: extraConfig
                   }), topoData = _combTopoData.topoData, resAndMetrics = _combTopoData.resAndMetrics; // rlog.debug("topoMod.initTopoData combTopoData", { topoData, resAndMetrics, });
 
-                  _context6.next = 47;
-                  return _this5.update({
+                  _context4.next = 47;
+                  return _this3.update({
                     currentTopo: topoData.config,
                     data: result,
                     globalConfig: extraConfig,
@@ -477,15 +424,15 @@ function _default(topoApp) {
 
                   topoApp.alarm.open(); // 加载标注悬浮框数据
 
-                  _context6.next = 52;
+                  _context4.next = 52;
                   return Promise.all([(0, _getTopoData.addLinkData)(result), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(result)), topoApp.elementTagTipConfig.init(result) // 暂停新配置开发
                   ]);
 
                 case 52:
-                  _yield$Promise$all = _context6.sent;
+                  _yield$Promise$all = _context4.sent;
                   newData = _yield$Promise$all[0];
-                  _context6.next = 56;
-                  return _this5.update({
+                  _context4.next = 56;
+                  return _this3.update({
                     data: newData
                   });
 
@@ -500,15 +447,15 @@ function _default(topoApp) {
 
                   topoApp.options.onLoad();
 
-                  _this5.update({
+                  _this3.update({
                     loading: false
                   });
 
                 case 62:
                 case "end":
-                  return _context6.stop();
+                  return _context4.stop();
               }
-            }, _callee6);
+            }, _callee4);
           }))();
         },
 
@@ -516,21 +463,21 @@ function _default(topoApp) {
          * 刷新拓扑图
          */
         refreshTopo: function refreshTopo(payload, rootState) {
-          var _this6 = this;
+          var _this4 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
             var _payload, clear;
 
-            return _regenerator["default"].wrap(function _callee7$(_context7) {
-              while (1) switch (_context7.prev = _context7.next) {
+            return _regenerator["default"].wrap(function _callee5$(_context5) {
+              while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   if (payload === void 0) {
                     payload = {};
                   }
 
                   _payload = payload, clear = _payload.clear;
-                  _context7.next = 4;
-                  return _this6.initTopoData({
+                  _context5.next = 4;
+                  return _this4.initTopoData({
                     topoId: rootState.topoMod.topoId,
                     refresh: true,
                     clear: clear
@@ -538,18 +485,18 @@ function _default(topoApp) {
 
                 case 4:
                 case "end":
-                  return _context7.stop();
+                  return _context5.stop();
               }
-            }, _callee7);
+            }, _callee5);
           }))();
         },
         operationTopoPage: function operationTopoPage(conditions, state) {
-          var _this7 = this;
+          var _this5 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
             var td;
-            return _regenerator["default"].wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+            return _regenerator["default"].wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = {};
@@ -557,7 +504,7 @@ function _default(topoApp) {
 
                   if (conditions.id === state.topoMod.topoId) {
                     if (conditions.type === 'delete') {
-                      _this7.update({
+                      _this5.update({
                         topoId: conditions.defId
                       });
                     }
@@ -569,7 +516,7 @@ function _default(topoApp) {
                         })
                       });
 
-                      _this7.update({
+                      _this5.update({
                         topoData: td
                       });
                     }
@@ -577,29 +524,29 @@ function _default(topoApp) {
 
                 case 2:
                 case "end":
-                  return _context8.stop();
+                  return _context6.stop();
               }
-            }, _callee8);
+            }, _callee6);
           }))();
         },
         openPermissionSetting: function openPermissionSetting(payload, rootState) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
-            return _regenerator["default"].wrap(function _callee9$(_context9) {
-              while (1) switch (_context9.prev = _context9.next) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+            return _regenerator["default"].wrap(function _callee7$(_context7) {
+              while (1) switch (_context7.prev = _context7.next) {
                 case 0:
                   dispatch.permissionSetting.open();
 
                 case 1:
                 case "end":
-                  return _context9.stop();
+                  return _context7.stop();
               }
-            }, _callee9);
+            }, _callee7);
           }))();
         },
         updateDelId: function updateDelId(conditions, state) {
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
-            return _regenerator["default"].wrap(function _callee10$(_context10) {
-              while (1) switch (_context10.prev = _context10.next) {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+            return _regenerator["default"].wrap(function _callee8$(_context8) {
+              while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   if (conditions === void 0) {
                     conditions = '';
@@ -609,53 +556,53 @@ function _default(topoApp) {
 
                 case 2:
                 case "end":
-                  return _context10.stop();
+                  return _context8.stop();
               }
-            }, _callee10);
+            }, _callee8);
           }))();
         },
         getTopoPermission: function getTopoPermission(playload, rootState) {
-          var _this8 = this;
+          var _this6 = this;
 
-          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11() {
+          return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
             var id, update, topoPermission;
-            return _regenerator["default"].wrap(function _callee11$(_context11) {
-              while (1) switch (_context11.prev = _context11.next) {
+            return _regenerator["default"].wrap(function _callee9$(_context9) {
+              while (1) switch (_context9.prev = _context9.next) {
                 case 0:
                   id = playload.id, update = playload.update;
-                  _context11.prev = 1;
-                  _context11.next = 4;
+                  _context9.prev = 1;
+                  _context9.next = 4;
                   return topoApp.serverApi.auth.getTopoPermission(id);
 
                 case 4:
-                  topoPermission = _context11.sent;
+                  topoPermission = _context9.sent;
 
                   _componentTopologyUtils.rlog.debug('查询拓扑权限', topoPermission);
 
-                  _context11.next = 11;
+                  _context9.next = 11;
                   break;
 
                 case 8:
-                  _context11.prev = 8;
-                  _context11.t0 = _context11["catch"](1);
+                  _context9.prev = 8;
+                  _context9.t0 = _context9["catch"](1);
 
-                  _componentTopologyUtils.rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
+                  _componentTopologyUtils.rlog.error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context9.t0); // 尚未区分拓扑图不存在还是接口请求报错
 
 
                 case 11:
                   if (update !== false) {
-                    _this8.update({
+                    _this6.update({
                       topoPermission: topoPermission
                     });
                   }
 
-                  return _context11.abrupt("return", topoPermission);
+                  return _context9.abrupt("return", topoPermission);
 
                 case 13:
                 case "end":
-                  return _context11.stop();
+                  return _context9.stop();
               }
-            }, _callee11, null, [[1, 8]]);
+            }, _callee9, null, [[1, 8]]);
           }))();
         }
       };

package/lib/core/utils/edgeUtil.js

@@ -3,17 +3,27 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
+exports.isCustomEdge = isCustomEdge;
 exports.updateEdgeExpanded = void 0;
 
 var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
 
 var _linkUtils = require("../models/utils/linkUtils");
 
+/**
+ * 是否手工连线
+ * @param {*} edge 
+ */
+function isCustomEdge(edge) {
+  return !edge.isEdgeGroupAgent() && (edge.a('type') == 'line' || !edge.a('type'));
+}
 /**
  * 根据配置更新连线展开折叠状态
  *
  * @param {*} topo
  */
+
+
 var updateEdgeExpanded = function updateEdgeExpanded(topo) {
   var _topo$historyManager, _topo$historyManager2;
 

package/lib/core/utils/metricUtil.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.formatMetric = formatMetric;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _utils = require("@riil-frontend/utils");
 
 var _DictCache = _interopRequireDefault(require("../models/cache/DictCache"));
@@ -23,16 +25,18 @@ function formatMetric(val, metricModel) {
   if (metricModel) {
     var _result$value;
 
-    // 分级字典特殊处理
-    if (metricModel.dict && !_DictCache["default"].getDictObject()[metricModel.code]) {
-      val = metricModel.dict[val];
+    var dictObject = (0, _extends2["default"])({}, _DictCache["default"].getDictObject()); // 分级字典特殊处理
+
+    if (metricModel.dict) {
+      // val = metricModel.dict[val]
+      dictObject[metricModel.code] = metricModel.dict;
     }
 
     var result = (0, _utils.metricValueFormat)({
       value: val,
       dataType: metricModel.dataType,
       changeValue: metricModel.changeValue,
-      dict: _DictCache["default"].getDictObject(),
+      dict: dictObject,
       unit: metricModel.unit,
       code: metricModel.code
     });

package/lib/core/utils/showGraphManageStatusUtil.js

@@ -14,6 +14,7 @@ function showManageStatus(options) {
   var topo = options.topo,
       resources = options.resources,
       graphLoaded = options.graphLoaded,
+      alarmSwitch = options.alarmSwitch,
       cisEventLevel = options.cisEventLevel;
 
   var hasAlarm = function hasAlarm(id) {
@@ -30,9 +31,9 @@ function showManageStatus(options) {
           manageStatus = resource.manageStatus,
           permission = resource.permission;
       var isNotMonite = manageStatus === 0;
-      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 没有告警且有查看权限，才显示未监控状态
+      var readable = !!(permission !== null && permission !== void 0 && permission.readable); // 未监控 && 有查看权限 && (告警静默 || 没有告警)，才显示未监控状态
 
-      var showUnMoniteStatus = !hasAlarm(id) && isNotMonite && readable;
+      var showUnMoniteStatus = isNotMonite && readable && (alarmSwitch === false || !hasAlarm(id));
       var element = topo.getDataModel().getDataByTag(id);
       if (!element) return; // ht元素设置是否显示监控状态，是否展示，用于缩小色块时显示未监控颜色
 

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

@@ -37,32 +37,31 @@ function EventsCard(props) {
       onHandleAlarm = props.onHandleAlarm; // 告警table列配置
 
   var columns = [{
-    title: '描述',
-    dataIndex: 'title',
-    key: 'title',
+    title: "描述",
+    dataIndex: "title",
+    key: "title",
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: _indexModule["default"]['alarm-title'],
+        className: _indexModule["default"]["alarm-title"],
         title: value,
         onClick: closeDetailDrawer
       }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
         type: record.icon,
         size: "xs",
-        className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
-      }), /*#__PURE__*/_react["default"].createElement("a", {
-        className: _indexModule["default"].link,
-        href: formatUrl(record.link)
+        className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
+      }), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
+        to: formatUrl(record.link)
       }, value));
     }
   }, {
-    title: '时间',
-    dataIndex: 'time',
-    key: 'time',
+    title: "时间",
+    dataIndex: "time",
+    key: "time",
     width: 144,
     cell: function cell(value, index, record) {
       return /*#__PURE__*/_react["default"].createElement("div", {
-        title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
-      }, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
+        title: (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss")
+      }, (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss"));
     }
   } // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
   // {

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

@@ -41,8 +41,8 @@ function LinkTopoCard(props) {
       openFlow = _useState[0],
       setOpenFlow = _useState[1];
 
-  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + data.attributes.name + "&num=0";
-  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + data.attributes.name + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
+  var analysisUrl = "../../default/trafficControl/linkConfigure?id=" + encodeURIComponent(data.attributes.display_name) + "&num=0";
+  var linkDetailsUrl = "/default/pagecenter/linkDetail/view/" + data.id + "?resId=" + data.id + "&domainCode=network&title=" + encodeURIComponent(data.attributes.display_name) + "&ciCode=network_link&tabByComType=uicbb-res-crucial-link-flow";
 
   var isOpenFlows = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {