@riil-frontend/component-topology 12.1.0-dev.9 → 13.0.0-dev.2
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/TopoView/topoView.js +7 -4
- package/es/core/editor/components/Sidebar/views/ImagePanel/ImagePanel.js +11 -3
- 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/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 +206 -244
- 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 +14 -17
- package/es/core/utils/edgeUtil.js +7 -11
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +1 -1
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
- package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
- package/es/networkTopo/services/topo/basic.js +4 -2
- package/es/networkTopo/utils/exitLinkUtil.js +23 -11
- package/es/networkTopo/utils/relateTopoDataUtil.js +38 -0
- package/es/style.js +1 -1
- package/es/utils/clusterUtil.js +3 -3
- package/es/utils/htElementUtils.js +8 -108
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- 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/settings/core/updateElementProperty.js +7 -2
- package/lib/core/editor/components/settings/propertyViews/view/GlobalEdgeToggle.js +2 -2
- 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 +212 -268
- 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 +20 -31
- package/lib/core/utils/edgeUtil.js +6 -10
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +1 -1
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopo.module.scss +1 -1
- package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
- package/lib/networkTopo/services/topo/basic.js +4 -2
- package/lib/networkTopo/utils/exitLinkUtil.js +23 -11
- package/lib/networkTopo/utils/relateTopoDataUtil.js +49 -0
- package/lib/style.js +1 -1
- package/lib/utils/clusterUtil.js +2 -2
- package/lib/utils/htElementUtils.js +9 -119
- package/package.json +2 -2
- package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
- package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
@@ -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 "
|
57
|
+
var version = typeof "13.0.0-dev.2" === 'string' ? "13.0.0-dev.2" : 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);
|
@@ -259,32 +261,25 @@ function _default(topoApp) {
|
|
259
261
|
var _this2 = this;
|
260
262
|
|
261
263
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
262
|
-
var editState, resources, _editState$groups, groups, query, data;
|
264
|
+
var editState, resources, _editState$groups, groups, relateTopoIdList, query, data;
|
263
265
|
|
264
266
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
265
267
|
while (1) switch (_context2.prev = _context2.next) {
|
266
268
|
case 0:
|
267
269
|
editState = rootState.topoConfig;
|
268
|
-
resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
|
270
|
+
resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, relateTopoIdList = editState.relateTopoIdList;
|
269
271
|
query = {
|
270
272
|
id: rootState.topoMod.topoId,
|
271
273
|
resources: resources,
|
272
|
-
groups: groups
|
274
|
+
groups: groups,
|
275
|
+
relateTopoIdList: relateTopoIdList
|
273
276
|
};
|
274
277
|
_context2.next = 5;
|
275
278
|
return _this2.getTopoByConditions(query);
|
276
279
|
|
277
280
|
case 5:
|
278
281
|
data = _context2.sent;
|
279
|
-
|
280
|
-
_rlog["default"].debug("按配置查询拓扑数据", {
|
281
|
-
config: {
|
282
|
-
resources: resources,
|
283
|
-
groups: groups
|
284
|
-
},
|
285
|
-
data: data
|
286
|
-
});
|
287
|
-
|
282
|
+
rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
|
288
283
|
return _context2.abrupt("return", data);
|
289
284
|
|
290
285
|
case 8:
|
@@ -320,14 +315,13 @@ function _default(topoApp) {
|
|
320
315
|
var _this4 = this;
|
321
316
|
|
322
317
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
323
|
-
var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
|
318
|
+
var topoId, resources, groups, relateTopoIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
|
324
319
|
|
325
320
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
326
321
|
while (1) switch (_context4.prev = _context4.next) {
|
327
322
|
case 0:
|
328
|
-
|
329
|
-
|
330
|
-
topoId = params.id, resources = params.resources, groups = params.groups;
|
323
|
+
rlog.debug("getTopoByConditions--------", params);
|
324
|
+
topoId = params.id, resources = params.resources, groups = params.groups, relateTopoIdList = params.relateTopoIdList;
|
331
325
|
viewConditions = (0, _topoData2.resToConditions)(resources);
|
332
326
|
groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
|
333
327
|
return (0, _extends2["default"])({}, group, {
|
@@ -335,26 +329,23 @@ function _default(topoApp) {
|
|
335
329
|
resources: (0, _topoData2.resToConditions)(group.resources)
|
336
330
|
});
|
337
331
|
});
|
338
|
-
|
339
|
-
_rlog["default"].debug("getTopoByConditions--------", viewConditions, groupInfo);
|
340
|
-
|
332
|
+
rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
|
341
333
|
_context4.next = 7;
|
342
|
-
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
|
334
|
+
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, relateTopoIdList);
|
343
335
|
|
344
336
|
case 7:
|
345
337
|
data = _context4.sent;
|
346
|
-
|
347
|
-
_rlog["default"].debug("getTopoByConditions--------data", data);
|
348
|
-
|
338
|
+
rlog.debug("getTopoByConditions--------data", data);
|
349
339
|
_context4.next = 11;
|
350
340
|
return (0, _getTopoData.buildData)(data);
|
351
341
|
|
352
342
|
case 11:
|
353
343
|
data = _context4.sent;
|
354
|
-
|
344
|
+
rlog.debug("getTopoByConditions--------", data, groupInfo);
|
345
|
+
_context4.next = 15;
|
355
346
|
return Promise.all([(0, _getTopoData.addLinkData)(data), topoApp.ciTyeCache.load((0, _topoData.getCiTypes)(data)), dispatch.customIcon.loadCustomIcons()]);
|
356
347
|
|
357
|
-
case
|
348
|
+
case 15:
|
358
349
|
_yield$Promise$all = _context4.sent;
|
359
350
|
dataWithLinkDetail = _yield$Promise$all[0];
|
360
351
|
_combTopoData = (0, _topoData.combTopoData)({
|
@@ -381,7 +372,7 @@ function _default(topoApp) {
|
|
381
372
|
topoDataTrans: topoDataTrans
|
382
373
|
});
|
383
374
|
|
384
|
-
case
|
375
|
+
case 23:
|
385
376
|
case "end":
|
386
377
|
return _context4.stop();
|
387
378
|
}
|
@@ -408,9 +399,7 @@ function _default(topoApp) {
|
|
408
399
|
}].concat(displayConfig.saveHistories || [])
|
409
400
|
}))
|
410
401
|
};
|
411
|
-
|
412
|
-
_rlog["default"].debug("saveGlobalConfig", config);
|
413
|
-
|
402
|
+
rlog.debug("saveGlobalConfig", config);
|
414
403
|
_context5.next = 5;
|
415
404
|
return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
|
416
405
|
|
@@ -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;
|
@@ -3,14 +3,10 @@
|
|
3
3
|
exports.__esModule = true;
|
4
4
|
exports["default"] = void 0;
|
5
5
|
|
6
|
-
var _componentTopologyUtils = require("@riil-frontend/component-topology-utils");
|
7
|
-
|
8
6
|
var _clusterUtil = require("../../utils/clusterUtil");
|
9
7
|
|
10
8
|
var _htElementUtils = require("../../utils/htElementUtils");
|
11
9
|
|
12
|
-
var _linkUtil = require("../utils/linkUtil");
|
13
|
-
|
14
10
|
// network_link.actual_bandwidth
|
15
11
|
function calcEdgeWidth(actualBandwidth) {
|
16
12
|
if (!actualBandwidth) {
|
@@ -61,16 +57,17 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
|
|
61
57
|
var _proto = LinkDynamicStyleExecutor.prototype;
|
62
58
|
|
63
59
|
_proto.execute = function execute() {
|
64
|
-
var
|
60
|
+
var _topo$historyManager,
|
61
|
+
_this = this,
|
62
|
+
_topo$historyManager2;
|
65
63
|
|
66
64
|
var topo = this.topo;
|
67
65
|
|
68
66
|
var _topo$dataModel$getDa = topo.dataModel.getData(),
|
69
|
-
links = _topo$dataModel$getDa.links
|
70
|
-
linkGroups = _topo$dataModel$getDa.linkGroups;
|
67
|
+
links = _topo$dataModel$getDa.links;
|
71
68
|
|
72
69
|
var dataModel = this.topo.getDataModel();
|
73
|
-
|
70
|
+
(_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态粗细'); // 1、如果连线可见,设置线宽
|
74
71
|
|
75
72
|
links.forEach(function (link) {
|
76
73
|
var edge = dataModel.getDataByTag(link.id);
|
@@ -78,63 +75,8 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
|
|
78
75
|
if (edge) {
|
79
76
|
edge.s('edge.width', _this.calcLinkEdgeWidth(link));
|
80
77
|
}
|
81
|
-
}); // 2、如果连线组关联链路并可见,设置线宽
|
82
|
-
|
83
|
-
linkGroups.forEach(function (link) {
|
84
|
-
// 聚合链路是连线/连线组,并可以查询到
|
85
|
-
var edge = topo.getDataModel().getDataByTag(link.id);
|
86
|
-
|
87
|
-
if (edge) {
|
88
|
-
edge.s('edge.width', _this.calcLinkEdgeWidth(link));
|
89
|
-
return;
|
90
|
-
} // 聚合链路是连线组(编辑模式还未关联业务信息)
|
91
|
-
|
92
|
-
|
93
|
-
var edgeGroup = (0, _htElementUtils.getEdgeGroupByNodeTags)(dataModel, link.source, link.target);
|
94
|
-
|
95
|
-
if (edgeGroup) {
|
96
|
-
var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
|
97
|
-
|
98
|
-
if (edgeGroupAgent) {
|
99
|
-
edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
|
100
|
-
}
|
101
|
-
} else {
|
102
|
-
_componentTopologyUtils.rlog.warn('动态链路样式执行:未找到聚合链路的ht元素', link);
|
103
|
-
}
|
104
|
-
}); // 3、如果连线组未关联链路并可见,设置线宽。
|
105
|
-
|
106
|
-
var edges = (0, _htElementUtils.getEdges)(dataModel);
|
107
|
-
edges.forEach(function (edge) {
|
108
|
-
try {
|
109
|
-
// 获取两端代理节点
|
110
|
-
var sourceAgent = edge.getSourceAgent();
|
111
|
-
var targetAgent = edge.getTargetAgent();
|
112
|
-
var sourceId = sourceAgent.getTag();
|
113
|
-
var targetId = targetAgent.getTag(); // 查询是否有聚合链路
|
114
|
-
|
115
|
-
var aggLink = linkGroups.find(function (link) {
|
116
|
-
return link.source === sourceId && link.target === targetId || link.target === sourceId && link.source === targetId;
|
117
|
-
}); // 如果连线组未关联链路并可见
|
118
|
-
|
119
|
-
if (!aggLink && edge.isEdgeGroupAgent()) {
|
120
|
-
// 查询两端代理节点(包含子节点)间的子链路列表
|
121
|
-
var sourceCiIds = getChildrenNodeCiIds([sourceAgent]);
|
122
|
-
var targetCiIds = getChildrenNodeCiIds([targetAgent]);
|
123
|
-
var aggLinks = (0, _linkUtil.getLinksBetweenNodes)(linkGroups, sourceCiIds, targetCiIds);
|
124
|
-
var phyLinks = (0, _linkUtil.getLinksBetweenNodes)(links, sourceCiIds, targetCiIds);
|
125
|
-
var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路,计算线宽并设置
|
126
|
-
|
127
|
-
if (linkBetweenNodes.length) {
|
128
|
-
var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
|
129
|
-
|
130
|
-
edge.s('edge.width', edgeWidth);
|
131
|
-
}
|
132
|
-
}
|
133
|
-
} catch (error) {
|
134
|
-
_componentTopologyUtils.rlog.error('连线组未关联链路并可见,设置线宽:异常', edge, error);
|
135
|
-
}
|
136
78
|
});
|
137
|
-
topo.historyManager
|
79
|
+
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态粗细');
|
138
80
|
}
|
139
81
|
/**
|
140
82
|
* 处理单个连线组切换。有链路时设置
|
@@ -430,7 +430,7 @@ var _default = (0, _extends2["default"])({
|
|
430
430
|
* @param {Array} groups
|
431
431
|
* @returns
|
432
432
|
*/
|
433
|
-
getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
|
433
|
+
getTopoDataByResource: function getTopoDataByResource(id, resources, groups, relateTopoIdList) {
|
434
434
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
|
435
435
|
var _result$nodes2, _result$links2;
|
436
436
|
|
@@ -450,7 +450,9 @@ var _default = (0, _extends2["default"])({
|
|
450
450
|
|
451
451
|
obj = prepareGroupParams(data);
|
452
452
|
_context13.next = 5;
|
453
|
-
return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj
|
453
|
+
return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, (0, _extends2["default"])({}, obj, {
|
454
|
+
relateTopoIdList: relateTopoIdList
|
455
|
+
}));
|
454
456
|
|
455
457
|
case 5:
|
456
458
|
result = _context13.sent;
|
@@ -251,9 +251,10 @@ function updateLinkTarget(links, nodes) {
|
|
251
251
|
|
252
252
|
|
253
253
|
function processByConditionResult(topoData, groupConfigs) {
|
254
|
-
var
|
254
|
+
var groups = topoData.groups,
|
255
|
+
nodes = topoData.nodes,
|
255
256
|
links = topoData.links;
|
256
|
-
var ipNodes = getIpNodes(groupConfigs,
|
257
|
+
var ipNodes = getIpNodes(groupConfigs, topoData); // 出口链路目的端设置为IP节点或者ping资源节点id
|
257
258
|
|
258
259
|
var newLinks = updateLinkTarget(links, nodes);
|
259
260
|
return (0, _extends2["default"])({}, topoData, {
|
@@ -261,15 +262,26 @@ function processByConditionResult(topoData, groupConfigs) {
|
|
261
262
|
links: newLinks
|
262
263
|
});
|
263
264
|
|
264
|
-
function getIpNodes(groupConfigs,
|
265
|
-
var
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
|
265
|
+
function getIpNodes(groupConfigs, _ref) {
|
266
|
+
var groups = _ref.groups,
|
267
|
+
nodes = _ref.nodes;
|
268
|
+
var ipNodes = [];
|
269
|
+
groupConfigs.forEach(function (g) {
|
270
|
+
g.condition.linkIps // 过滤ping资源对应的ip节点
|
271
|
+
.filter(function (ip) {
|
272
|
+
return !findPingNode(nodes, ip);
|
273
|
+
}).map(function (ip) {
|
274
|
+
var topoGroup = g.topoGroup;
|
275
|
+
var group = groups.find(function (item) {
|
276
|
+
return item.id === topoGroup.id || item.tag === topoGroup.tag;
|
277
|
+
});
|
278
|
+
ipNodes.push((0, _extends2["default"])({}, buildIpNode(ip), {
|
279
|
+
// 解决区域里有ip添加资源ip消失的问题
|
280
|
+
'groupId': group === null || group === void 0 ? void 0 : group.id,
|
281
|
+
'groupTag': group === null || group === void 0 ? void 0 : group.tag
|
282
|
+
}));
|
283
|
+
});
|
272
284
|
});
|
273
|
-
return
|
285
|
+
return ipNodes;
|
274
286
|
}
|
275
287
|
}
|