@riil-frontend/component-topology 13.0.0-dev.1 → 13.0.0-dev.3
Sign up to get free protection for your applications and to get access to all the features.
- package/build/1.js +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/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
- package/es/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -15
- package/es/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +2 -27
- package/es/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
- package/es/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -52
- package/es/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +29 -0
- package/es/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +29 -0
- package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +71 -0
- 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/editor/utils/edgeTypeStyleUtil.js +11 -32
- package/es/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/es/core/hooks/usePolling.js +2 -1
- package/es/core/hooks/useTopoEdit.js +206 -248
- package/es/core/models/AttributeMetricDisplay.js +4 -3
- package/es/core/models/HistoryManager.js +11 -9
- package/es/core/models/TopoApp.js +39 -45
- package/es/core/models/topoData.js +7 -14
- package/es/core/models/utils/linkUtils.js +36 -28
- package/es/core/store/models/topoConfig.js +14 -17
- package/es/core/utils/edgeUtil.js +7 -10
- package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +2 -2
- package/es/networkTopo/models/EdgeGroupTagTipBuilder.js +7 -7
- package/es/networkTopo/models/LinkDynamicStyleExecutor.js +7 -63
- package/es/networkTopo/services/topo/basic.js +15 -8
- package/es/networkTopo/utils/edgeGroupTagUtil.js +2 -2
- package/es/networkTopo/utils/exitLinkUtil.js +23 -11
- package/es/networkTopo/utils/relateTopoDataUtil.js +96 -0
- package/es/style.js +1 -1
- package/es/utils/clusterUtil.js +3 -3
- package/es/utils/htElementUtils.js +16 -84
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +1 -1
- package/lib/core/components/TopoView/topoView.js +15 -19
- package/lib/core/editor/components/Toolbar/widgets/EdgeColorButton/EdgeColorButton.js +2 -2
- package/lib/core/editor/components/Toolbar/widgets/EdgeTypeButton/LineType.js +5 -14
- package/lib/core/editor/components/Toolbar/widgets/FontFamilyWidget.js +3 -28
- package/lib/core/editor/components/Toolbar/widgets/FontSizeWidget.js +3 -28
- package/lib/core/editor/components/Toolbar/widgets/FontStyleButton.js +6 -56
- package/lib/core/editor/components/Toolbar/widgets/components/FontFamilySelect.js +38 -0
- package/lib/core/editor/components/Toolbar/widgets/components/FontSizeSelect.js +38 -0
- package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +83 -0
- 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/editor/utils/edgeTypeStyleUtil.js +10 -33
- package/lib/core/hooks/useGraphAlarmDisplay.js +4 -0
- package/lib/core/hooks/usePolling.js +6 -5
- package/lib/core/hooks/useTopoEdit.js +212 -272
- package/lib/core/models/AttributeMetricDisplay.js +6 -6
- package/lib/core/models/HistoryManager.js +13 -17
- package/lib/core/models/TopoApp.js +39 -43
- package/lib/core/models/topoData.js +7 -14
- package/lib/core/models/utils/linkUtils.js +36 -27
- package/lib/core/store/models/topoConfig.js +20 -31
- package/lib/core/utils/edgeUtil.js +8 -10
- package/lib/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js +3 -2
- package/lib/networkTopo/models/EdgeGroupTagTipBuilder.js +6 -6
- package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +6 -64
- package/lib/networkTopo/services/topo/basic.js +21 -8
- package/lib/networkTopo/utils/edgeGroupTagUtil.js +2 -2
- package/lib/networkTopo/utils/exitLinkUtil.js +23 -11
- package/lib/networkTopo/utils/relateTopoDataUtil.js +109 -0
- package/lib/style.js +1 -1
- package/lib/utils/clusterUtil.js +2 -2
- package/lib/utils/htElementUtils.js +19 -93
- package/package.json +2 -2
- package/es/networkTopo/models/LinkTagsTipsBuilder.js +0 -235
- package/lib/networkTopo/models/LinkTagsTipsBuilder.js +0 -245
@@ -1,13 +1,14 @@
|
|
1
1
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
4
|
-
import
|
4
|
+
import Logger from 'loglevel';
|
5
5
|
import { DEFAULT_NODE_TAG_COMMON_CONFIG, DEFAULT_TIP_COMMON_CONFIG } from "../../constants/ResourceInfoDisplay";
|
6
6
|
import { isMonitoring } from "../utils/manageStatusUtil";
|
7
7
|
import AttributeFormatter from "./attributeFormatter";
|
8
8
|
import DictCache from "./cache/DictCache";
|
9
9
|
import { getNodesNameVisible as _getNodesNameVisible, updateNodesNameVisible as _updateNodesNameVisible } from "./utils/nodeNameVisibleUtil";
|
10
10
|
import { translateCisRefAttributeName } from "../../utils/ciRefAttributeTranslateUtil";
|
11
|
+
var rlog = Logger.getLogger('topo');
|
11
12
|
|
12
13
|
function isGraphField(item) {
|
13
14
|
return item.type === 'graph';
|
@@ -526,7 +527,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
526
527
|
tags: tags
|
527
528
|
});
|
528
529
|
});
|
529
|
-
rlog.debug('
|
530
|
+
rlog.debug(' ==> ht: 推送标注', elementTagsAndTips);
|
530
531
|
var htTopo = topo.getHtTopo();
|
531
532
|
|
532
533
|
if (htTopo) {
|
@@ -537,7 +538,7 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
537
538
|
try {
|
538
539
|
htTopo.loadTagAndTip(JSON.parse(JSON.stringify(elementTagsAndTips)));
|
539
540
|
} catch (error) {
|
540
|
-
rlog.error('
|
541
|
+
rlog.error(' ==> ht: 推送标注失败', error);
|
541
542
|
}
|
542
543
|
|
543
544
|
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '加载标注');
|
@@ -1,5 +1,7 @@
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
2
2
|
import { rlog } from '@riil-frontend/component-topology-utils';
|
3
|
+
import Logger from 'loglevel';
|
4
|
+
var log = Logger.getLogger('topo.HistoryManager');
|
3
5
|
var ht = window.ht;
|
4
6
|
|
5
7
|
var HistoryManager = /*#__PURE__*/function () {
|
@@ -10,7 +12,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
10
12
|
this.topo = topo;
|
11
13
|
this.htHistoryManager = htHistoryManager;
|
12
14
|
htHistoryManager.clear();
|
13
|
-
|
15
|
+
log.info('HistoryManager 初始化', htHistoryManager);
|
14
16
|
this.updateStore = this.updateStore.bind(this);
|
15
17
|
this.init();
|
16
18
|
}
|
@@ -58,10 +60,10 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
58
60
|
|
59
61
|
_proto.setDisabled = function setDisabled(disabled, message) {
|
60
62
|
this.htHistoryManager.setDisabled(disabled);
|
61
|
-
|
63
|
+
log.debug("HistoryManager.setDisabled: " + (disabled ? '禁用' : '启用') + ". <" + message + ">, " + this.toString() + ", ", 'Histories: ', this.getHistories());
|
62
64
|
};
|
63
65
|
|
64
|
-
_proto.beginTransaction = function beginTransaction() {
|
66
|
+
_proto.beginTransaction = function beginTransaction(name) {
|
65
67
|
var _this = this;
|
66
68
|
|
67
69
|
this.htHistoryManager.beginTransaction();
|
@@ -92,7 +94,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
92
94
|
oldValue: _this.topo.store.getModelState(item.modelName)[item.property]
|
93
95
|
});
|
94
96
|
});
|
95
|
-
|
97
|
+
log.debug("HistoryManager.beginTransaction: " + this.toString(), this.getHistories());
|
96
98
|
};
|
97
99
|
|
98
100
|
_proto.addStoreHistory = function addStoreHistory() {
|
@@ -117,16 +119,16 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
117
119
|
type: 'store',
|
118
120
|
data: storeChanged
|
119
121
|
});
|
120
|
-
|
122
|
+
log.debug('HistoryManager.addStoreHistory', storeChanged);
|
121
123
|
}
|
122
124
|
|
123
125
|
this.storeHistory = [];
|
124
126
|
};
|
125
127
|
|
126
|
-
_proto.endTransaction = function endTransaction() {
|
128
|
+
_proto.endTransaction = function endTransaction(name) {
|
127
129
|
this.addStoreHistory();
|
128
130
|
this.htHistoryManager.endTransaction();
|
129
|
-
|
131
|
+
log.debug("HistoryManager.endTransaction: " + this.toString(), this.getHistories());
|
130
132
|
};
|
131
133
|
|
132
134
|
_proto.clear = function clear() {
|
@@ -170,7 +172,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
170
172
|
return;
|
171
173
|
}
|
172
174
|
|
173
|
-
|
175
|
+
log.debug('HistoryManager.undo', this.getHistories(), this.getHistoryIndex());
|
174
176
|
var storeHistory = this.getCurrentStoreHistory(true);
|
175
177
|
|
176
178
|
if (storeHistory) {
|
@@ -188,7 +190,7 @@ var HistoryManager = /*#__PURE__*/function () {
|
|
188
190
|
_proto.redo = function redo() {
|
189
191
|
var _this4 = this;
|
190
192
|
|
191
|
-
|
193
|
+
log.debug('HistoryManager.redo', this.getHistories(), this.getHistoryIndex());
|
192
194
|
var storeHistory = this.getCurrentStoreHistory(false);
|
193
195
|
|
194
196
|
if (storeHistory) {
|
@@ -10,7 +10,7 @@ import Alarm from "./Alarm";
|
|
10
10
|
import TopoGraphView from "./TopoGraphView";
|
11
11
|
import createStore from "../store/createStore";
|
12
12
|
import buildProvider from "../components/buildProvider";
|
13
|
-
import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes
|
13
|
+
import { getEdgeDatas, getGroupDatas, getNodeData, getNodeDatas, getNodes } from "../../utils/htElementUtils";
|
14
14
|
import Test from "../test/Test";
|
15
15
|
import { formatGroups } from "../../utils/topoData";
|
16
16
|
import DictCache from "./cache/DictCache";
|
@@ -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 "13.0.0-dev.
|
27
|
+
var version = typeof "13.0.0-dev.3" === 'string' ? "13.0.0-dev.3" : null;
|
28
28
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
29
29
|
/**
|
30
30
|
* 拓扑显示和编辑
|
@@ -188,38 +188,29 @@ var Topo = /*#__PURE__*/function () {
|
|
188
188
|
|
189
189
|
_proto.getData = function getData() {
|
190
190
|
return {
|
191
|
-
groups: this.
|
192
|
-
nodes: this.
|
193
|
-
|
191
|
+
groups: getGroupDatas(this.getDataModel()),
|
192
|
+
nodes: getNodes(this.getDataModel()).filter(function (node) {
|
193
|
+
return !!node.getTag();
|
194
|
+
}).map(getNodeData),
|
194
195
|
customNodes: getNodeDatas(this.getDataModel()).filter(function (item) {
|
195
196
|
return !item.id;
|
196
197
|
}),
|
197
|
-
|
198
|
+
lines: getEdgeDatas(this.getDataModel()).filter(function (item) {
|
199
|
+
return !!item.id;
|
200
|
+
}),
|
201
|
+
customLines: getEdgeDatas(this.getDataModel()).filter(function (item) {
|
198
202
|
return !item.id;
|
199
203
|
})
|
200
204
|
};
|
201
|
-
}
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
_proto.getNodes = function getNodes() {
|
208
|
-
var nodes = _getNodes(this.getDataModel()).filter(function (node) {
|
209
|
-
return !!node.getTag();
|
210
|
-
});
|
211
|
-
|
212
|
-
return nodes.map(getNodeData);
|
213
|
-
};
|
205
|
+
}
|
206
|
+
/**
|
207
|
+
* @deprecated 待移除。uicbb有使用
|
208
|
+
* @returns
|
209
|
+
*/
|
210
|
+
;
|
214
211
|
|
215
212
|
_proto.getLines = function getLines() {
|
216
|
-
return this.
|
217
|
-
return !!item.id;
|
218
|
-
});
|
219
|
-
};
|
220
|
-
|
221
|
-
_proto.getEdges = function getEdges() {
|
222
|
-
return getEdgeDatas(this.getDataModel());
|
213
|
+
return this.getData().lines;
|
223
214
|
}
|
224
215
|
/**
|
225
216
|
* 全量更新数据
|
@@ -278,18 +269,19 @@ var Topo = /*#__PURE__*/function () {
|
|
278
269
|
/*#__PURE__*/
|
279
270
|
function () {
|
280
271
|
var _addElements = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(elements) {
|
281
|
-
var data;
|
272
|
+
var prevData, data;
|
282
273
|
return _regeneratorRuntime.wrap(function _callee5$(_context5) {
|
283
274
|
while (1) switch (_context5.prev = _context5.next) {
|
284
275
|
case 0:
|
276
|
+
prevData = this.getData();
|
285
277
|
data = {
|
286
|
-
groups: [].concat(
|
287
|
-
nodes: [].concat(
|
288
|
-
lines: [].concat(
|
278
|
+
groups: [].concat(prevData.groups, elements.groups || []),
|
279
|
+
nodes: [].concat(prevData.nodes, elements.nodes || []),
|
280
|
+
lines: [].concat(prevData.lines, elements.lines || [])
|
289
281
|
};
|
290
282
|
this.updateElements(data); // TODO 更新store,触发属性、指标模型加载,更新指标
|
291
283
|
|
292
|
-
case
|
284
|
+
case 3:
|
293
285
|
case "end":
|
294
286
|
return _context5.stop();
|
295
287
|
}
|
@@ -516,38 +508,39 @@ var Topo = /*#__PURE__*/function () {
|
|
516
508
|
while (1) switch (_context12.prev = _context12.next) {
|
517
509
|
case 0:
|
518
510
|
rlog.info('TopoApp.enterEditMode');
|
511
|
+
this.historyManager = null;
|
519
512
|
|
520
513
|
if (!this.options.onSwitchToEditModeBegin) {
|
521
|
-
_context12.next =
|
514
|
+
_context12.next = 5;
|
522
515
|
break;
|
523
516
|
}
|
524
517
|
|
525
|
-
_context12.next =
|
518
|
+
_context12.next = 5;
|
526
519
|
return this.options.onSwitchToEditModeBegin(this);
|
527
520
|
|
528
|
-
case
|
521
|
+
case 5:
|
529
522
|
topoDispatchers = this.store.getModelDispatchers('topoMod');
|
530
|
-
_context12.next =
|
523
|
+
_context12.next = 8;
|
531
524
|
return topoDispatchers.update({
|
532
525
|
viewState: 'edit'
|
533
526
|
});
|
534
527
|
|
535
|
-
case
|
536
|
-
_context12.next =
|
528
|
+
case 8:
|
529
|
+
_context12.next = 10;
|
537
530
|
return this.view.switchToEditMode();
|
538
531
|
|
539
|
-
case
|
532
|
+
case 10:
|
540
533
|
updateEdgeExpanded(this);
|
541
534
|
|
542
535
|
if (!this.options.onSwitchToEditMode) {
|
543
|
-
_context12.next =
|
536
|
+
_context12.next = 14;
|
544
537
|
break;
|
545
538
|
}
|
546
539
|
|
547
|
-
_context12.next =
|
540
|
+
_context12.next = 14;
|
548
541
|
return this.options.onSwitchToEditMode(this);
|
549
542
|
|
550
|
-
case
|
543
|
+
case 14:
|
551
544
|
if (this.getDataModel()) {
|
552
545
|
// 更新节点名称显示隐藏
|
553
546
|
this.attributeMetricDisplay.updateNodesNameVisible();
|
@@ -557,7 +550,7 @@ var Topo = /*#__PURE__*/function () {
|
|
557
550
|
iconManageDispatchers = this.store.getModelDispatchers('customIcon');
|
558
551
|
iconManageDispatchers.loadEditorIcons();
|
559
552
|
|
560
|
-
case
|
553
|
+
case 17:
|
561
554
|
case "end":
|
562
555
|
return _context12.stop();
|
563
556
|
}
|
@@ -581,18 +574,19 @@ var Topo = /*#__PURE__*/function () {
|
|
581
574
|
return this.view.switchToViewMode();
|
582
575
|
|
583
576
|
case 2:
|
577
|
+
this.historyManager = null;
|
584
578
|
editDispatchers = this.store.getModelDispatchers('topoConfig');
|
585
579
|
editDispatchers.switchToViewMode(this.id);
|
586
580
|
|
587
581
|
if (!this.options.onSwitchToViewMode) {
|
588
|
-
_context13.next =
|
582
|
+
_context13.next = 8;
|
589
583
|
break;
|
590
584
|
}
|
591
585
|
|
592
|
-
_context13.next =
|
586
|
+
_context13.next = 8;
|
593
587
|
return this.options.onSwitchToViewMode(this);
|
594
588
|
|
595
|
-
case
|
589
|
+
case 8:
|
596
590
|
case "end":
|
597
591
|
return _context13.stop();
|
598
592
|
}
|
@@ -41,7 +41,7 @@ export function saveTopo(_x) {
|
|
41
41
|
|
42
42
|
function _saveTopo() {
|
43
43
|
_saveTopo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
|
44
|
-
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources
|
44
|
+
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, relateTopoIdList, viewGroupId, groupInfo, viewResources;
|
45
45
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
46
46
|
while (1) switch (_context.prev = _context.next) {
|
47
47
|
case 0:
|
@@ -72,7 +72,7 @@ function _saveTopo() {
|
|
72
72
|
|
73
73
|
case 8:
|
74
74
|
if (!(resources || groups)) {
|
75
|
-
_context.next =
|
75
|
+
_context.next = 15;
|
76
76
|
break;
|
77
77
|
}
|
78
78
|
|
@@ -94,30 +94,23 @@ function _saveTopo() {
|
|
94
94
|
});
|
95
95
|
}
|
96
96
|
|
97
|
-
linkIps = []; // resources?.static.map((nodeId) => {
|
98
|
-
// if (nodeId.startsWith("ip_")) {
|
99
|
-
// linkIps.push(nodeId.replace("ip_", ""));
|
100
|
-
// }
|
101
|
-
// });
|
102
|
-
|
103
97
|
rlog.debug("saveTopo-groupInfo", groupInfo);
|
104
|
-
_context.next =
|
98
|
+
_context.next = 15;
|
105
99
|
return topoService.bindResourceToTopo(topoId, {
|
106
100
|
groups: groupInfo,
|
107
|
-
linkIps: linkIps,
|
108
101
|
relateTopoIdList: relateTopoIdList
|
109
102
|
});
|
110
103
|
|
111
|
-
case
|
104
|
+
case 15:
|
112
105
|
if (!serialize) {
|
113
|
-
_context.next =
|
106
|
+
_context.next = 18;
|
114
107
|
break;
|
115
108
|
}
|
116
109
|
|
117
|
-
_context.next =
|
110
|
+
_context.next = 18;
|
118
111
|
return topoService.saveSerializeData(topoId, serialize);
|
119
112
|
|
120
|
-
case
|
113
|
+
case 18:
|
121
114
|
case "end":
|
122
115
|
return _context.stop();
|
123
116
|
}
|
@@ -2,10 +2,9 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
4
4
|
import keyBy from "lodash/keyBy";
|
5
|
-
import _ from "lodash";
|
6
|
-
import { queryCisByIds, queryModelAsset } from "../../services"; // 查询所有连线
|
5
|
+
import _ from "lodash"; // 查询所有连线
|
7
6
|
|
8
|
-
import { getEdges } from "../../../utils/htElementUtils";
|
7
|
+
import { getEdges, isEdgeGroupAgent } from "../../../utils/htElementUtils";
|
9
8
|
import CiTypeCache from "../cache/CiTypeCache";
|
10
9
|
import CiCache from "../cache/CiCache"; // const interfaceTypeMap = {
|
11
10
|
// "network.interface": {
|
@@ -32,7 +31,20 @@ export function isCrucialLink(link) {
|
|
32
31
|
*/
|
33
32
|
|
34
33
|
export function isExitLink(link) {
|
35
|
-
|
34
|
+
var _link$attributes;
|
35
|
+
|
36
|
+
return (link === null || link === void 0 ? void 0 : (_link$attributes = link.attributes) === null || _link$attributes === void 0 ? void 0 : _link$attributes.destination_type) === "ip";
|
37
|
+
}
|
38
|
+
/**
|
39
|
+
* 是否聚合链路
|
40
|
+
* @param {*} link
|
41
|
+
* @returns
|
42
|
+
*/
|
43
|
+
|
44
|
+
export function isAggLink(link) {
|
45
|
+
var _link$attributes2, _link$attributes3;
|
46
|
+
|
47
|
+
return (link === null || link === void 0 ? void 0 : (_link$attributes2 = link.attributes) === null || _link$attributes2 === void 0 ? void 0 : _link$attributes2.destination_type) === "network.agg_interface" && (link === null || link === void 0 ? void 0 : (_link$attributes3 = link.attributes) === null || _link$attributes3 === void 0 ? void 0 : _link$attributes3.source_type) === "network.agg_interface";
|
36
48
|
}
|
37
49
|
export function mergeLinksData(links, linkCis, nodes, interfaceCiMap, interfaceDoc) {
|
38
50
|
var linkCiMap = keyBy(links, "id");
|
@@ -83,7 +95,7 @@ function _getLinksDetail() {
|
|
83
95
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
84
96
|
while (1) switch (_context.prev = _context.next) {
|
85
97
|
case 0:
|
86
|
-
if (
|
98
|
+
if (links !== null && links !== void 0 && links.length) {
|
87
99
|
_context.next = 2;
|
88
100
|
break;
|
89
101
|
}
|
@@ -91,9 +103,6 @@ function _getLinksDetail() {
|
|
91
103
|
return _context.abrupt("return", []);
|
92
104
|
|
93
105
|
case 2:
|
94
|
-
// const linkCis = await topoService.relation.batchQueryRelation(
|
95
|
-
// links.map((link) => link.id)
|
96
|
-
// );
|
97
106
|
linkCis = links;
|
98
107
|
interfaceIds = [].concat(linkCis.map(function (item) {
|
99
108
|
return item.attributes.source_id;
|
@@ -149,7 +158,8 @@ export var plurals = {
|
|
149
158
|
2: ["phy"],
|
150
159
|
3: ["agg"],
|
151
160
|
4: ["phy", "agg"]
|
152
|
-
};
|
161
|
+
}; // 待办:移到网络拓扑组件
|
162
|
+
|
153
163
|
export var showLinkByConfig = function showLinkByConfig(props) {
|
154
164
|
var _plurals$compatibleWi;
|
155
165
|
|
@@ -161,31 +171,29 @@ export var showLinkByConfig = function showLinkByConfig(props) {
|
|
161
171
|
|
162
172
|
var gv = topo.getGraphView();
|
163
173
|
var dm = gv.getDataModel();
|
164
|
-
var edges = getEdges(dm)
|
174
|
+
var edges = getEdges(dm).filter(function (edge) {
|
175
|
+
return !isEdgeGroupAgent(edge);
|
176
|
+
}); // console.log("edges", edges);
|
165
177
|
|
166
178
|
var showPhy = types.indexOf("phy") >= 0;
|
167
179
|
var showAgg = types.indexOf("agg") >= 0; // console.log("edges----types",showType, types,showPhy, showAgg);
|
168
180
|
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
var _d$attributes, _d$attributes2;
|
177
|
-
|
178
|
-
var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
|
181
|
+
edges.forEach(function (edge) {
|
182
|
+
if (showType === 1 || showType === true) {
|
183
|
+
// 单链路全部显示
|
184
|
+
// console.log("单链路全部显示", edge);
|
185
|
+
edge.s("x.visible", true);
|
186
|
+
} else {
|
187
|
+
var d = topo.dataModel.getDataById(edge.getTag()); // 判断是否聚合链路
|
179
188
|
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
}
|
189
|
+
if (isAggLink(d)) {
|
190
|
+
edge.s("x.visible", showAgg);
|
191
|
+
} else {
|
192
|
+
// console.log("edge", edge, d, showAgg);
|
193
|
+
edge.s("x.visible", showPhy);
|
186
194
|
}
|
187
|
-
}
|
188
|
-
}
|
195
|
+
}
|
196
|
+
});
|
189
197
|
};
|
190
198
|
export var mergeExportLinkData = function mergeExportLinkData(props) {
|
191
199
|
var source = props.source,
|
@@ -8,13 +8,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
8
8
|
import { getUUID, isAvailableArray } from "@riil-frontend/utils";
|
9
9
|
import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
|
10
10
|
import { TOPO_PARENT_ID } from "@riil-frontend/component-topology-common/es/services/topo";
|
11
|
-
import
|
11
|
+
import Logger from 'loglevel';
|
12
12
|
import { removeFromArray } from "../../../utils/format";
|
13
13
|
import { DEFAULT_GROUP } from "../../../utils/template";
|
14
14
|
import { combTopoData, getCiTypes } from "../../../utils/topoData";
|
15
15
|
import { saveTopo as _saveTopo, resToConditions, getLayoutId } from "../../../core/models/topoData";
|
16
16
|
import networkLinkServer from "../../../networkTopo/services/topo/networkLink";
|
17
17
|
import { addLinkData, buildData as buildTopoData } from "../../../networkTopo/getTopoData";
|
18
|
+
var rlog = Logger.getLogger('topo');
|
18
19
|
|
19
20
|
var newGroupWithUUID = function newGroupWithUUID(group) {
|
20
21
|
if (group === void 0) {
|
@@ -242,30 +243,25 @@ export default function (topoApp) {
|
|
242
243
|
var _this2 = this;
|
243
244
|
|
244
245
|
return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
245
|
-
var editState, resources, _editState$groups, groups, query, data;
|
246
|
+
var editState, resources, _editState$groups, groups, relateTopoIdList, query, data;
|
246
247
|
|
247
248
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
248
249
|
while (1) switch (_context2.prev = _context2.next) {
|
249
250
|
case 0:
|
250
251
|
editState = rootState.topoConfig;
|
251
|
-
resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups;
|
252
|
+
resources = editState.resources, _editState$groups = editState.groups, groups = _editState$groups === void 0 ? [] : _editState$groups, relateTopoIdList = editState.relateTopoIdList;
|
252
253
|
query = {
|
253
254
|
id: rootState.topoMod.topoId,
|
254
255
|
resources: resources,
|
255
|
-
groups: groups
|
256
|
+
groups: groups,
|
257
|
+
relateTopoIdList: relateTopoIdList
|
256
258
|
};
|
257
259
|
_context2.next = 5;
|
258
260
|
return _this2.getTopoByConditions(query);
|
259
261
|
|
260
262
|
case 5:
|
261
263
|
data = _context2.sent;
|
262
|
-
rlog.debug("
|
263
|
-
config: {
|
264
|
-
resources: resources,
|
265
|
-
groups: groups
|
266
|
-
},
|
267
|
-
data: data
|
268
|
-
});
|
264
|
+
rlog.debug("按配置查询拓扑数据. 参数:", query, ", 返回结果: ", data);
|
269
265
|
return _context2.abrupt("return", data);
|
270
266
|
|
271
267
|
case 8:
|
@@ -301,13 +297,13 @@ export default function (topoApp) {
|
|
301
297
|
var _this4 = this;
|
302
298
|
|
303
299
|
return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
|
304
|
-
var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
|
300
|
+
var topoId, resources, groups, relateTopoIdList, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
|
305
301
|
|
306
302
|
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
307
303
|
while (1) switch (_context4.prev = _context4.next) {
|
308
304
|
case 0:
|
309
305
|
rlog.debug("getTopoByConditions--------", params);
|
310
|
-
topoId = params.id, resources = params.resources, groups = params.groups;
|
306
|
+
topoId = params.id, resources = params.resources, groups = params.groups, relateTopoIdList = params.relateTopoIdList;
|
311
307
|
viewConditions = resToConditions(resources);
|
312
308
|
groupInfo = isAvailableArray(groups) && groups.map(function (group) {
|
313
309
|
return _extends({}, group, {
|
@@ -317,7 +313,7 @@ export default function (topoApp) {
|
|
317
313
|
});
|
318
314
|
rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
|
319
315
|
_context4.next = 7;
|
320
|
-
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
|
316
|
+
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, relateTopoIdList);
|
321
317
|
|
322
318
|
case 7:
|
323
319
|
data = _context4.sent;
|
@@ -327,10 +323,11 @@ export default function (topoApp) {
|
|
327
323
|
|
328
324
|
case 11:
|
329
325
|
data = _context4.sent;
|
330
|
-
|
326
|
+
rlog.debug("getTopoByConditions--------", data, groupInfo);
|
327
|
+
_context4.next = 15;
|
331
328
|
return Promise.all([addLinkData(data), topoApp.ciTyeCache.load(getCiTypes(data)), dispatch.customIcon.loadCustomIcons()]);
|
332
329
|
|
333
|
-
case
|
330
|
+
case 15:
|
334
331
|
_yield$Promise$all = _context4.sent;
|
335
332
|
dataWithLinkDetail = _yield$Promise$all[0];
|
336
333
|
_combTopoData = combTopoData({
|
@@ -357,7 +354,7 @@ export default function (topoApp) {
|
|
357
354
|
topoDataTrans: topoDataTrans
|
358
355
|
});
|
359
356
|
|
360
|
-
case
|
357
|
+
case 23:
|
361
358
|
case "end":
|
362
359
|
return _context4.stop();
|
363
360
|
}
|
@@ -1,12 +1,13 @@
|
|
1
1
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
2
2
|
import { showLinkByConfig } from "../models/utils/linkUtils";
|
3
|
+
import { isEdgeGroupAgent } from "../../utils/htElementUtils";
|
3
4
|
/**
|
4
5
|
* 是否手工连线
|
5
6
|
* @param {*} edge
|
6
7
|
*/
|
7
8
|
|
8
9
|
export function isCustomEdge(edge) {
|
9
|
-
return !
|
10
|
+
return !isEdgeGroupAgent(edge) && (edge.a('type') == 'line' || !edge.a('type'));
|
10
11
|
}
|
11
12
|
/**
|
12
13
|
* 根据配置更新连线展开折叠状态
|
@@ -15,7 +16,7 @@ export function isCustomEdge(edge) {
|
|
15
16
|
*/
|
16
17
|
|
17
18
|
export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
18
|
-
var _topo$historyManager, _topo$historyManager2;
|
19
|
+
var _topo$historyManager, _topo$historyManager2, _topo$linkDynamicStyl;
|
19
20
|
|
20
21
|
var _topo$store$getModelS = topo.store.getModelState("topoMod"),
|
21
22
|
viewState = _topo$store$getModelS.viewState;
|
@@ -28,8 +29,7 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
28
29
|
}
|
29
30
|
|
30
31
|
var _topo$store$getModelS2 = topo.store.getModelState("displayConfig"),
|
31
|
-
expandAllEdges = _topo$store$getModelS2.expandAllEdges;
|
32
|
-
|
32
|
+
expandAllEdges = _topo$store$getModelS2.expandAllEdges;
|
33
33
|
|
34
34
|
(_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '连线展开控制');
|
35
35
|
|
@@ -38,10 +38,10 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
38
38
|
topo: topo,
|
39
39
|
showType: 1
|
40
40
|
});
|
41
|
-
htTopo.
|
41
|
+
htTopo.toggleAllEdgeGroups(false);
|
42
42
|
rlog.debug("updateEdgeExpanded 折叠");
|
43
43
|
} else {
|
44
|
-
htTopo.
|
44
|
+
htTopo.toggleAllEdgeGroups(true);
|
45
45
|
showLinkByConfig({
|
46
46
|
topo: topo,
|
47
47
|
showType: expandAllEdges,
|
@@ -51,8 +51,5 @@ export var updateEdgeExpanded = function updateEdgeExpanded(topo) {
|
|
51
51
|
}
|
52
52
|
|
53
53
|
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '连线展开控制');
|
54
|
-
|
55
|
-
if (topo.linkDynamicStyleExecutor) {
|
56
|
-
topo.linkDynamicStyleExecutor.execute();
|
57
|
-
}
|
54
|
+
(_topo$linkDynamicStyl = topo.linkDynamicStyleExecutor) === null || _topo$linkDynamicStyl === void 0 ? void 0 : _topo$linkDynamicStyl.execute();
|
58
55
|
};
|
package/es/core/viewer/components/plugins/ElementDetailDrawer/hooks/useElementDetailManager.js
CHANGED
@@ -1,5 +1,6 @@
|
|
1
1
|
import React, { useMemo } from 'react';
|
2
2
|
import DefaultDetailContent from "../../ResourceDetail/DefaultDetailContent";
|
3
|
+
import { isEdgeGroupAgent } from "../../../../../../utils/htElementUtils";
|
3
4
|
|
4
5
|
function useElementDetailManager(props) {
|
5
6
|
var topo = props.topo,
|
@@ -62,9 +63,8 @@ function useElementDetailManager(props) {
|
|
62
63
|
}
|
63
64
|
|
64
65
|
function openByHtElement(htElement) {
|
65
|
-
var isEdgeGroupAgent = htElement instanceof ht.Edge && htElement.isEdgeGroupAgent() && !htElement.s('edge.expanded');
|
66
66
|
open({
|
67
|
-
id: isEdgeGroupAgent || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
|
67
|
+
id: isEdgeGroupAgent(htElement) || !htElement.getTag() ? "ht:" + htElement.getId() : htElement.getTag(),
|
68
68
|
htElement: htElement
|
69
69
|
});
|
70
70
|
}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { getEdgeGroups } from "../../utils/htElementUtils";
|
1
|
+
import { getEdgeGroupAgents, getEdgeGroups } from "../../utils/htElementUtils";
|
2
2
|
import { getEdgeGroupLinkIdConfig } from "../utils/edgeGroupTagUtil";
|
3
3
|
|
4
4
|
var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
|
@@ -16,11 +16,11 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
|
|
16
16
|
|
17
17
|
var topo = this.topo;
|
18
18
|
var dm = this.topo.getDataModel();
|
19
|
-
var
|
20
|
-
|
21
|
-
|
22
|
-
var linkId = getEdgeGroupLinkIdConfig(
|
23
|
-
var edgeGroupId = [
|
19
|
+
var edgeGroupAgents = getEdgeGroupAgents(dm);
|
20
|
+
var edgeGroupsTagsTips = edgeGroupAgents.map(function (edgeGroupAgent) {
|
21
|
+
// 获取配置的链路
|
22
|
+
var linkId = getEdgeGroupLinkIdConfig(edgeGroupAgent, topo);
|
23
|
+
var edgeGroupId = [edgeGroupAgent.getSource().getId(), edgeGroupAgent.getTarget().getId()];
|
24
24
|
var data = {
|
25
25
|
tags: [],
|
26
26
|
tips: []
|
@@ -31,7 +31,7 @@ var EdgeGroupTagTipBuilder = /*#__PURE__*/function () {
|
|
31
31
|
}
|
32
32
|
|
33
33
|
return {
|
34
|
-
htId:
|
34
|
+
htId: edgeGroupAgent.getId(),
|
35
35
|
edgeGroupId: edgeGroupId,
|
36
36
|
tags: data.tags,
|
37
37
|
tips: data.tips,
|