@riil-frontend/component-topology 3.3.0 → 3.5.0-a.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/1.js +2 -2
- package/build/2.js +1 -1
- package/build/index.js +17 -17
- package/es/components/MultiResourceDrawer/index.js +2 -2
- package/es/components/NetworkTopoResourceSelectDrawer/NetworkTopoResourceSelectDrawer.js +9 -0
- package/es/components/NetworkTopoResourceSelectDrawer/index.js +2 -0
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +8 -3
- package/es/components/ResourceSelectDrawer/ResourceSelectList.js +9 -6
- package/es/components/SingleResourceDrawer/SelectDrawer.js +1 -1
- package/es/constants/ResourceTypeLimit.js +38 -1
- package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +1 -1
- package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +29 -16
- package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +0 -1
- package/es/core/editor/components/settings/propertyViews/index.js +1 -5
- package/es/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js +1 -1
- package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +2 -1
- package/es/core/editor/components/titlebar/TopoEditorTitleBar.js +29 -1
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/utils/linkUtils.js +15 -16
- package/es/hooks/useTopoEdit.js +0 -5
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +12 -10
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +3 -4
- package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +94 -59
- package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +19 -15
- package/es/topoCenter/hooks/editor/useDeleteEdges.js +2 -0
- package/es/topoCenter/services/link.js +22 -14
- package/es/topoCenter/store/topoTreeMod.js +6 -19
- package/es/topoCenter/utils/linPermissionUtil.js +3 -4
- package/lib/components/MultiResourceDrawer/index.js +2 -2
- package/lib/components/NetworkTopoResourceSelectDrawer/NetworkTopoResourceSelectDrawer.js +20 -0
- package/lib/components/NetworkTopoResourceSelectDrawer/index.js +11 -0
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +8 -3
- package/lib/components/ResourceSelectDrawer/ResourceSelectList.js +10 -5
- package/lib/components/SingleResourceDrawer/SelectDrawer.js +2 -2
- package/lib/constants/ResourceTypeLimit.js +53 -2
- package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +2 -2
- package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +30 -15
- package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +0 -1
- package/lib/core/editor/components/settings/propertyViews/index.js +1 -5
- package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js +2 -2
- package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +3 -2
- package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js +32 -1
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/utils/linkUtils.js +13 -14
- package/lib/hooks/useTopoEdit.js +0 -5
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +16 -12
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +3 -4
- package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +94 -59
- package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +17 -16
- package/lib/topoCenter/hooks/editor/useDeleteEdges.js +2 -0
- package/lib/topoCenter/services/link.js +22 -14
- package/lib/topoCenter/store/topoTreeMod.js +7 -20
- package/lib/topoCenter/utils/linPermissionUtil.js +3 -4
- package/package.json +3 -3
|
@@ -7,6 +7,8 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
9
9
|
|
|
10
|
+
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
11
|
+
|
|
10
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
11
13
|
|
|
12
14
|
var _componentTopologyCommon = require("@riil-frontend/component-topology-common");
|
|
@@ -17,6 +19,8 @@ var _componentNoDataPage = _interopRequireDefault(require("@riil-frontend/compon
|
|
|
17
19
|
|
|
18
20
|
var _ResourceTypeLimit = require("../../constants/ResourceTypeLimit");
|
|
19
21
|
|
|
22
|
+
var _excluded = ["selectionMode", "limitTypes", "excludeIds", "commonResListProps"];
|
|
23
|
+
|
|
20
24
|
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); }
|
|
21
25
|
|
|
22
26
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -24,7 +28,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
24
28
|
function ResourceSelectList(props, ref) {
|
|
25
29
|
var selectionMode = props.selectionMode,
|
|
26
30
|
limitTypes = props.limitTypes,
|
|
27
|
-
excludeIds = props.excludeIds
|
|
31
|
+
excludeIds = props.excludeIds,
|
|
32
|
+
commonResListProps = props.commonResListProps,
|
|
33
|
+
otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
|
|
28
34
|
var tableProps = (0, _extends2["default"])({}, selectionMode ? {
|
|
29
35
|
rowSelection: {
|
|
30
36
|
mode: selectionMode
|
|
@@ -32,17 +38,16 @@ function ResourceSelectList(props, ref) {
|
|
|
32
38
|
} : {}, {
|
|
33
39
|
emptyContent: /*#__PURE__*/_react["default"].createElement(_componentNoDataPage["default"], null)
|
|
34
40
|
});
|
|
35
|
-
return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], {
|
|
41
|
+
return /*#__PURE__*/_react["default"].createElement(_componentCommonResList["default"], (0, _extends2["default"])({
|
|
36
42
|
ref: ref,
|
|
37
|
-
|
|
38
|
-
limitTypes: limitTypes || _ResourceTypeLimit.RESOURCE_LIMIT_TYPES,
|
|
43
|
+
limitTypes: limitTypes,
|
|
39
44
|
defaultCondition: excludeIds.length ? "!id('" + excludeIds.join('\',\'') + "')" : undefined,
|
|
40
45
|
request: (0, _componentTopologyCommon.getRequest)(),
|
|
41
46
|
tableProps: tableProps,
|
|
42
47
|
paginationProps: {
|
|
43
48
|
type: 'simple'
|
|
44
49
|
}
|
|
45
|
-
});
|
|
50
|
+
}, otherProps, commonResListProps || {}));
|
|
46
51
|
}
|
|
47
52
|
|
|
48
53
|
var _default = /*#__PURE__*/_react["default"].forwardRef(ResourceSelectList);
|
|
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
13
13
|
|
|
14
14
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../NetworkTopoResourceSelectDrawer"));
|
|
17
17
|
|
|
18
18
|
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); }
|
|
19
19
|
|
|
@@ -57,7 +57,7 @@ var SingleSelectDrawer = function SingleSelectDrawer(props) {
|
|
|
57
57
|
};
|
|
58
58
|
}();
|
|
59
59
|
|
|
60
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
60
|
+
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
|
61
61
|
visible: visible,
|
|
62
62
|
excludeIds: totalSelection,
|
|
63
63
|
selectionMode: "single",
|
|
@@ -1,8 +1,59 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
exports.__esModule = true;
|
|
4
|
-
exports.RESOURCE_LIMIT_TYPES = void 0;
|
|
5
|
-
|
|
6
|
+
exports.filterCiTypes = exports.RESOURCE_LIMIT_TYPES = void 0;
|
|
7
|
+
exports.filterModelTree = filterModelTree;
|
|
8
|
+
exports.getCiModels = getCiModels;
|
|
9
|
+
exports.getNetworkTopoCommonResListProps = void 0;
|
|
10
|
+
|
|
11
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
12
|
+
|
|
13
|
+
var excludeTypes = ['data_center', 'manage_assets', 'network_link', 'access_link']; // 过滤模型树
|
|
14
|
+
|
|
15
|
+
function filterModelTree(modelTree) {
|
|
16
|
+
return modelTree.filter(function (node) {
|
|
17
|
+
return !excludeTypes.includes(node.code);
|
|
18
|
+
}).map(function (node) {
|
|
19
|
+
return (0, _extends2["default"])({}, node, {
|
|
20
|
+
childs: filterModelTree(node.childs || []).filter(function (child) {
|
|
21
|
+
return child.monitorable;
|
|
22
|
+
})
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
function getCiModels(modelTree) {
|
|
28
|
+
var list = [];
|
|
29
|
+
filterModelTree(modelTree).forEach(function (domainModel) {
|
|
30
|
+
list.push.apply(list, domainModel.childs);
|
|
31
|
+
});
|
|
32
|
+
return list;
|
|
33
|
+
} // 资源选择组件过滤类型
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
var filterCiTypes = function filterCiTypes(tree) {
|
|
37
|
+
return tree.filter(function (node) {
|
|
38
|
+
return !excludeTypes.includes(node.value);
|
|
39
|
+
}).map(function (node) {
|
|
40
|
+
return (0, _extends2["default"])({}, node, {
|
|
41
|
+
children: filterCiTypes(node.children || [])
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
exports.filterCiTypes = filterCiTypes;
|
|
47
|
+
|
|
48
|
+
var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
|
|
49
|
+
return {
|
|
50
|
+
innerTreeFilters: ['monitorable', 'discoverable'],
|
|
51
|
+
filterCiRes: filterCiTypes
|
|
52
|
+
};
|
|
53
|
+
}; // 拓扑中心资源类型限制
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
exports.getNetworkTopoCommonResListProps = getNetworkTopoCommonResListProps;
|
|
6
57
|
var RESOURCE_LIMIT_TYPES = [// 网络设备
|
|
7
58
|
'common_network', 'switch', 'switch_cluster', 'router', // 操作系统
|
|
8
59
|
'linux', 'windows', // 数据库
|
|
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
11
11
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../components/NetworkTopoResourceSelectDrawer"));
|
|
15
15
|
|
|
16
16
|
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); }
|
|
17
17
|
|
|
@@ -45,7 +45,7 @@ var GroupAddResourceDrawer = function GroupAddResourceDrawer(props) {
|
|
|
45
45
|
};
|
|
46
46
|
}();
|
|
47
47
|
|
|
48
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
48
|
+
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
|
49
49
|
visible: visible,
|
|
50
50
|
getExcludeIds: topoEdit.getAllNodeResourceIds,
|
|
51
51
|
onOk: onOk,
|
|
@@ -64,7 +64,7 @@ function CommonEdgePropertyView(props) {
|
|
|
64
64
|
|
|
65
65
|
var getLinkByNodes = /*#__PURE__*/function () {
|
|
66
66
|
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
|
|
67
|
-
var result;
|
|
67
|
+
var result, hasLinkIds, axlink;
|
|
68
68
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
69
69
|
while (1) {
|
|
70
70
|
switch (_context.prev = _context.next) {
|
|
@@ -74,13 +74,21 @@ function CommonEdgePropertyView(props) {
|
|
|
74
74
|
|
|
75
75
|
case 2:
|
|
76
76
|
result = _context.sent;
|
|
77
|
+
hasLinkIds = topo.getLines().map(function (line) {
|
|
78
|
+
return line.id;
|
|
79
|
+
});
|
|
80
|
+
axlink = [];
|
|
81
|
+
result.data.map(function (exLink) {
|
|
82
|
+
if (hasLinkIds.indexOf(exLink.id) < 0) {
|
|
83
|
+
axlink.push(exLink);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
77
86
|
|
|
78
|
-
_rlog["default"].debug("出口链路列表", result.data);
|
|
87
|
+
_rlog["default"].debug("出口链路列表", result.data, axlink);
|
|
79
88
|
|
|
89
|
+
setAssociatedlinks(axlink);
|
|
80
90
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
case 5:
|
|
91
|
+
case 8:
|
|
84
92
|
case "end":
|
|
85
93
|
return _context.stop();
|
|
86
94
|
}
|
|
@@ -97,6 +105,8 @@ function CommonEdgePropertyView(props) {
|
|
|
97
105
|
autoUnmount: false,
|
|
98
106
|
values: parseValues(values, edge),
|
|
99
107
|
onChange: function onChange(name, value) {
|
|
108
|
+
_rlog["default"].debug("CommonEdgePropertyView", name, value);
|
|
109
|
+
|
|
100
110
|
var newValues = field.getValues();
|
|
101
111
|
|
|
102
112
|
_onChange(name, value, newValues);
|
|
@@ -121,14 +131,18 @@ function CommonEdgePropertyView(props) {
|
|
|
121
131
|
};
|
|
122
132
|
|
|
123
133
|
var bindExitLink = /*#__PURE__*/function () {
|
|
124
|
-
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(
|
|
125
|
-
var exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
|
|
134
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
|
|
135
|
+
var data, exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
|
|
126
136
|
|
|
127
137
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
128
138
|
while (1) {
|
|
129
139
|
switch (_context2.prev = _context2.next) {
|
|
130
140
|
case 0:
|
|
131
|
-
|
|
141
|
+
data = associatedlinks.find(function (link) {
|
|
142
|
+
return link.id === value;
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
_rlog["default"].debug("bindExitLink--- v, edge", data, edge);
|
|
132
146
|
|
|
133
147
|
exitLink = {
|
|
134
148
|
attributes: [],
|
|
@@ -160,16 +174,16 @@ function CommonEdgePropertyView(props) {
|
|
|
160
174
|
topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
|
|
161
175
|
exportLinkIdList: exportLinkIdList
|
|
162
176
|
}));
|
|
163
|
-
_context2.next =
|
|
177
|
+
_context2.next = 14;
|
|
164
178
|
return editDispatchers.fetchDataByConfig();
|
|
165
179
|
|
|
166
|
-
case
|
|
180
|
+
case 14:
|
|
167
181
|
_yield$editDispatcher = _context2.sent;
|
|
168
182
|
elements = _yield$editDispatcher.elements;
|
|
169
183
|
|
|
170
|
-
_rlog["default"].debug(
|
|
184
|
+
_rlog["default"].debug("fetchDataByConfig", elements);
|
|
171
185
|
|
|
172
|
-
case
|
|
186
|
+
case 17:
|
|
173
187
|
case "end":
|
|
174
188
|
return _context2.stop();
|
|
175
189
|
}
|
|
@@ -242,13 +256,14 @@ function CommonEdgePropertyView(props) {
|
|
|
242
256
|
style: {
|
|
243
257
|
width: 232
|
|
244
258
|
},
|
|
259
|
+
disabled: associatedlinks.length < 1,
|
|
245
260
|
onChange: function onChange(v) {
|
|
246
261
|
bindExitLink(v);
|
|
247
262
|
}
|
|
248
|
-
}, associatedlinks.map(function (
|
|
263
|
+
}, associatedlinks.map(function (item, index) {
|
|
249
264
|
return /*#__PURE__*/_react["default"].createElement(_select["default"].Option, {
|
|
250
|
-
value:
|
|
265
|
+
value: item.id,
|
|
251
266
|
key: index
|
|
252
|
-
},
|
|
267
|
+
}, item.attributes.display_name);
|
|
253
268
|
}))))))));
|
|
254
269
|
}
|
|
@@ -29,11 +29,7 @@ var propertyPanelMap = {
|
|
|
29
29
|
multiple: _MultipleElementPropertyView["default"]
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
-
if (localStorage.getItem('topo.debug') === 'true') {
|
|
33
|
-
Object.assign(propertyPanelMap, {
|
|
34
|
-
view: _ViewPropertyView["default"]
|
|
35
|
-
});
|
|
36
|
-
}
|
|
32
|
+
if (localStorage.getItem('topo.debug') === 'true') {}
|
|
37
33
|
|
|
38
34
|
var _default = propertyPanelMap;
|
|
39
35
|
exports["default"] = _default;
|
package/lib/core/editor/components/settings/propertyViews/layer/DataTab/LayerAddResourceDrawer.js
CHANGED
|
@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
11
11
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
|
|
15
15
|
|
|
16
16
|
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); }
|
|
17
17
|
|
|
@@ -51,7 +51,7 @@ var LayerAddResourceDrawer = function LayerAddResourceDrawer(props) {
|
|
|
51
51
|
};
|
|
52
52
|
}();
|
|
53
53
|
|
|
54
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
54
|
+
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
|
55
55
|
visible: visible,
|
|
56
56
|
getExcludeIds: topoEdit.getAllNodeResourceIds,
|
|
57
57
|
onOk: onOk,
|
|
@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
13
13
|
|
|
14
14
|
var _react = _interopRequireWildcard(require("react"));
|
|
15
15
|
|
|
16
|
-
var
|
|
16
|
+
var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("../../../../../../../components/NetworkTopoResourceSelectDrawer"));
|
|
17
17
|
|
|
18
18
|
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); }
|
|
19
19
|
|
|
@@ -73,8 +73,9 @@ var BindResourceDrawer = function BindResourceDrawer(props) {
|
|
|
73
73
|
};
|
|
74
74
|
}();
|
|
75
75
|
|
|
76
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
76
|
+
return /*#__PURE__*/_react["default"].createElement(_NetworkTopoResourceSelectDrawer["default"], {
|
|
77
77
|
visible: visible,
|
|
78
|
+
title: "\u5173\u8054\u8D44\u6E90",
|
|
78
79
|
getExcludeIds: topoEditApi.getAllNodeResourceIds,
|
|
79
80
|
selectionMode: "single",
|
|
80
81
|
onOk: handleSave,
|
|
@@ -5,8 +5,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = TopoEditorTitleBar;
|
|
7
7
|
|
|
8
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
+
|
|
8
10
|
var _box = _interopRequireDefault(require("@alifd/next/lib/box"));
|
|
9
11
|
|
|
12
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
+
|
|
14
|
+
var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
|
|
15
|
+
|
|
10
16
|
var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
11
17
|
|
|
12
18
|
var _react = _interopRequireDefault(require("react"));
|
|
@@ -45,7 +51,32 @@ function TopoEditorTitleBar(props) {
|
|
|
45
51
|
}, "\u4FDD\u5B58"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
|
46
52
|
className: _TitleBarModule["default"].button,
|
|
47
53
|
onClick: function onClick() {
|
|
48
|
-
|
|
54
|
+
_dialog["default"].confirm({
|
|
55
|
+
title: "提示",
|
|
56
|
+
content: "若现在退出,图上修改的内容将不会保存!",
|
|
57
|
+
onOk: function () {
|
|
58
|
+
var _onOk = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
59
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
60
|
+
while (1) {
|
|
61
|
+
switch (_context.prev = _context.next) {
|
|
62
|
+
case 0:
|
|
63
|
+
topo.exitEditMode();
|
|
64
|
+
|
|
65
|
+
case 1:
|
|
66
|
+
case "end":
|
|
67
|
+
return _context.stop();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}, _callee);
|
|
71
|
+
}));
|
|
72
|
+
|
|
73
|
+
function onOk() {
|
|
74
|
+
return _onOk.apply(this, arguments);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return onOk;
|
|
78
|
+
}()
|
|
79
|
+
});
|
|
49
80
|
}
|
|
50
81
|
}, "\u9000\u51FA"))));
|
|
51
82
|
}
|
|
@@ -48,7 +48,7 @@ var _PluginManager = _interopRequireDefault(require("./PluginManager"));
|
|
|
48
48
|
var _topoFactory = _interopRequireDefault(require("./topoFactory"));
|
|
49
49
|
|
|
50
50
|
// eslint-disable-next-line no-undef
|
|
51
|
-
var version = typeof "3.
|
|
51
|
+
var version = typeof "3.5.0-a.1" === 'string' ? "3.5.0-a.1" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|
|
@@ -21,26 +21,25 @@ var _keyBy = _interopRequireDefault(require("lodash/keyBy"));
|
|
|
21
21
|
var _services = require("../../services");
|
|
22
22
|
|
|
23
23
|
var interfaceTypeMap = {
|
|
24
|
-
|
|
25
|
-
displayName:
|
|
24
|
+
"network.interface": {
|
|
25
|
+
displayName: "网络接口"
|
|
26
26
|
},
|
|
27
|
-
|
|
28
|
-
displayName:
|
|
27
|
+
"network.agg_interface": {
|
|
28
|
+
displayName: "聚合接口"
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
|
|
32
32
|
function isAggLink(link) {
|
|
33
|
-
return link.attributes[
|
|
33
|
+
return link.attributes["network_link.connect_type"] === "agg";
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
function mergeLinksData(links, linkCis, nodes, interfaceCis) {
|
|
37
|
-
var linkCiMap = (0, _keyBy["default"])(linkCis,
|
|
37
|
+
var linkCiMap = (0, _keyBy["default"])(linkCis, "id");
|
|
38
38
|
return links.map(function (link) {
|
|
39
39
|
var _nodes$find, _nodes$find2, _interfaceCis$find, _interfaceCis$find2;
|
|
40
40
|
|
|
41
41
|
var linkCi = linkCiMap[link.id];
|
|
42
|
-
var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes);
|
|
43
|
-
console.log('mergeLinksData', link, attributes); // 翻译
|
|
42
|
+
var attributes = (0, _extends2["default"])({}, linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes); // 翻译
|
|
44
43
|
|
|
45
44
|
return (0, _extends2["default"])({}, link, {
|
|
46
45
|
id: linkCi.id,
|
|
@@ -48,14 +47,14 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis) {
|
|
|
48
47
|
name: linkCi === null || linkCi === void 0 ? void 0 : linkCi.attributes.name,
|
|
49
48
|
attributes: (0, _extends2["default"])({}, attributes, {
|
|
50
49
|
// 源/目的设备
|
|
51
|
-
|
|
50
|
+
"network_link.source_device_id_object": {
|
|
52
51
|
displayName: (_nodes$find = nodes.find(function (node) {
|
|
53
|
-
return node.id === attributes[
|
|
52
|
+
return node.id === attributes["network_link.source_device_id"];
|
|
54
53
|
})) === null || _nodes$find === void 0 ? void 0 : _nodes$find.name
|
|
55
54
|
},
|
|
56
|
-
|
|
55
|
+
"network_link.destination_device_id_object": {
|
|
57
56
|
displayName: (_nodes$find2 = nodes.find(function (node) {
|
|
58
|
-
return node.id === attributes[
|
|
57
|
+
return node.id === attributes["network_link.destination_device_id"];
|
|
59
58
|
})) === null || _nodes$find2 === void 0 ? void 0 : _nodes$find2.name
|
|
60
59
|
},
|
|
61
60
|
// 源/目的接口类型
|
|
@@ -65,12 +64,12 @@ function mergeLinksData(links, linkCis, nodes, interfaceCis) {
|
|
|
65
64
|
source_id_object: {
|
|
66
65
|
displayName: (_interfaceCis$find = interfaceCis.find(function (node) {
|
|
67
66
|
return node.id === attributes.source_id;
|
|
68
|
-
})) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes[
|
|
67
|
+
})) === null || _interfaceCis$find === void 0 ? void 0 : _interfaceCis$find.attributes["display_name"]
|
|
69
68
|
},
|
|
70
69
|
destination_id_object: {
|
|
71
70
|
displayName: (_interfaceCis$find2 = interfaceCis.find(function (node) {
|
|
72
71
|
return node.id === attributes.destination_id;
|
|
73
|
-
})) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes[
|
|
72
|
+
})) === null || _interfaceCis$find2 === void 0 ? void 0 : _interfaceCis$find2.attributes["display_name"]
|
|
74
73
|
}
|
|
75
74
|
})
|
|
76
75
|
});
|
package/lib/hooks/useTopoEdit.js
CHANGED
|
@@ -363,11 +363,6 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
363
363
|
case 'link':
|
|
364
364
|
if (onLineDelete) {
|
|
365
365
|
onLineDelete(data);
|
|
366
|
-
} // 临时放这里,仅拓扑中心有
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
if (topo.linkDynamicStyleExecutor) {
|
|
370
|
-
topo.linkDynamicStyleExecutor.execute();
|
|
371
366
|
}
|
|
372
367
|
|
|
373
368
|
break;
|
|
@@ -7,7 +7,7 @@ exports["default"] = LinkDataTab;
|
|
|
7
7
|
|
|
8
8
|
var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
9
9
|
|
|
10
|
-
var _react =
|
|
10
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
11
11
|
|
|
12
12
|
var _LinkInfoPreview = _interopRequireDefault(require("../../link/LinkInfoPreview"));
|
|
13
13
|
|
|
@@ -17,32 +17,36 @@ var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-ut
|
|
|
17
17
|
|
|
18
18
|
var _linPermissionUtil = require("../../../../../../utils/linPermissionUtil");
|
|
19
19
|
|
|
20
|
+
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); }
|
|
21
|
+
|
|
22
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
23
|
+
|
|
20
24
|
function LinkDataTab(props) {
|
|
21
25
|
var topo = props.topo,
|
|
22
|
-
edge = props.edge
|
|
23
|
-
|
|
26
|
+
edge = props.edge;
|
|
27
|
+
var nodes = topo.dataModel.getNodes();
|
|
28
|
+
|
|
29
|
+
var _useState = (0, _react.useState)(),
|
|
30
|
+
link = _useState[0],
|
|
31
|
+
setLink = _useState[1]; // 节点间只有连线组时,显示连线组的数据
|
|
24
32
|
|
|
25
|
-
var nodes = topo.dataModel.getNodes(); //rlog.debug("LinkDataTab--edge", edge, nodes);
|
|
26
|
-
// const disabled = ["delete", "write"].indexOf(operation) < 0;
|
|
27
|
-
//rlog.debug("LinkDataTab--", permission);
|
|
28
|
-
// 节点间只有连线组时,显示连线组的数据
|
|
29
33
|
|
|
30
34
|
var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
|
|
31
35
|
links = _topo$store$useModelS.links,
|
|
32
36
|
linkGroups = _topo$store$useModelS.linkGroups;
|
|
33
|
-
var
|
|
37
|
+
var linkData = [].concat(links, linkGroups).find(function (item) {
|
|
34
38
|
return item.id === edge.getTag();
|
|
35
39
|
});
|
|
36
|
-
|
|
37
|
-
|
|
40
|
+
(0, _react.useEffect)(function () {
|
|
41
|
+
setLink(linkData);
|
|
42
|
+
}, [edge, linkData]);
|
|
43
|
+
var permission = (0, _linPermissionUtil.getLinkPermission)(edge, nodes, link);
|
|
38
44
|
|
|
39
45
|
var _topo$store$useModel = topo.store.useModel("topoConfig"),
|
|
40
46
|
editState = _topo$store$useModel[0],
|
|
41
47
|
editDispatchers = _topo$store$useModel[1];
|
|
42
48
|
|
|
43
49
|
var openEditLinkDrawer = function openEditLinkDrawer() {
|
|
44
|
-
_rlog["default"].debug("openEditLinkDrawer-link", link);
|
|
45
|
-
|
|
46
50
|
editDispatchers.update({
|
|
47
51
|
addLinkIsOpen: true,
|
|
48
52
|
currentLink: link
|
package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js
CHANGED
|
@@ -20,18 +20,17 @@ var _linPermissionUtil = require("../../../../../../topoCenter/utils/linPermissi
|
|
|
20
20
|
var _htElementUtils = require("../../../../../../utils/htElementUtils.js");
|
|
21
21
|
|
|
22
22
|
function LinkPropertyView(props) {
|
|
23
|
-
console.log("LinkPropertyView", props);
|
|
24
23
|
var edge = props.edge,
|
|
25
24
|
topo = props.topo; // 无权限不显示数据页签
|
|
26
|
-
// const operation = props.edge.a('operation');
|
|
27
25
|
|
|
28
26
|
var _topo$store$useModelS = topo.store.useModelState("topoMod").data,
|
|
29
27
|
links = _topo$store$useModelS.links,
|
|
30
28
|
linkGroups = _topo$store$useModelS.linkGroups;
|
|
31
29
|
var link = [].concat(links, linkGroups).find(function (item) {
|
|
32
30
|
return item.id === edge.getTag();
|
|
33
|
-
});
|
|
34
|
-
|
|
31
|
+
}); // console.log("LinkPropertyView--getLinkPermission", links, link);
|
|
32
|
+
|
|
33
|
+
var operation = (0, _linPermissionUtil.getLinkPermission)(edge, topo.getNodes(topo.dataModel), link);
|
|
35
34
|
|
|
36
35
|
if (!operation) {
|
|
37
36
|
return /*#__PURE__*/_react["default"].createElement(_Setting["default"], props);
|