@riil-frontend/component-topology 13.0.0-dev.8 → 13.0.0-dev.9
Sign up to get free protection for your applications and to get access to all the features.
- package/build/index.js +29 -29
- package/es/components/ColorPanel/index.js +68 -58
- package/es/core/editor/components/Toolbar/widgets/components/FontColorDropdown.js +10 -4
- package/es/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +21 -15
- package/es/core/hooks/useResourceConfig.js +1 -2
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/topoData.js +3 -4
- package/es/core/store/models/topoConfig.js +6 -7
- package/es/networkTopo/services/topo/basic.js +18 -16
- package/es/networkTopo/utils/relateTopoDataUtil.js +42 -5
- package/es/utils/ResourceConfigUtil.js +1 -16
- package/lib/components/ColorPanel/index.js +71 -59
- package/lib/core/editor/components/Toolbar/widgets/components/FontColorDropdown.js +10 -4
- package/lib/core/editor/components/Toolbar/widgets/components/FontStyleSelect.js +21 -15
- package/lib/core/hooks/useResourceConfig.js +1 -2
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/topoData.js +3 -4
- package/lib/core/store/models/topoConfig.js +6 -7
- package/lib/networkTopo/services/topo/basic.js +18 -18
- package/lib/networkTopo/utils/relateTopoDataUtil.js +44 -5
- package/lib/utils/ResourceConfigUtil.js +1 -16
- package/package.json +2 -2
@@ -7,8 +7,12 @@ exports["default"] = void 0;
|
|
7
7
|
|
8
8
|
var _balloon = _interopRequireDefault(require("@alifd/next/lib/balloon"));
|
9
9
|
|
10
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
11
|
+
|
10
12
|
var _react = _interopRequireWildcard(require("react"));
|
11
13
|
|
14
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
15
|
+
|
12
16
|
var _classnames4 = _interopRequireDefault(require("classnames"));
|
13
17
|
|
14
18
|
var _color = _interopRequireDefault(require("color"));
|
@@ -26,7 +30,58 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
26
30
|
/* eslint-disable eqeqeq */
|
27
31
|
|
28
32
|
/* eslint-disable jsx-a11y/alt-text */
|
29
|
-
|
33
|
+
var defaultColorList = [{
|
34
|
+
color: 'rgba(255, 255, 255, 1)',
|
35
|
+
borderColor: 'rgba(219, 219, 219, 1)'
|
36
|
+
}, {
|
37
|
+
color: 'rgba(245, 245, 245, 1)',
|
38
|
+
borderColor: 'rgba(208, 208, 208, 1)'
|
39
|
+
}, {
|
40
|
+
color: 'rgba(230, 230, 230, 1)',
|
41
|
+
borderColor: 'rgba(196, 196, 196, 1)'
|
42
|
+
}, {
|
43
|
+
color: 'rgba(168, 168, 168, 1)',
|
44
|
+
borderColor: 'rgba(146, 146, 146, 1)'
|
45
|
+
}, {
|
46
|
+
color: 'rgba(97, 97, 97, 1)',
|
47
|
+
borderColor: 'rgba(85, 85, 85, 1)'
|
48
|
+
}, {
|
49
|
+
color: 'rgba(49, 49, 49, 1)',
|
50
|
+
borderColor: 'rgba(43, 43, 43, 1)'
|
51
|
+
}, {
|
52
|
+
color: 'rgba(251, 115, 80, 1)',
|
53
|
+
borderColor: 'rgba(213, 98, 69, 1)'
|
54
|
+
}, {
|
55
|
+
color: 'rgba(255, 166, 41, 1)',
|
56
|
+
borderColor: 'rgba(219, 144, 45, 1)'
|
57
|
+
}, {
|
58
|
+
color: 'rgba(255, 205, 42, 1)',
|
59
|
+
borderColor: 'rgba(216, 175, 37, 1)'
|
60
|
+
}, {
|
61
|
+
color: 'rgba(18, 174, 92, 1)',
|
62
|
+
borderColor: 'rgba(23, 148, 79, 1)'
|
63
|
+
}, {
|
64
|
+
color: 'rgba(83, 184, 255, 1)',
|
65
|
+
borderColor: 'rgba(74, 156, 217, 1)'
|
66
|
+
}, {
|
67
|
+
color: 'rgba(183, 128, 255, 1)',
|
68
|
+
borderColor: 'rgba(155, 109, 216, 1)'
|
69
|
+
}, {
|
70
|
+
color: 'rgba(254, 192, 174, 1)',
|
71
|
+
borderColor: 'rgba(217, 163, 148, 1)'
|
72
|
+
}, {
|
73
|
+
color: 'rgba(252, 209, 156, 1)',
|
74
|
+
borderColor: 'rgba(215, 178, 133, 1)'
|
75
|
+
}, {
|
76
|
+
color: 'rgba(255, 232, 163, 1)',
|
77
|
+
borderColor: 'rgba(217, 198, 139, 1)'
|
78
|
+
}, {
|
79
|
+
color: 'rgba(176, 244, 197, 1)',
|
80
|
+
borderColor: 'rgba(153, 209, 171, 1)'
|
81
|
+
}, {
|
82
|
+
color: 'rgba(189, 227, 255, 1)',
|
83
|
+
borderColor: 'rgba(161, 193, 217, 1)'
|
84
|
+
}];
|
30
85
|
/**
|
31
86
|
* 颜色选择
|
32
87
|
*
|
@@ -34,12 +89,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
34
89
|
* @return {*}
|
35
90
|
* @constructor
|
36
91
|
*/
|
92
|
+
|
37
93
|
function ColorPanel(props) {
|
38
94
|
var _classnames2, _classnames3;
|
39
95
|
|
40
96
|
var value = props.value,
|
41
97
|
showClear = props.showClear,
|
42
|
-
dataSource = props.dataSource,
|
98
|
+
_props$dataSource = props.dataSource,
|
99
|
+
dataSource = _props$dataSource === void 0 ? defaultColorList : _props$dataSource,
|
100
|
+
colorPickerBalloonProps = props.colorPickerBalloonProps,
|
43
101
|
onChange = props.onChange,
|
44
102
|
onPickerFocus = props.onPickerFocus,
|
45
103
|
onPickerBlur = props.onPickerBlur;
|
@@ -187,9 +245,7 @@ function ColorPanel(props) {
|
|
187
245
|
onClick: function onClick() {
|
188
246
|
changClick('17');
|
189
247
|
}
|
190
|
-
}, /*#__PURE__*/_react["default"].createElement(_balloon["default"], {
|
191
|
-
visible: visible,
|
192
|
-
trigger: defaultTrigger,
|
248
|
+
}, /*#__PURE__*/_react["default"].createElement(_balloon["default"], (0, _extends2["default"])({
|
193
249
|
closable: false,
|
194
250
|
triggerType: "click",
|
195
251
|
animation: false,
|
@@ -198,9 +254,12 @@ function ColorPanel(props) {
|
|
198
254
|
alignEdge: true,
|
199
255
|
style: {
|
200
256
|
paddingBottom: 0
|
201
|
-
}
|
257
|
+
}
|
258
|
+
}, colorPickerBalloonProps, {
|
259
|
+
visible: visible,
|
260
|
+
trigger: defaultTrigger,
|
202
261
|
onClose: close
|
203
|
-
}, /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
|
262
|
+
}), /*#__PURE__*/_react["default"].createElement(_reactColor.SketchPicker, {
|
204
263
|
color: data !== null && data !== void 0 ? data : undefined // width={230}
|
205
264
|
,
|
206
265
|
disableAlpha: true,
|
@@ -216,61 +275,14 @@ function ColorPanel(props) {
|
|
216
275
|
}))))));
|
217
276
|
}
|
218
277
|
|
278
|
+
ColorPanel.propTypes = {
|
279
|
+
dataSource: _propTypes["default"].array
|
280
|
+
};
|
219
281
|
ColorPanel.defaultProps = {
|
220
282
|
value: undefined,
|
221
283
|
showClear: false,
|
222
|
-
dataSource:
|
223
|
-
|
224
|
-
borderColor: 'rgba(219, 219, 219, 1)'
|
225
|
-
}, {
|
226
|
-
color: 'rgba(245, 245, 245, 1)',
|
227
|
-
borderColor: 'rgba(208, 208, 208, 1)'
|
228
|
-
}, {
|
229
|
-
color: 'rgba(230, 230, 230, 1)',
|
230
|
-
borderColor: 'rgba(196, 196, 196, 1)'
|
231
|
-
}, {
|
232
|
-
color: 'rgba(168, 168, 168, 1)',
|
233
|
-
borderColor: 'rgba(146, 146, 146, 1)'
|
234
|
-
}, {
|
235
|
-
color: 'rgba(97, 97, 97, 1)',
|
236
|
-
borderColor: 'rgba(85, 85, 85, 1)'
|
237
|
-
}, {
|
238
|
-
color: 'rgba(49, 49, 49, 1)',
|
239
|
-
borderColor: 'rgba(43, 43, 43, 1)'
|
240
|
-
}, {
|
241
|
-
color: 'rgba(251, 115, 80, 1)',
|
242
|
-
borderColor: 'rgba(213, 98, 69, 1)'
|
243
|
-
}, {
|
244
|
-
color: 'rgba(255, 166, 41, 1)',
|
245
|
-
borderColor: 'rgba(219, 144, 45, 1)'
|
246
|
-
}, {
|
247
|
-
color: 'rgba(255, 205, 42, 1)',
|
248
|
-
borderColor: 'rgba(216, 175, 37, 1)'
|
249
|
-
}, {
|
250
|
-
color: 'rgba(18, 174, 92, 1)',
|
251
|
-
borderColor: 'rgba(23, 148, 79, 1)'
|
252
|
-
}, {
|
253
|
-
color: 'rgba(83, 184, 255, 1)',
|
254
|
-
borderColor: 'rgba(74, 156, 217, 1)'
|
255
|
-
}, {
|
256
|
-
color: 'rgba(183, 128, 255, 1)',
|
257
|
-
borderColor: 'rgba(155, 109, 216, 1)'
|
258
|
-
}, {
|
259
|
-
color: 'rgba(254, 192, 174, 1)',
|
260
|
-
borderColor: 'rgba(217, 163, 148, 1)'
|
261
|
-
}, {
|
262
|
-
color: 'rgba(252, 209, 156, 1)',
|
263
|
-
borderColor: 'rgba(215, 178, 133, 1)'
|
264
|
-
}, {
|
265
|
-
color: 'rgba(255, 232, 163, 1)',
|
266
|
-
borderColor: 'rgba(217, 198, 139, 1)'
|
267
|
-
}, {
|
268
|
-
color: 'rgba(176, 244, 197, 1)',
|
269
|
-
borderColor: 'rgba(153, 209, 171, 1)'
|
270
|
-
}, {
|
271
|
-
color: 'rgba(189, 227, 255, 1)',
|
272
|
-
borderColor: 'rgba(161, 193, 217, 1)'
|
273
|
-
}],
|
284
|
+
dataSource: defaultColorList,
|
285
|
+
colorPickerBalloonProps: {},
|
274
286
|
onChange: function onChange() {},
|
275
287
|
onPickerFocus: function onPickerFocus() {},
|
276
288
|
onPickerBlur: function onPickerBlur() {}
|
@@ -31,6 +31,8 @@ function FontColorDropdown(props) {
|
|
31
31
|
background = props.background,
|
32
32
|
_props$fieldDisabled = props.fieldDisabled,
|
33
33
|
fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
|
34
|
+
colorPickerBalloonProps = props.colorPickerBalloonProps,
|
35
|
+
backgroundPickerBalloonProps = props.backgroundPickerBalloonProps,
|
34
36
|
onChange = props.onChange,
|
35
37
|
onColorChange = props.onColorChange,
|
36
38
|
onBackgroundChange = props.onBackgroundChange,
|
@@ -43,11 +45,9 @@ function FontColorDropdown(props) {
|
|
43
45
|
var backgroundEnabled = fieldDisabled.background !== true;
|
44
46
|
var opacityEnabled = fieldDisabled.opacity !== true;
|
45
47
|
|
46
|
-
var onFocus = function onFocus() {
|
47
|
-
};
|
48
|
+
var onFocus = function onFocus() {};
|
48
49
|
|
49
|
-
var onBlur = function onBlur() {
|
50
|
-
};
|
50
|
+
var onBlur = function onBlur() {};
|
51
51
|
|
52
52
|
var icon = disabled ? /*#__PURE__*/_react["default"].createElement("img", {
|
53
53
|
src: "/img/topo/editor/toolbar/\u6587\u5B57\u989C\u8272\u53CA\u586B\u5145/Disable.svg",
|
@@ -70,6 +70,7 @@ function FontColorDropdown(props) {
|
|
70
70
|
}
|
71
71
|
}, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
|
72
72
|
value: color,
|
73
|
+
colorPickerBalloonProps: colorPickerBalloonProps,
|
73
74
|
onChange: onColorChange,
|
74
75
|
onPickerFocus: onFocus,
|
75
76
|
onPickerBlur: onBlur
|
@@ -96,6 +97,7 @@ function FontColorDropdown(props) {
|
|
96
97
|
}, /*#__PURE__*/_react["default"].createElement(_ColorPanel["default"], {
|
97
98
|
showClear: true,
|
98
99
|
value: background,
|
100
|
+
colorPickerBalloonProps: backgroundPickerBalloonProps,
|
99
101
|
onChange: onBackgroundChange,
|
100
102
|
onPickerFocus: onFocus,
|
101
103
|
onPickerBlur: onBlur
|
@@ -126,5 +128,9 @@ function FontColorD(props) {
|
|
126
128
|
}));
|
127
129
|
}
|
128
130
|
|
131
|
+
_ColorPanel["default"].defaultProps = {
|
132
|
+
colorPickerBalloonProps: {},
|
133
|
+
backgroundPickerBalloonProps: {}
|
134
|
+
};
|
129
135
|
var _default = FontColorD;
|
130
136
|
exports["default"] = _default;
|
@@ -43,7 +43,25 @@ function FontStyleSelect(props) {
|
|
43
43
|
disabled = props.disabled,
|
44
44
|
onChange = props.onChange,
|
45
45
|
_props$fieldDisabled = props.fieldDisabled,
|
46
|
-
fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled
|
46
|
+
fieldDisabled = _props$fieldDisabled === void 0 ? {} : _props$fieldDisabled,
|
47
|
+
hideItemTootip = props.hideItemTootip;
|
48
|
+
|
49
|
+
var renderMenuItemContent = function renderMenuItemContent(item) {
|
50
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
51
|
+
style: {
|
52
|
+
display: 'flex',
|
53
|
+
alignItems: 'center'
|
54
|
+
}
|
55
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
56
|
+
src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
|
57
|
+
alt: ""
|
58
|
+
}), /*#__PURE__*/_react["default"].createElement("span", {
|
59
|
+
style: fieldDisabled[item.key] ? {} : {
|
60
|
+
color: _variables["default"]['$color-text1-4']
|
61
|
+
}
|
62
|
+
}, item.label));
|
63
|
+
};
|
64
|
+
|
47
65
|
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"], {
|
48
66
|
value: value,
|
49
67
|
valueRender: function valueRender() {
|
@@ -59,20 +77,8 @@ function FontStyleSelect(props) {
|
|
59
77
|
return /*#__PURE__*/_react["default"].createElement(_DropdownMenu["default"].Item, {
|
60
78
|
key: item.key,
|
61
79
|
disabled: !!fieldDisabled[item.key]
|
62
|
-
}, /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
|
63
|
-
trigger:
|
64
|
-
style: {
|
65
|
-
display: 'flex',
|
66
|
-
alignItems: 'center'
|
67
|
-
}
|
68
|
-
}, /*#__PURE__*/_react["default"].createElement("img", {
|
69
|
-
src: "/img/topo/editor/toolbar/" + item.icon + "/" + (fieldDisabled[item.key] ? 'Disable' : 'Normal') + ".svg",
|
70
|
-
alt: ""
|
71
|
-
}), /*#__PURE__*/_react["default"].createElement("span", {
|
72
|
-
style: fieldDisabled[item.key] ? {} : {
|
73
|
-
color: _variables["default"]['$color-text1-4']
|
74
|
-
}
|
75
|
-
}, item.label)),
|
80
|
+
}, hideItemTootip ? renderMenuItemContent(item) : /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
|
81
|
+
trigger: renderMenuItemContent(item),
|
76
82
|
align: "r",
|
77
83
|
popupStyle: {}
|
78
84
|
}, item.tooltip));
|
@@ -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 "13.0.0-dev.
|
57
|
+
var version = typeof "13.0.0-dev.9" === 'string' ? "13.0.0-dev.9" : null;
|
58
58
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
59
59
|
/**
|
60
60
|
* 拓扑显示和编辑
|
@@ -57,11 +57,11 @@ 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,
|
60
|
+
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, 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:
|
64
|
-
topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups,
|
64
|
+
topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, viewGroupId = data.viewGroupId;
|
65
65
|
|
66
66
|
_rlog["default"].debug("saveTopo", data); // 保存布局
|
67
67
|
|
@@ -116,8 +116,7 @@ function _saveTopo() {
|
|
116
116
|
|
117
117
|
_context.next = 15;
|
118
118
|
return topoService.bindResourceToTopo(topoId, {
|
119
|
-
groups: groupInfo
|
120
|
-
relateTopoIdList: relateTopoIdList
|
119
|
+
groups: groupInfo
|
121
120
|
});
|
122
121
|
|
123
122
|
case 15:
|
@@ -261,18 +261,17 @@ function _default(topoApp) {
|
|
261
261
|
var _this2 = this;
|
262
262
|
|
263
263
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
264
|
-
var editState, resources, _editState$groups, groups,
|
264
|
+
var editState, resources, _editState$groups, groups, query, data;
|
265
265
|
|
266
266
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
267
267
|
while (1) switch (_context2.prev = _context2.next) {
|
268
268
|
case 0:
|
269
269
|
editState = rootState.topoConfig;
|
270
|
-
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;
|
271
271
|
query = {
|
272
272
|
id: rootState.topoMod.topoId,
|
273
273
|
resources: resources,
|
274
|
-
groups: groups
|
275
|
-
relateTopoIdList: relateTopoIdList
|
274
|
+
groups: groups
|
276
275
|
};
|
277
276
|
_context2.next = 5;
|
278
277
|
return _this2.getTopoByConditions(query);
|
@@ -315,13 +314,13 @@ function _default(topoApp) {
|
|
315
314
|
var _this4 = this;
|
316
315
|
|
317
316
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
|
318
|
-
var topoId, resources, groups,
|
317
|
+
var topoId, resources, groups, viewConditions, groupInfo, data, _yield$Promise$all, dataWithLinkDetail, _combTopoData, topoData, resAndMetrics, topoDataTrans;
|
319
318
|
|
320
319
|
return _regenerator["default"].wrap(function _callee4$(_context4) {
|
321
320
|
while (1) switch (_context4.prev = _context4.next) {
|
322
321
|
case 0:
|
323
322
|
rlog.debug("getTopoByConditions--------", params);
|
324
|
-
topoId = params.id, resources = params.resources, groups = params.groups
|
323
|
+
topoId = params.id, resources = params.resources, groups = params.groups;
|
325
324
|
viewConditions = (0, _topoData2.resToConditions)(resources);
|
326
325
|
groupInfo = (0, _utils.isAvailableArray)(groups) && groups.map(function (group) {
|
327
326
|
return (0, _extends2["default"])({}, group, {
|
@@ -331,7 +330,7 @@ function _default(topoApp) {
|
|
331
330
|
});
|
332
331
|
rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
|
333
332
|
_context4.next = 7;
|
334
|
-
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo
|
333
|
+
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo);
|
335
334
|
|
336
335
|
case 7:
|
337
336
|
data = _context4.sent;
|
@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
5
5
|
exports.__esModule = true;
|
6
6
|
exports["default"] = exports.TOPO_PARENT_ID = exports.TOPO_GROUP_ID = void 0;
|
7
7
|
|
8
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
9
|
-
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
11
9
|
|
12
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
@@ -23,9 +21,7 @@ var _model = require("../model");
|
|
23
21
|
|
24
22
|
var _exitLinkUtil = require("../../utils/exitLinkUtil");
|
25
23
|
|
26
|
-
var
|
27
|
-
|
28
|
-
var _excluded = ["groups", "resources"];
|
24
|
+
var relateTopoDataUtil = _interopRequireWildcard(require("../../utils/relateTopoDataUtil"));
|
29
25
|
|
30
26
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
31
27
|
|
@@ -122,7 +118,8 @@ function prepareGroupParams(modifiedGroups) {
|
|
122
118
|
};
|
123
119
|
}).filter(Boolean);
|
124
120
|
return {
|
125
|
-
groups: groups
|
121
|
+
groups: groups,
|
122
|
+
relateTopoIdList: relateTopoDataUtil.getRelateTopoIdListFromConfig(modifiedGroups)
|
126
123
|
};
|
127
124
|
}
|
128
125
|
|
@@ -422,7 +419,7 @@ var _default = (0, _extends2["default"])({
|
|
422
419
|
}),
|
423
420
|
serialize: result.serialize ? JSON.parse(result.serialize) : undefined
|
424
421
|
});
|
425
|
-
result =
|
422
|
+
result = relateTopoDataUtil.processBothTopoData(result);
|
426
423
|
result = (0, _exitLinkUtil.processExitLink)(result);
|
427
424
|
return _context12.abrupt("return", result);
|
428
425
|
|
@@ -441,11 +438,11 @@ var _default = (0, _extends2["default"])({
|
|
441
438
|
* @param {Array} groups
|
442
439
|
* @returns
|
443
440
|
*/
|
444
|
-
getTopoDataByResource: function getTopoDataByResource(id, resources, groups
|
441
|
+
getTopoDataByResource: function getTopoDataByResource(id, resources, groups) {
|
445
442
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13() {
|
446
443
|
var _result$nodes2, _result$links2;
|
447
444
|
|
448
|
-
var data,
|
445
|
+
var data, params, result;
|
449
446
|
return _regenerator["default"].wrap(function _callee13$(_context13) {
|
450
447
|
while (1) switch (_context13.prev = _context13.next) {
|
451
448
|
case 0:
|
@@ -459,11 +456,9 @@ var _default = (0, _extends2["default"])({
|
|
459
456
|
});
|
460
457
|
}
|
461
458
|
|
462
|
-
|
459
|
+
params = prepareGroupParams(data);
|
463
460
|
_context13.next = 5;
|
464
|
-
return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id,
|
465
|
-
relateTopoIdList: relateTopoIdList
|
466
|
-
}));
|
461
|
+
return _componentTopologyUtils.request.post(API_ROOT + "/structure/byCondition/" + id, params);
|
467
462
|
|
468
463
|
case 5:
|
469
464
|
result = _context13.sent;
|
@@ -475,9 +470,14 @@ var _default = (0, _extends2["default"])({
|
|
475
470
|
});
|
476
471
|
})
|
477
472
|
});
|
478
|
-
|
473
|
+
result = relateTopoDataUtil.processByConditionTopoData({
|
474
|
+
data: result,
|
475
|
+
config: data
|
476
|
+
});
|
477
|
+
result = (0, _exitLinkUtil.processByConditionResult)(result, params.groups);
|
478
|
+
return _context13.abrupt("return", result);
|
479
479
|
|
480
|
-
case
|
480
|
+
case 10:
|
481
481
|
case "end":
|
482
482
|
return _context13.stop();
|
483
483
|
}
|
@@ -494,11 +494,11 @@ var _default = (0, _extends2["default"])({
|
|
494
494
|
*/
|
495
495
|
bindResourceToTopo: function bindResourceToTopo(id, config) {
|
496
496
|
return (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14() {
|
497
|
-
var groups, resources,
|
497
|
+
var groups, resources, newGroups, obj;
|
498
498
|
return _regenerator["default"].wrap(function _callee14$(_context14) {
|
499
499
|
while (1) switch (_context14.prev = _context14.next) {
|
500
500
|
case 0:
|
501
|
-
groups = config.groups, resources = config.resources
|
501
|
+
groups = config.groups, resources = config.resources;
|
502
502
|
newGroups = Array.isArray(groups) ? groups : [];
|
503
503
|
|
504
504
|
if (resources) {
|
@@ -512,7 +512,7 @@ var _default = (0, _extends2["default"])({
|
|
512
512
|
|
513
513
|
obj = prepareGroupParams(newGroups);
|
514
514
|
_context14.next = 6;
|
515
|
-
return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id,
|
515
|
+
return _componentTopologyUtils.request.post(API_ROOT + "/resource/" + id, obj);
|
516
516
|
|
517
517
|
case 6:
|
518
518
|
return _context14.abrupt("return", _context14.sent);
|
@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
4
4
|
|
5
5
|
exports.__esModule = true;
|
6
6
|
exports.buildTopoNode = buildTopoNode;
|
7
|
+
exports.getRelateTopoIdListFromConfig = getRelateTopoIdListFromConfig;
|
7
8
|
exports.processBothTopoData = processBothTopoData;
|
8
9
|
exports.processByConditionTopoData = processByConditionTopoData;
|
9
10
|
|
@@ -37,10 +38,30 @@ function processBothTopoData(topoData) {
|
|
37
38
|
|
38
39
|
|
39
40
|
function processByConditionTopoData(ctx) {
|
40
|
-
var
|
41
|
-
|
42
|
-
|
43
|
-
|
41
|
+
var data = ctx.data,
|
42
|
+
config = ctx.config;
|
43
|
+
var nodes = data.nodes,
|
44
|
+
links = data.links;
|
45
|
+
return (0, _extends2["default"])({}, data, {
|
46
|
+
nodes: [].concat(nodes, buildTopoNodeDatas(config)),
|
47
|
+
links: buildTopoLinks(links)
|
48
|
+
});
|
49
|
+
}
|
50
|
+
|
51
|
+
function getRelateTopoIdListFromConfig(groups) {
|
52
|
+
var relateTopoIdList = [];
|
53
|
+
groups.forEach(function (g) {
|
54
|
+
g.resources["static"].filter(function (ciId) {
|
55
|
+
return ciId.startsWith('topo:');
|
56
|
+
}).map(function (ciId) {
|
57
|
+
return ciId.replace('topo:', '');
|
58
|
+
}).map(function (topoId) {
|
59
|
+
if (!relateTopoIdList.includes(topoId)) {
|
60
|
+
relateTopoIdList.push(topoId);
|
61
|
+
}
|
62
|
+
});
|
63
|
+
});
|
64
|
+
return relateTopoIdList;
|
44
65
|
}
|
45
66
|
|
46
67
|
function buildTopoNode(topoId) {
|
@@ -63,7 +84,7 @@ function buildTopoNode(topoId) {
|
|
63
84
|
}
|
64
85
|
|
65
86
|
function buildTopoLinks(links) {
|
66
|
-
links.push
|
87
|
+
// links.push(...topoLinks)
|
67
88
|
return links.map(function (link) {
|
68
89
|
return (0, _extends2["default"])({}, link, {
|
69
90
|
"source": link.sourceType ? link.sourceType + ':' + link.source : link.source,
|
@@ -117,6 +138,24 @@ function buildTopoNodeDatasFromSerialize(serialize) {
|
|
117
138
|
return topoNodeDatas;
|
118
139
|
}
|
119
140
|
|
141
|
+
function buildTopoNodeDatas(config) {
|
142
|
+
var topoNodeDatas = [];
|
143
|
+
config.forEach(function (g) {
|
144
|
+
g.resources["static"].filter(function (ciId) {
|
145
|
+
return ciId.startsWith('topo:');
|
146
|
+
}).map(function (ciId) {
|
147
|
+
return ciId.replace('topo:', '');
|
148
|
+
}).map(function (topoId) {
|
149
|
+
topoNodeDatas.push((0, _extends2["default"])({}, buildTopoNode(topoId), {
|
150
|
+
// 添加资源拓扑节点消失的问题
|
151
|
+
'groupId': g.id,
|
152
|
+
'groupTag': g.tag
|
153
|
+
}));
|
154
|
+
});
|
155
|
+
});
|
156
|
+
return topoNodeDatas;
|
157
|
+
}
|
158
|
+
|
120
159
|
function getRelateTopoIdsFromSerialize(serialize) {
|
121
160
|
return serialize;
|
122
161
|
}
|
@@ -52,23 +52,8 @@ function getResourceConfigFromHt(topo) {
|
|
52
52
|
return {
|
53
53
|
layers: (0, _sortBy["default"])(layers, 'order'),
|
54
54
|
groups: groups,
|
55
|
-
resources: resources
|
56
|
-
relateTopoIdList: getRelateTopoIdList(dataModel)
|
55
|
+
resources: resources
|
57
56
|
};
|
58
|
-
} // 查询关联拓扑id列表
|
59
|
-
|
60
|
-
|
61
|
-
function getRelateTopoIdList(dataModel) {
|
62
|
-
return (0, _htElementUtils.getNodes)(dataModel).reduce(function (topoIds, node) {
|
63
|
-
var bindType = node.a('bindType');
|
64
|
-
var bindTopo = node.a('bindTopo');
|
65
|
-
|
66
|
-
if (bindType === 'topo' && bindTopo && !topoIds.includes(bindTopo)) {
|
67
|
-
return [].concat(topoIds, [bindTopo]);
|
68
|
-
}
|
69
|
-
|
70
|
-
return topoIds;
|
71
|
-
}, []);
|
72
57
|
}
|
73
58
|
|
74
59
|
function getLayerDatas(dataModel) {
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@riil-frontend/component-topology",
|
3
|
-
"version": "13.0.0-dev.
|
3
|
+
"version": "13.0.0-dev.9",
|
4
4
|
"description": "拓扑",
|
5
5
|
"scripts": {
|
6
6
|
"start": "build-scripts start",
|
@@ -123,6 +123,6 @@
|
|
123
123
|
"access": "public"
|
124
124
|
},
|
125
125
|
"license": "MIT",
|
126
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.
|
126
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@13.0.0-dev.9/build/index.html",
|
127
127
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
128
128
|
}
|