@riil-frontend/component-topology 7.0.0-dev.2 → 7.0.0-dev.20
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.css +1 -1
- package/build/index.js +31 -31
- package/es/core/components/TopoView/topoView.js +2 -19
- package/es/core/components/titlebar/index.js +2 -1
- package/es/core/editor/components/EditorPlugin.js +1 -2
- package/es/core/editor/components/Toolbar/buttons.js +2 -2
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -3
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
- package/es/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
- package/es/core/editor/components/settings/PropertyView.js +11 -10
- package/es/core/editor/components/settings/Settings.js +8 -1
- package/es/core/editor/components/settings/core/PropertyViewManager.js +4 -3
- package/es/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -7
- package/es/core/editor/components/settings/propertyViews/node/data/Data.js +6 -3
- package/es/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
- package/es/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +10 -0
- package/es/core/editor/hooks/useKeyboardShortcut.js +1 -1
- package/es/core/hooks/usePolling.js +1 -6
- package/es/core/hooks/useTopoEdit.js +134 -170
- package/es/core/models/Alarm.js +12 -24
- package/es/core/models/TopoApp.js +1 -1
- package/es/core/models/topoData.js +3 -3
- package/es/core/models/utils/linkUtils.js +0 -3
- package/es/core/store/models/topoConfig.js +7 -5
- package/es/core/store/models/topoMod.js +8 -7
- package/es/core/utils/saveSerialize.js +2 -3
- package/es/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -25
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
- package/es/core/viewer/components/titlebar/BasicTools.js +3 -16
- package/es/core/viewer/components/titlebar/widgets/AlarmButton.js +25 -0
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +8 -2
- package/es/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +7 -9
- package/es/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +42 -16
- package/es/networkTopo/components/editor/useEditorProps.js +4 -5
- package/es/networkTopo/getTopoData.js +18 -30
- package/es/networkTopo/hooks/editor/useDeleteEdges.js +6 -3
- package/es/networkTopo/services/alert.js +55 -0
- package/es/networkTopo/services/authorization.js +135 -0
- package/es/networkTopo/services/cmdb.js +897 -0
- package/es/networkTopo/services/index.js +2 -26
- package/es/networkTopo/services/mdc.js +74 -0
- package/es/networkTopo/services/metric.js +68 -0
- package/es/networkTopo/services/model.js +1283 -0
- package/es/networkTopo/services/risk.js +29 -0
- package/es/networkTopo/services/topo/auth.js +67 -0
- package/es/networkTopo/services/topo/basic.js +727 -0
- package/es/networkTopo/services/topo/blacklist.js +60 -0
- package/es/networkTopo/services/topo/ciInfo.js +69 -0
- package/es/networkTopo/services/topo/constants.js +1 -0
- package/es/networkTopo/services/topo/icon.js +131 -0
- package/es/networkTopo/services/topo/index.js +18 -0
- package/es/networkTopo/services/topo/networkLink.js +33 -0
- package/es/networkTopo/services/topo/relation.js +27 -0
- package/es/networkTopo/services/topo/resourceWebUrl.js +84 -0
- package/es/networkTopo/utils/storage.js +38 -0
- package/es/style.js +21 -21
- package/es/utils/tree.js +1 -0
- package/lib/core/components/TopoView/topoView.js +2 -20
- package/lib/core/components/titlebar/index.js +5 -1
- package/lib/core/editor/components/EditorPlugin.js +1 -3
- package/lib/core/editor/components/Toolbar/buttons.js +2 -2
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/edgeTag.js +11 -4
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/elements/nodeTag.js +6 -1
- package/lib/core/editor/components/Toolbar/widgets/components/textStyleSetting/ElementTextStyleSetting/textStyleUtil.js +5 -0
- package/lib/core/editor/components/settings/PropertyView.js +10 -10
- package/lib/core/editor/components/settings/Settings.js +9 -1
- package/lib/core/editor/components/settings/core/PropertyViewManager.js +4 -3
- package/lib/core/editor/components/settings/core/edgePropertyViewAdapter.js +1 -10
- package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +7 -4
- package/lib/core/editor/components/settings/propertyViews/node/data/NodeRelateResourceButton.js +4 -2
- package/lib/core/editor/components/settings/propertyViews/node/data/PlatformDisplay.js +18 -0
- package/lib/core/editor/hooks/useKeyboardShortcut.js +1 -1
- package/lib/core/hooks/usePolling.js +1 -6
- package/lib/core/hooks/useTopoEdit.js +134 -170
- package/lib/core/models/Alarm.js +12 -24
- package/lib/core/models/TopoApp.js +1 -1
- package/lib/core/models/topoData.js +7 -11
- package/lib/core/models/utils/linkUtils.js +0 -5
- package/lib/core/store/models/topoConfig.js +7 -5
- package/lib/core/store/models/topoMod.js +10 -7
- package/lib/core/utils/saveSerialize.js +1 -3
- package/lib/core/viewer/components/plugins/ResourceDetail/ResourceDetailDrawer.js +13 -2
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +28 -26
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +4 -0
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +17 -17
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/index.module.scss +1 -0
- package/lib/core/viewer/components/titlebar/BasicTools.js +3 -17
- package/lib/core/viewer/components/titlebar/widgets/AlarmButton.js +36 -0
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/Data/index.js +8 -2
- package/lib/networkTopo/components/editor/propertyViews/edge/LinkPropertyView/LinkPropertyView.js +7 -9
- package/lib/networkTopo/components/editor/propertyViews/edge/link/LinkInfoPreview.js +42 -16
- package/lib/networkTopo/components/editor/useEditorProps.js +4 -6
- package/lib/networkTopo/getTopoData.js +19 -33
- package/lib/networkTopo/hooks/editor/useDeleteEdges.js +6 -4
- package/lib/networkTopo/services/alert.js +66 -0
- package/lib/networkTopo/services/authorization.js +145 -0
- package/lib/networkTopo/services/cmdb.js +977 -0
- package/lib/networkTopo/services/index.js +3 -29
- package/lib/networkTopo/services/mdc.js +91 -0
- package/lib/networkTopo/services/metric.js +82 -0
- package/lib/networkTopo/services/model.js +1387 -0
- package/lib/networkTopo/services/risk.js +40 -0
- package/lib/networkTopo/services/topo/auth.js +79 -0
- package/lib/networkTopo/services/topo/basic.js +753 -0
- package/lib/networkTopo/services/topo/blacklist.js +72 -0
- package/lib/networkTopo/services/topo/ciInfo.js +82 -0
- package/lib/networkTopo/services/topo/constants.js +6 -0
- package/lib/networkTopo/services/topo/icon.js +144 -0
- package/lib/networkTopo/services/topo/index.js +42 -0
- package/lib/networkTopo/services/topo/networkLink.js +45 -0
- package/lib/networkTopo/services/topo/relation.js +39 -0
- package/lib/networkTopo/services/topo/resourceWebUrl.js +95 -0
- package/lib/networkTopo/utils/storage.js +46 -0
- package/lib/style.js +21 -21
- package/lib/utils/tree.js +1 -0
- package/package.json +3 -3
- package/es/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -15
- package/es/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -10
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -630
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -4
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -458
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -104
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -55
- package/es/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -187
- package/es/networkTopo/event/index.js +0 -6
- package/lib/core/editor/components/plugins/MultipleResourceSelectPlugin.js +0 -25
- package/lib/core/editor/components/settings/propertyViews/edge/addEdgeProps.js +0 -19
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/AddLinkDrawer.js +0 -661
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/NetworkLinkForm.js +0 -12
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/editLinkInfo.js +0 -486
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/components/index.module.scss +0 -34
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/hooks/useAddLink.js +0 -120
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/index.module.scss +0 -12
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/mock.js +0 -60
- package/lib/networkTopo/components/editor/propertyViews/edge/addLinkDrawer/server.js +0 -207
- package/lib/networkTopo/event/index.js +0 -11
package/lib/core/models/Alarm.js
CHANGED
@@ -237,23 +237,11 @@ var Alarm = /*#__PURE__*/function () {
|
|
237
237
|
|
238
238
|
_proto.hmGetTopoAlarm = /*#__PURE__*/function () {
|
239
239
|
var _hmGetTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(id) {
|
240
|
-
var
|
241
|
-
|
240
|
+
var mainCiIdList, endTime, startTime, parms, result;
|
242
241
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
243
242
|
while (1) {
|
244
243
|
switch (_context3.prev = _context3.next) {
|
245
244
|
case 0:
|
246
|
-
_this$topo$store$getS = this.topo.store.getState().topoMod, data = _this$topo$store$getS.data, resAndMetrics = _this$topo$store$getS.resAndMetrics, topoData = _this$topo$store$getS.topoData;
|
247
|
-
_this$getState2 = this.getState(), alarmIsOpened = _this$getState2.alarmIsOpened, alarmOpening = _this$getState2.alarmOpening; // const { nodes, links } = data;
|
248
|
-
|
249
|
-
nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList, resIdsList = resAndMetrics.resIdsList; // rlog.debug(
|
250
|
-
// "获取告警列表--resAndMetrics,topoData,data",
|
251
|
-
// this.topo,
|
252
|
-
// resAndMetrics,
|
253
|
-
// topoData,
|
254
|
-
// data
|
255
|
-
// );
|
256
|
-
|
257
245
|
mainCiIdList = this.topo.dataModel.getDatas().filter(function (ci) {
|
258
246
|
return !!ci.operation;
|
259
247
|
}) // 过滤掉权限
|
@@ -262,7 +250,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
262
250
|
});
|
263
251
|
|
264
252
|
if (!(mainCiIdList.length === 0)) {
|
265
|
-
_context3.next =
|
253
|
+
_context3.next = 4;
|
266
254
|
break;
|
267
255
|
}
|
268
256
|
|
@@ -272,7 +260,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
272
260
|
});
|
273
261
|
return _context3.abrupt("return");
|
274
262
|
|
275
|
-
case
|
263
|
+
case 4:
|
276
264
|
//rlog.debug("获取告警列表", mainCiIdList);
|
277
265
|
endTime = null; // new Date().valueOf();
|
278
266
|
|
@@ -297,10 +285,10 @@ var Alarm = /*#__PURE__*/function () {
|
|
297
285
|
endTime: endTime
|
298
286
|
}
|
299
287
|
};
|
300
|
-
_context3.next =
|
288
|
+
_context3.next = 9;
|
301
289
|
return _topo["default"].getAlarmByIds(parms);
|
302
290
|
|
303
|
-
case
|
291
|
+
case 9:
|
304
292
|
result = _context3.sent;
|
305
293
|
|
306
294
|
_rlog["default"].debug("getAlarmById-result", result); // if (alarmIsOpened) {
|
@@ -313,7 +301,7 @@ var Alarm = /*#__PURE__*/function () {
|
|
313
301
|
// });
|
314
302
|
|
315
303
|
|
316
|
-
case
|
304
|
+
case 11:
|
317
305
|
case "end":
|
318
306
|
return _context3.stop();
|
319
307
|
}
|
@@ -408,14 +396,14 @@ var Alarm = /*#__PURE__*/function () {
|
|
408
396
|
var _openTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(id) {
|
409
397
|
var _this2 = this;
|
410
398
|
|
411
|
-
var _this$
|
399
|
+
var _this$getState2, alarmOpening, topoAlarmIsOpen, alarmDispatchers;
|
412
400
|
|
413
401
|
return _regenerator["default"].wrap(function _callee6$(_context6) {
|
414
402
|
while (1) {
|
415
403
|
switch (_context6.prev = _context6.next) {
|
416
404
|
case 0:
|
417
405
|
// 如果当前拓扑图开启中或已开启则退出
|
418
|
-
_this$
|
406
|
+
_this$getState2 = this.getState(), alarmOpening = _this$getState2.alarmOpening, topoAlarmIsOpen = _this$getState2.topoAlarmIsOpen;
|
419
407
|
|
420
408
|
if (!(this.currentTopoId === id && (topoAlarmIsOpen || alarmOpening))) {
|
421
409
|
_context6.next = 3;
|
@@ -477,14 +465,14 @@ var Alarm = /*#__PURE__*/function () {
|
|
477
465
|
/*#__PURE__*/
|
478
466
|
function () {
|
479
467
|
var _closeTopoAlarm = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(id) {
|
480
|
-
var _this$
|
468
|
+
var _this$getState3, alarmIsOpened, alarmOpening;
|
481
469
|
|
482
470
|
return _regenerator["default"].wrap(function _callee7$(_context7) {
|
483
471
|
while (1) {
|
484
472
|
switch (_context7.prev = _context7.next) {
|
485
473
|
case 0:
|
486
474
|
// 如果未开启则退出
|
487
|
-
_this$
|
475
|
+
_this$getState3 = this.getState(), alarmIsOpened = _this$getState3.alarmIsOpened, alarmOpening = _this$getState3.alarmOpening;
|
488
476
|
|
489
477
|
if (!(!alarmIsOpened && !alarmOpening)) {
|
490
478
|
_context7.next = 3;
|
@@ -574,13 +562,13 @@ var Alarm = /*#__PURE__*/function () {
|
|
574
562
|
/*#__PURE__*/
|
575
563
|
function () {
|
576
564
|
var _handleAlarmEvent = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(alertData) {
|
577
|
-
var _this$
|
565
|
+
var _this$getState4, alarmIsOpened, resAndMetrics, resIdsList, nodeIdsList, linkIdsList, alarmDispatchers, sendAl, idsList, operations, _yield$alarmDispatche, eqFlag, alarmlist, _this$topo$viewProps, _this$topo$viewProps2;
|
578
566
|
|
579
567
|
return _regenerator["default"].wrap(function _callee9$(_context9) {
|
580
568
|
while (1) {
|
581
569
|
switch (_context9.prev = _context9.next) {
|
582
570
|
case 0:
|
583
|
-
_this$
|
571
|
+
_this$getState4 = this.getState(), alarmIsOpened = _this$getState4.alarmIsOpened;
|
584
572
|
resAndMetrics = this.topo.store.getState().topoMod.resAndMetrics;
|
585
573
|
resIdsList = resAndMetrics.resIdsList, nodeIdsList = resAndMetrics.nodeIdsList, linkIdsList = resAndMetrics.linkIdsList;
|
586
574
|
alarmDispatchers = this.topo.store.getModelDispatchers("topoAlarm"); // 添加事件
|
@@ -54,7 +54,7 @@ var _ElementTagTipConfig = _interopRequireDefault(require("./tagstips/ElementTag
|
|
54
54
|
var _SelectionModel = _interopRequireDefault(require("./SelectionModel"));
|
55
55
|
|
56
56
|
// eslint-disable-next-line no-undef
|
57
|
-
var version = typeof "7.0.0-dev.
|
57
|
+
var version = typeof "7.0.0-dev.20" === 'string' ? "7.0.0-dev.20" : null;
|
58
58
|
console.info("\u62D3\u6251\u7248\u672C: " + version);
|
59
59
|
/**
|
60
60
|
* 拓扑显示和编辑
|
@@ -13,14 +13,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
|
|
13
13
|
|
14
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
15
15
|
|
16
|
-
var _topo =
|
16
|
+
var _topo = require("@riil-frontend/component-topology-common/es/services/topo");
|
17
17
|
|
18
18
|
var _rlog = _interopRequireDefault(require("@riil-frontend/component-topology-utils/es/rlog"));
|
19
19
|
|
20
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
21
|
-
|
22
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
23
|
-
|
24
20
|
function getLayoutId(layout) {
|
25
21
|
if (!layout || typeof layout === "string") {
|
26
22
|
return layout;
|
@@ -53,12 +49,12 @@ function saveTopo(_x) {
|
|
53
49
|
|
54
50
|
function _saveTopo() {
|
55
51
|
_saveTopo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(data) {
|
56
|
-
var topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
|
52
|
+
var topoService, topoId, template, layout, backgroundId, globalConfig, serialize, resources, groups, exportLinkIdList, relateTopoIdList, viewGroupId, groupInfo, viewResources;
|
57
53
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
58
54
|
while (1) {
|
59
55
|
switch (_context.prev = _context.next) {
|
60
56
|
case 0:
|
61
|
-
topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
|
57
|
+
topoService = data.topoService, topoId = data.id, template = data.template, layout = data.layout, backgroundId = data.backgroundId, globalConfig = data.globalConfig, serialize = data.serialize, resources = data.resources, groups = data.groups, exportLinkIdList = data.exportLinkIdList, relateTopoIdList = data.relateTopoIdList, viewGroupId = data.viewGroupId;
|
62
58
|
|
63
59
|
_rlog["default"].debug("saveTopo", data); // 保存布局
|
64
60
|
|
@@ -69,7 +65,7 @@ function _saveTopo() {
|
|
69
65
|
}
|
70
66
|
|
71
67
|
_context.next = 5;
|
72
|
-
return
|
68
|
+
return topoService.changeLayout({
|
73
69
|
id: topoId,
|
74
70
|
template: template,
|
75
71
|
layout: getLayoutId(layout),
|
@@ -83,7 +79,7 @@ function _saveTopo() {
|
|
83
79
|
}
|
84
80
|
|
85
81
|
_context.next = 8;
|
86
|
-
return
|
82
|
+
return topoService.saveTopoSettings(topoId, globalConfig);
|
87
83
|
|
88
84
|
case 8:
|
89
85
|
if (!(resources || groups)) {
|
@@ -112,7 +108,7 @@ function _saveTopo() {
|
|
112
108
|
_rlog["default"].debug("saveTopo-groupInfo", groupInfo);
|
113
109
|
|
114
110
|
_context.next = 15;
|
115
|
-
return
|
111
|
+
return topoService.bindResourceToTopo(topoId, {
|
116
112
|
groups: groupInfo,
|
117
113
|
exportLinkIdList: exportLinkIdList,
|
118
114
|
relateTopoIdList: relateTopoIdList
|
@@ -125,7 +121,7 @@ function _saveTopo() {
|
|
125
121
|
}
|
126
122
|
|
127
123
|
_context.next = 18;
|
128
|
-
return
|
124
|
+
return topoService.saveSerializeData(topoId, serialize);
|
129
125
|
|
130
126
|
case 18:
|
131
127
|
case "end":
|
@@ -6,7 +6,6 @@ exports.__esModule = true;
|
|
6
6
|
exports.buildTopoLinkData = buildTopoLinkData;
|
7
7
|
exports.getInterfaceObject = exports.compatibleWith = void 0;
|
8
8
|
exports.getLinksDetail = getLinksDetail;
|
9
|
-
exports.isAggLink = isAggLink;
|
10
9
|
exports.isCrucialLink = isCrucialLink;
|
11
10
|
exports.isExitLink = isExitLink;
|
12
11
|
exports.mergeLinksData = mergeLinksData;
|
@@ -57,10 +56,6 @@ function isExitLink(link) {
|
|
57
56
|
return (link === null || link === void 0 ? void 0 : link.attributes) && !(link !== null && link !== void 0 && link.attributes['destination_id']);
|
58
57
|
}
|
59
58
|
|
60
|
-
function isAggLink(link) {
|
61
|
-
return link.attributes["network_link.connect_type"] === "agg";
|
62
|
-
}
|
63
|
-
|
64
59
|
var getInterfaceObject = /*#__PURE__*/function () {
|
65
60
|
var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(codes) {
|
66
61
|
var query, promises, result, ifDoc;
|
@@ -197,7 +197,7 @@ function _default(topoApp) {
|
|
197
197
|
switch (_context.prev = _context.next) {
|
198
198
|
case 0:
|
199
199
|
_context.next = 2;
|
200
|
-
return
|
200
|
+
return topoApp.serverApi.getConditions(topoApp.id);
|
201
201
|
|
202
202
|
case 2:
|
203
203
|
data = _context.sent;
|
@@ -347,7 +347,7 @@ function _default(topoApp) {
|
|
347
347
|
}); // rlog.debug("getTopoByConditions--------", viewConditions, groupInfo);
|
348
348
|
|
349
349
|
_context4.next = 5;
|
350
|
-
return
|
350
|
+
return topoApp.serverApi.getTopoDataByResource(topoId, viewConditions, groupInfo, exportLinkIdList);
|
351
351
|
|
352
352
|
case 5:
|
353
353
|
data = _context4.sent;
|
@@ -415,7 +415,7 @@ function _default(topoApp) {
|
|
415
415
|
_rlog["default"].debug('saveGlobalConfig', config);
|
416
416
|
|
417
417
|
_context5.next = 5;
|
418
|
-
return
|
418
|
+
return topoApp.serverApi.saveTopoSettings(topoApp.id, config);
|
419
419
|
|
420
420
|
case 5:
|
421
421
|
case "end":
|
@@ -438,7 +438,9 @@ function _default(topoApp) {
|
|
438
438
|
case 0:
|
439
439
|
currentBackground = topoApp.store.getModelState("background").current;
|
440
440
|
_context6.next = 3;
|
441
|
-
return (0, _topoData2.saveTopo)((0, _extends2["default"])({
|
441
|
+
return (0, _topoData2.saveTopo)((0, _extends2["default"])({
|
442
|
+
topoService: topoApp.serverApi
|
443
|
+
}, data, {
|
442
444
|
viewGroupId: (_state$topoConfig$vie = state.topoConfig.viewGroup) === null || _state$topoConfig$vie === void 0 ? void 0 : _state$topoConfig$vie.id,
|
443
445
|
template: state.topoMod.type,
|
444
446
|
// 背景图
|
@@ -466,7 +468,7 @@ function _default(topoApp) {
|
|
466
468
|
case 0:
|
467
469
|
topoId = data.id, ciIdList = data.ciIdList;
|
468
470
|
_context7.next = 3;
|
469
|
-
return
|
471
|
+
return topoApp.serverApi.addToBlocklist(topoId, ciIdList);
|
470
472
|
|
471
473
|
case 3:
|
472
474
|
case "end":
|
@@ -417,7 +417,7 @@ function _default(topoApp) {
|
|
417
417
|
|
418
418
|
case 29:
|
419
419
|
_context6.next = 31;
|
420
|
-
return topoApp.options.loadData(topoId);
|
420
|
+
return topoApp.options.loadData(topoId, topoApp.serverApi);
|
421
421
|
|
422
422
|
case 31:
|
423
423
|
result = _context6.sent;
|
@@ -629,17 +629,20 @@ function _default(topoApp) {
|
|
629
629
|
|
630
630
|
case 4:
|
631
631
|
topoPermission = _context11.sent;
|
632
|
-
|
632
|
+
|
633
|
+
_rlog["default"].debug('查询拓扑权限', topoPermission);
|
634
|
+
|
635
|
+
_context11.next = 11;
|
633
636
|
break;
|
634
637
|
|
635
|
-
case
|
636
|
-
_context11.prev =
|
638
|
+
case 8:
|
639
|
+
_context11.prev = 8;
|
637
640
|
_context11.t0 = _context11["catch"](1);
|
638
641
|
|
639
642
|
_rlog["default"].error("\u67E5\u8BE2\u62D3\u6251" + id + "\u7684\u6743\u9650\u5931\u8D25", _context11.t0); // 尚未区分拓扑图不存在还是接口请求报错
|
640
643
|
|
641
644
|
|
642
|
-
case
|
645
|
+
case 11:
|
643
646
|
if (update !== false) {
|
644
647
|
_this8.update({
|
645
648
|
topoPermission: topoPermission
|
@@ -648,12 +651,12 @@ function _default(topoApp) {
|
|
648
651
|
|
649
652
|
return _context11.abrupt("return", topoPermission);
|
650
653
|
|
651
|
-
case
|
654
|
+
case 13:
|
652
655
|
case "end":
|
653
656
|
return _context11.stop();
|
654
657
|
}
|
655
658
|
}
|
656
|
-
}, _callee11, null, [[1,
|
659
|
+
}, _callee11, null, [[1, 8]]);
|
657
660
|
}))();
|
658
661
|
}
|
659
662
|
};
|
@@ -9,8 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
9
9
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
11
11
|
|
12
|
-
var _topo = _interopRequireDefault(require("@riil-frontend/component-topology-common/es/services/topo"));
|
13
|
-
|
14
12
|
/**
|
15
13
|
* 增加保存拓扑序列化数据方法,以便于拓扑中心和业务拓扑使用
|
16
14
|
*
|
@@ -30,7 +28,7 @@ function _saveSerialize() {
|
|
30
28
|
topoId = topo.getId();
|
31
29
|
serialize = topo.getHtTopo().serialize();
|
32
30
|
_context.next = 4;
|
33
|
-
return
|
31
|
+
return topo.serverApi.saveSerializeData(topoId, serialize);
|
34
32
|
|
35
33
|
case 4:
|
36
34
|
case "end":
|
@@ -218,9 +218,20 @@ function ResourceDetailDrawer(props) {
|
|
218
218
|
}
|
219
219
|
|
220
220
|
var renderContent = function renderContent() {
|
221
|
-
|
221
|
+
// 支持自定义概览
|
222
|
+
var _ref = (viewerProps === null || viewerProps === void 0 ? void 0 : viewerProps.resourceDetailProps) || {},
|
223
|
+
getResourceDetail = _ref.getResourceDetail;
|
224
|
+
|
225
|
+
var ResourceDetailWidget;
|
226
|
+
|
227
|
+
if (getResourceDetail) {
|
228
|
+
ResourceDetailWidget = getResourceDetail(resourceData);
|
229
|
+
}
|
230
|
+
|
231
|
+
if (!ResourceDetailWidget) {
|
232
|
+
ResourceDetailWidget = _ResourceDetail["default"];
|
233
|
+
}
|
222
234
|
|
223
|
-
var ResourceDetailWidget = (viewerProps === null || viewerProps === void 0 ? void 0 : (_viewerProps$resource = viewerProps.resourceDetailProps) === null || _viewerProps$resource === void 0 ? void 0 : _viewerProps$resource.ResourceDetailWidget) || _ResourceDetail["default"];
|
224
235
|
return /*#__PURE__*/_react["default"].createElement(ResourceDetailWidget, (0, _extends2["default"])({}, props, {
|
225
236
|
topo: topo,
|
226
237
|
userId: userId,
|
package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js
CHANGED
@@ -13,8 +13,6 @@ var _table = _interopRequireDefault(require("@alifd/next/lib/table"));
|
|
13
13
|
|
14
14
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
15
15
|
|
16
|
-
var _button = _interopRequireDefault(require("@alifd/next/lib/button"));
|
17
|
-
|
18
16
|
var _icon = _interopRequireDefault(require("@alifd/next/lib/icon"));
|
19
17
|
|
20
18
|
var _react = _interopRequireDefault(require("react"));
|
@@ -75,30 +73,34 @@ function EventsCard(props) {
|
|
75
73
|
title: (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss')
|
76
74
|
}, (0, _moment["default"])(value).format('YYYY-MM-DD HH:mm:ss'));
|
77
75
|
}
|
78
|
-
}
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
76
|
+
} // 临时屏蔽告警操作列,后续版本按权限显示 2023-3-6 20:23:45
|
77
|
+
// {
|
78
|
+
// title: '操作',
|
79
|
+
// dataIndex: 'status',
|
80
|
+
// key: 'status',
|
81
|
+
// width: 64,
|
82
|
+
// cell: (status, index, record) => {
|
83
|
+
// if (record.type === 'alarm') {
|
84
|
+
// return status === 'toDeal' ? (
|
85
|
+
// <Button
|
86
|
+
// text
|
87
|
+
// type="primary"
|
88
|
+
// onClick={() => alarmRiskOperation(record.type, record.params)}
|
89
|
+
// >
|
90
|
+
// 受理
|
91
|
+
// </Button>
|
92
|
+
// ) : (
|
93
|
+
// <Button disabled text type="primary">
|
94
|
+
// 已受理
|
95
|
+
// </Button>
|
96
|
+
// );
|
97
|
+
// } else {
|
98
|
+
// // return <Button text type="primary" onClick={() => alarmRiskOperation(record.type, record)}>受理</Button>
|
99
|
+
// return '';
|
100
|
+
// }
|
101
|
+
// },
|
102
|
+
// },
|
103
|
+
]; // 告警/风险 操作 (受理)
|
102
104
|
|
103
105
|
function alarmRiskOperation(_x, _x2) {
|
104
106
|
return _alarmRiskOperation.apply(this, arguments);
|
@@ -947,6 +947,8 @@ function ResourceOverview(props) {
|
|
947
947
|
defaultDisabledCol: ['display_name'],
|
948
948
|
max: 6,
|
949
949
|
columns: baseInfoCol,
|
950
|
+
getOverviewConfig: resourceOverviewProps.getOverviewConfig,
|
951
|
+
saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
|
950
952
|
onChange: baseInfoColChange
|
951
953
|
}));
|
952
954
|
}
|
@@ -967,6 +969,8 @@ function ResourceOverview(props) {
|
|
967
969
|
defaultCol: defaultCols.keyIndicators,
|
968
970
|
max: 6,
|
969
971
|
columns: metricCol,
|
972
|
+
getOverviewConfig: resourceOverviewProps.getOverviewConfig,
|
973
|
+
saveOverviewConfig: resourceOverviewProps.saveOverviewConfig,
|
970
974
|
onChange: metricColChange
|
971
975
|
})
|
972
976
|
}, /*#__PURE__*/_react["default"].createElement(_ResourceOverviewMetric["default"], {
|
@@ -58,7 +58,9 @@ function Configurator(props) {
|
|
58
58
|
type = props.type,
|
59
59
|
max = props.max,
|
60
60
|
_props$btnStyle = props.btnStyle,
|
61
|
-
btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle
|
61
|
+
btnStyle = _props$btnStyle === void 0 ? {} : _props$btnStyle,
|
62
|
+
getOverviewConfig = props.getOverviewConfig,
|
63
|
+
saveOverviewConfig = props.saveOverviewConfig; // console.log('Configurator props', props);
|
62
64
|
|
63
65
|
var buttonRef = (0, _react.useRef)(null);
|
64
66
|
|
@@ -96,35 +98,33 @@ function Configurator(props) {
|
|
96
98
|
|
97
99
|
function _init() {
|
98
100
|
_init = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
101
|
+
var _overviewConfig;
|
102
|
+
|
99
103
|
var overviewConfig, newPrevCols, newNextCols, oldCols, newCols;
|
100
104
|
return _regenerator["default"].wrap(function _callee3$(_context3) {
|
101
105
|
while (1) {
|
102
106
|
switch (_context3.prev = _context3.next) {
|
103
107
|
case 0:
|
108
|
+
overviewConfig = {};
|
109
|
+
|
104
110
|
if (!(topoId && templateCode)) {
|
105
|
-
_context3.next =
|
111
|
+
_context3.next = 5;
|
106
112
|
break;
|
107
113
|
}
|
108
114
|
|
109
|
-
_context3.next =
|
110
|
-
return _overview["default"].getOverviewConfig(topoId, templateCode);
|
115
|
+
_context3.next = 4;
|
116
|
+
return (getOverviewConfig || _overview["default"].getOverviewConfig)(topoId, templateCode);
|
111
117
|
|
112
|
-
case
|
113
|
-
|
114
|
-
_context3.next = 7;
|
115
|
-
break;
|
118
|
+
case 4:
|
119
|
+
overviewConfig = _context3.sent;
|
116
120
|
|
117
|
-
case
|
118
|
-
_context3.t0 = {};
|
119
|
-
|
120
|
-
case 7:
|
121
|
-
overviewConfig = _context3.t0;
|
121
|
+
case 5:
|
122
122
|
// console.log('overviewConfig', overviewConfig);
|
123
123
|
// const overviewConfig = ''
|
124
124
|
newPrevCols = [];
|
125
125
|
newNextCols = [];
|
126
126
|
|
127
|
-
if (overviewConfig !== null &&
|
127
|
+
if ((_overviewConfig = overviewConfig) !== null && _overviewConfig !== void 0 && _overviewConfig[type]) {
|
128
128
|
oldCols = JSON.parse(overviewConfig[type]) || []; // 已设置
|
129
129
|
|
130
130
|
oldCols.forEach(function (old_item) {
|
@@ -174,7 +174,7 @@ function Configurator(props) {
|
|
174
174
|
setOrgColumns(newCols);
|
175
175
|
onChange(newCols);
|
176
176
|
|
177
|
-
case
|
177
|
+
case 12:
|
178
178
|
case "end":
|
179
179
|
return _context3.stop();
|
180
180
|
}
|
@@ -251,7 +251,7 @@ function Configurator(props) {
|
|
251
251
|
|
252
252
|
var onOk = /*#__PURE__*/function () {
|
253
253
|
var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
254
|
-
var
|
254
|
+
var _ref3;
|
255
255
|
|
256
256
|
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
257
257
|
while (1) {
|
@@ -266,7 +266,7 @@ function Configurator(props) {
|
|
266
266
|
}
|
267
267
|
|
268
268
|
_context2.next = 5;
|
269
|
-
return _overview["default"].saveOverviewConfig(topoId, templateCode, (
|
269
|
+
return (saveOverviewConfig || _overview["default"].saveOverviewConfig)(topoId, templateCode, (_ref3 = {}, _ref3[type] = JSON.stringify(columnsState), _ref3));
|
270
270
|
|
271
271
|
case 5:
|
272
272
|
case "end":
|
@@ -15,37 +15,23 @@ var _EditButton = _interopRequireDefault(require("./widgets/EditButton"));
|
|
15
15
|
|
16
16
|
var _NodesDragSwitchWrapper = _interopRequireDefault(require("./widgets/NodesDragSwitchWrapper"));
|
17
17
|
|
18
|
-
var _AlarmListShowButton = _interopRequireDefault(require("./widgets/AlarmListShowButton"));
|
19
|
-
|
20
18
|
var _SettingButtonWidget = _interopRequireDefault(require("./widgets/SettingButtonWidget"));
|
21
19
|
|
22
|
-
var
|
20
|
+
var _AlarmButton = _interopRequireDefault(require("./widgets/AlarmButton"));
|
23
21
|
|
24
22
|
function BasicTools(props) {
|
25
23
|
var topo = props.topo,
|
26
24
|
_props$showEditButton = props.showEditButton,
|
27
25
|
showEditButton = _props$showEditButton === void 0 ? true : _props$showEditButton,
|
28
26
|
children = props.children;
|
29
|
-
|
30
|
-
var _topo$store$useModel = topo.store.useModel("topoAlarm"),
|
31
|
-
alarmState = _topo$store$useModel[0],
|
32
|
-
alarmDispatchers = _topo$store$useModel[1];
|
33
|
-
|
34
|
-
var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
|
35
|
-
var alarmData = (0, _useEventData["default"])({
|
36
|
-
topo: topo
|
37
|
-
});
|
38
27
|
return /*#__PURE__*/_react["default"].createElement(_box["default"], {
|
39
28
|
direction: "row",
|
40
29
|
spacing: 8
|
41
30
|
}, showEditButton && /*#__PURE__*/_react["default"].createElement(_EditButton["default"], (0, _extends2["default"])({
|
42
31
|
topo: topo
|
43
|
-
}, props)), /*#__PURE__*/_react["default"].createElement(
|
32
|
+
}, props)), /*#__PURE__*/_react["default"].createElement(_AlarmButton["default"], (0, _extends2["default"])({
|
44
33
|
topo: topo
|
45
|
-
}, props, {
|
46
|
-
alarmPanelIsOpen: alarmPanelIsOpen,
|
47
|
-
alarmData: alarmData
|
48
|
-
})), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
|
34
|
+
}, props)), /*#__PURE__*/_react["default"].createElement(_SettingButtonWidget["default"], props), /*#__PURE__*/_react["default"].createElement(_NodesDragSwitchWrapper["default"], (0, _extends2["default"])({
|
49
35
|
topo: topo
|
50
36
|
}, props)), children);
|
51
37
|
}
|
@@ -0,0 +1,36 @@
|
|
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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
9
|
+
|
10
|
+
var _react = _interopRequireDefault(require("react"));
|
11
|
+
|
12
|
+
var _AlarmListShowButton = _interopRequireDefault(require("./AlarmListShowButton"));
|
13
|
+
|
14
|
+
var _useEventData = _interopRequireDefault(require("../../../../hooks/useEventData"));
|
15
|
+
|
16
|
+
function AlarmButton(props) {
|
17
|
+
var topo = props.topo;
|
18
|
+
|
19
|
+
var _topo$store$useModel = topo.store.useModel("topoAlarm"),
|
20
|
+
alarmState = _topo$store$useModel[0],
|
21
|
+
alarmDispatchers = _topo$store$useModel[1];
|
22
|
+
|
23
|
+
var alarmPanelIsOpen = alarmState.alarmPanelIsOpen;
|
24
|
+
var alarmData = (0, _useEventData["default"])({
|
25
|
+
topo: topo
|
26
|
+
});
|
27
|
+
return /*#__PURE__*/_react["default"].createElement(_AlarmListShowButton["default"], (0, _extends2["default"])({
|
28
|
+
topo: topo
|
29
|
+
}, props, {
|
30
|
+
alarmPanelIsOpen: alarmPanelIsOpen,
|
31
|
+
alarmData: alarmData
|
32
|
+
}));
|
33
|
+
}
|
34
|
+
|
35
|
+
var _default = AlarmButton;
|
36
|
+
exports["default"] = _default;
|
@@ -24,7 +24,10 @@ function LinkDataTab(props) {
|
|
24
24
|
|
25
25
|
var topo = props.topo,
|
26
26
|
edge = props.edge,
|
27
|
-
link = props.link
|
27
|
+
link = props.link,
|
28
|
+
source = props.source,
|
29
|
+
target = props.target,
|
30
|
+
editorProps = props.editorProps;
|
28
31
|
|
29
32
|
var _topo$store$useModel = topo.store.useModel("topoConfig"),
|
30
33
|
editState = _topo$store$useModel[0],
|
@@ -41,8 +44,11 @@ function LinkDataTab(props) {
|
|
41
44
|
className: _LinkInfoPreviewModule["default"].panelFullHeight
|
42
45
|
}, /*#__PURE__*/_react["default"].createElement(_LinkInfoPreview["default"], {
|
43
46
|
className: _LinkInfoPreviewModule["default"].lindInfoPreview,
|
47
|
+
topo: topo,
|
44
48
|
data: link,
|
45
|
-
|
49
|
+
source: source,
|
50
|
+
target: target,
|
51
|
+
isCmpTopo: (editorProps === null || editorProps === void 0 ? void 0 : editorProps.topoType) === 'cmpTopo'
|
46
52
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
47
53
|
className: _LinkInfoPreviewModule["default"].footer
|
48
54
|
}, /*#__PURE__*/_react["default"].createElement(_button["default"], {
|