@riil-frontend/component-topology 3.17.0 → 3.17.3
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/index.js +12 -12
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +3 -2
- package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +4 -3
- package/es/topoCenter/hooks/editor/useDeleteEdges.js +5 -1
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetail.js +3 -2
- package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +4 -3
- package/lib/topoCenter/hooks/editor/useDeleteEdges.js +5 -1
- package/package.json +2 -2
|
@@ -20,7 +20,7 @@ import { updateEdgeExpanded } from "../utils/edgeUtil";
|
|
|
20
20
|
import PluginManager from "./PluginManager";
|
|
21
21
|
import topoFactory from "./topoFactory"; // eslint-disable-next-line no-undef
|
|
22
22
|
|
|
23
|
-
var version = typeof "3.17.
|
|
23
|
+
var version = typeof "3.17.3" === 'string' ? "3.17.3" : null;
|
|
24
24
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
25
25
|
/**
|
|
26
26
|
* 拓扑显示和编辑
|
|
@@ -135,10 +135,11 @@ function ResourceDetail(props) {
|
|
|
135
135
|
type = data.type,
|
|
136
136
|
ciType = data.ciType,
|
|
137
137
|
ciName = data.ciName,
|
|
138
|
-
operation = data.operation
|
|
138
|
+
operation = data.operation,
|
|
139
|
+
permission = data.permission;
|
|
139
140
|
if ( // 仅展示资源和链路的概览
|
|
140
141
|
!['node', 'link', 'linkGroup'].includes(type) || // 没有权限不显示
|
|
141
|
-
!operation || // 没有citype不显示
|
|
142
|
+
!operation && !(permission !== null && permission !== void 0 && permission.readable) || // 没有citype不显示
|
|
142
143
|
!ciType) return;
|
|
143
144
|
var htElement = topo.getDataModel().getDataByTag(id);
|
|
144
145
|
|
package/es/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js
CHANGED
|
@@ -100,8 +100,9 @@ export default function EditLinkInfo(props) {
|
|
|
100
100
|
};
|
|
101
101
|
};
|
|
102
102
|
|
|
103
|
-
var connectHandleChange = function connectHandleChange(v) {
|
|
104
|
-
|
|
103
|
+
var connectHandleChange = function connectHandleChange(v) {
|
|
104
|
+
field.setValue("connect_type", v);
|
|
105
|
+
field.reset("destination_id");
|
|
105
106
|
};
|
|
106
107
|
|
|
107
108
|
var getRatedBandwidth = function getRatedBandwidth() {};
|
|
@@ -287,7 +288,7 @@ export default function EditLinkInfo(props) {
|
|
|
287
288
|
label: "\u6E90\u8282\u70B9IP"
|
|
288
289
|
}), /*#__PURE__*/React.createElement("div", {
|
|
289
290
|
className: styles.label
|
|
290
|
-
}, (_sourceValue$ipAddres2 = sourceValue.ipAddress) !== null && _sourceValue$ipAddres2 !== void 0 ? _sourceValue$ipAddres2 :
|
|
291
|
+
}, (_sourceValue$ipAddres2 = sourceValue.ipAddress) !== null && _sourceValue$ipAddres2 !== void 0 ? _sourceValue$ipAddres2 : "-"))), /*#__PURE__*/React.createElement(Col, {
|
|
291
292
|
span: "12"
|
|
292
293
|
}, /*#__PURE__*/React.createElement(FormItem, _extends({}, formItemLayout, {
|
|
293
294
|
labelAlign: labelAlign,
|
|
@@ -73,7 +73,11 @@ export default (function (_ref) {
|
|
|
73
73
|
edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
|
|
74
74
|
|
|
75
75
|
if (edgesInNodes.length >= 2) {
|
|
76
|
-
|
|
76
|
+
if (isAgg) {
|
|
77
|
+
htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
|
|
78
|
+
} else {
|
|
79
|
+
htTopo.deleteEdge(edge);
|
|
80
|
+
}
|
|
77
81
|
} else {
|
|
78
82
|
// 一根线时
|
|
79
83
|
edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
|
|
@@ -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.17.
|
|
51
|
+
var version = typeof "3.17.3" === 'string' ? "3.17.3" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|
|
@@ -158,10 +158,11 @@ function ResourceDetail(props) {
|
|
|
158
158
|
type = data.type,
|
|
159
159
|
ciType = data.ciType,
|
|
160
160
|
ciName = data.ciName,
|
|
161
|
-
operation = data.operation
|
|
161
|
+
operation = data.operation,
|
|
162
|
+
permission = data.permission;
|
|
162
163
|
if ( // 仅展示资源和链路的概览
|
|
163
164
|
!['node', 'link', 'linkGroup'].includes(type) || // 没有权限不显示
|
|
164
|
-
!operation || // 没有citype不显示
|
|
165
|
+
!operation && !(permission !== null && permission !== void 0 && permission.readable) || // 没有citype不显示
|
|
165
166
|
!ciType) return;
|
|
166
167
|
var htElement = topo.getDataModel().getDataByTag(id);
|
|
167
168
|
|
package/lib/topoCenter/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js
CHANGED
|
@@ -128,8 +128,9 @@ function EditLinkInfo(props) {
|
|
|
128
128
|
};
|
|
129
129
|
};
|
|
130
130
|
|
|
131
|
-
var connectHandleChange = function connectHandleChange(v) {
|
|
132
|
-
|
|
131
|
+
var connectHandleChange = function connectHandleChange(v) {
|
|
132
|
+
field.setValue("connect_type", v);
|
|
133
|
+
field.reset("destination_id");
|
|
133
134
|
};
|
|
134
135
|
|
|
135
136
|
var getRatedBandwidth = function getRatedBandwidth() {};
|
|
@@ -315,7 +316,7 @@ function EditLinkInfo(props) {
|
|
|
315
316
|
label: "\u6E90\u8282\u70B9IP"
|
|
316
317
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
317
318
|
className: _indexModule["default"].label
|
|
318
|
-
}, (_sourceValue$ipAddres2 = sourceValue.ipAddress) !== null && _sourceValue$ipAddres2 !== void 0 ? _sourceValue$ipAddres2 :
|
|
319
|
+
}, (_sourceValue$ipAddres2 = sourceValue.ipAddress) !== null && _sourceValue$ipAddres2 !== void 0 ? _sourceValue$ipAddres2 : "-"))), /*#__PURE__*/_react["default"].createElement(Col, {
|
|
319
320
|
span: "12"
|
|
320
321
|
}, /*#__PURE__*/_react["default"].createElement(FormItem, (0, _extends2["default"])({}, formItemLayout, {
|
|
321
322
|
labelAlign: labelAlign,
|
|
@@ -88,7 +88,11 @@ var _default = function _default(_ref) {
|
|
|
88
88
|
edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
|
|
89
89
|
|
|
90
90
|
if (edgesInNodes.length >= 2) {
|
|
91
|
-
|
|
91
|
+
if (isAgg) {
|
|
92
|
+
htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
|
|
93
|
+
} else {
|
|
94
|
+
htTopo.deleteEdge(edge);
|
|
95
|
+
}
|
|
92
96
|
} else {
|
|
93
97
|
// 一根线时
|
|
94
98
|
edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riil-frontend/component-topology",
|
|
3
|
-
"version": "3.17.
|
|
3
|
+
"version": "3.17.3",
|
|
4
4
|
"description": "拓扑",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "build-scripts start",
|
|
@@ -110,6 +110,6 @@
|
|
|
110
110
|
"access": "public"
|
|
111
111
|
},
|
|
112
112
|
"license": "MIT",
|
|
113
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@3.17.
|
|
113
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@3.17.3/build/index.html",
|
|
114
114
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
|
115
115
|
}
|