@riil-frontend/component-topology 3.1.13 → 3.4.0
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 +36 -36
- package/demo/CHANGELOG/CHANGELOG.md +5 -0
- 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 +12 -1
- package/es/core/common/icons/icon.js +3 -28
- package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +1 -1
- package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +148 -10
- package/es/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +4 -5
- 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/models/TopoApp.js +1 -1
- package/es/core/models/topoData.js +21 -18
- package/es/core/models/utils/linkUtils.js +14 -14
- package/es/hooks/useResourceConfig.js +3 -2
- package/es/hooks/useSelection.js +16 -14
- package/es/models/topoConfig.js +20 -16
- package/es/models/topoMod.js +1 -0
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +14 -8
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +16 -3
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +3 -3
- package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +145 -97
- package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +61 -21
- package/es/topoCenter/components/editor/propertyViews/edge/link/LinkInfoPreview.js +26 -7
- package/es/topoCenter/event/index.js +1 -0
- package/es/topoCenter/hooks/editor/useDeleteEdges.js +46 -24
- package/es/topoCenter/services/link.js +51 -0
- package/es/topoCenter/utils/linPermissionUtil.js +24 -13
- package/es/utils/ResourceConfigUtil.js +38 -16
- package/es/utils/topoData.js +6 -7
- 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 +19 -2
- package/lib/core/common/icons/icon.js +3 -35
- package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +2 -2
- package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +160 -9
- package/lib/core/editor/components/settings/propertyViews/edge/EdgePropertyView.js +3 -5
- 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/models/TopoApp.js +1 -1
- package/lib/core/models/topoData.js +24 -17
- package/lib/core/models/utils/linkUtils.js +12 -12
- package/lib/hooks/useResourceConfig.js +3 -2
- package/lib/hooks/useSelection.js +15 -11
- package/lib/models/topoConfig.js +24 -16
- package/lib/models/topoMod.js +1 -0
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +19 -9
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +17 -2
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +2 -2
- package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +145 -113
- package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +60 -22
- package/lib/topoCenter/components/editor/propertyViews/edge/link/LinkInfoPreview.js +27 -7
- package/lib/topoCenter/event/index.js +2 -1
- package/lib/topoCenter/hooks/editor/useDeleteEdges.js +46 -24
- package/lib/topoCenter/services/link.js +52 -0
- package/lib/topoCenter/utils/linPermissionUtil.js +24 -13
- package/lib/utils/ResourceConfigUtil.js +36 -14
- package/lib/utils/topoData.js +6 -7
- package/package.json +3 -3
- package/es/core/common/icons/defaultIcons.js +0 -44
- package/es/core/common/icons/networkTopoCiTypeIcons.js +0 -9
- package/lib/core/common/icons/defaultIcons.js +0 -53
- package/lib/core/common/icons/networkTopoCiTypeIcons.js +0 -22
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
exports.__esModule = true;
|
|
6
|
+
exports["default"] = void 0;
|
|
7
|
+
|
|
8
|
+
var _NetworkTopoResourceSelectDrawer = _interopRequireDefault(require("./NetworkTopoResourceSelectDrawer"));
|
|
9
|
+
|
|
10
|
+
var _default = _NetworkTopoResourceSelectDrawer["default"];
|
|
11
|
+
exports["default"] = _default;
|
|
@@ -32,12 +32,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
32
32
|
*/
|
|
33
33
|
function ResourceSelectDrawer(props) {
|
|
34
34
|
var visible = props.visible,
|
|
35
|
+
title = props.title,
|
|
35
36
|
selectionMode = props.selectionMode,
|
|
36
37
|
limitTypes = props.limitTypes,
|
|
37
38
|
excludeIds = props.excludeIds,
|
|
38
39
|
getExcludeIds = props.getExcludeIds,
|
|
39
40
|
onOk = props.onOk,
|
|
40
|
-
onClose = props.onClose
|
|
41
|
+
onClose = props.onClose,
|
|
42
|
+
commonResListProps = props.commonResListProps;
|
|
41
43
|
var resourceSelectRef = (0, _react.useRef)();
|
|
42
44
|
|
|
43
45
|
var _useState = (0, _react.useState)(false),
|
|
@@ -101,7 +103,7 @@ function ResourceSelectDrawer(props) {
|
|
|
101
103
|
}
|
|
102
104
|
|
|
103
105
|
return /*#__PURE__*/_react["default"].createElement(_Drawer["default"], {
|
|
104
|
-
title:
|
|
106
|
+
title: title,
|
|
105
107
|
visible: visible,
|
|
106
108
|
loading: loading,
|
|
107
109
|
onSave: handleOk,
|
|
@@ -115,12 +117,14 @@ function ResourceSelectDrawer(props) {
|
|
|
115
117
|
ref: resourceSelectRef,
|
|
116
118
|
selectionMode: selectionMode,
|
|
117
119
|
limitTypes: limitTypes,
|
|
118
|
-
excludeIds: finalExcludeIds
|
|
120
|
+
excludeIds: finalExcludeIds,
|
|
121
|
+
commonResListProps: commonResListProps
|
|
119
122
|
}));
|
|
120
123
|
}
|
|
121
124
|
|
|
122
125
|
ResourceSelectDrawer.propTypes = {
|
|
123
126
|
visible: _propTypes["default"].bool,
|
|
127
|
+
title: _propTypes["default"].string,
|
|
124
128
|
limitTypes: _propTypes["default"].array,
|
|
125
129
|
excludeIds: _propTypes["default"].array,
|
|
126
130
|
selectionMode: _propTypes["default"].any,
|
|
@@ -129,6 +133,7 @@ ResourceSelectDrawer.propTypes = {
|
|
|
129
133
|
};
|
|
130
134
|
ResourceSelectDrawer.defaultProps = {
|
|
131
135
|
visible: true,
|
|
136
|
+
title: '添加资源',
|
|
132
137
|
excludeIds: [],
|
|
133
138
|
onOk: function onOk() {},
|
|
134
139
|
onClose: function onClose() {}
|
|
@@ -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,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
exports.RESOURCE_LIMIT_TYPES = void 0;
|
|
5
|
-
|
|
4
|
+
exports.getNetworkTopoCommonResListProps = exports.filterCiTypes = exports.RESOURCE_LIMIT_TYPES = void 0;
|
|
5
|
+
|
|
6
|
+
var filterCiTypes = function filterCiTypes(tree) {
|
|
7
|
+
return tree.filter(function (item) {
|
|
8
|
+
return item.value !== 'data_center';
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
exports.filterCiTypes = filterCiTypes;
|
|
13
|
+
|
|
14
|
+
var getNetworkTopoCommonResListProps = function getNetworkTopoCommonResListProps() {
|
|
15
|
+
return {
|
|
16
|
+
innerTreeFilters: ['monitorable', 'discoverable'],
|
|
17
|
+
filterCiRes: filterCiTypes
|
|
18
|
+
};
|
|
19
|
+
}; // 拓扑中心资源类型限制
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
exports.getNetworkTopoCommonResListProps = getNetworkTopoCommonResListProps;
|
|
6
23
|
var RESOURCE_LIMIT_TYPES = [// 网络设备
|
|
7
24
|
'common_network', 'switch', 'switch_cluster', 'router', // 操作系统
|
|
8
25
|
'linux', 'windows', // 数据库
|
|
@@ -8,59 +8,27 @@ exports.getCustomIconIdFromHtId = getCustomIconIdFromHtId;
|
|
|
8
8
|
exports.getEditorIcons = getEditorIcons;
|
|
9
9
|
exports.getGroupDefaultIcons = getGroupDefaultIcons;
|
|
10
10
|
exports.getGroupIconGroups = getGroupIconGroups;
|
|
11
|
-
exports.getIconLibs = getIconLibs;
|
|
12
11
|
exports.getNodeDefaultIcons = getNodeDefaultIcons;
|
|
13
12
|
exports.getNodeIconGroups = getNodeIconGroups;
|
|
14
|
-
exports.getSystemIcons = getSystemIcons;
|
|
15
13
|
exports.getUserCustomIcons = getUserCustomIcons;
|
|
16
14
|
exports.transformCustomIcon2HtIcon = transformCustomIcon2HtIcon;
|
|
17
15
|
exports.transformCustomIcons2HtIcons = transformCustomIcons2HtIcons;
|
|
18
16
|
|
|
19
17
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
20
18
|
|
|
21
|
-
var
|
|
19
|
+
var _manager = _interopRequireDefault(require("@riil-frontend/component-topology-graph/es/manager"));
|
|
22
20
|
|
|
23
|
-
var _networkTopoCiTypeIcons = _interopRequireDefault(require("./networkTopoCiTypeIcons"));
|
|
24
|
-
|
|
25
|
-
var groupDefaultIcons = [{
|
|
26
|
-
id: 'editor.icon.cloud.medium',
|
|
27
|
-
name: '区域',
|
|
28
|
-
url: '/img/topo/citype-icons/区域_平面.svg'
|
|
29
|
-
}];
|
|
30
|
-
|
|
31
|
-
function getSystemIcons() {
|
|
32
|
-
var networkTopoCiTypeIcons = (0, _networkTopoCiTypeIcons["default"])().filter(function (icon) {
|
|
33
|
-
return !_defaultIcons.DEFAULT_NODE_ICONS.filter(function (defaultIcon) {
|
|
34
|
-
return defaultIcon.id === icon.id;
|
|
35
|
-
}).length;
|
|
36
|
-
});
|
|
37
|
-
return [].concat(_defaultIcons.DEFAULT_NODE_ICONS, networkTopoCiTypeIcons);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
function getIconLibs() {
|
|
41
|
-
return [{
|
|
42
|
-
id: '1',
|
|
43
|
-
name: '默认图标库1',
|
|
44
|
-
icons: getSystemIcons()
|
|
45
|
-
}, {
|
|
46
|
-
id: '2',
|
|
47
|
-
name: '默认图标库2',
|
|
48
|
-
icons: getSystemIcons()
|
|
49
|
-
}];
|
|
50
|
-
}
|
|
51
21
|
/**
|
|
52
22
|
* 获取默认图标
|
|
53
23
|
* @param {*} topo
|
|
54
24
|
* @returns
|
|
55
25
|
*/
|
|
56
|
-
|
|
57
|
-
|
|
58
26
|
function getNodeDefaultIcons(topo) {
|
|
59
|
-
return [].concat(
|
|
27
|
+
return [].concat(_manager["default"].iconLibManager.getNodeIcons(), topo.options.icons || []);
|
|
60
28
|
}
|
|
61
29
|
|
|
62
30
|
function getGroupDefaultIcons(topo) {
|
|
63
|
-
return [].concat(
|
|
31
|
+
return [].concat(_manager["default"].iconLibManager.getIcons());
|
|
64
32
|
}
|
|
65
33
|
/**
|
|
66
34
|
* 获取编辑模式左侧图片列表
|
|
@@ -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,
|
|
@@ -5,12 +5,18 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
exports["default"] = CommonEdgePropertyView;
|
|
7
7
|
|
|
8
|
+
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
+
|
|
10
|
+
var _select = _interopRequireDefault(require("@alifd/next/lib/select"));
|
|
11
|
+
|
|
8
12
|
var _form = _interopRequireDefault(require("@alifd/next/lib/form"));
|
|
9
13
|
|
|
10
14
|
var _numberPicker = _interopRequireDefault(require("@alifd/next/lib/number-picker"));
|
|
11
15
|
|
|
12
16
|
var _field = _interopRequireDefault(require("@alifd/next/lib/field"));
|
|
13
17
|
|
|
18
|
+
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
19
|
+
|
|
14
20
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
15
21
|
|
|
16
22
|
var _collapse = _interopRequireDefault(require("@alifd/next/lib/collapse"));
|
|
@@ -21,6 +27,10 @@ var _ColorPicker = _interopRequireDefault(require("../../../../../../common/comp
|
|
|
21
27
|
|
|
22
28
|
var _LineType = _interopRequireDefault(require("../../common/LineType"));
|
|
23
29
|
|
|
30
|
+
var _link = _interopRequireDefault(require("../../../../../../topoCenter/services/link"));
|
|
31
|
+
|
|
32
|
+
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
|
33
|
+
|
|
24
34
|
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); }
|
|
25
35
|
|
|
26
36
|
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; }
|
|
@@ -29,7 +39,7 @@ var CollapsePanel = _collapse["default"].Panel;
|
|
|
29
39
|
|
|
30
40
|
function parseValues(values, edge) {
|
|
31
41
|
return (0, _extends2["default"])({}, values, {
|
|
32
|
-
|
|
42
|
+
"styleMap.edge.width": edge.s("edge.width") // element.getStyleMap() 如果是默认值则不返回
|
|
33
43
|
|
|
34
44
|
});
|
|
35
45
|
}
|
|
@@ -40,43 +50,166 @@ function CommonEdgePropertyView(props) {
|
|
|
40
50
|
values = props.values,
|
|
41
51
|
_onChange = props.onChange,
|
|
42
52
|
editorProps = props.editorProps;
|
|
53
|
+
var store = topo.store;
|
|
54
|
+
|
|
55
|
+
var _store$useModel = store.useModel("topoConfig"),
|
|
56
|
+
editState = _store$useModel[0],
|
|
57
|
+
editDispatchers = _store$useModel[1]; // 可关联出口链路
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
var _useState = (0, _react.useState)([]),
|
|
61
|
+
associatedlinks = _useState[0],
|
|
62
|
+
setAssociatedlinks = _useState[1]; // const [isLine, setIsLine] = useState(false);
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
var getLinkByNodes = /*#__PURE__*/function () {
|
|
66
|
+
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
|
|
67
|
+
var result, hasLinkIds, axlink;
|
|
68
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
69
|
+
while (1) {
|
|
70
|
+
switch (_context.prev = _context.next) {
|
|
71
|
+
case 0:
|
|
72
|
+
_context.next = 2;
|
|
73
|
+
return _link["default"].queryAssociatedlinks(id);
|
|
74
|
+
|
|
75
|
+
case 2:
|
|
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
|
+
});
|
|
86
|
+
|
|
87
|
+
_rlog["default"].debug("出口链路列表", result.data, axlink);
|
|
88
|
+
|
|
89
|
+
setAssociatedlinks(axlink);
|
|
90
|
+
|
|
91
|
+
case 8:
|
|
92
|
+
case "end":
|
|
93
|
+
return _context.stop();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}, _callee);
|
|
97
|
+
}));
|
|
98
|
+
|
|
99
|
+
return function getLinkByNodes(_x) {
|
|
100
|
+
return _ref.apply(this, arguments);
|
|
101
|
+
};
|
|
102
|
+
}();
|
|
43
103
|
|
|
44
104
|
var field = _field["default"].useField({
|
|
45
105
|
autoUnmount: false,
|
|
46
106
|
values: parseValues(values, edge),
|
|
47
107
|
onChange: function onChange(name, value) {
|
|
108
|
+
_rlog["default"].debug("CommonEdgePropertyView", name, value);
|
|
109
|
+
|
|
48
110
|
var newValues = field.getValues();
|
|
49
111
|
|
|
50
112
|
_onChange(name, value, newValues);
|
|
51
113
|
}
|
|
52
114
|
});
|
|
53
115
|
|
|
116
|
+
(0, _react.useEffect)(function () {
|
|
117
|
+
console.log("CommonEdgePropertyView-edge", edge, edge.getSource().getTag(), edge.getTarget());
|
|
118
|
+
var ids = [edge.getSource().getTag(), edge.getTarget().getTag()];
|
|
119
|
+
getLinkByNodes(ids);
|
|
120
|
+
}, [edge]);
|
|
54
121
|
(0, _react.useEffect)(function () {
|
|
55
122
|
field.setValues(parseValues(values, edge));
|
|
56
123
|
}, [values]);
|
|
57
124
|
|
|
58
125
|
var setLineColor = function setLineColor(color) {
|
|
59
|
-
var style = edge.a(
|
|
60
|
-
edge.s(
|
|
61
|
-
edge.a(
|
|
126
|
+
var style = edge.a("styles") || {};
|
|
127
|
+
edge.s("edge.color", color);
|
|
128
|
+
edge.a("styles", (0, _extends2["default"])({}, style, {
|
|
62
129
|
color: color
|
|
63
130
|
}));
|
|
64
131
|
};
|
|
65
132
|
|
|
133
|
+
var bindExitLink = /*#__PURE__*/function () {
|
|
134
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
|
|
135
|
+
var data, exitLink, aobj, config, exconfig, exportLinkIdList, _yield$editDispatcher, elements;
|
|
136
|
+
|
|
137
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
138
|
+
while (1) {
|
|
139
|
+
switch (_context2.prev = _context2.next) {
|
|
140
|
+
case 0:
|
|
141
|
+
data = associatedlinks.find(function (link) {
|
|
142
|
+
return link.id === value;
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
_rlog["default"].debug("bindExitLink--- v, edge", data, edge);
|
|
146
|
+
|
|
147
|
+
exitLink = {
|
|
148
|
+
attributes: [],
|
|
149
|
+
ciType: "network_link",
|
|
150
|
+
dtype: "link",
|
|
151
|
+
id: data.id,
|
|
152
|
+
interfaceSource: data["network_link.source_device_id"],
|
|
153
|
+
interfaceTarget: data["network_link.destination_device_id"],
|
|
154
|
+
metrics: [],
|
|
155
|
+
name: data.name,
|
|
156
|
+
"network_link.connect_type": "exit",
|
|
157
|
+
"network_link.destination_ipv4": data["network_link.destination_ipv4"],
|
|
158
|
+
operation: "delete",
|
|
159
|
+
connect_type: "exit",
|
|
160
|
+
source: data.source_id,
|
|
161
|
+
target: data.destination_id,
|
|
162
|
+
type: "link"
|
|
163
|
+
};
|
|
164
|
+
aobj = edge.getAttrObject();
|
|
165
|
+
edge.setAttrObject((0, _extends2["default"])({}, aobj, exitLink));
|
|
166
|
+
edge.setTag(data.id);
|
|
167
|
+
config = topo.resourceConfig.getConfigFromHt();
|
|
168
|
+
|
|
169
|
+
_rlog["default"].debug("getConfigFromHt", config, topo.resourceConfig);
|
|
170
|
+
|
|
171
|
+
exconfig = (0, _extends2["default"])({}, config);
|
|
172
|
+
exportLinkIdList = config.exportLinkIdList;
|
|
173
|
+
exportLinkIdList.push(data.id);
|
|
174
|
+
topo.resourceConfig.updateConfig((0, _extends2["default"])({}, config, {
|
|
175
|
+
exportLinkIdList: exportLinkIdList
|
|
176
|
+
}));
|
|
177
|
+
_context2.next = 14;
|
|
178
|
+
return editDispatchers.fetchDataByConfig();
|
|
179
|
+
|
|
180
|
+
case 14:
|
|
181
|
+
_yield$editDispatcher = _context2.sent;
|
|
182
|
+
elements = _yield$editDispatcher.elements;
|
|
183
|
+
|
|
184
|
+
_rlog["default"].debug("fetchDataByConfig", elements);
|
|
185
|
+
|
|
186
|
+
case 17:
|
|
187
|
+
case "end":
|
|
188
|
+
return _context2.stop();
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
}, _callee2);
|
|
192
|
+
}));
|
|
193
|
+
|
|
194
|
+
return function bindExitLink(_x2) {
|
|
195
|
+
return _ref2.apply(this, arguments);
|
|
196
|
+
};
|
|
197
|
+
}();
|
|
198
|
+
|
|
66
199
|
return /*#__PURE__*/_react["default"].createElement(_form["default"], {
|
|
67
200
|
field: field,
|
|
68
201
|
labelAlign: "top"
|
|
69
202
|
}, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, null, /*#__PURE__*/_react["default"].createElement(_collapse["default"], {
|
|
70
|
-
defaultExpandedKeys: [
|
|
203
|
+
defaultExpandedKeys: ["显示设置"],
|
|
71
204
|
style: {
|
|
72
|
-
border:
|
|
205
|
+
border: "none"
|
|
73
206
|
}
|
|
74
207
|
}, /*#__PURE__*/_react["default"].createElement(CollapsePanel, {
|
|
75
208
|
key: "\u663E\u793A\u8BBE\u7F6E",
|
|
76
209
|
title: "\u663E\u793A\u8BBE\u7F6E"
|
|
77
210
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
78
211
|
style: {
|
|
79
|
-
display:
|
|
212
|
+
display: "flex"
|
|
80
213
|
}
|
|
81
214
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
82
215
|
style: {
|
|
@@ -99,7 +232,7 @@ function CommonEdgePropertyView(props) {
|
|
|
99
232
|
max: 5,
|
|
100
233
|
placeholder: "\u8BF7\u8F93\u5165",
|
|
101
234
|
style: {
|
|
102
|
-
width:
|
|
235
|
+
width: "100%"
|
|
103
236
|
}
|
|
104
237
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
105
238
|
style: {
|
|
@@ -111,8 +244,26 @@ function CommonEdgePropertyView(props) {
|
|
|
111
244
|
marginBottom: 0
|
|
112
245
|
}
|
|
113
246
|
}, /*#__PURE__*/_react["default"].createElement(_ColorPicker["default"], {
|
|
114
|
-
value: values[
|
|
247
|
+
value: values["styleMap.edge.color"],
|
|
115
248
|
align: "br",
|
|
116
249
|
onChange: setLineColor
|
|
250
|
+
})))), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_form["default"].Item, {
|
|
251
|
+
label: "\u5173\u8054\u51FA\u53E3\u94FE\u8DEF",
|
|
252
|
+
style: {
|
|
253
|
+
marginBottom: 0
|
|
254
|
+
}
|
|
255
|
+
}, /*#__PURE__*/_react["default"].createElement(_select["default"], {
|
|
256
|
+
style: {
|
|
257
|
+
width: 232
|
|
258
|
+
},
|
|
259
|
+
disabled: associatedlinks.length < 1,
|
|
260
|
+
onChange: function onChange(v) {
|
|
261
|
+
bindExitLink(v);
|
|
262
|
+
}
|
|
263
|
+
}, associatedlinks.map(function (item, index) {
|
|
264
|
+
return /*#__PURE__*/_react["default"].createElement(_select["default"].Option, {
|
|
265
|
+
value: item.id,
|
|
266
|
+
key: index
|
|
267
|
+
}, item.attributes.display_name);
|
|
117
268
|
}))))))));
|
|
118
269
|
}
|
|
@@ -44,7 +44,7 @@ function EdgePropertyViewMatch(props) {
|
|
|
44
44
|
}));
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
type = type ||
|
|
47
|
+
type = type || "edgeGroup";
|
|
48
48
|
} else {
|
|
49
49
|
if (editorProps.getEdgePropertyViewType) {
|
|
50
50
|
type = editorProps.getEdgePropertyViewType((0, _extends2["default"])({}, props, {
|
|
@@ -52,7 +52,7 @@ function EdgePropertyViewMatch(props) {
|
|
|
52
52
|
}));
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
type = type ||
|
|
55
|
+
type = type || "edge";
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
var views = (0, _extends2["default"])({}, commonViews, editorProps.edgePropertyViews || {});
|
|
@@ -65,6 +65,4 @@ function EdgePropertyViewMatch(props) {
|
|
|
65
65
|
return /*#__PURE__*/_react["default"].createElement(View, (0, _extends2["default"])({}, props, {
|
|
66
66
|
edge: edge
|
|
67
67
|
}));
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
;
|
|
68
|
+
}
|
|
@@ -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,
|
|
@@ -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.4.0" === 'string' ? "3.4.0" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|