@riil-frontend/component-topology 2.15.20 → 2.15.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/1.js +1 -1
- package/build/index.css +1 -1
- package/build/index.js +23 -23
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +2 -0
- package/es/core/common/icons/defaultIcons.js +3 -9
- package/es/core/common/icons/icon.js +1 -22
- package/es/core/components/AlarmListPanel/index.js +17 -35
- package/es/core/components/TopoView/topoView.js +2 -0
- package/es/core/components/titlebar/TitleBar.js +3 -3
- package/es/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -3
- package/es/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +2 -2
- package/es/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +3 -4
- package/es/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +3 -3
- package/es/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +4 -4
- package/es/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/node/NodePropertyView.js +1 -3
- package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +5 -0
- package/es/core/editor/components/settings/propertyViews/text/TextPropertyView.js +5 -7
- package/es/core/models/Alarm.js +30 -51
- package/es/core/models/AttributeMetricDisplay.js +22 -13
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/utils/linkUtils.js +3 -0
- package/es/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +1 -1
- package/es/core/viewer/components/plugins/BaseInfo/index.js +58 -79
- package/es/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +31 -29
- package/es/hooks/useTopoEdit.js +16 -5
- package/es/index.js +3 -1
- package/es/style.js +1 -0
- package/es/topoCenter/components/TopoView.js +7 -6
- package/es/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js +2 -3
- package/es/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +1 -3
- package/es/topoCenter/hooks/editor/useDeleteEdges.js +19 -11
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +2 -0
- package/lib/core/common/icons/defaultIcons.js +4 -13
- package/lib/core/common/icons/icon.js +1 -30
- package/lib/core/components/AlarmListPanel/index.js +19 -36
- package/lib/core/components/TopoView/topoView.js +2 -0
- package/lib/core/components/titlebar/TitleBar.js +2 -2
- package/lib/core/editor/components/settings/propertyViews/edge/CommonEdgePropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/edge/edgeGroup/EdgeGroupSetting.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/group/DataTab/hoooks/useGroupRelateResource.js +3 -3
- package/lib/core/editor/components/settings/propertyViews/group/SettingTab/Setting.js +3 -4
- package/lib/core/editor/components/settings/propertyViews/layer/DataTab/NodeList.js +4 -8
- package/lib/core/editor/components/settings/propertyViews/layer/SettingTab/Setting.js +4 -4
- package/lib/core/editor/components/settings/propertyViews/multipleElements/MultipleElementPropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/node/NodePropertyView.js +1 -3
- package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +5 -0
- package/lib/core/editor/components/settings/propertyViews/text/TextPropertyView.js +5 -7
- package/lib/core/models/Alarm.js +30 -51
- package/lib/core/models/AttributeMetricDisplay.js +22 -13
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/utils/linkUtils.js +5 -0
- package/lib/core/viewer/components/plugins/BaseInfo/components/ResourceOverview/index.js +1 -1
- package/lib/core/viewer/components/plugins/BaseInfo/index.js +58 -79
- package/lib/core/viewer/components/titlebar/widgets/AlarmListShowButton.js +33 -28
- package/lib/hooks/useTopoEdit.js +16 -5
- package/lib/index.js +17 -2
- package/lib/style.js +1 -0
- package/lib/topoCenter/components/TopoView.js +5 -4
- package/lib/topoCenter/components/editor/propertyViews/LayerRelatedResourceList.js +2 -4
- package/lib/topoCenter/components/editor/propertyViews/edge/LinkPropertyView/Setting/index.js +1 -3
- package/lib/topoCenter/hooks/editor/useDeleteEdges.js +20 -11
- package/package.json +4 -4
|
@@ -123,10 +123,6 @@ function BaseInfo(props) {
|
|
|
123
123
|
userId = _useState4[0],
|
|
124
124
|
setUserId = _useState4[1];
|
|
125
125
|
|
|
126
|
-
var _useState5 = (0, _react.useState)(null),
|
|
127
|
-
paramData = _useState5[0],
|
|
128
|
-
setParamData = _useState5[1];
|
|
129
|
-
|
|
130
126
|
(0, _react.useEffect)(function () {
|
|
131
127
|
var notifier = topo.view.topoClient.notifier;
|
|
132
128
|
notifier.on(_componentTopologyGraph.TopoEvent.EVENT_DOUBLE_CLICK, openOverview);
|
|
@@ -143,111 +139,94 @@ function BaseInfo(props) {
|
|
|
143
139
|
}, []); // 解决切换拓扑图隐藏概览
|
|
144
140
|
|
|
145
141
|
(0, _react.useEffect)(function () {
|
|
146
|
-
setVisible(false);
|
|
147
|
-
setParamData(null); // TODO 其他数据重置
|
|
142
|
+
setVisible(false); // TODO 其他数据重置
|
|
148
143
|
}, [topoId]);
|
|
149
144
|
|
|
150
145
|
function getUser() {
|
|
151
146
|
return _getUser.apply(this, arguments);
|
|
152
|
-
} //
|
|
153
|
-
// const data = node.getAttrObject()
|
|
154
|
-
// console.log('单击切换基本信息', data);
|
|
155
|
-
// setVisible(prev => {
|
|
156
|
-
// prev && openOverview(data)
|
|
157
|
-
// return prev
|
|
158
|
-
// })
|
|
159
|
-
// }
|
|
160
|
-
// function openOverview (data) {
|
|
161
|
-
// console.log('双击打开基本信息', data);
|
|
162
|
-
// const {
|
|
163
|
-
// id,
|
|
164
|
-
// name,
|
|
165
|
-
// type,
|
|
166
|
-
// ciType,
|
|
167
|
-
// ciName,
|
|
168
|
-
// operation,
|
|
169
|
-
// } = data
|
|
170
|
-
// // 仅展示资源和链路的概览
|
|
171
|
-
// if (!['node', 'link', 'linkGroup'].includes(type)) return
|
|
172
|
-
// // 应用拓扑中没有链路详情
|
|
173
|
-
// if (topo.options.resourceOverviewDrawer?.getData && type === 'link') return
|
|
174
|
-
// // 没有权限不显示
|
|
175
|
-
// if (!operation) return
|
|
176
|
-
// setActiveData({
|
|
177
|
-
// id,
|
|
178
|
-
// name,
|
|
179
|
-
// type: type === 'linkGroup' ? 'link' : type,
|
|
180
|
-
// ciType,
|
|
181
|
-
// ciName
|
|
182
|
-
// })
|
|
183
|
-
// const { metrics } = topo.ciTyeCache.getCiType(ciType)
|
|
184
|
-
// topoDispatchers.update({
|
|
185
|
-
// id,
|
|
186
|
-
// metricCodes: metrics.slice(0, 6).map(item => item.code), // 需要展示的关键指标 code
|
|
187
|
-
// })
|
|
188
|
-
// setVisible(true)
|
|
189
|
-
// }
|
|
147
|
+
} // select切换
|
|
190
148
|
|
|
191
149
|
|
|
192
150
|
function _getUser() {
|
|
193
|
-
_getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function
|
|
194
|
-
|
|
195
|
-
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
151
|
+
_getUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
152
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
196
153
|
while (1) {
|
|
197
|
-
switch (
|
|
154
|
+
switch (_context2.prev = _context2.next) {
|
|
198
155
|
case 0:
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
156
|
+
setUserId( /*#__PURE__*/function () {
|
|
157
|
+
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(prev) {
|
|
158
|
+
var res;
|
|
159
|
+
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
160
|
+
while (1) {
|
|
161
|
+
switch (_context.prev = _context.next) {
|
|
162
|
+
case 0:
|
|
163
|
+
console.log('获取用户id', prev); // 如果已经获取过,就不再重新获取
|
|
164
|
+
|
|
165
|
+
if (!prev) {
|
|
166
|
+
_context.next = 3;
|
|
167
|
+
break;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
return _context.abrupt("return", prev);
|
|
171
|
+
|
|
172
|
+
case 3:
|
|
173
|
+
_context.next = 5;
|
|
174
|
+
return _overview["default"].getUserId();
|
|
175
|
+
|
|
176
|
+
case 5:
|
|
177
|
+
res = _context.sent;
|
|
178
|
+
return _context.abrupt("return", (res === null || res === void 0 ? void 0 : res.user_id) || '');
|
|
179
|
+
|
|
180
|
+
case 7:
|
|
181
|
+
case "end":
|
|
182
|
+
return _context.stop();
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}, _callee);
|
|
186
|
+
}));
|
|
187
|
+
|
|
188
|
+
return function (_x) {
|
|
189
|
+
return _ref2.apply(this, arguments);
|
|
190
|
+
};
|
|
191
|
+
}());
|
|
192
|
+
|
|
193
|
+
case 1:
|
|
207
194
|
case "end":
|
|
208
|
-
return
|
|
195
|
+
return _context2.stop();
|
|
209
196
|
}
|
|
210
197
|
}
|
|
211
|
-
},
|
|
198
|
+
}, _callee2);
|
|
212
199
|
}));
|
|
213
200
|
return _getUser.apply(this, arguments);
|
|
214
201
|
}
|
|
215
202
|
|
|
216
203
|
function onChangeActive(activeNode) {
|
|
217
|
-
|
|
218
|
-
activeNode && openOverview((0, _extends2["default"])({}, activeNode, {
|
|
204
|
+
activeNode && init((0, _extends2["default"])({}, activeNode, {
|
|
219
205
|
type: 'node'
|
|
220
|
-
}));
|
|
221
|
-
}
|
|
206
|
+
}), 'select');
|
|
207
|
+
} // 单击切换
|
|
222
208
|
|
|
223
|
-
(0, _react.useEffect)(function () {
|
|
224
|
-
(visible || (paramData === null || paramData === void 0 ? void 0 : paramData.isVisible)) && paramData && init(paramData);
|
|
225
|
-
}, [paramData, visible]);
|
|
226
209
|
|
|
227
210
|
function changeOverview(node) {
|
|
228
211
|
var data = node.getAttrObject();
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
212
|
+
init(data, 'click');
|
|
213
|
+
} // 双击打开
|
|
214
|
+
|
|
232
215
|
|
|
233
216
|
function openOverview(data) {
|
|
234
|
-
|
|
235
|
-
setParamData((0, _extends2["default"])({}, data, {
|
|
236
|
-
isVisible: true
|
|
237
|
-
}));
|
|
217
|
+
init(data, 'doubleClick');
|
|
238
218
|
}
|
|
239
219
|
|
|
240
|
-
function init(data) {
|
|
220
|
+
function init(data, targetType) {
|
|
241
221
|
var _topo$options$resourc;
|
|
242
222
|
|
|
243
|
-
console.log('初始化基本信息', data);
|
|
223
|
+
console.log('初始化基本信息', data, targetType);
|
|
244
224
|
var id = data.id,
|
|
245
225
|
name = data.name,
|
|
246
226
|
type = data.type,
|
|
247
227
|
ciType = data.ciType,
|
|
248
228
|
ciName = data.ciName,
|
|
249
|
-
operation = data.operation
|
|
250
|
-
isVisible = data.isVisible; // 仅展示资源和链路的概览
|
|
229
|
+
operation = data.operation; // 仅展示资源和链路的概览
|
|
251
230
|
|
|
252
231
|
if (!['node', 'link', 'linkGroup'].includes(type)) return; // 应用拓扑中没有链路详情
|
|
253
232
|
|
|
@@ -273,9 +252,9 @@ function BaseInfo(props) {
|
|
|
273
252
|
|
|
274
253
|
}); // 显示隐藏
|
|
275
254
|
|
|
276
|
-
|
|
255
|
+
targetType === 'doubleClick' && setVisible(true); // userId
|
|
277
256
|
|
|
278
|
-
|
|
257
|
+
getUser();
|
|
279
258
|
}
|
|
280
259
|
|
|
281
260
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_drawer["default"], {
|
|
@@ -296,7 +275,7 @@ function BaseInfo(props) {
|
|
|
296
275
|
}, /*#__PURE__*/_react["default"].createElement(_tab["default"].Item, {
|
|
297
276
|
title: "\u8D44\u6E90\u6982\u89C8",
|
|
298
277
|
key: "1"
|
|
299
|
-
}, /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
|
|
278
|
+
}, activeData.id && /*#__PURE__*/_react["default"].createElement(_ResourceOverview["default"], (0, _extends2["default"])({}, props, activeData, {
|
|
300
279
|
userId: userId
|
|
301
280
|
}))))));
|
|
302
281
|
}
|
|
@@ -9,56 +9,61 @@ var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
|
|
9
9
|
|
|
10
10
|
var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
|
|
11
11
|
|
|
12
|
+
var _overlay = _interopRequireDefault(require("@alifd/next/lib/overlay"));
|
|
13
|
+
|
|
12
14
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
15
|
|
|
14
16
|
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
15
17
|
|
|
18
|
+
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
|
19
|
+
|
|
16
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); }
|
|
17
21
|
|
|
18
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; }
|
|
19
23
|
|
|
24
|
+
var Popup = _overlay["default"].Popup;
|
|
20
25
|
/**
|
|
21
26
|
* 元素拖拽开关
|
|
22
27
|
*
|
|
23
28
|
* @return {any}
|
|
24
29
|
*/
|
|
30
|
+
|
|
25
31
|
function AlarmListShowButton(props) {
|
|
26
32
|
var topo = props.topo,
|
|
27
|
-
style = props.style
|
|
33
|
+
style = props.style,
|
|
34
|
+
viewerProps = props.viewerProps;
|
|
35
|
+
var AlarmListPanel = viewerProps.AlarmListPanel;
|
|
28
36
|
var store = topo.store;
|
|
29
37
|
|
|
30
38
|
var _store$useModel = store.useModel("topoAlarm"),
|
|
31
39
|
topoState = _store$useModel[0];
|
|
32
40
|
|
|
33
|
-
var alarmPanelIsOpen = topoState.alarmPanelIsOpen;
|
|
34
|
-
|
|
35
|
-
// if (movable) {
|
|
36
|
-
// setVisiable(false);
|
|
37
|
-
// }
|
|
38
|
-
// }, []);
|
|
39
|
-
// 初始化时注册打开设置事件
|
|
40
|
-
// useEffect(() => {
|
|
41
|
-
// const handleRefresh = (e) => {
|
|
42
|
-
// setMovable(false);
|
|
43
|
-
// };
|
|
44
|
-
// notifier && notifier.on(TopoEvent.EVENT_REFRESH, handleRefresh);
|
|
45
|
-
// return () => {
|
|
46
|
-
// notifier && notifier.off(TopoEvent.EVENT_REFRESH, handleRefresh);
|
|
47
|
-
// };
|
|
48
|
-
// }, [notifier]);
|
|
41
|
+
var alarmPanelIsOpen = topoState.alarmPanelIsOpen;
|
|
42
|
+
var alarmBtn = (0, _react.useRef)();
|
|
49
43
|
|
|
50
44
|
var showAlarmList = function showAlarmList() {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
45
|
+
topo.alarm.switchAlarmPopPanel(true);
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
var onVisibleChange = function onVisibleChange(visible) {
|
|
49
|
+
topo.alarm.switchAlarmPopPanel(visible);
|
|
56
50
|
};
|
|
57
51
|
|
|
58
|
-
return /*#__PURE__*/_react["default"].createElement(
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
52
|
+
return /*#__PURE__*/_react["default"].createElement(Popup, {
|
|
53
|
+
trigger: /*#__PURE__*/_react["default"].createElement(_button["default"], {
|
|
54
|
+
style: style,
|
|
55
|
+
ref: alarmBtn
|
|
56
|
+
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
57
|
+
type: "warning"
|
|
58
|
+
})),
|
|
59
|
+
cache: true,
|
|
60
|
+
defaultVisible: true,
|
|
61
|
+
visible: alarmPanelIsOpen,
|
|
62
|
+
onVisibleChange: onVisibleChange,
|
|
63
|
+
offset: [112, 5],
|
|
64
|
+
triggerType: "click",
|
|
65
|
+
safeNode: function safeNode() {
|
|
66
|
+
return alarmBtn;
|
|
67
|
+
}
|
|
68
|
+
}, /*#__PURE__*/_react["default"].createElement(AlarmListPanel, props));
|
|
64
69
|
}
|
package/lib/hooks/useTopoEdit.js
CHANGED
|
@@ -852,7 +852,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
852
852
|
|
|
853
853
|
var bindNodeResource = /*#__PURE__*/function () {
|
|
854
854
|
var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(params) {
|
|
855
|
-
var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements,
|
|
855
|
+
var id, oldResId, newResId, node, groupElement, config, groupId, groupTag, _yield$editDispatcher, elements, nodeRelatedDatas, replaceOrAddRes;
|
|
856
856
|
|
|
857
857
|
return _regenerator["default"].wrap(function _callee7$(_context7) {
|
|
858
858
|
while (1) {
|
|
@@ -881,7 +881,7 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
881
881
|
|
|
882
882
|
groupTag = groupElement.a('tag'); // 容器临时id
|
|
883
883
|
|
|
884
|
-
config.groups = groups.map(function (g) {
|
|
884
|
+
config.groups = config.groups.map(function (g) {
|
|
885
885
|
// 匹配到容器,替换资源或增加
|
|
886
886
|
if (g.id === groupId || g.tag === groupTag) {
|
|
887
887
|
return (0, _extends2["default"])({}, g, {
|
|
@@ -908,15 +908,26 @@ var useTopoEdit = function useTopoEdit(params) {
|
|
|
908
908
|
_yield$editDispatcher = _context7.sent;
|
|
909
909
|
elements = _yield$editDispatcher.topoDataTrans;
|
|
910
910
|
// 过滤出关联的节点和连线,通知ht更新
|
|
911
|
-
|
|
912
|
-
|
|
911
|
+
nodeRelatedDatas = (0, _format.filterElementsByNodeId)(elements, newResId);
|
|
912
|
+
|
|
913
|
+
if (nodeRelatedDatas.length) {
|
|
914
|
+
_context7.next = 17;
|
|
915
|
+
break;
|
|
916
|
+
}
|
|
917
|
+
|
|
918
|
+
_message["default"].error('关联资源失败');
|
|
919
|
+
|
|
920
|
+
return _context7.abrupt("return", false);
|
|
921
|
+
|
|
922
|
+
case 17:
|
|
923
|
+
saveBind(_componentTopologyGraph.TopoEvent.DATA_TYPE_RESOURCE_SINGLE, nodeRelatedDatas);
|
|
913
924
|
node.a('customName', null); // 临时放这里,仅拓扑中心有
|
|
914
925
|
|
|
915
926
|
if (topo.linkDynamicStyleExecutor) {
|
|
916
927
|
topo.linkDynamicStyleExecutor.execute();
|
|
917
928
|
}
|
|
918
929
|
|
|
919
|
-
case
|
|
930
|
+
case 20:
|
|
920
931
|
case "end":
|
|
921
932
|
return _context7.stop();
|
|
922
933
|
}
|
package/lib/index.js
CHANGED
|
@@ -4,13 +4,24 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
4
4
|
|
|
5
5
|
exports.__esModule = true;
|
|
6
6
|
var _exportNames = {
|
|
7
|
-
|
|
7
|
+
iconFactory: true,
|
|
8
|
+
Topology: true,
|
|
9
|
+
htElementUtils: true
|
|
8
10
|
};
|
|
11
|
+
exports.htElementUtils = void 0;
|
|
12
|
+
|
|
13
|
+
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
14
|
+
|
|
15
|
+
exports.iconFactory = _componentTopologyGraph.iconFactory;
|
|
9
16
|
|
|
10
17
|
var _TopoView = _interopRequireDefault(require("./core/components/TopoView"));
|
|
11
18
|
|
|
12
19
|
exports.Topology = _TopoView["default"];
|
|
13
20
|
|
|
21
|
+
var htElementUtils = _interopRequireWildcard(require("./utils/htElementUtils"));
|
|
22
|
+
|
|
23
|
+
exports.htElementUtils = htElementUtils;
|
|
24
|
+
|
|
14
25
|
var _createTopo = require("./createTopo");
|
|
15
26
|
|
|
16
27
|
Object.keys(_createTopo).forEach(function (key) {
|
|
@@ -27,4 +38,8 @@ Object.keys(_titlebar).forEach(function (key) {
|
|
|
27
38
|
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
|
28
39
|
if (key in exports && exports[key] === _titlebar[key]) return;
|
|
29
40
|
exports[key] = _titlebar[key];
|
|
30
|
-
});
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
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); }
|
|
44
|
+
|
|
45
|
+
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; }
|
package/lib/style.js
CHANGED
|
@@ -23,6 +23,7 @@ require('@alifd/next/lib/divider/style');
|
|
|
23
23
|
require('@alifd/next/lib/box/style');
|
|
24
24
|
require('@alifd/next/lib/dropdown/style');
|
|
25
25
|
require('@alifd/next/lib/menu/style');
|
|
26
|
+
require('@alifd/next/lib/overlay/style');
|
|
26
27
|
require('@alifd/next/lib/radio/style');
|
|
27
28
|
require('@alifd/next/lib/checkbox/style');
|
|
28
29
|
require('@alifd/next/lib/grid/style');
|
|
@@ -41,7 +41,7 @@ function NetworkTopology(props) {
|
|
|
41
41
|
titleBar = props.titleBar,
|
|
42
42
|
onEnterEdit = props.onEnterEdit,
|
|
43
43
|
otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
|
|
44
|
-
var topoState = topo.store.useModelState(
|
|
44
|
+
var topoState = topo.store.useModelState("topoMod");
|
|
45
45
|
var loading = topoState.loading,
|
|
46
46
|
topoId = topoState.topoId,
|
|
47
47
|
topoData = topoState.topoData,
|
|
@@ -51,7 +51,8 @@ function NetworkTopology(props) {
|
|
|
51
51
|
var viewerProps = (0, _extends2["default"])({}, props.viewerProps, {
|
|
52
52
|
showLinkConfig: true,
|
|
53
53
|
// 是否显示链路相关配置
|
|
54
|
-
|
|
54
|
+
AlarmListPanel: _AlarmListPanel["default"],
|
|
55
|
+
plugins: []
|
|
55
56
|
});
|
|
56
57
|
return /*#__PURE__*/_react["default"].createElement(_TopoView["default"], (0, _extends2["default"])({}, otherProps, {
|
|
57
58
|
topo: topo,
|
|
@@ -89,9 +90,9 @@ function NetworkTopology(props) {
|
|
|
89
90
|
};
|
|
90
91
|
|
|
91
92
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
92
|
-
className: _indexModule["default"][
|
|
93
|
+
className: _indexModule["default"]["topo-center-view"]
|
|
93
94
|
}, /*#__PURE__*/_react["default"].createElement(_loading["default"], {
|
|
94
|
-
className: _indexModule["default"][
|
|
95
|
+
className: _indexModule["default"]["topo-center-mask-loading"],
|
|
95
96
|
visible: loading
|
|
96
97
|
}, renderContent()));
|
|
97
98
|
}
|
|
@@ -7,14 +7,12 @@ exports["default"] = LayerResourceList;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _componentTopologyGraph = require("@riil-frontend/component-topology-graph");
|
|
11
11
|
|
|
12
12
|
var _ResourceList = _interopRequireDefault(require("../../../../core/editor/components/settings/common/GroupNodeList/ResourceList"));
|
|
13
13
|
|
|
14
14
|
var _htElementUtils = require("../../../../utils/htElementUtils");
|
|
15
15
|
|
|
16
|
-
var _icon = require("../../../../core/common/icons/icon");
|
|
17
|
-
|
|
18
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); }
|
|
19
17
|
|
|
20
18
|
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; }
|
|
@@ -53,7 +51,7 @@ function LayerResourceList(props) {
|
|
|
53
51
|
resource = _ref.resource;
|
|
54
52
|
return {
|
|
55
53
|
title: resource.name,
|
|
56
|
-
img:
|
|
54
|
+
img: _componentTopologyGraph.iconFactory.getIconImageUrl(node.getImage())
|
|
57
55
|
};
|
|
58
56
|
}); // rlog.debug('LayerResourceList', {nodes, resourceNodes, data});
|
|
59
57
|
|
|
@@ -17,6 +17,8 @@ var _dialog = _interopRequireDefault(require("@alifd/next/lib/dialog"));
|
|
|
17
17
|
|
|
18
18
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
|
19
19
|
|
|
20
|
+
var _linkUtils = require("../../../core/models/utils/linkUtils");
|
|
21
|
+
|
|
20
22
|
var _link = _interopRequireDefault(require("../../services/link"));
|
|
21
23
|
|
|
22
24
|
var _linPermissionUtil = require("../../utils/linPermissionUtil");
|
|
@@ -57,6 +59,7 @@ var _default = function _default(_ref) {
|
|
|
57
59
|
var deleteLink = function deleteLink(edge) {
|
|
58
60
|
var id = edge.getTag();
|
|
59
61
|
var link = topo.dataModel.getDataById(id);
|
|
62
|
+
var isAgg = (0, _linkUtils.isAggLink)(link);
|
|
60
63
|
|
|
61
64
|
if (!checkLinkDeleteable(link)) {
|
|
62
65
|
return;
|
|
@@ -64,7 +67,7 @@ var _default = function _default(_ref) {
|
|
|
64
67
|
|
|
65
68
|
var htTopo = topo.getHtTopo();
|
|
66
69
|
confirmDeleteLink( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
67
|
-
var success, edgesInNodes, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
|
|
70
|
+
var success, edgesInNodes, edgeGroupData, edgeData, _topo$store$getModel, topoState, topoDispatchers, _topoState$data, links, linkGroups;
|
|
68
71
|
|
|
69
72
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
70
73
|
while (1) {
|
|
@@ -86,26 +89,32 @@ var _default = function _default(_ref) {
|
|
|
86
89
|
return _context.abrupt("return");
|
|
87
90
|
|
|
88
91
|
case 6:
|
|
89
|
-
_message["default"].success('删除成功'); //
|
|
92
|
+
_message["default"].success('删除成功'); // 获取两个节点间的连线数据列表
|
|
93
|
+
|
|
90
94
|
|
|
95
|
+
edgesInNodes = htTopo.getEdgeDatasInNodes(edge.getSource(), edge.getTarget());
|
|
91
96
|
|
|
92
|
-
if (
|
|
93
|
-
|
|
94
|
-
|
|
97
|
+
if (edgesInNodes.length >= 2) {
|
|
98
|
+
htTopo.deleteEdge(edge);
|
|
99
|
+
} else {
|
|
100
|
+
// 一根线时
|
|
101
|
+
edgeGroupData = htTopo.getEdgeGroupData(edge.getSource(), edge.getTarget());
|
|
102
|
+
edgeData = htTopo.getEdgeData(edge);
|
|
95
103
|
|
|
96
|
-
if (
|
|
104
|
+
if (isAgg && edgeData) {
|
|
105
|
+
// 当前是连线组代理 且 有连线数据,清空组数据
|
|
97
106
|
htTopo.setEdgeGroupData(edge.getSource(), edge.getTarget(), null);
|
|
107
|
+
} else if (!isAgg && edgeGroupData) {
|
|
108
|
+
htTopo.setEdgeData(edge, null);
|
|
98
109
|
} else {
|
|
99
110
|
htTopo.deleteEdge(edge);
|
|
100
111
|
}
|
|
101
|
-
} else {
|
|
102
|
-
htTopo.deleteEdge(edge);
|
|
103
112
|
} // 更新数据
|
|
104
113
|
|
|
105
114
|
|
|
106
115
|
_topo$store$getModel = topo.store.getModel('topoMod'), topoState = _topo$store$getModel[0], topoDispatchers = _topo$store$getModel[1];
|
|
107
116
|
_topoState$data = topoState.data, links = _topoState$data.links, linkGroups = _topoState$data.linkGroups;
|
|
108
|
-
_context.next =
|
|
117
|
+
_context.next = 13;
|
|
109
118
|
return topoDispatchers.update({
|
|
110
119
|
data: (0, _extends2["default"])({}, topoState.data, {
|
|
111
120
|
links: links.filter(function (link) {
|
|
@@ -117,11 +126,11 @@ var _default = function _default(_ref) {
|
|
|
117
126
|
})
|
|
118
127
|
});
|
|
119
128
|
|
|
120
|
-
case
|
|
129
|
+
case 13:
|
|
121
130
|
// 刷新链路动态线宽
|
|
122
131
|
topo.linkDynamicStyleExecutor.execute();
|
|
123
132
|
|
|
124
|
-
case
|
|
133
|
+
case 14:
|
|
125
134
|
case "end":
|
|
126
135
|
return _context.stop();
|
|
127
136
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riil-frontend/component-topology",
|
|
3
|
-
"version": "2.15.
|
|
3
|
+
"version": "2.15.23",
|
|
4
4
|
"description": "拓扑",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"start": "build-scripts start",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@ahooksjs/use-tree-plugin": "^0.2.1",
|
|
42
42
|
"@alifd/biz-anchor": "^1.1.7",
|
|
43
43
|
"@ice/store": "^1.4.2",
|
|
44
|
-
"@riil-frontend/component-topo-icon-select": "^1.0.
|
|
44
|
+
"@riil-frontend/component-topo-icon-select": "^1.0.10",
|
|
45
45
|
"@riil-frontend/component-topology-utils": "^2.0.20-alpha.0",
|
|
46
46
|
"classnames": "^2.2.3",
|
|
47
47
|
"prop-types": "^15.5.8",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"@riil-frontend/component-table-filter-tags": "latest",
|
|
69
69
|
"@riil-frontend/component-table-layout": "^2.0.2",
|
|
70
70
|
"@riil-frontend/component-topology-common": "^1.0.9",
|
|
71
|
-
"@riil-frontend/component-topology-graph": "^2.5.
|
|
71
|
+
"@riil-frontend/component-topology-graph": "^2.5.6",
|
|
72
72
|
"@riil-frontend/css": "^2.0.2",
|
|
73
73
|
"@riil-frontend/hooks": "latest",
|
|
74
74
|
"@riil-frontend/next-collapse": "^1.0.1-a.0",
|
|
@@ -110,6 +110,6 @@
|
|
|
110
110
|
"access": "public"
|
|
111
111
|
},
|
|
112
112
|
"license": "MIT",
|
|
113
|
-
"homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.
|
|
113
|
+
"homepage": "https://unpkg.com/@riil-frontend/component-topology@2.15.23/build/index.html",
|
|
114
114
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
|
115
115
|
}
|