@riil-frontend/component-topology 12.0.0-dev.9 → 12.1.0-dev.2

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/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() {

package/lib/core/viewer/components/plugins/ViewerPlugin.js

@@ -21,8 +21,10 @@ function ViewerPlugin(props) {
   var topo = props.topo,
       viewerProps = props.viewerProps;
   var store = topo.store;
+  var alarmInfoDoc = viewerProps.alarmInfoDoc;
   (0, _useAlarm["default"])({
-    topo: topo
+    topo: topo,
+    alarmInfoDoc: alarmInfoDoc
   });
   (0, _useManageStatus["default"])({
     topo: topo

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

@@ -15,11 +15,7 @@ var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventDa
 
 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 alarmState = topo.store.useModelState("topoAlarm");
   var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
   var alarmData = (0, _useEventData["default"])({
     topo: topo

package/lib/networkTopo/components/TopoView.js

@@ -11,7 +11,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _index = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/components/NoDataPage/index"));
 
@@ -31,13 +31,9 @@ var _useRelateTopo = _interopRequireDefault(require("../hooks/viewer/useRelateTo
 
 var _useEdgeFlow = _interopRequireDefault(require("../hooks/viewer/useEdgeFlow"));
 
-var _useEdgeExpand = _interopRequireDefault(require("../hooks/useEdgeExpand"));
-
 var _excluded = ["topo", "viewerProps", "titleBar", "nodataPage", "notfoundPageProps", "noPermissionPageProps"];
 
-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; }
+// import useEdgeExpand from "../hooks/useEdgeExpand";
 
 /**
  * 拓扑组件。变化无权限、无数据显示
@@ -60,10 +56,8 @@ function NetworkTopologyCore(props) {
   });
   (0, _useEdgeFlow["default"])({
     topo: topo
-  });
-  (0, _useEdgeExpand["default"])({
-    topo: topo
-  });
+  }); // useEdgeExpand({ topo })
+
   var relateTopo = (0, _useRelateTopo["default"])({
     topo: topo
   });
@@ -92,10 +86,7 @@ function NetworkTopologyCore(props) {
       });
     } else if (!topoId) {
       return null;
-    } // if (loading) {
-    //   return null;
-    // }
-
+    }
 
     if (!loading) {
       // 加载完成后

package/lib/networkTopo/hooks/useEdgeExpand.js

@@ -23,9 +23,8 @@ function useEdgeExpand(props) {
           data = e.data;
 
       if (data instanceof ht.Group && property === 'expanded') {
-        (0, _edgeUtil.updateEdgeExpanded)(topo);
-        setTimeout(function () {
-          (0, _edgeUtil.updateEdgeExpanded)(topo);
+        // updateEdgeExpanded(topo)
+        setTimeout(function () {// updateEdgeExpanded(topo)
         }, 100);
       }
     }

package/lib/networkTopo/services/topo/basic.js

@@ -23,7 +23,7 @@ var _model = require("../model");
 
 var _exitLinkUtil = require("../../utils/exitLinkUtil");
 
-var _excluded = ["groups", "resources", "exportLinkIdList"];
+var _excluded = ["groups", "resources"];
 var API_ROOT = _constants.TOPO_API_ROOT;
 /**
  * 拓扑图（看做一个容器）的“父容器”ID
@@ -480,11 +480,11 @@ var _default = (0, _extends2["default"])({
   */
   bindResourceToTopo: function bindResourceToTopo(id, config) {
     return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
-      var groups, resources, exportLinkIdList, otherConfig, newGroups, obj;
+      var groups, resources, otherConfig, newGroups, obj;
       return _regenerator["default"].wrap(function _callee14$(_context14) {
         while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            groups = config.groups, resources = config.resources, exportLinkIdList = config.exportLinkIdList, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
+            groups = config.groups, resources = config.resources, otherConfig = (0, _objectWithoutPropertiesLoose2["default"])(config, _excluded);
             newGroups = Array.isArray(groups) ? groups : [];
 
             if (resources) {