@riil-frontend/component-topology 2.15.22 → 2.15.25
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.css +1 -1
- package/build/index.js +14 -14
- 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/models/Alarm.js +30 -51
- package/es/core/models/AttributeMetricDisplay.js +76 -55
- package/es/core/models/TopoApp.js +1 -1
- 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/style.js +1 -0
- package/es/topoCenter/components/TopoView.js +7 -6
- 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/models/Alarm.js +30 -51
- package/lib/core/models/AttributeMetricDisplay.js +76 -55
- package/lib/core/models/TopoApp.js +1 -1
- 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/style.js +1 -0
- package/lib/topoCenter/components/TopoView.js +5 -4
- package/package.json +4 -4
|
@@ -43,7 +43,12 @@ function filterUnExistedFields(fields, ciTypeMeta) {
|
|
|
43
43
|
return fields.filter(function (item) {
|
|
44
44
|
return isFieldExisted(item, ciTypeMeta);
|
|
45
45
|
});
|
|
46
|
-
}
|
|
46
|
+
} // 无权限不显示标注、悬浮框
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
var filterByPermission = function filterByPermission(resource, items) {
|
|
50
|
+
return resource.operation ? items : [];
|
|
51
|
+
};
|
|
47
52
|
/**
|
|
48
53
|
* 资源标注、悬浮框数据
|
|
49
54
|
*/
|
|
@@ -171,6 +176,31 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
171
176
|
tips: []
|
|
172
177
|
};
|
|
173
178
|
}
|
|
179
|
+
/**
|
|
180
|
+
* 查询需要查询数据的连线
|
|
181
|
+
* @param {*} data
|
|
182
|
+
* @returns
|
|
183
|
+
*/
|
|
184
|
+
;
|
|
185
|
+
|
|
186
|
+
_proto.getEdges = function getEdges(data) {
|
|
187
|
+
// 获得图上业务节点、业务连线
|
|
188
|
+
var _ref2 = data || this.topo.dataModel.getData(),
|
|
189
|
+
links = _ref2.links,
|
|
190
|
+
linkGroups = _ref2.linkGroups;
|
|
191
|
+
|
|
192
|
+
return [].concat(links.map(function (link) {
|
|
193
|
+
return (0, _extends2["default"])({}, link, {
|
|
194
|
+
type: 'edge'
|
|
195
|
+
});
|
|
196
|
+
}), linkGroups.map(function (link) {
|
|
197
|
+
return (0, _extends2["default"])({}, link, {
|
|
198
|
+
type: 'edgeGroup'
|
|
199
|
+
});
|
|
200
|
+
})).filter(function (link) {
|
|
201
|
+
return link.ciType === 'network_link';
|
|
202
|
+
});
|
|
203
|
+
}
|
|
174
204
|
/**
|
|
175
205
|
* 获取资源的标注、悬浮框配置,只包含属性和指标字段。无权限的资源无配置
|
|
176
206
|
*
|
|
@@ -184,15 +214,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
184
214
|
var _this = this;
|
|
185
215
|
|
|
186
216
|
// 获得图上业务节点、业务连线
|
|
187
|
-
var
|
|
188
|
-
nodes =
|
|
189
|
-
links = _ref2.links,
|
|
190
|
-
linkGroups = _ref2.linkGroups; // 无权限不显示标注、悬浮框
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
var filterByPermission = function filterByPermission(resource, items) {
|
|
194
|
-
return resource.operation ? items : [];
|
|
195
|
-
};
|
|
217
|
+
var _ref3 = data || this.topo.dataModel.getData(),
|
|
218
|
+
nodes = _ref3.nodes;
|
|
196
219
|
|
|
197
220
|
return [].concat(nodes.filter(function (node) {
|
|
198
221
|
return !!node.ciType;
|
|
@@ -208,29 +231,13 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
208
231
|
tags: filterByPermission(node, ciTypeConfig.tags),
|
|
209
232
|
tips: filterByPermission(node, ciTypeConfig.tips)
|
|
210
233
|
};
|
|
211
|
-
}),
|
|
212
|
-
return link.ciType === 'network_link';
|
|
213
|
-
}).map(function (link) {
|
|
234
|
+
}), this.getEdges().map(function (link) {
|
|
214
235
|
var ciType = link.ciType;
|
|
215
236
|
|
|
216
237
|
var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
|
|
217
238
|
|
|
218
239
|
return {
|
|
219
|
-
type:
|
|
220
|
-
id: link.id,
|
|
221
|
-
ciType: ciType,
|
|
222
|
-
tags: filterByPermission(link, ciTypeConfig.tags),
|
|
223
|
-
tips: filterByPermission(link, ciTypeConfig.tips)
|
|
224
|
-
};
|
|
225
|
-
}), linkGroups.filter(function (link) {
|
|
226
|
-
return link.ciType === 'network_link';
|
|
227
|
-
}).map(function (link) {
|
|
228
|
-
var ciType = link.ciType;
|
|
229
|
-
|
|
230
|
-
var ciTypeConfig = _this.getNetworkLinkConfig(link, config);
|
|
231
|
-
|
|
232
|
-
return {
|
|
233
|
-
type: 'edgeGroup',
|
|
240
|
+
type: link.type,
|
|
234
241
|
id: link.id,
|
|
235
242
|
ciType: ciType,
|
|
236
243
|
tags: filterByPermission(link, ciTypeConfig.tags),
|
|
@@ -245,6 +252,8 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
245
252
|
|
|
246
253
|
return this.getResourceTagTipConfig().map(function (ciConfig) {
|
|
247
254
|
var fields = {
|
|
255
|
+
ciType: ciConfig.ciType,
|
|
256
|
+
type: ciConfig.type,
|
|
248
257
|
id: ciConfig.id,
|
|
249
258
|
attributes: [],
|
|
250
259
|
metrics: []
|
|
@@ -333,9 +342,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
333
342
|
|
|
334
343
|
_proto.updateNodesNameVisible = function updateNodesNameVisible() {
|
|
335
344
|
var dm = this.topo.getDataModel();
|
|
336
|
-
this.getNodesNameVisible().forEach(function (
|
|
337
|
-
var id =
|
|
338
|
-
visible =
|
|
345
|
+
this.getNodesNameVisible().forEach(function (_ref4) {
|
|
346
|
+
var id = _ref4.id,
|
|
347
|
+
visible = _ref4.visible;
|
|
339
348
|
dm.getDataByTag(id).a('isShowName', visible);
|
|
340
349
|
});
|
|
341
350
|
}
|
|
@@ -352,14 +361,14 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
352
361
|
var _fetchData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
353
362
|
var _this4 = this;
|
|
354
363
|
|
|
355
|
-
var
|
|
364
|
+
var topo, _topo$store$getState$, resIdsList, nodeIdsList, codes, param, linkAdapter, result;
|
|
356
365
|
|
|
357
366
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
358
367
|
while (1) {
|
|
359
368
|
switch (_context.prev = _context.next) {
|
|
360
369
|
case 0:
|
|
361
370
|
linkAdapter = function _linkAdapter(data) {
|
|
362
|
-
var link =
|
|
371
|
+
var link = topo.dataModel.getDataById(data.id);
|
|
363
372
|
|
|
364
373
|
if (!link) {
|
|
365
374
|
return data;
|
|
@@ -372,9 +381,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
372
381
|
});
|
|
373
382
|
};
|
|
374
383
|
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
384
|
+
topo = this.topo;
|
|
385
|
+
_topo$store$getState$ = topo.store.getState().topoBizMod.resAndMetrics, resIdsList = _topo$store$getState$.resIdsList, nodeIdsList = _topo$store$getState$.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
|
|
386
|
+
// 无资源,不查询
|
|
378
387
|
|
|
379
388
|
if (resIdsList.length) {
|
|
380
389
|
_context.next = 5;
|
|
@@ -389,14 +398,17 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
389
398
|
|
|
390
399
|
case 7:
|
|
391
400
|
// 需要查询的指标列表
|
|
392
|
-
codes = this.getResourceMetricCodes();
|
|
393
|
-
// return [];
|
|
394
|
-
// }
|
|
395
|
-
|
|
401
|
+
codes = this.getResourceMetricCodes();
|
|
396
402
|
param = {
|
|
397
403
|
ciId: nodeIdsList,
|
|
398
404
|
codes: codes,
|
|
399
|
-
|
|
405
|
+
// 过滤掉不需要查询的
|
|
406
|
+
relationId: this.getEdges().map(function (edge) {
|
|
407
|
+
return {
|
|
408
|
+
ciId: edge.id,
|
|
409
|
+
operation: edge.operation
|
|
410
|
+
};
|
|
411
|
+
})
|
|
400
412
|
};
|
|
401
413
|
/**
|
|
402
414
|
* 链路属性适配
|
|
@@ -530,20 +542,29 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
530
542
|
attributeMap = ciData.attributeMap;
|
|
531
543
|
ciRefAttributeMap[id] = [];
|
|
532
544
|
|
|
533
|
-
_this5.topo.ciTyeCache.getCiType(ciType)
|
|
534
|
-
return !!attributeMeta.refCi;
|
|
535
|
-
}).forEach(function (attributeMeta) {
|
|
536
|
-
var refId = attributeMap[attributeMeta.code];
|
|
545
|
+
var ciTypeMeta = _this5.topo.ciTyeCache.getCiType(ciType);
|
|
537
546
|
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
547
|
+
if (ciTypeMeta) {
|
|
548
|
+
ciTypeMeta.attributes.filter(function (attributeMeta) {
|
|
549
|
+
return !!attributeMeta.refCi;
|
|
550
|
+
}).forEach(function (attributeMeta) {
|
|
551
|
+
var refId = attributeMap[attributeMeta.code];
|
|
552
|
+
|
|
553
|
+
if (refId && !refIdMap[refId]) {
|
|
554
|
+
refIdMap[refId] = true;
|
|
555
|
+
}
|
|
541
556
|
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
557
|
+
ciRefAttributeMap[id].push({
|
|
558
|
+
attrCode: attributeMeta.code,
|
|
559
|
+
id: refId
|
|
560
|
+
});
|
|
545
561
|
});
|
|
546
|
-
}
|
|
562
|
+
} else {
|
|
563
|
+
_rlog["default"].warn('推送属性指标数据:未查询到ciType', {
|
|
564
|
+
ciData: ciData,
|
|
565
|
+
ciType: ciType
|
|
566
|
+
});
|
|
567
|
+
}
|
|
547
568
|
});
|
|
548
569
|
refIds = Object.keys(refIdMap);
|
|
549
570
|
|
|
@@ -679,9 +700,9 @@ var AttributeMetricDisplay = /*#__PURE__*/function () {
|
|
|
679
700
|
var _this6 = this;
|
|
680
701
|
|
|
681
702
|
// 查询没有关联链路的连线组及对应子链路列表
|
|
682
|
-
var _this$topo$store$
|
|
683
|
-
links = _this$topo$store$
|
|
684
|
-
linkGroups = _this$topo$store$
|
|
703
|
+
var _this$topo$store$getM = this.topo.store.getModelState('topoMod').data,
|
|
704
|
+
links = _this$topo$store$getM.links,
|
|
705
|
+
linkGroups = _this$topo$store$getM.linkGroups;
|
|
685
706
|
|
|
686
707
|
var getLinkUId = function getLinkUId(link) {
|
|
687
708
|
return [link.source, link.target].sort().join('-');
|
|
@@ -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 "2.15.
|
|
51
|
+
var version = typeof "2.15.25" === 'string' ? "2.15.25" : null;
|
|
52
52
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
|
53
53
|
/**
|
|
54
54
|
* 拓扑显示和编辑
|
|
@@ -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/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
|
}
|
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.25",
|
|
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.25/build/index.html",
|
|
114
114
|
"gitHead": "2da19ffccbb7ca60a8acf396e39f542c68bb33f5"
|
|
115
115
|
}
|