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

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

@@ -46,7 +46,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isAppTopo) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
 
@@ -61,27 +61,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             alarmList = _yield$resourceOvervi2.alarms;
             alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                alarmInfo: item,
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "[" + item.alertObject + "] " + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             })) || [];
+            console.log("setAlarmRiskList", alarmList);
             setAlarmRiskList(alarmList);
-            _context.next = 24;
+            _context.next = 25;
             break;
 
-          case 9:
-            _context.next = 11;
+          case 10:
+            _context.next = 12;
             return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
               alertStatusList: ['toDeal', 'woDealing', 'dealing'],
               // toDeal: 待处理, dealing：处理中
@@ -91,7 +93,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               sortOrder: 'asc'
             });
 
-          case 11:
+          case 12:
             _yield$alarmService$g2 = _context.sent;
             _alarmList2 = _yield$alarmService$g2.datas;
             // 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
@@ -100,28 +102,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
             });
             _alarmList2 = _alarmList2.map(function (item) {
               return {
-                type: 'alarm',
-                icon: 'gaojing-3',
+                type: "alarm",
+                icon: "gaojing-3",
                 className: "alarm-color-icon-lv" + item.alertLevel,
                 title: "" + item.alertObject + item.alertTitle,
-                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
+                link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
                 time: item.createTime,
                 status: item.status,
                 params: [{
                   alertId: item.alertId,
-                  status: 'dealing',
+                  status: "dealing",
                   userId: userId,
                   isBaseAlert: false
                 }]
               };
             }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
 
-            _context.next = 17;
+            _context.next = 18;
             return _overview["default"].queryAllComponentsByCiId(id);
 
-          case 17:
+          case 18:
             AllComponentsByCiId = _context.sent;
-            _context.next = 20;
+            _context.next = 21;
             return _overview["default"].getRiskByIds({
               ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
                 return item.id;
@@ -131,7 +133,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
               pageSize: 10000
             });
 
-          case 20:
+          case 21:
             _yield$service$getRis2 = _context.sent;
             riskList = _yield$service$getRis2.content;
             riskList = riskList.map(function (item) {
@@ -147,7 +149,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
 
             setAlarmRiskList([].concat(_alarmList2, riskList));
 
-          case 24:
+          case 25:
           case "end":
             return _context.stop();
         }

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