@riil-frontend/component-topology 12.1.0-dev.8 → 12.1.1
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/1.js +1 -1
- package/build/index.css +1 -1
- package/build/index.js +14 -14
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- package/es/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
- package/es/core/components/TopoView/topoView.js +7 -4
- package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +11 -3
- package/es/core/editor/components/Toolbar/widgets/Layout/index.js +2 -2
- package/es/core/editor/components/settings/core/updateElementProperty.js +3 -2
- package/es/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
- package/es/core/editor/hooks/useKeyboardShortcut.js +4 -0
- package/es/core/editor/hooks/useNewElementTheme.js +20 -16
- package/es/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/es/core/hooks/usePolling.js +2 -1
- package/es/core/hooks/useTopoEdit.js +208 -243
- package/es/core/models/Alarm.js +14 -15
- package/es/core/models/AttributeMetricDisplay.js +4 -3
- package/es/core/models/HistoryManager.js +11 -9
- package/es/core/models/TopoApp.js +17 -15
- package/es/core/models/topoData.js +7 -14
- package/es/core/models/utils/linkUtils.js +2 -2
- package/es/core/store/models/topoConfig.js +7 -11
- package/es/core/utils/edgeUtil.js +7 -11
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +51 -13
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
- package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
- package/es/networkTopo/utils/exitLinkUtil.js +23 -11
- package/es/style.js +1 -1
- package/es/utils/clusterUtil.js +3 -3
- package/es/utils/htElementUtils.js +8 -108
- package/es/utils/topoData.js +1 -1
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- package/lib/core/components/AlarmListPanel/components/AlarmListItem.js +2 -2
- package/lib/core/components/TopoView/topoView.js +15 -19
- package/lib/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +12 -3
- package/lib/core/editor/components/Toolbar/widgets/Layout/index.js +1 -1
- package/lib/core/editor/components/settings/core/updateElementProperty.js +7 -2
- package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
- package/lib/core/editor/hooks/useKeyboardShortcut.js +4 -0
- package/lib/core/editor/hooks/useNewElementTheme.js +20 -16
- package/lib/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/lib/core/hooks/usePolling.js +6 -5
- package/lib/core/hooks/useTopoEdit.js +214 -267
- package/lib/core/models/Alarm.js +14 -15
- package/lib/core/models/AttributeMetricDisplay.js +6 -6
- package/lib/core/models/HistoryManager.js +13 -17
- package/lib/core/models/TopoApp.js +18 -15
- package/lib/core/models/topoData.js +7 -14
- package/lib/core/models/utils/linkUtils.js +1 -1
- package/lib/core/store/models/topoConfig.js +13 -25
- package/lib/core/utils/edgeUtil.js +6 -10
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +52 -13
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +8 -0
- package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
- package/lib/networkTopo/utils/exitLinkUtil.js +23 -11
- package/lib/style.js +1 -1
- package/lib/utils/clusterUtil.js +2 -2
- package/lib/utils/htElementUtils.js +9 -119
- package/lib/utils/topoData.js +1 -1
- package/package.json +2 -2
- package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
- package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
package/lib/core/models/Alarm.js
CHANGED
@@ -481,14 +481,14 @@ var Alarm = /*#__PURE__*/function () {
|
|
481
481
|
console.log("handleAlarmEvent-接收到推送的原始告警信息", alertData);
|
482
482
|
|
483
483
|
if (!((0, _utils.isAvailableArray)(alertData) && (0, _utils.isAvailableArray)(resIdsList))) {
|
484
|
-
_context8.next =
|
484
|
+
_context8.next = 25;
|
485
485
|
break;
|
486
486
|
}
|
487
487
|
|
488
488
|
sendAl = [];
|
489
489
|
idsList = [].concat(nodeIdsList, linkIdsList);
|
490
|
-
operations = [];
|
491
|
-
|
490
|
+
operations = []; // console.log('idsList---------', idsList)
|
491
|
+
|
492
492
|
idsList.forEach(function (idItem) {
|
493
493
|
if (idItem.operation === null) {
|
494
494
|
operations.push(idItem.ciId);
|
@@ -514,23 +514,22 @@ var Alarm = /*#__PURE__*/function () {
|
|
514
514
|
if (resIdsList.indexOf(ciId) >= 0 && operations.indexOf(ciId) < 0) {
|
515
515
|
sendAl.push(obj);
|
516
516
|
}
|
517
|
-
});
|
518
|
-
console.log("before-combAlarmData", sendAl, idsList);
|
517
|
+
}); // console.log("before-combAlarmData", sendAl, idsList);
|
519
518
|
|
520
519
|
if (!(sendAl.length > 0)) {
|
521
|
-
_context8.next =
|
520
|
+
_context8.next = 25;
|
522
521
|
break;
|
523
522
|
}
|
524
523
|
|
525
524
|
_componentTopologyUtils.rlog.debug('过滤掉非本拓扑的告警信息 告警开关-推送告警到ht-alarmIsOpened-sendAl', alarmIsOpened, sendAl);
|
526
525
|
|
527
|
-
_context8.prev =
|
528
|
-
_context8.next =
|
526
|
+
_context8.prev = 13;
|
527
|
+
_context8.next = 16;
|
529
528
|
return alarmDispatchers.combAlarmData({
|
530
529
|
alarmdata: sendAl
|
531
530
|
});
|
532
531
|
|
533
|
-
case
|
532
|
+
case 16:
|
534
533
|
_yield$alarmDispatche2 = _context8.sent;
|
535
534
|
eqFlag = _yield$alarmDispatche2.eqFlag;
|
536
535
|
alarmlist = _yield$alarmDispatche2.alarmlist;
|
@@ -551,20 +550,20 @@ var Alarm = /*#__PURE__*/function () {
|
|
551
550
|
}
|
552
551
|
}
|
553
552
|
|
554
|
-
_context8.next =
|
553
|
+
_context8.next = 25;
|
555
554
|
break;
|
556
555
|
|
557
|
-
case
|
558
|
-
_context8.prev =
|
559
|
-
_context8.t0 = _context8["catch"](
|
556
|
+
case 22:
|
557
|
+
_context8.prev = 22;
|
558
|
+
_context8.t0 = _context8["catch"](13);
|
560
559
|
|
561
560
|
_componentTopologyUtils.rlog.error('告警发送异常', _context8.t0);
|
562
561
|
|
563
|
-
case
|
562
|
+
case 25:
|
564
563
|
case "end":
|
565
564
|
return _context8.stop();
|
566
565
|
}
|
567
|
-
}, _callee8, this, [[
|
566
|
+
}, _callee8, this, [[13, 22]]);
|
568
567
|
}));
|
569
568
|
|
570
569
|
function handleAlarmEvent(_x6) {
|
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
11
11
|
|
12
12
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
13
13
|
|
14
|
-
var
|
14
|
+
var _loglevel = _interopRequireDefault(require("loglevel"));
|
15
15
|
|
16
16
|
var _ResourceInfoDisplay = require("../../constants/ResourceInfoDisplay");
|
17
17
|
|
@@ -25,6 +25,8 @@ var _nodeNameVisibleUtil = require("./utils/nodeNameVisibleUtil");
|
|
25
25
|
|
26
26
|
var _ciRefAttributeTranslateUtil = require("../../utils/ciRefAttributeTranslateUtil");
|
27
27
|
|
28
|
+
var rlog = _loglevel["default"].getLogger('topo');
|
29
|
+
|
28
30
|
function isGraphField(item) {
|
29
31
|
return item.type === 'graph';
|
30
32
|
}
|
@@ -451,7 +453,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
451
453
|
});
|
452
454
|
});
|
453
455
|
} else {
|
454
|
-
|
456
|
+
rlog.warn("\u63A8\u9001\u5C5E\u6027\u6307\u6807\u6570\u636E\uFF1A\u672A\u67E5\u8BE2\u5230ciType " + ciType, ciData);
|
455
457
|
}
|
456
458
|
});
|
457
459
|
refIds = Object.keys(refIdMap);
|
@@ -540,9 +542,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
540
542
|
tags: tags
|
541
543
|
});
|
542
544
|
});
|
543
|
-
|
544
|
-
_componentTopologyUtils.rlog.debug('推送标注 => ht', elementTagsAndTips);
|
545
|
-
|
545
|
+
rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
|
546
546
|
var htTopo = topo.getHtTopo();
|
547
547
|
|
548
548
|
if (htTopo) {
|
@@ -553,7 +553,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
553
553
|
try {
|
554
554
|
htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
|
555
555
|
} catch (error) {
|
556
|
-
|
556
|
+
rlog.error(' ==> ht: 推送标注失败', error);
|
557
557
|
}
|
558
558
|
|
559
559
|
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
|
@@ -9,6 +9,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
9
9
|
|
10
10
|
var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
|
11
11
|
|
12
|
+
var _loglevel = _interopRequireDefault(require("loglevel"));
|
13
|
+
|
14
|
+
var log = _loglevel["default"].getLogger('topo.HistoryManager');
|
15
|
+
|
12
16
|
var ht = window.ht;
|
13
17
|
|
14
18
|
var HistoryManager = /*#__PURE__*/function () {
|
@@ -19,9 +23,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
19
23
|
this.topo = topo;
|
20
24
|
this.htHistoryManager = htHistoryManager;
|
21
25
|
htHistoryManager.clear();
|
22
|
-
|
23
|
-
_componentTopologyUtils.rlog.info('HistoryManager 初始化', htHistoryManager);
|
24
|
-
|
26
|
+
log.info('HistoryManager 初始化', htHistoryManager);
|
25
27
|
this.updateStore = this.updateStore.bind(this);
|
26
28
|
this.init();
|
27
29
|
}
|
@@ -69,11 +71,10 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
69
71
|
|
70
72
|
_proto.setDisabled = function setDisabled(disabled, message) {
|
71
73
|
this.htHistoryManager.setDisabled(disabled);
|
72
|
-
|
73
|
-
_componentTopologyUtils.rlog.debug("HistoryManager.setDisabled " + (disabled ? '禁用' : '启用') + (message ? "(" + message + ")" : '') + ": " + this.toString(), this.getHistories());
|
74
|
+
log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
|
74
75
|
};
|
75
76
|
|
76
|
-
_proto.beginTransaction = function beginTransaction() {
|
77
|
+
_proto.beginTransaction = function beginTransaction(name) {
|
77
78
|
var _this = this;
|
78
79
|
|
79
80
|
this.htHistoryManager.beginTransaction();
|
@@ -104,8 +105,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
104
105
|
oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
|
105
106
|
});
|
106
107
|
});
|
107
|
-
|
108
|
-
_componentTopologyUtils.rlog.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
|
108
|
+
log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
|
109
109
|
};
|
110
110
|
|
111
111
|
_proto.addStoreHistory = function addStoreHistory() {
|
@@ -130,18 +130,16 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
130
130
|
type: 'store',
|
131
131
|
data: storeChanged
|
132
132
|
});
|
133
|
-
|
134
|
-
_componentTopologyUtils.rlog.debug('HistoryManager.addStoreHistory', storeChanged);
|
133
|
+
log.debug('HistoryManager.addStoreHistory', storeChanged);
|
135
134
|
}
|
136
135
|
|
137
136
|
this.storeHistory = [];
|
138
137
|
};
|
139
138
|
|
140
|
-
_proto.endTransaction = function endTransaction() {
|
139
|
+
_proto.endTransaction = function endTransaction(name) {
|
141
140
|
this.addStoreHistory();
|
142
141
|
this.htHistoryManager.endTransaction();
|
143
|
-
|
144
|
-
_componentTopologyUtils.rlog.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
|
142
|
+
log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
|
145
143
|
};
|
146
144
|
|
147
145
|
_proto.clear = function clear() {
|
@@ -185,8 +183,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
185
183
|
return;
|
186
184
|
}
|
187
185
|
|
188
|
-
|
189
|
-
|
186
|
+
log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
|
190
187
|
var storeHistory = this.getCurrentStoreHistory(true);
|
191
188
|
|
192
189
|
if (storeHistory) {
|
@@ -204,8 +201,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
204
201
|
_proto.redo = function redo() {
|
205
202
|
var _this4 = this;
|
206
203
|
|
207
|
-
|
208
|
-
|
204
|
+
log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
|
209
205
|
var storeHistory = this.getCurrentStoreHistory(false);
|
210
206
|
|
211
207
|
if (storeHistory) {
|
@@ -54,7 +54,7 @@ var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
|
|
54
54
|
var _CiCache = _interopRequireDefault(require("./cache/CiCache"));
|
55
55
|
|
56
56
|
// eslint-disable-next-line no-undef
|
57
|
-
var version = typeof "12.1.
|
57
|
+
var version = typeof "12.1.1" === 'string' ? "12.1.1" : null;
|
58
58
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
59
59
|
/**
|
60
60
|
* 拓扑显示和编辑
|
@@ -540,37 +540,39 @@ var Topo = /*#__PURE__*/function () {
|
|
540
540
|
case 0:
|
541
541
|
_componentTopologyUtils.rlog.info('TopoApp.enterEditMode');
|
542
542
|
|
543
|
+
this.historyManager = null;
|
544
|
+
|
543
545
|
if (!this.options.onSwitchToEditModeBegin) {
|
544
|
-
_context12.next =
|
546
|
+
_context12.next = 5;
|
545
547
|
break;
|
546
548
|
}
|
547
549
|
|
548
|
-
_context12.next =
|
550
|
+
_context12.next = 5;
|
549
551
|
return this.options.onSwitchToEditModeBegin(this);
|
550
552
|
|
551
|
-
case
|
553
|
+
case 5:
|
552
554
|
topoDispatchers = this.store.getModelDispatchers('topoMod');
|
553
|
-
_context12.next =
|
555
|
+
_context12.next = 8;
|
554
556
|
return topoDispatchers.update({
|
555
557
|
viewState: 'edit'
|
556
558
|
});
|
557
559
|
|
558
|
-
case
|
559
|
-
_context12.next =
|
560
|
+
case 8:
|
561
|
+
_context12.next = 10;
|
560
562
|
return this.view.switchToEditMode();
|
561
563
|
|
562
|
-
case
|
564
|
+
case 10:
|
563
565
|
(0, _edgeUtil.updateEdgeExpanded)(this);
|
564
566
|
|
565
567
|
if (!this.options.onSwitchToEditMode) {
|
566
|
-
_context12.next =
|
568
|
+
_context12.next = 14;
|
567
569
|
break;
|
568
570
|
}
|
569
571
|
|
570
|
-
_context12.next =
|
572
|
+
_context12.next = 14;
|
571
573
|
return this.options.onSwitchToEditMode(this);
|
572
574
|
|
573
|
-
case
|
575
|
+
case 14:
|
574
576
|
if (this.getDataModel()) {
|
575
577
|
// 更新节点名称显示隐藏
|
576
578
|
this.attributeMetricDisplay.updateNodesNameVisible();
|
@@ -580,7 +582,7 @@ var Topo = /*#__PURE__*/function () {
|
|
580
582
|
iconManageDispatchers = this.store.getModelDispatchers('customIcon');
|
581
583
|
iconManageDispatchers.loadEditorIcons();
|
582
584
|
|
583
|
-
case
|
585
|
+
case 17:
|
584
586
|
case "end":
|
585
587
|
return _context12.stop();
|
586
588
|
}
|
@@ -604,18 +606,19 @@ var Topo = /*#__PURE__*/function () {
|
|
604
606
|
return this.view.switchToViewMode();
|
605
607
|
|
606
608
|
case 2:
|
609
|
+
this.historyManager = null;
|
607
610
|
editDispatchers = this.store.getModelDispatchers('topoConfig');
|
608
611
|
editDispatchers.switchToViewMode(this.id);
|
609
612
|
|
610
613
|
if (!this.options.onSwitchToViewMode) {
|
611
|
-
_context13.next =
|
614
|
+
_context13.next = 8;
|
612
615
|
break;
|
613
616
|
}
|
614
617
|
|
615
|
-
_context13.next =
|
618
|
+
_context13.next = 8;
|
616
619
|
return this.options.onSwitchToViewMode(this);
|
617
620
|
|
618
|
-
case
|
621
|
+
case 8:
|
619
622
|
case "end":
|
620
623
|
return _context13.stop();
|
621
624
|
}
|
@@ -57,7 +57,7 @@ function saveTopo(_x) {
|
|
57
57
|
|
58
58
|
function _saveTopo() {
|
59
59
|
_saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
|
60
|
-
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources
|
60
|
+
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
|
61
61
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
62
62
|
while (1) switch (_context.prev = _context.next) {
|
63
63
|
case 0:
|
@@ -90,7 +90,7 @@ function _saveTopo() {
|
|
90
90
|
|
91
91
|
case 8:
|
92
92
|
if (!(resources || groups)) {
|
93
|
-
_context.next =
|
93
|
+
_context.next = 15;
|
94
94
|
break;
|
95
95
|
}
|
96
96
|
|
@@ -112,31 +112,24 @@ function _saveTopo() {
|
|
112
112
|
});
|
113
113
|
}
|
114
114
|
|
115
|
-
linkIps = []; // resources?.static.map((nodeId) => {
|
116
|
-
// if (nodeId.startsWith("ip_")) {
|
117
|
-
// linkIps.push(nodeId.replace("ip_", ""));
|
118
|
-
// }
|
119
|
-
// });
|
120
|
-
|
121
115
|
_rlog["default"].debug("saveTopo-groupInfo", groupInfo);
|
122
116
|
|
123
|
-
_context.next =
|
117
|
+
_context.next = 15;
|
124
118
|
return topoService.bindResourceToTopo(topoId, {
|
125
119
|
groups: groupInfo,
|
126
|
-
linkIps: linkIps,
|
127
120
|
relateTopoIdList: relateTopoIdList
|
128
121
|
});
|
129
122
|
|
130
|
-
case
|
123
|
+
case 15:
|
131
124
|
if (!serialize) {
|
132
|
-
_context.next =
|
125
|
+
_context.next = 18;
|
133
126
|
break;
|
134
127
|
}
|
135
128
|
|
136
|
-
_context.next =
|
129
|
+
_context.next = 18;
|
137
130
|
return topoService.saveSerializeData(topoId, serialize);
|
138
131
|
|
139
|
-
case
|
132
|
+
case 18:
|
140
133
|
case "end":
|
141
134
|
return _context.stop();
|
142
135
|
}
|
@@ -202,7 +202,7 @@ var showLinkByConfig = function showLinkByConfig(props) {
|
|
202
202
|
var gv = topo.getGraphView();
|
203
203
|
var dm = gv.getDataModel();
|
204
204
|
var edges = (0, _htElementUtils.getEdges)(dm).filter(function (edge) {
|
205
|
-
return !(0, _htElementUtils.
|
205
|
+
return !(0, _htElementUtils.isEdgeGroupAgent)(edge);
|
206
206
|
}); // console.log("edges", edges);
|
207
207
|
|
208
208
|
var showPhy = types.indexOf("phy") >= 0;
|
@@ -17,7 +17,7 @@ var _utils2 = require("@riil-frontend/component-topology-graph/es/utils");
|
|
17
17
|
|
18
18
|
var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
|
19
19
|
|
20
|
-
var
|
20
|
+
var _loglevel = _interopRequireDefault(require("loglevel"));
|
21
21
|
|
22
22
|
var _format = require("../../../utils/format");
|
23
23
|
|
@@ -34,6 +34,8 @@ var _getTopoData = require("../../../networkTopo/getTopoData");
|
|
34
34
|
/**
|
35
35
|
* 拓扑配置
|
36
36
|
*/
|
37
|
+
var rlog = _loglevel["default"].getLogger('topo');
|
38
|
+
|
37
39
|
var newGroupWithUUID = function newGroupWithUUID(group) {
|
38
40
|
if (group === void 0) {
|
39
41
|
group = _template.DEFAULT_GROUP;
|
@@ -96,7 +98,7 @@ function conditionToRes(conditions) {
|
|
96
98
|
}
|
97
99
|
|
98
100
|
function updateGroupData(groups, index, data) {
|
99
|
-
|
101
|
+
rlog.debug("容器侦查-----updateGroupData", groups, index, data);
|
100
102
|
|
101
103
|
if (groups && groups[index]) {
|
102
104
|
var group = (0, _extends2["default"])({}, groups[index], data);
|
@@ -276,15 +278,7 @@ function _default(topoApp) {
|
|
276
278
|
|
277
279
|
case 5:
|
278
280
|
data = _context2.sent;
|
279
|
-
|
280
|
-
_rlog["default"].debug("按配置查询拓扑数据", {
|
281
|
-
config: {
|
282
|
-
resources: resources,
|
283
|
-
groups: groups
|
284
|
-
},
|
285
|
-
data: data
|
286
|
-
});
|
287
|
-
|
281
|
+
rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
|
288
282
|
return _context2.abrupt("return", data);
|
289
283
|
|
290
284
|
case 8:
|
@@ -325,8 +319,7 @@ function _default(topoApp) {
|
|
325
319
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
326
320
|
while (1) switch (_context4.prev = _context4.next) {
|
327
321
|
case 0:
|
328
|
-
|
329
|
-
|
322
|
+
rlog.debug("getTopoByConditions--------", params);
|
330
323
|
topoId = params.id, resources = params.resources, groups = params.groups;
|
331
324
|
viewConditions = (0, _topoData2.resToConditions)(resources);
|
332
325
|
groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
|
@@ -335,26 +328,23 @@ function _default(topoApp) {
|
|
335
328
|
resources: (0, _topoData2.resToConditions)(group.resources)
|
336
329
|
});
|
337
330
|
});
|
338
|
-
|
339
|
-
_rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
|
340
|
-
|
331
|
+
rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
|
341
332
|
_context4.next = 7;
|
342
333
|
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
|
343
334
|
|
344
335
|
case 7:
|
345
336
|
data = _context4.sent;
|
346
|
-
|
347
|
-
_rlog["default"].debug("getTopoByConditions--------data", data);
|
348
|
-
|
337
|
+
rlog.debug("getTopoByConditions--------data", data);
|
349
338
|
_context4.next = 11;
|
350
339
|
return (0, _getTopoData.buildData)(data);
|
351
340
|
|
352
341
|
case 11:
|
353
342
|
data = _context4.sent;
|
354
|
-
|
343
|
+
rlog.debug("getTopoByConditions--------", data, groupInfo);
|
344
|
+
_context4.next = 15;
|
355
345
|
return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
|
356
346
|
|
357
|
-
case
|
347
|
+
case 15:
|
358
348
|
_yield$Promise$all = _context4.sent;
|
359
349
|
dataWithLinkDetail = _yield$Promise$all[0];
|
360
350
|
_combTopoData = (0, _topoData.combTopoData)({
|
@@ -381,7 +371,7 @@ function _default(topoApp) {
|
|
381
371
|
topoDataTrans: topoDataTrans
|
382
372
|
});
|
383
373
|
|
384
|
-
case
|
374
|
+
case 23:
|
385
375
|
case "end":
|
386
376
|
return _context4.stop();
|
387
377
|
}
|
@@ -408,9 +398,7 @@ function _default(topoApp) {
|
|
408
398
|
}].concat(displayConfig.saveHistories || [])
|
409
399
|
}))
|
410
400
|
};
|
411
|
-
|
412
|
-
_rlog["default"].debug("saveGlobalConfig", config);
|
413
|
-
|
401
|
+
rlog.debug("saveGlobalConfig", config);
|
414
402
|
_context5.next = 5;
|
415
403
|
return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
|
416
404
|
|
@@ -17,7 +17,7 @@ var _htElementUtils = require("../../utils/htElementUtils");
|
|
17
17
|
* @param {*} edge
|
18
18
|
*/
|
19
19
|
function isCustomEdge(edge) {
|
20
|
-
return !(0, _htElementUtils.
|
20
|
+
return !(0, _htElementUtils.isEdgeGroupAgent)(edge) && (edge.a('type') == 'line' || !edge.a('type'));
|
21
21
|
}
|
22
22
|
/**
|
23
23
|
* 根据配置更新连线展开折叠状态
|
@@ -27,7 +27,7 @@ function isCustomEdge(edge) {
|
|
27
27
|
|
28
28
|
|
29
29
|
var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
30
|
-
var _topo$historyManager, _topo$historyManager2;
|
30
|
+
var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
|
31
31
|
|
32
32
|
var _topo$store$getModelS = topo.store.getModelState("topoMod"),
|
33
33
|
viewState = _topo$store$getModelS.viewState;
|
@@ -40,8 +40,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
40
40
|
}
|
41
41
|
|
42
42
|
var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
|
43
|
-
expandAllEdges = _topo$store$getModelS2.expandAllEdges;
|
44
|
-
|
43
|
+
expandAllEdges = _topo$store$getModelS2.expandAllEdges;
|
45
44
|
|
46
45
|
(_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
|
47
46
|
|
@@ -50,11 +49,11 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
50
49
|
topo: topo,
|
51
50
|
showType: 1
|
52
51
|
});
|
53
|
-
htTopo.
|
52
|
+
htTopo.toggleAllEdgeGroups(false);
|
54
53
|
|
55
54
|
_rlog["default"].debug("updateEdgeExpanded 折叠");
|
56
55
|
} else {
|
57
|
-
htTopo.
|
56
|
+
htTopo.toggleAllEdgeGroups(true);
|
58
57
|
(0, _linkUtils.showLinkByConfig)({
|
59
58
|
topo: topo,
|
60
59
|
showType: expandAllEdges,
|
@@ -65,10 +64,7 @@ var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
65
64
|
}
|
66
65
|
|
67
66
|
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
|
68
|
-
|
69
|
-
if (topo.linkDynamicStyleExecutor) {
|
70
|
-
topo.linkDynamicStyleExecutor.execute();
|
71
|
-
}
|
67
|
+
(_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
|
72
68
|
};
|
73
69
|
|
74
70
|
exports.updateEdgeExpanded = updateEdgeExpanded;
|
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js
CHANGED
@@ -27,31 +27,70 @@ var _overview = _interopRequireDefault(require("../../../../../../services/overv
|
|
27
27
|
|
28
28
|
var _indexModule = _interopRequireDefault(require("./index.module.scss"));
|
29
29
|
|
30
|
+
var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
|
31
|
+
|
30
32
|
function formatUrl(url) {
|
31
|
-
|
33
|
+
var _window, _window$location;
|
34
|
+
|
35
|
+
console.log(url);
|
36
|
+
var prefix = '/default/pagecenter';
|
37
|
+
|
38
|
+
if (((_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.pathname.indexOf(prefix)) === 0 && (url === null || url === void 0 ? void 0 : url.indexOf(prefix)) === 0) {
|
39
|
+
return url.split(prefix)[1];
|
40
|
+
} else {
|
41
|
+
return url;
|
42
|
+
}
|
32
43
|
}
|
33
44
|
|
34
45
|
function EventsCard(props) {
|
35
46
|
var alarmRiskList = props.alarmRiskList,
|
36
47
|
closeDetailDrawer = props.closeDetailDrawer,
|
37
|
-
onHandleAlarm = props.onHandleAlarm;
|
48
|
+
onHandleAlarm = props.onHandleAlarm;
|
49
|
+
|
50
|
+
var jumpTo = function jumpTo(url) {
|
51
|
+
closeDetailDrawer();
|
52
|
+
|
53
|
+
if (topo.viewProps.jumpto) {
|
54
|
+
topo.viewProps.jumpto(formatUrl(url));
|
55
|
+
} else {
|
56
|
+
(0, _componentTopologyUtils.getHistory)().push(formatUrl(url));
|
57
|
+
}
|
58
|
+
}; // 告警table列配置
|
59
|
+
|
38
60
|
|
39
61
|
var columns = [{
|
40
62
|
title: "描述",
|
41
63
|
dataIndex: "title",
|
42
64
|
key: "title",
|
43
65
|
cell: function cell(value, index, record) {
|
44
|
-
return
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
66
|
+
return (
|
67
|
+
/*#__PURE__*/
|
68
|
+
// <div
|
69
|
+
// className={styles["alarm-title"]}
|
70
|
+
// title={value}
|
71
|
+
// onClick={closeDetailDrawer}
|
72
|
+
// >
|
73
|
+
// <Icon
|
74
|
+
// type={record.icon}
|
75
|
+
// size="xs"
|
76
|
+
// className={`${styles["alarm-color-icon"]} ${record.className}`}
|
77
|
+
// />
|
78
|
+
// <Link to={formatUrl(record.link)}>{value}</Link>
|
79
|
+
// </div>
|
80
|
+
_react["default"].createElement("div", {
|
81
|
+
className: _indexModule["default"]['alarm-title'],
|
82
|
+
title: value,
|
83
|
+
onClick: function onClick() {
|
84
|
+
jumpTo(record.link);
|
85
|
+
}
|
86
|
+
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
87
|
+
type: record.icon,
|
88
|
+
size: "xs",
|
89
|
+
className: _indexModule["default"]['alarm-color-icon'] + " " + record.className
|
90
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
91
|
+
className: _indexModule["default"].link
|
92
|
+
}, value))
|
93
|
+
);
|
55
94
|
}
|
56
95
|
}, {
|
57
96
|
title: "时间",
|