@riil-frontend/component-topology 12.0.1 → 12.1.0-dev.10
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.js +14 -14
- 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/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/usePolling.js +2 -1
- package/es/core/hooks/useTopoEdit.js +169 -235
- package/es/core/models/AttributeMetricDisplay.js +2 -1
- package/es/core/models/HistoryManager.js +11 -9
- package/es/core/models/TopoApp.js +23 -31
- package/es/core/models/utils/linkUtils.js +36 -28
- package/es/core/store/models/topoConfig.js +2 -1
- 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/utils/edgeGroupTagUtil.js +2 -2
- package/es/utils/clusterUtil.js +3 -3
- package/es/utils/htElementUtils.js +16 -84
- 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/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/usePolling.js +6 -5
- package/lib/core/hooks/useTopoEdit.js +177 -261
- package/lib/core/models/AttributeMetricDisplay.js +6 -6
- package/lib/core/models/HistoryManager.js +13 -17
- package/lib/core/models/TopoApp.js +22 -29
- package/lib/core/models/utils/linkUtils.js +36 -27
- package/lib/core/store/models/topoConfig.js +9 -16
- 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/utils/edgeGroupTagUtil.js +2 -2
- 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';
|
@@ -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 ? "(" + message + ")" : '') + ": " + this.toString(), 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 "12.0.
|
27
|
+
var version = typeof "12.1.0-dev.10" === 'string' ? "12.1.0-dev.10" : 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
|
}
|
@@ -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) {
|
@@ -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,
|
@@ -1,7 +1,5 @@
|
|
1
|
-
import { rlog } from '@riil-frontend/component-topology-utils';
|
2
1
|
import { isClusterHtElement } from "../../utils/clusterUtil";
|
3
|
-
import {
|
4
|
-
import { getLinksBetweenNodes } from "../utils/linkUtil"; // network_link.actual_bandwidth
|
2
|
+
import { isNode } from "../../utils/htElementUtils"; // network_link.actual_bandwidth
|
5
3
|
|
6
4
|
function calcEdgeWidth(actualBandwidth) {
|
7
5
|
if (!actualBandwidth) {
|
@@ -52,16 +50,17 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
|
|
52
50
|
var _proto = LinkDynamicStyleExecutor.prototype;
|
53
51
|
|
54
52
|
_proto.execute = function execute() {
|
55
|
-
var
|
53
|
+
var _topo$historyManager,
|
54
|
+
_this = this,
|
55
|
+
_topo$historyManager2;
|
56
56
|
|
57
57
|
var topo = this.topo;
|
58
58
|
|
59
59
|
var _topo$dataModel$getDa = topo.dataModel.getData(),
|
60
|
-
links = _topo$dataModel$getDa.links
|
61
|
-
linkGroups = _topo$dataModel$getDa.linkGroups;
|
60
|
+
links = _topo$dataModel$getDa.links;
|
62
61
|
|
63
62
|
var dataModel = this.topo.getDataModel();
|
64
|
-
|
63
|
+
(_topo$historyManager = topo.historyManager) === null || _topo$historyManager === void 0 ? void 0 : _topo$historyManager.setDisabled(true, '链路动态样式'); // 1、如果连线可见,设置线宽
|
65
64
|
|
66
65
|
links.forEach(function (link) {
|
67
66
|
var edge = dataModel.getDataByTag(link.id);
|
@@ -69,63 +68,8 @@ var LinkDynamicStyleExecutor = /*#__PURE__*/function () {
|
|
69
68
|
if (edge) {
|
70
69
|
edge.s('edge.width', _this.calcLinkEdgeWidth(link));
|
71
70
|
}
|
72
|
-
}); // 2、如果连线组关联链路并可见,设置线宽
|
73
|
-
|
74
|
-
linkGroups.forEach(function (link) {
|
75
|
-
// 聚合链路是连线/连线组,并可以查询到
|
76
|
-
var edge = topo.getDataModel().getDataByTag(link.id);
|
77
|
-
|
78
|
-
if (edge) {
|
79
|
-
edge.s('edge.width', _this.calcLinkEdgeWidth(link));
|
80
|
-
return;
|
81
|
-
} // 聚合链路是连线组(编辑模式还未关联业务信息)
|
82
|
-
|
83
|
-
|
84
|
-
var edgeGroup = getEdgeGroupByNodeTags(dataModel, link.source, link.target);
|
85
|
-
|
86
|
-
if (edgeGroup) {
|
87
|
-
var edgeGroupAgent = edgeGroup.getEdgeGroupAgent(); // 判断是显示的连线组元素
|
88
|
-
|
89
|
-
if (edgeGroupAgent) {
|
90
|
-
edgeGroup.getEdgeGroupAgent().s('edge.width', _this.calcLinkEdgeWidth(link));
|
91
|
-
}
|
92
|
-
} else {
|
93
|
-
rlog.warn('动态链路样式执行:未找到聚合链路的ht元素', link);
|
94
|
-
}
|
95
|
-
}); // 3、如果连线组未关联链路并可见,设置线宽。
|
96
|
-
|
97
|
-
var edges = getEdges(dataModel);
|
98
|
-
edges.forEach(function (edge) {
|
99
|
-
try {
|
100
|
-
// 获取两端代理节点
|
101
|
-
var sourceAgent = edge.getSourceAgent();
|
102
|
-
var targetAgent = edge.getTargetAgent();
|
103
|
-
var sourceId = sourceAgent.getTag();
|
104
|
-
var targetId = targetAgent.getTag(); // 查询是否有聚合链路
|
105
|
-
|
106
|
-
var aggLink = linkGroups.find(function (link) {
|
107
|
-
return link.source === sourceId && link.target === targetId || link.target === sourceId && link.source === targetId;
|
108
|
-
}); // 如果连线组未关联链路并可见
|
109
|
-
|
110
|
-
if (!aggLink && edge.isEdgeGroupAgent()) {
|
111
|
-
// 查询两端代理节点(包含子节点)间的子链路列表
|
112
|
-
var sourceCiIds = getChildrenNodeCiIds([sourceAgent]);
|
113
|
-
var targetCiIds = getChildrenNodeCiIds([targetAgent]);
|
114
|
-
var aggLinks = getLinksBetweenNodes(linkGroups, sourceCiIds, targetCiIds);
|
115
|
-
var phyLinks = getLinksBetweenNodes(links, sourceCiIds, targetCiIds);
|
116
|
-
var linkBetweenNodes = aggLinks.length ? aggLinks : phyLinks; // 如果有子链路,计算线宽并设置
|
117
|
-
|
118
|
-
if (linkBetweenNodes.length) {
|
119
|
-
var edgeWidth = _this.calcEdgeGroupEdgeWidth(linkBetweenNodes);
|
120
|
-
|
121
|
-
edge.s('edge.width', edgeWidth);
|
122
|
-
}
|
123
|
-
}
|
124
|
-
} catch (error) {
|
125
|
-
rlog.error('连线组未关联链路并可见,设置线宽:异常', edge, error);
|
126
|
-
}
|
127
71
|
});
|
128
|
-
topo.historyManager
|
72
|
+
(_topo$historyManager2 = topo.historyManager) === null || _topo$historyManager2 === void 0 ? void 0 : _topo$historyManager2.setDisabled(false, '链路动态样式');
|
129
73
|
}
|
130
74
|
/**
|
131
75
|
* 处理单个连线组切换。有链路时设置
|
@@ -55,8 +55,8 @@ export function getEdgeGroupLinkIdConfig(edgeGroup, topo) {
|
|
55
55
|
});
|
56
56
|
}
|
57
57
|
export function getEdgeGroupConfigId(edgeGroup) {
|
58
|
-
var sourceNode = edgeGroup.
|
59
|
-
var targetNode = edgeGroup.
|
58
|
+
var sourceNode = edgeGroup.getSource();
|
59
|
+
var targetNode = edgeGroup.getTarget();
|
60
60
|
var sourceId = sourceNode.a('uuid');
|
61
61
|
var targetId = targetNode.a('uuid');
|
62
62
|
return [sourceId, targetId].sort().join(',');
|
package/es/utils/clusterUtil.js
CHANGED
@@ -5,7 +5,7 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
5
5
|
*/
|
6
6
|
import { transformTopoElements } from "@riil-frontend/component-topology-graph/es/utils";
|
7
7
|
import rlog from "@riil-frontend/component-topology-utils/es/rlog";
|
8
|
-
import { getGroups,
|
8
|
+
import { getGroups, containsElement } from "./htElementUtils";
|
9
9
|
import { findGroupChildren } from "./topoData";
|
10
10
|
export function isCluster(node) {
|
11
11
|
return !!node.cluster;
|
@@ -76,7 +76,7 @@ export function isClusterHtElement(element) {
|
|
76
76
|
return !!element.a('cluster');
|
77
77
|
}
|
78
78
|
export function isClusterMemberHtElement(element) {
|
79
|
-
return element
|
79
|
+
return (element === null || element === void 0 ? void 0 : element.getParent()) && isClusterHtElement(element.getParent());
|
80
80
|
}
|
81
81
|
/**
|
82
82
|
* 集群无权限时收起
|
@@ -111,7 +111,7 @@ export function upgradeV103GraphClusterNode(topo, topoData) {
|
|
111
111
|
var topoDataTrans = transformTopoElements(topoData);
|
112
112
|
var dm = topo.getDataModel();
|
113
113
|
var unExistedList = topoDataTrans.filter(function (data) {
|
114
|
-
return !
|
114
|
+
return !containsElement(dm, data);
|
115
115
|
});
|
116
116
|
|
117
117
|
if (!unExistedList.length) {
|