@riil-frontend/component-topology 11.0.36 → 11.0.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.js +6 -6
- package/es/core/hooks/useTopoEdit.js +21 -16
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/utils/edgeUtil.js +1 -2
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +12 -13
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +20 -18
- package/lib/core/hooks/useTopoEdit.js +21 -16
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/utils/edgeUtil.js +1 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +12 -13
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +20 -18
- package/package.json +3 -3
|
@@ -554,7 +554,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
554
554
|
|
|
555
555
|
function _bindViewResources() {
|
|
556
556
|
_bindViewResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12(data) {
|
|
557
|
-
var config,
|
|
557
|
+
var config, result, _elements;
|
|
558
558
|
|
|
559
559
|
return _regeneratorRuntime.wrap(function _callee12$(_context12) {
|
|
560
560
|
while (1) switch (_context12.prev = _context12.next) {
|
|
@@ -570,15 +570,19 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
570
570
|
return editDispatchers.fetchDataByConfig();
|
|
571
571
|
|
|
572
572
|
case 6:
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
|
|
573
|
+
result = _context12.sent;
|
|
574
|
+
console.log("fetchDataByConfig", result);
|
|
576
575
|
|
|
577
|
-
if (
|
|
578
|
-
|
|
576
|
+
if (result) {
|
|
577
|
+
_elements = result.elements;
|
|
578
|
+
saveBind(TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
|
|
579
|
+
|
|
580
|
+
if (topo.linkDynamicStyleExecutor) {
|
|
581
|
+
topo.linkDynamicStyleExecutor.execute();
|
|
582
|
+
}
|
|
579
583
|
}
|
|
580
584
|
|
|
581
|
-
case
|
|
585
|
+
case 9:
|
|
582
586
|
case "end":
|
|
583
587
|
return _context12.stop();
|
|
584
588
|
}
|
|
@@ -593,7 +597,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
593
597
|
|
|
594
598
|
function _addLayerResources() {
|
|
595
599
|
_addLayerResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(group, newResourceIds) {
|
|
596
|
-
var _yield$
|
|
600
|
+
var _yield$editDispatcher3, elements, newElements;
|
|
597
601
|
|
|
598
602
|
return _regeneratorRuntime.wrap(function _callee13$(_context13) {
|
|
599
603
|
while (1) switch (_context13.prev = _context13.next) {
|
|
@@ -608,8 +612,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
608
612
|
return editDispatchers.fetchDataByConfig();
|
|
609
613
|
|
|
610
614
|
case 5:
|
|
611
|
-
_yield$
|
|
612
|
-
elements = _yield$
|
|
615
|
+
_yield$editDispatcher3 = _context13.sent;
|
|
616
|
+
elements = _yield$editDispatcher3.elements;
|
|
613
617
|
// 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
|
|
614
618
|
newElements = findUNExistedElements(elements);
|
|
615
619
|
rlog.debug("添加分层资源", {
|
|
@@ -1001,7 +1005,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1001
1005
|
|
|
1002
1006
|
function _relateNodeIp() {
|
|
1003
1007
|
_relateNodeIp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(txtValue, nodeElement) {
|
|
1004
|
-
var dm, isUnique, ip, configObj, configData,
|
|
1008
|
+
var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
|
|
1005
1009
|
|
|
1006
1010
|
return _regeneratorRuntime.wrap(function _callee15$(_context15) {
|
|
1007
1011
|
while (1) switch (_context15.prev = _context15.next) {
|
|
@@ -1023,7 +1027,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1023
1027
|
isUnique = isUniqueIp(dm, txtValue, nodeElement); // 获取关联链路
|
|
1024
1028
|
|
|
1025
1029
|
if (!isUnique) {
|
|
1026
|
-
_context15.next =
|
|
1030
|
+
_context15.next = 24;
|
|
1027
1031
|
break;
|
|
1028
1032
|
}
|
|
1029
1033
|
|
|
@@ -1047,8 +1051,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1047
1051
|
case 16:
|
|
1048
1052
|
configData = _context15.sent;
|
|
1049
1053
|
// console.log("configData",configObj, configData);
|
|
1050
|
-
|
|
1051
|
-
newLinkElements = findUNExistedLinkElements(
|
|
1054
|
+
_elements2 = configData.elements;
|
|
1055
|
+
newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
|
|
1052
1056
|
|
|
1053
1057
|
newLink = newLinkElements.filter(function (item) {
|
|
1054
1058
|
return item.type === "link";
|
|
@@ -1063,7 +1067,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1063
1067
|
nodes: [],
|
|
1064
1068
|
links: newLink,
|
|
1065
1069
|
linkGroups: newLinkGroup
|
|
1066
|
-
};
|
|
1070
|
+
};
|
|
1071
|
+
console.log("createElementsData", createElementsData);
|
|
1067
1072
|
|
|
1068
1073
|
if ([].concat(newLink, newLinkGroup).length > 0) {
|
|
1069
1074
|
_htTopo = topo.getHtTopo();
|
|
@@ -1071,7 +1076,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1071
1076
|
_htTopo.createElements(createElementsData);
|
|
1072
1077
|
}
|
|
1073
1078
|
|
|
1074
|
-
case
|
|
1079
|
+
case 24:
|
|
1075
1080
|
case "end":
|
|
1076
1081
|
return _context15.stop();
|
|
1077
1082
|
}
|
|
@@ -24,7 +24,7 @@ import ElementTagTipConfig from "./tagstips/ElementTagTipConfig";
|
|
|
24
24
|
import SelectionModel from "./SelectionModel";
|
|
25
25
|
import CiCache from "./cache/CiCache"; // eslint-disable-next-line no-undef
|
|
26
26
|
|
|
27
|
-
var version = typeof "11.0.
|
|
27
|
+
var version = typeof "11.0.38" === 'string' ? "11.0.38" : null;
|
|
28
28
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
29
29
|
/**
|
|
30
30
|
* 拓扑显示和编辑
|
|
@@ -36,8 +36,7 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
|
36
36
|
htTopo.expandAllEdgeGroups();
|
|
37
37
|
showLinkByConfig({
|
|
38
38
|
topo: topo,
|
|
39
|
-
showType: expandAllEdges
|
|
40
|
-
isEditMode: isEditMode
|
|
39
|
+
showType: isEditMode ? 4 : expandAllEdges
|
|
41
40
|
});
|
|
42
41
|
rlog.debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
|
|
43
42
|
}
|
package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js
CHANGED
|
@@ -20,32 +20,31 @@ function EventsCard(props) {
|
|
|
20
20
|
onHandleAlarm = props.onHandleAlarm; // 告警table列配置
|
|
21
21
|
|
|
22
22
|
var columns = [{
|
|
23
|
-
title:
|
|
24
|
-
dataIndex:
|
|
25
|
-
key:
|
|
23
|
+
title: "描述",
|
|
24
|
+
dataIndex: "title",
|
|
25
|
+
key: "title",
|
|
26
26
|
cell: function cell(value, index, record) {
|
|
27
27
|
return /*#__PURE__*/React.createElement("div", {
|
|
28
|
-
className: styles[
|
|
28
|
+
className: styles["alarm-title"],
|
|
29
29
|
title: value,
|
|
30
30
|
onClick: closeDetailDrawer
|
|
31
31
|
}, /*#__PURE__*/React.createElement(_Icon, {
|
|
32
32
|
type: record.icon,
|
|
33
33
|
size: "xs",
|
|
34
|
-
className: styles[
|
|
35
|
-
}), /*#__PURE__*/React.createElement(
|
|
36
|
-
|
|
37
|
-
href: formatUrl(record.link)
|
|
34
|
+
className: styles["alarm-color-icon"] + " " + record.className
|
|
35
|
+
}), /*#__PURE__*/React.createElement(Link, {
|
|
36
|
+
to: formatUrl(record.link)
|
|
38
37
|
}, value));
|
|
39
38
|
}
|
|
40
39
|
}, {
|
|
41
|
-
title:
|
|
42
|
-
dataIndex:
|
|
43
|
-
key:
|
|
40
|
+
title: "时间",
|
|
41
|
+
dataIndex: "time",
|
|
42
|
+
key: "time",
|
|
44
43
|
width: 144,
|
|
45
44
|
cell: function cell(value, index, record) {
|
|
46
45
|
return /*#__PURE__*/React.createElement("div", {
|
|
47
|
-
title: moment(value).format(
|
|
48
|
-
}, moment(value).format(
|
|
46
|
+
title: moment(value).format("YYYY-MM-DD HH:mm:ss")
|
|
47
|
+
}, moment(value).format("YYYY-MM-DD HH:mm:ss"));
|
|
49
48
|
}
|
|
50
49
|
} // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
|
|
51
50
|
// {
|
|
@@ -34,7 +34,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
34
34
|
while (1) switch (_context.prev = _context.next) {
|
|
35
35
|
case 0:
|
|
36
36
|
if (!isAppTopo) {
|
|
37
|
-
_context.next =
|
|
37
|
+
_context.next = 10;
|
|
38
38
|
break;
|
|
39
39
|
}
|
|
40
40
|
|
|
@@ -49,27 +49,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
49
49
|
alarmList = _yield$resourceOvervi2.alarms;
|
|
50
50
|
alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
|
|
51
51
|
return {
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
alarmInfo: item,
|
|
53
|
+
type: "alarm",
|
|
54
|
+
icon: "gaojing-3",
|
|
54
55
|
className: "alarm-color-icon-lv" + item.alertLevel,
|
|
55
56
|
title: "[" + item.alertObject + "] " + item.alertTitle,
|
|
56
|
-
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
|
|
57
|
+
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
|
|
57
58
|
time: item.createTime,
|
|
58
59
|
status: item.status,
|
|
59
60
|
params: [{
|
|
60
61
|
alertId: item.alertId,
|
|
61
|
-
status:
|
|
62
|
+
status: "dealing",
|
|
62
63
|
userId: userId,
|
|
63
64
|
isBaseAlert: false
|
|
64
65
|
}]
|
|
65
66
|
};
|
|
66
67
|
})) || [];
|
|
68
|
+
console.log("setAlarmRiskList", alarmList);
|
|
67
69
|
setAlarmRiskList(alarmList);
|
|
68
|
-
_context.next =
|
|
70
|
+
_context.next = 25;
|
|
69
71
|
break;
|
|
70
72
|
|
|
71
|
-
case
|
|
72
|
-
_context.next =
|
|
73
|
+
case 10:
|
|
74
|
+
_context.next = 12;
|
|
73
75
|
return alarmService.getAlarmByIds([id].concat(childrenIds), {
|
|
74
76
|
alertStatusList: ['toDeal', 'woDealing', 'dealing'],
|
|
75
77
|
// toDeal: 待处理, dealing：处理中
|
|
@@ -79,7 +81,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
79
81
|
sortOrder: 'asc'
|
|
80
82
|
});
|
|
81
83
|
|
|
82
|
-
case
|
|
84
|
+
case 12:
|
|
83
85
|
_yield$alarmService$g2 = _context.sent;
|
|
84
86
|
_alarmList2 = _yield$alarmService$g2.datas;
|
|
85
87
|
// 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
|
|
@@ -88,28 +90,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
88
90
|
});
|
|
89
91
|
_alarmList2 = _alarmList2.map(function (item) {
|
|
90
92
|
return {
|
|
91
|
-
type:
|
|
92
|
-
icon:
|
|
93
|
+
type: "alarm",
|
|
94
|
+
icon: "gaojing-3",
|
|
93
95
|
className: "alarm-color-icon-lv" + item.alertLevel,
|
|
94
96
|
title: "" + item.alertObject + item.alertTitle,
|
|
95
|
-
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
|
|
97
|
+
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
|
|
96
98
|
time: item.createTime,
|
|
97
99
|
status: item.status,
|
|
98
100
|
params: [{
|
|
99
101
|
alertId: item.alertId,
|
|
100
|
-
status:
|
|
102
|
+
status: "dealing",
|
|
101
103
|
userId: userId,
|
|
102
104
|
isBaseAlert: false
|
|
103
105
|
}]
|
|
104
106
|
};
|
|
105
107
|
}); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
|
|
106
108
|
|
|
107
|
-
_context.next =
|
|
109
|
+
_context.next = 18;
|
|
108
110
|
return service.queryAllComponentsByCiId(id);
|
|
109
111
|
|
|
110
|
-
case
|
|
112
|
+
case 18:
|
|
111
113
|
AllComponentsByCiId = _context.sent;
|
|
112
|
-
_context.next =
|
|
114
|
+
_context.next = 21;
|
|
113
115
|
return service.getRiskByIds({
|
|
114
116
|
ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
|
|
115
117
|
return item.id;
|
|
@@ -119,7 +121,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
119
121
|
pageSize: 10000
|
|
120
122
|
});
|
|
121
123
|
|
|
122
|
-
case
|
|
124
|
+
case 21:
|
|
123
125
|
_yield$service$getRis2 = _context.sent;
|
|
124
126
|
riskList = _yield$service$getRis2.content;
|
|
125
127
|
riskList = riskList.map(function (item) {
|
|
@@ -135,7 +137,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
135
137
|
|
|
136
138
|
setAlarmRiskList([].concat(_alarmList2, riskList));
|
|
137
139
|
|
|
138
|
-
case
|
|
140
|
+
case 25:
|
|
139
141
|
case "end":
|
|
140
142
|
return _context.stop();
|
|
141
143
|
}
|
|
@@ -591,7 +591,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
591
591
|
|
|
592
592
|
function _bindViewResources() {
|
|
593
593
|
_bindViewResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(data) {
|
|
594
|
-
var config,
|
|
594
|
+
var config, result, _elements;
|
|
595
595
|
|
|
596
596
|
return _regenerator["default"].wrap(function _callee12$(_context12) {
|
|
597
597
|
while (1) switch (_context12.prev = _context12.next) {
|
|
@@ -607,15 +607,19 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
607
607
|
return editDispatchers.fetchDataByConfig();
|
|
608
608
|
|
|
609
609
|
case 6:
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, elements); // 临时放这里，仅拓扑中心有
|
|
610
|
+
result = _context12.sent;
|
|
611
|
+
console.log("fetchDataByConfig", result);
|
|
613
612
|
|
|
614
|
-
if (
|
|
615
|
-
|
|
613
|
+
if (result) {
|
|
614
|
+
_elements = result.elements;
|
|
615
|
+
saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_COMBO, _elements); // 临时放这里，仅拓扑中心有
|
|
616
|
+
|
|
617
|
+
if (topo.linkDynamicStyleExecutor) {
|
|
618
|
+
topo.linkDynamicStyleExecutor.execute();
|
|
619
|
+
}
|
|
616
620
|
}
|
|
617
621
|
|
|
618
|
-
case
|
|
622
|
+
case 9:
|
|
619
623
|
case "end":
|
|
620
624
|
return _context12.stop();
|
|
621
625
|
}
|
|
@@ -630,7 +634,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
630
634
|
|
|
631
635
|
function _addLayerResources() {
|
|
632
636
|
_addLayerResources = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(group, newResourceIds) {
|
|
633
|
-
var _yield$
|
|
637
|
+
var _yield$editDispatcher3, elements, newElements;
|
|
634
638
|
|
|
635
639
|
return _regenerator["default"].wrap(function _callee13$(_context13) {
|
|
636
640
|
while (1) switch (_context13.prev = _context13.next) {
|
|
@@ -645,8 +649,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
645
649
|
return editDispatchers.fetchDataByConfig();
|
|
646
650
|
|
|
647
651
|
case 5:
|
|
648
|
-
_yield$
|
|
649
|
-
elements = _yield$
|
|
652
|
+
_yield$editDispatcher3 = _context13.sent;
|
|
653
|
+
elements = _yield$editDispatcher3.elements;
|
|
650
654
|
// 2022-11-10 修复 添加资源后分层重新布局问题，仅布局新增资源。替换api topo.updateElements(data)
|
|
651
655
|
newElements = findUNExistedElements(elements);
|
|
652
656
|
|
|
@@ -1047,7 +1051,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1047
1051
|
|
|
1048
1052
|
function _relateNodeIp() {
|
|
1049
1053
|
_relateNodeIp = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(txtValue, nodeElement) {
|
|
1050
|
-
var dm, isUnique, ip, configObj, configData,
|
|
1054
|
+
var dm, isUnique, ip, configObj, configData, _elements2, newLinkElements, newLink, newLinkGroup, createElementsData, _htTopo;
|
|
1051
1055
|
|
|
1052
1056
|
return _regenerator["default"].wrap(function _callee15$(_context15) {
|
|
1053
1057
|
while (1) switch (_context15.prev = _context15.next) {
|
|
@@ -1069,7 +1073,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1069
1073
|
isUnique = (0, _exitLinkUtil.isUniqueIp)(dm, txtValue, nodeElement); // 获取关联链路
|
|
1070
1074
|
|
|
1071
1075
|
if (!isUnique) {
|
|
1072
|
-
_context15.next =
|
|
1076
|
+
_context15.next = 24;
|
|
1073
1077
|
break;
|
|
1074
1078
|
}
|
|
1075
1079
|
|
|
@@ -1093,8 +1097,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1093
1097
|
case 16:
|
|
1094
1098
|
configData = _context15.sent;
|
|
1095
1099
|
// console.log("configData",configObj, configData);
|
|
1096
|
-
|
|
1097
|
-
newLinkElements = findUNExistedLinkElements(
|
|
1100
|
+
_elements2 = configData.elements;
|
|
1101
|
+
newLinkElements = findUNExistedLinkElements(_elements2); // console.log("configData", configData, newLinkElements);
|
|
1098
1102
|
|
|
1099
1103
|
newLink = newLinkElements.filter(function (item) {
|
|
1100
1104
|
return item.type === "link";
|
|
@@ -1109,7 +1113,8 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1109
1113
|
nodes: [],
|
|
1110
1114
|
links: newLink,
|
|
1111
1115
|
linkGroups: newLinkGroup
|
|
1112
|
-
};
|
|
1116
|
+
};
|
|
1117
|
+
console.log("createElementsData", createElementsData);
|
|
1113
1118
|
|
|
1114
1119
|
if ([].concat(newLink, newLinkGroup).length > 0) {
|
|
1115
1120
|
_htTopo = topo.getHtTopo();
|
|
@@ -1117,7 +1122,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
1117
1122
|
_htTopo.createElements(createElementsData);
|
|
1118
1123
|
}
|
|
1119
1124
|
|
|
1120
|
-
case
|
|
1125
|
+
case 24:
|
|
1121
1126
|
case "end":
|
|
1122
1127
|
return _context15.stop();
|
|
1123
1128
|
}
|
|
@@ -56,7 +56,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
|
|
|
56
56
|
var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
|
|
57
57
|
|
|
58
58
|
// eslint-disable-next-line no-undef
|
|
59
|
-
var version = typeof "11.0.
|
|
59
|
+
var version = typeof "11.0.38" === 'string' ? "11.0.38" : null;
|
|
60
60
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
61
61
|
/**
|
|
62
62
|
* 拓扑显示和编辑
|
|
@@ -45,8 +45,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
|
45
45
|
htTopo.expandAllEdgeGroups();
|
|
46
46
|
(0, _linkUtils.showLinkByConfig)({
|
|
47
47
|
topo: topo,
|
|
48
|
-
showType: expandAllEdges
|
|
49
|
-
isEditMode: isEditMode
|
|
48
|
+
showType: isEditMode ? 4 : expandAllEdges
|
|
50
49
|
});
|
|
51
50
|
|
|
52
51
|
_rlog["default"].debug("updateEdgeExpanded 展开-isEditMode", isEditMode);
|
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js
CHANGED
|
@@ -37,32 +37,31 @@ function EventsCard(props) {
|
|
|
37
37
|
onHandleAlarm = props.onHandleAlarm; // 告警table列配置
|
|
38
38
|
|
|
39
39
|
var columns = [{
|
|
40
|
-
title:
|
|
41
|
-
dataIndex:
|
|
42
|
-
key:
|
|
40
|
+
title: "描述",
|
|
41
|
+
dataIndex: "title",
|
|
42
|
+
key: "title",
|
|
43
43
|
cell: function cell(value, index, record) {
|
|
44
44
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
45
|
-
className: _indexModule["default"][
|
|
45
|
+
className: _indexModule["default"]["alarm-title"],
|
|
46
46
|
title: value,
|
|
47
47
|
onClick: closeDetailDrawer
|
|
48
48
|
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
49
49
|
type: record.icon,
|
|
50
50
|
size: "xs",
|
|
51
|
-
className: _indexModule["default"][
|
|
52
|
-
}), /*#__PURE__*/_react["default"].createElement("
|
|
53
|
-
|
|
54
|
-
href: formatUrl(record.link)
|
|
51
|
+
className: _indexModule["default"]["alarm-color-icon"] + " " + record.className
|
|
52
|
+
}), /*#__PURE__*/_react["default"].createElement(_Link["default"], {
|
|
53
|
+
to: formatUrl(record.link)
|
|
55
54
|
}, value));
|
|
56
55
|
}
|
|
57
56
|
}, {
|
|
58
|
-
title:
|
|
59
|
-
dataIndex:
|
|
60
|
-
key:
|
|
57
|
+
title: "时间",
|
|
58
|
+
dataIndex: "time",
|
|
59
|
+
key: "time",
|
|
61
60
|
width: 144,
|
|
62
61
|
cell: function cell(value, index, record) {
|
|
63
62
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
64
|
-
title: (0, _moment["default"])(value).format(
|
|
65
|
-
}, (0, _moment["default"])(value).format(
|
|
63
|
+
title: (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss")
|
|
64
|
+
}, (0, _moment["default"])(value).format("YYYY-MM-DD HH:mm:ss"));
|
|
66
65
|
}
|
|
67
66
|
} // 临时屏蔽告警操作列，后续版本按权限显示 2023-3-6 20:23:45
|
|
68
67
|
// {
|
|
@@ -46,7 +46,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
46
46
|
while (1) switch (_context.prev = _context.next) {
|
|
47
47
|
case 0:
|
|
48
48
|
if (!isAppTopo) {
|
|
49
|
-
_context.next =
|
|
49
|
+
_context.next = 10;
|
|
50
50
|
break;
|
|
51
51
|
}
|
|
52
52
|
|
|
@@ -61,27 +61,29 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
61
61
|
alarmList = _yield$resourceOvervi2.alarms;
|
|
62
62
|
alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
|
|
63
63
|
return {
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
alarmInfo: item,
|
|
65
|
+
type: "alarm",
|
|
66
|
+
icon: "gaojing-3",
|
|
66
67
|
className: "alarm-color-icon-lv" + item.alertLevel,
|
|
67
68
|
title: "[" + item.alertObject + "] " + item.alertTitle,
|
|
68
|
-
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
|
|
69
|
+
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
|
|
69
70
|
time: item.createTime,
|
|
70
71
|
status: item.status,
|
|
71
72
|
params: [{
|
|
72
73
|
alertId: item.alertId,
|
|
73
|
-
status:
|
|
74
|
+
status: "dealing",
|
|
74
75
|
userId: userId,
|
|
75
76
|
isBaseAlert: false
|
|
76
77
|
}]
|
|
77
78
|
};
|
|
78
79
|
})) || [];
|
|
80
|
+
console.log("setAlarmRiskList", alarmList);
|
|
79
81
|
setAlarmRiskList(alarmList);
|
|
80
|
-
_context.next =
|
|
82
|
+
_context.next = 25;
|
|
81
83
|
break;
|
|
82
84
|
|
|
83
|
-
case
|
|
84
|
-
_context.next =
|
|
85
|
+
case 10:
|
|
86
|
+
_context.next = 12;
|
|
85
87
|
return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
|
|
86
88
|
alertStatusList: ['toDeal', 'woDealing', 'dealing'],
|
|
87
89
|
// toDeal: 待处理, dealing：处理中
|
|
@@ -91,7 +93,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
91
93
|
sortOrder: 'asc'
|
|
92
94
|
});
|
|
93
95
|
|
|
94
|
-
case
|
|
96
|
+
case 12:
|
|
95
97
|
_yield$alarmService$g2 = _context.sent;
|
|
96
98
|
_alarmList2 = _yield$alarmService$g2.datas;
|
|
97
99
|
// 2022-07-16 后端不支持多列排序，暂通过前端实现,按创建时间倒序
|
|
@@ -100,28 +102,28 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
100
102
|
});
|
|
101
103
|
_alarmList2 = _alarmList2.map(function (item) {
|
|
102
104
|
return {
|
|
103
|
-
type:
|
|
104
|
-
icon:
|
|
105
|
+
type: "alarm",
|
|
106
|
+
icon: "gaojing-3",
|
|
105
107
|
className: "alarm-color-icon-lv" + item.alertLevel,
|
|
106
108
|
title: "" + item.alertObject + item.alertTitle,
|
|
107
|
-
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
|
|
109
|
+
link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + encodeURI(encodeURI(item.alertObject)) + "&ruleId=" + item.ruleId,
|
|
108
110
|
time: item.createTime,
|
|
109
111
|
status: item.status,
|
|
110
112
|
params: [{
|
|
111
113
|
alertId: item.alertId,
|
|
112
|
-
status:
|
|
114
|
+
status: "dealing",
|
|
113
115
|
userId: userId,
|
|
114
116
|
isBaseAlert: false
|
|
115
117
|
}]
|
|
116
118
|
};
|
|
117
119
|
}); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
|
|
118
120
|
|
|
119
|
-
_context.next =
|
|
121
|
+
_context.next = 18;
|
|
120
122
|
return _overview["default"].queryAllComponentsByCiId(id);
|
|
121
123
|
|
|
122
|
-
case
|
|
124
|
+
case 18:
|
|
123
125
|
AllComponentsByCiId = _context.sent;
|
|
124
|
-
_context.next =
|
|
126
|
+
_context.next = 21;
|
|
125
127
|
return _overview["default"].getRiskByIds({
|
|
126
128
|
ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
|
|
127
129
|
return item.id;
|
|
@@ -131,7 +133,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
131
133
|
pageSize: 10000
|
|
132
134
|
});
|
|
133
135
|
|
|
134
|
-
case
|
|
136
|
+
case 21:
|
|
135
137
|
_yield$service$getRis2 = _context.sent;
|
|
136
138
|
riskList = _yield$service$getRis2.content;
|
|
137
139
|
riskList = riskList.map(function (item) {
|
|
@@ -147,7 +149,7 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
|
|
|
147
149
|
|
|
148
150
|
setAlarmRiskList([].concat(_alarmList2, riskList));
|
|
149
151
|
|
|
150
|
-
case
|
|
152
|
+
case 25:
|
|
151
153
|
case "end":
|
|
152
154
|
return _context.stop();
|
|
153
155
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riil-frontend/component-topology",
|
|
3
|
-
"version": "11.0.
|
|
3
|
+
"version": "11.0.38",
|
|
4
4
|
"description": "拓扑",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "build-scripts start",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@riil-frontend/css": "^2.0.2",
|
|
80
80
|
"@riil-frontend/hooks": "latest",
|
|
81
81
|
"@riil-frontend/next-collapse": "^1.0.1-a.0",
|
|
82
|
-
"@riil-frontend/utils": "^1.0.
|
|
82
|
+
"@riil-frontend/utils": "^1.0.45",
|
|
83
83
|
"@types/jest": "^29.5.4",
|
|
84
84
|
"axios": "^0.21.1",
|
|
85
85
|
"build-plugin-component": "^1.12.1",
|
|
@@ -122,6 +122,6 @@
|
|
|
122
122
|
"access": "public"
|
|
123
123
|
},
|
|
124
124
|
"license": "MIT",
|
|
125
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.
|
|
125
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@11.0.38/build/index.html",
|
|
126
126
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
|
127
127
|
}
|