@riil-frontend/component-topology 11.0.34 → 12.0.0-dev.1
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 +4 -2
- package/build/index.js +57 -34
- package/es/components/BatchAttrMetric/setting.js +1 -1
- package/es/components/MultiResourceDrawer/index.js +16 -18
- package/es/components/ResourceList/ResourceSelect.js +48 -50
- package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +24 -26
- package/es/components/SingleResourceDrawer/SelectDrawer.js +18 -20
- package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +23 -25
- package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +78 -84
- package/es/core/components/titlebar/widgets/TitleWidget.js +5 -3
- package/es/core/editor/components/BackgroundView/UploadDialog/index.js +17 -18
- package/es/core/editor/components/BackgroundView/index.js +119 -129
- package/es/core/editor/components/CustomIconPlugin/RenameDialog.js +20 -22
- package/es/core/editor/components/CustomIconPlugin/UploadIconDialog.js +33 -34
- package/es/core/editor/components/CustomIconPlugin/utils/svgToShape.js +15 -17
- package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +7 -9
- package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +37 -41
- package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +50 -54
- package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +50 -54
- package/es/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +11 -13
- package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +21 -23
- package/es/core/editor/components/settings/propertyViews/node/data/Data.js +15 -17
- package/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js +10 -12
- package/es/core/editor/components/titlebar/TopoEditorTitleBar.js +21 -27
- package/es/core/editor/hooks/useKeyboardShortcut.js +36 -32
- package/es/core/editor/hooks/useNewElementTheme.js +2 -2
- package/es/core/editor/store/background.js +8 -10
- package/es/core/editor/store/topoEdit.js +4 -6
- package/es/core/editor/utils/copyElementUtil.js +171 -0
- package/es/core/editor/utils/edgeTypeStyleUtil.js +2 -4
- package/es/core/hooks/usePolling.js +117 -121
- package/es/core/hooks/useResourceConfig.js +58 -66
- package/es/core/hooks/useTopoEdit.js +473 -503
- package/es/core/models/Alarm.js +281 -298
- package/es/core/models/AttributeMetricDisplay.js +101 -107
- package/es/core/models/PluginManager.js +4 -3
- package/es/core/models/SelectionModel.js +4 -5
- package/es/core/models/TopoApp.js +205 -240
- package/es/core/models/TopoGraphView.js +18 -21
- package/es/core/models/cache/CiCache.js +28 -27
- package/es/core/models/cache/CiTypeCache.js +37 -41
- package/es/core/models/cache/DictCache.js +33 -35
- package/es/core/models/graph/Background.js +15 -17
- package/es/core/models/plugins/resourceWebControllUrl.js +76 -82
- package/es/core/models/tagstips/ElementTagTipConfig.js +34 -38
- package/es/core/models/topoData.js +68 -70
- package/es/core/models/utils/linkUtils.js +41 -43
- package/es/core/models/utils/nodeNameVisibleUtil.js +4 -4
- package/es/core/services/alarm.js +14 -16
- package/es/core/services/background.js +59 -67
- package/es/core/services/cmdb/metric.js +9 -11
- package/es/core/services/cmdb.js +20 -20
- package/es/core/services/index.js +39 -45
- package/es/core/services/overview.js +131 -151
- package/es/core/services/topo/basic.js +37 -41
- package/es/core/services/topo/tagtip.js +10 -12
- package/es/core/store/models/ciModel.js +58 -62
- package/es/core/store/models/customIcon.js +120 -134
- package/es/core/store/models/displayConfig.js +15 -19
- package/es/core/store/models/selection.js +4 -6
- package/es/core/store/models/topoAlarm.js +162 -145
- package/es/core/store/models/topoBaseInfoOverview.js +4 -6
- package/es/core/store/models/topoBizMod.js +9 -11
- package/es/core/store/models/topoConfig.js +215 -231
- package/es/core/store/models/topoGraphView.js +4 -6
- package/es/core/store/models/topoMod.js +373 -395
- package/es/core/utils/imageUtil.js +18 -20
- package/es/core/utils/metricUtil.js +5 -0
- package/es/core/utils/saveSerialize.js +9 -11
- package/es/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +56 -58
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +15 -17
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +343 -357
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +86 -92
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +39 -41
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +189 -205
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +107 -109
- package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +57 -59
- package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +33 -37
- package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +25 -29
- package/es/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +32 -36
- package/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +17 -19
- package/es/networkTopo/components/Link/hook.js +73 -77
- package/es/networkTopo/components/Link/index.js +86 -94
- package/es/networkTopo/components/Link/setting.js +42 -44
- package/es/networkTopo/getTopoData.js +63 -69
- package/es/networkTopo/hooks/viewer/useRelateTopo.js +30 -32
- package/es/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
- package/es/networkTopo/models/TopoCenter.js +18 -22
- package/es/networkTopo/services/alert.js +18 -22
- package/es/networkTopo/services/authorization.js +45 -55
- package/es/networkTopo/services/cmdb.js +422 -470
- package/es/networkTopo/services/funcAuth.js +22 -24
- package/es/networkTopo/services/link.js +107 -117
- package/es/networkTopo/services/mdc.js +18 -24
- package/es/networkTopo/services/metric.js +23 -27
- package/es/networkTopo/services/model.js +445 -509
- package/es/networkTopo/services/risk.js +9 -11
- package/es/networkTopo/services/topo/auth.js +27 -33
- package/es/networkTopo/services/topo/basic.js +251 -289
- package/es/networkTopo/services/topo/blacklist.js +20 -24
- package/es/networkTopo/services/topo/ciInfo.js +27 -31
- package/es/networkTopo/services/topo/icon.js +49 -59
- package/es/networkTopo/services/topo/networkLink.js +32 -36
- package/es/networkTopo/services/topo/relation.js +9 -11
- package/es/networkTopo/services/topo/resourceWebUrl.js +36 -42
- package/es/networkTopo/store/functionAuth.js +31 -37
- package/es/networkTopo/store/topoCenter.js +142 -152
- package/es/networkTopo/store/topoLinkMod.js +4 -6
- package/es/networkTopo/store/topoTreeMod.js +170 -182
- package/es/networkTopo/utils/exportData.js +52 -54
- package/lib/components/BatchAttrMetric/setting.js +1 -1
- package/lib/components/MultiResourceDrawer/index.js +16 -18
- package/lib/components/ResourceList/ResourceSelect.js +48 -50
- package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +27 -29
- package/lib/components/SingleResourceDrawer/SelectDrawer.js +18 -20
- package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +30 -32
- package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +78 -84
- package/lib/core/components/titlebar/widgets/TitleWidget.js +5 -3
- package/lib/core/editor/components/BackgroundView/UploadDialog/index.js +18 -18
- package/lib/core/editor/components/BackgroundView/index.js +118 -128
- package/lib/core/editor/components/CustomIconPlugin/RenameDialog.js +22 -24
- package/lib/core/editor/components/CustomIconPlugin/UploadIconDialog.js +34 -34
- package/lib/core/editor/components/CustomIconPlugin/utils/svgToShape.js +19 -21
- package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +8 -10
- package/lib/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +37 -41
- package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +50 -54
- package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +50 -54
- package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +12 -14
- package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +26 -28
- package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +15 -17
- package/lib/core/editor/components/settings/propertyViews/view/BackgroundSize.js +12 -14
- package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js +25 -31
- package/lib/core/editor/hooks/useKeyboardShortcut.js +37 -34
- package/lib/core/editor/hooks/useNewElementTheme.js +2 -2
- package/lib/core/editor/store/background.js +8 -10
- package/lib/core/editor/store/topoEdit.js +4 -6
- package/lib/core/editor/utils/copyElementUtil.js +182 -0
- package/lib/core/editor/utils/edgeTypeStyleUtil.js +2 -4
- package/lib/core/hooks/usePolling.js +116 -120
- package/lib/core/hooks/useResourceConfig.js +58 -66
- package/lib/core/hooks/useTopoEdit.js +465 -495
- package/lib/core/models/Alarm.js +275 -292
- package/lib/core/models/AttributeMetricDisplay.js +104 -110
- package/lib/core/models/PluginManager.js +4 -3
- package/lib/core/models/SelectionModel.js +4 -5
- package/lib/core/models/TopoApp.js +205 -240
- package/lib/core/models/TopoGraphView.js +18 -21
- package/lib/core/models/cache/CiCache.js +33 -32
- package/lib/core/models/cache/CiTypeCache.js +38 -42
- package/lib/core/models/cache/DictCache.js +33 -35
- package/lib/core/models/graph/Background.js +16 -18
- package/lib/core/models/plugins/resourceWebControllUrl.js +74 -80
- package/lib/core/models/tagstips/ElementTagTipConfig.js +34 -38
- package/lib/core/models/topoData.js +69 -71
- package/lib/core/models/utils/linkUtils.js +41 -43
- package/lib/core/models/utils/nodeNameVisibleUtil.js +4 -4
- package/lib/core/services/alarm.js +18 -20
- package/lib/core/services/background.js +70 -78
- package/lib/core/services/cmdb/metric.js +10 -12
- package/lib/core/services/cmdb.js +22 -22
- package/lib/core/services/index.js +45 -51
- package/lib/core/services/overview.js +131 -151
- package/lib/core/services/topo/basic.js +37 -41
- package/lib/core/services/topo/tagtip.js +12 -14
- package/lib/core/store/models/ciModel.js +66 -70
- package/lib/core/store/models/customIcon.js +120 -134
- package/lib/core/store/models/displayConfig.js +15 -19
- package/lib/core/store/models/selection.js +4 -6
- package/lib/core/store/models/topoAlarm.js +163 -145
- package/lib/core/store/models/topoBaseInfoOverview.js +4 -6
- package/lib/core/store/models/topoBizMod.js +9 -11
- package/lib/core/store/models/topoConfig.js +222 -238
- package/lib/core/store/models/topoGraphView.js +4 -6
- package/lib/core/store/models/topoMod.js +375 -397
- package/lib/core/utils/imageUtil.js +22 -24
- package/lib/core/utils/metricUtil.js +5 -0
- package/lib/core/utils/saveSerialize.js +9 -11
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +56 -58
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +15 -17
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +344 -358
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +86 -92
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +39 -41
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +190 -206
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +107 -109
- package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +57 -59
- package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +29 -33
- package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +25 -29
- package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +32 -36
- package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +18 -20
- package/lib/networkTopo/components/Link/hook.js +73 -77
- package/lib/networkTopo/components/Link/index.js +87 -95
- package/lib/networkTopo/components/Link/setting.js +42 -44
- package/lib/networkTopo/getTopoData.js +63 -69
- package/lib/networkTopo/hooks/viewer/useRelateTopo.js +31 -33
- package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
- package/lib/networkTopo/models/TopoCenter.js +18 -22
- package/lib/networkTopo/services/alert.js +18 -22
- package/lib/networkTopo/services/authorization.js +55 -65
- package/lib/networkTopo/services/cmdb.js +422 -470
- package/lib/networkTopo/services/funcAuth.js +24 -26
- package/lib/networkTopo/services/link.js +108 -118
- package/lib/networkTopo/services/mdc.js +21 -27
- package/lib/networkTopo/services/metric.js +27 -31
- package/lib/networkTopo/services/model.js +445 -509
- package/lib/networkTopo/services/risk.js +11 -13
- package/lib/networkTopo/services/topo/auth.js +27 -33
- package/lib/networkTopo/services/topo/basic.js +252 -290
- package/lib/networkTopo/services/topo/blacklist.js +20 -24
- package/lib/networkTopo/services/topo/ciInfo.js +34 -38
- package/lib/networkTopo/services/topo/icon.js +59 -69
- package/lib/networkTopo/services/topo/networkLink.js +32 -36
- package/lib/networkTopo/services/topo/relation.js +11 -13
- package/lib/networkTopo/services/topo/resourceWebUrl.js +44 -50
- package/lib/networkTopo/store/functionAuth.js +31 -37
- package/lib/networkTopo/store/topoCenter.js +142 -152
- package/lib/networkTopo/store/topoLinkMod.js +4 -6
- package/lib/networkTopo/store/topoTreeMod.js +166 -178
- package/lib/networkTopo/utils/exportData.js +59 -61
- package/lib/utils/htElementDataUtil.js +4 -2
- package/package.json +5 -3
@@ -0,0 +1,171 @@
|
|
1
|
+
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
2
|
+
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
3
|
+
export function handleCopyHotkey(event, options) {
|
4
|
+
var target = event.target || event.srcElement;
|
5
|
+
var tagName = target.tagName;
|
6
|
+
|
7
|
+
if (tagName !== 'BODY') {
|
8
|
+
copy(options);
|
9
|
+
}
|
10
|
+
}
|
11
|
+
export function handlePasteHotkey(event, options) {
|
12
|
+
var target = event.target || event.srcElement;
|
13
|
+
var tagName = target.tagName;
|
14
|
+
|
15
|
+
if (tagName !== 'BODY') {
|
16
|
+
paste(options);
|
17
|
+
}
|
18
|
+
}
|
19
|
+
|
20
|
+
function copy(options) {
|
21
|
+
var topo = options.topo;
|
22
|
+
var gv = topo.getHtTopo().getGraphView();
|
23
|
+
var dm = gv.dm();
|
24
|
+
var sm = dm.sm();
|
25
|
+
var serializer = new ht.JSONSerializer(dm);
|
26
|
+
|
27
|
+
serializer.isSerializable = function (data) {
|
28
|
+
//可在此设置要选中的数据或者在copy处
|
29
|
+
// if(sm.co(data)){
|
30
|
+
// if(data instanceof ht.Group){
|
31
|
+
// sm.as(data.getChildren());
|
32
|
+
// }
|
33
|
+
// }
|
34
|
+
return sm.co(data);
|
35
|
+
};
|
36
|
+
|
37
|
+
var copyData = {
|
38
|
+
copyTopoElements: true,
|
39
|
+
source: {
|
40
|
+
id: topo.id,
|
41
|
+
topoType: topo.viewProps.topoType
|
42
|
+
},
|
43
|
+
data: serializer.toJSON()
|
44
|
+
};
|
45
|
+
writeClipboard(JSON.stringify(copyData, null, 0));
|
46
|
+
}
|
47
|
+
|
48
|
+
function paste(_x) {
|
49
|
+
return _paste.apply(this, arguments);
|
50
|
+
}
|
51
|
+
|
52
|
+
function _paste() {
|
53
|
+
_paste = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
|
54
|
+
var topo, clipboardText, copyData;
|
55
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
56
|
+
while (1) switch (_context.prev = _context.next) {
|
57
|
+
case 0:
|
58
|
+
topo = options.topo;
|
59
|
+
_context.next = 3;
|
60
|
+
return readClipboard();
|
61
|
+
|
62
|
+
case 3:
|
63
|
+
clipboardText = _context.sent;
|
64
|
+
copyData = parseCopyData(clipboardText, topo);
|
65
|
+
|
66
|
+
if (copyData) {
|
67
|
+
topo.historyManager.beginTransaction();
|
68
|
+
doPaste(topo, copyData.data);
|
69
|
+
topo.historyManager.endTransaction();
|
70
|
+
}
|
71
|
+
|
72
|
+
case 6:
|
73
|
+
case "end":
|
74
|
+
return _context.stop();
|
75
|
+
}
|
76
|
+
}, _callee);
|
77
|
+
}));
|
78
|
+
return _paste.apply(this, arguments);
|
79
|
+
}
|
80
|
+
|
81
|
+
function parseCopyData(clipboardText, topo) {
|
82
|
+
var copyData = null;
|
83
|
+
|
84
|
+
try {
|
85
|
+
copyData = JSON.parse(clipboardText); // 网络拓扑和业务拓扑之间不支持复制粘贴
|
86
|
+
|
87
|
+
if (!copyData.copyTopoElements || copyData.topoType !== topo.topoType) {
|
88
|
+
copyData = null;
|
89
|
+
}
|
90
|
+
} catch (error) {}
|
91
|
+
|
92
|
+
return copyData;
|
93
|
+
}
|
94
|
+
|
95
|
+
function validateTopoCopyText(clipboardText) {
|
96
|
+
// TODO
|
97
|
+
return true;
|
98
|
+
}
|
99
|
+
|
100
|
+
function doPaste(topo, clipboardText) {
|
101
|
+
// 解析剪切板内容
|
102
|
+
var parseDm = new ht.DataModel();
|
103
|
+
var parseSerializer = new ht.JSONSerializer(parseDm);
|
104
|
+
parseSerializer.deserialize(clipboardText);
|
105
|
+
var elements = parseDm.getDatas().toArray(); // 添加到拓扑图
|
106
|
+
|
107
|
+
var gv = topo.getHtTopo().getGraphView();
|
108
|
+
var dm = gv.dm();
|
109
|
+
elements.forEach(function (d) {
|
110
|
+
dm.add(d);
|
111
|
+
});
|
112
|
+
parseDm.clear(); // 粘贴之后进行处理
|
113
|
+
|
114
|
+
var sm = dm.sm();
|
115
|
+
sm.cs();
|
116
|
+
sm.as(elements); // 粘贴位置处理
|
117
|
+
|
118
|
+
if (isPasetToOriginTopo()) {
|
119
|
+
gv.moveSelection(60, 60);
|
120
|
+
} else {// 从拓扑图A复制到拓扑图B时,粘贴到拓扑图可视区域中心位置居中粘贴
|
121
|
+
// TODO
|
122
|
+
} // 若用户粘贴后的位置超出现有位置后,将视野拉到可视范围内
|
123
|
+
// TODO
|
124
|
+
// gv.translate(-60, -60)
|
125
|
+
|
126
|
+
}
|
127
|
+
|
128
|
+
function isPasetToOriginTopo() {
|
129
|
+
// TODO
|
130
|
+
return true;
|
131
|
+
}
|
132
|
+
|
133
|
+
function writeClipboard(_x2) {
|
134
|
+
return _writeClipboard.apply(this, arguments);
|
135
|
+
}
|
136
|
+
|
137
|
+
function _writeClipboard() {
|
138
|
+
_writeClipboard = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(text) {
|
139
|
+
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
140
|
+
while (1) switch (_context2.prev = _context2.next) {
|
141
|
+
case 0:
|
142
|
+
navigator.clipboard.writeText(text);
|
143
|
+
|
144
|
+
case 1:
|
145
|
+
case "end":
|
146
|
+
return _context2.stop();
|
147
|
+
}
|
148
|
+
}, _callee2);
|
149
|
+
}));
|
150
|
+
return _writeClipboard.apply(this, arguments);
|
151
|
+
}
|
152
|
+
|
153
|
+
function readClipboard() {
|
154
|
+
return _readClipboard.apply(this, arguments);
|
155
|
+
}
|
156
|
+
|
157
|
+
function _readClipboard() {
|
158
|
+
_readClipboard = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
|
159
|
+
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
160
|
+
while (1) switch (_context3.prev = _context3.next) {
|
161
|
+
case 0:
|
162
|
+
return _context3.abrupt("return", navigator.clipboard.readText());
|
163
|
+
|
164
|
+
case 1:
|
165
|
+
case "end":
|
166
|
+
return _context3.stop();
|
167
|
+
}
|
168
|
+
}, _callee3);
|
169
|
+
}));
|
170
|
+
return _readClipboard.apply(this, arguments);
|
171
|
+
}
|
@@ -68,14 +68,12 @@ export function isNodeAllEdges(topo) {
|
|
68
68
|
return nodeLineList[i]._id == edge._id;
|
69
69
|
}).length == 0) {
|
70
70
|
inEdges = true;
|
71
|
-
return
|
71
|
+
return 1; // break
|
72
72
|
}
|
73
73
|
};
|
74
74
|
|
75
75
|
for (var i = 0; i < nodeLineList.length; i++) {
|
76
|
-
|
77
|
-
|
78
|
-
if (_ret === "break") break;
|
76
|
+
if (_loop(i)) break;
|
79
77
|
}
|
80
78
|
});
|
81
79
|
return inEdges;
|
@@ -46,112 +46,110 @@ var usePolling = function usePolling(props) {
|
|
46
46
|
var _topo$store$getModelS, resIdsList, nodeIdsList, codes, param, _yield$Promise$all, ciMetricsResult, mergeData, transformLinkData, adapterIpv6;
|
47
47
|
|
48
48
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
49
|
-
while (1) {
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
var ipv6 = data.attributeMap.ipv6_address;
|
54
|
-
|
55
|
-
if (!ipv6 && data.attributeMap.ipv6_address_list) {
|
56
|
-
ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
|
57
|
-
}
|
58
|
-
|
59
|
-
return _extends({}, data, {
|
60
|
-
attributeMap: _extends({}, data.attributeMap, {
|
61
|
-
ipv6_address: ipv6
|
62
|
-
})
|
63
|
-
});
|
64
|
-
};
|
49
|
+
while (1) switch (_context.prev = _context.next) {
|
50
|
+
case 0:
|
51
|
+
adapterIpv6 = function _adapterIpv(data) {
|
52
|
+
var ipv6 = data.attributeMap.ipv6_address;
|
65
53
|
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
linkGroups = _topo$dataModel$getDa2.linkGroups;
|
54
|
+
if (!ipv6 && data.attributeMap.ipv6_address_list) {
|
55
|
+
ipv6 = (data.attributeMap.ipv6_address_list || '').split(',')[0];
|
56
|
+
}
|
70
57
|
|
71
|
-
|
72
|
-
|
73
|
-
|
58
|
+
return _extends({}, data, {
|
59
|
+
attributeMap: _extends({}, data.attributeMap, {
|
60
|
+
ipv6_address: ipv6
|
61
|
+
})
|
62
|
+
});
|
63
|
+
};
|
74
64
|
|
75
|
-
|
76
|
-
|
77
|
-
|
65
|
+
transformLinkData = function _transformLinkData(data) {
|
66
|
+
var _topo$dataModel$getDa2 = topo.dataModel.getData(),
|
67
|
+
links = _topo$dataModel$getDa2.links,
|
68
|
+
linkGroups = _topo$dataModel$getDa2.linkGroups;
|
78
69
|
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
};
|
83
|
-
|
84
|
-
mergeData = function _mergeData(ciMetricsResult) {
|
85
|
-
// 合并属性、指标
|
86
|
-
var _topo$dataModel$getDa = topo.dataModel.getData(),
|
87
|
-
nodes = _topo$dataModel$getDa.nodes,
|
88
|
-
links = _topo$dataModel$getDa.links;
|
89
|
-
|
90
|
-
return [].concat(nodes, links).filter(function (item) {
|
91
|
-
return !!item.ciType;
|
92
|
-
}).map(function (ciData) {
|
93
|
-
var resultData = _extends({}, ciData, {
|
94
|
-
attributeMap: _extends({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
|
95
|
-
});
|
96
|
-
|
97
|
-
resultData = transformLinkData(resultData);
|
98
|
-
resultData = adapterIpv6(resultData);
|
99
|
-
return resultData;
|
100
|
-
}).map(function (ciData) {
|
101
|
-
var ciMetricResult = ciMetricsResult.find(function (item) {
|
102
|
-
return item.id === (ciData.ciId || ciData.id);
|
103
|
-
});
|
104
|
-
return _extends({}, ciData, {
|
105
|
-
metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.metrics) || {}
|
106
|
-
});
|
107
|
-
});
|
108
|
-
};
|
109
|
-
|
110
|
-
_topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
|
111
|
-
// 无资源,不查询
|
70
|
+
var link = [].concat(links, linkGroups).find(function (item) {
|
71
|
+
return item.id === data.id;
|
72
|
+
});
|
112
73
|
|
113
|
-
if (
|
114
|
-
|
115
|
-
break;
|
74
|
+
if (!link) {
|
75
|
+
return data;
|
116
76
|
}
|
117
77
|
|
118
|
-
return
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
}
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
78
|
+
return _extends({}, data, {
|
79
|
+
attributeMap: link.attributes || {}
|
80
|
+
});
|
81
|
+
};
|
82
|
+
|
83
|
+
mergeData = function _mergeData(ciMetricsResult) {
|
84
|
+
// 合并属性、指标
|
85
|
+
var _topo$dataModel$getDa = topo.dataModel.getData(),
|
86
|
+
nodes = _topo$dataModel$getDa.nodes,
|
87
|
+
links = _topo$dataModel$getDa.links;
|
88
|
+
|
89
|
+
return [].concat(nodes, links).filter(function (item) {
|
90
|
+
return !!item.ciType;
|
91
|
+
}).map(function (ciData) {
|
92
|
+
var resultData = _extends({}, ciData, {
|
93
|
+
attributeMap: _extends({}, (ciData === null || ciData === void 0 ? void 0 : ciData.attributes) || {})
|
94
|
+
});
|
95
|
+
|
96
|
+
resultData = transformLinkData(resultData);
|
97
|
+
resultData = adapterIpv6(resultData);
|
98
|
+
return resultData;
|
99
|
+
}).map(function (ciData) {
|
100
|
+
var ciMetricResult = ciMetricsResult.find(function (item) {
|
101
|
+
return item.id === (ciData.ciId || ciData.id);
|
102
|
+
});
|
103
|
+
return _extends({}, ciData, {
|
104
|
+
metrics: (ciMetricResult === null || ciMetricResult === void 0 ? void 0 : ciMetricResult.metrics) || {}
|
105
|
+
});
|
106
|
+
});
|
107
|
+
};
|
108
|
+
|
109
|
+
_topo$store$getModelS = topo.store.getModelState('topoBizMod').resAndMetrics, resIdsList = _topo$store$getModelS.resIdsList, nodeIdsList = _topo$store$getModelS.nodeIdsList; // rlog.debug('根据ci的id获取属性的值-getCiArrByIds', resIdsList, metrics);
|
110
|
+
// 无资源,不查询
|
111
|
+
|
112
|
+
if (resIdsList.length) {
|
113
|
+
_context.next = 6;
|
114
|
+
break;
|
115
|
+
}
|
116
|
+
|
117
|
+
return _context.abrupt("return", []);
|
118
|
+
|
119
|
+
case 6:
|
120
|
+
// 需要查询的指标列表
|
121
|
+
codes = topo.attributeMetricDisplay.getResourceMetricCodes();
|
122
|
+
param = {
|
123
|
+
ciId: nodeIdsList,
|
124
|
+
codes: codes,
|
125
|
+
// 过滤掉不需要查询的
|
126
|
+
relationId: topo.attributeMetricDisplay.getEdges().map(function (edge) {
|
127
|
+
return {
|
128
|
+
ciId: edge.id,
|
129
|
+
operation: edge.operation
|
130
|
+
};
|
131
|
+
})
|
132
|
+
};
|
133
|
+
_context.t0 = Promise;
|
134
|
+
_context.t1 = // 查询指标值
|
135
|
+
topo.serverApi.ciInfo.batchQueryCiInfo(param);
|
136
|
+
_context.next = 12;
|
137
|
+
return DictCache.init();
|
138
|
+
|
139
|
+
case 12:
|
140
|
+
_context.t2 = _context.sent;
|
141
|
+
_context.t3 = [_context.t1, _context.t2];
|
142
|
+
_context.next = 16;
|
143
|
+
return _context.t0.all.call(_context.t0, _context.t3);
|
144
|
+
|
145
|
+
case 16:
|
146
|
+
_yield$Promise$all = _context.sent;
|
147
|
+
ciMetricsResult = _yield$Promise$all[0];
|
148
|
+
return _context.abrupt("return", mergeData(ciMetricsResult));
|
149
|
+
|
150
|
+
case 19:
|
151
|
+
case "end":
|
152
|
+
return _context.stop();
|
155
153
|
}
|
156
154
|
}, _callee);
|
157
155
|
}));
|
@@ -167,28 +165,26 @@ var usePolling = function usePolling(props) {
|
|
167
165
|
_refresh = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
168
166
|
var data;
|
169
167
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
170
|
-
while (1) {
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
return _context2.stop();
|
191
|
-
}
|
168
|
+
while (1) switch (_context2.prev = _context2.next) {
|
169
|
+
case 0:
|
170
|
+
if (!(!pollingSwitch || !(resAndMetrics !== null && resAndMetrics !== void 0 && resAndMetrics.resIdsList.length))) {
|
171
|
+
_context2.next = 2;
|
172
|
+
break;
|
173
|
+
}
|
174
|
+
|
175
|
+
return _context2.abrupt("return");
|
176
|
+
|
177
|
+
case 2:
|
178
|
+
_context2.next = 4;
|
179
|
+
return fetchData();
|
180
|
+
|
181
|
+
case 4:
|
182
|
+
data = _context2.sent;
|
183
|
+
return _context2.abrupt("return", data);
|
184
|
+
|
185
|
+
case 6:
|
186
|
+
case "end":
|
187
|
+
return _context2.stop();
|
192
188
|
}
|
193
189
|
}, _callee2);
|
194
190
|
}));
|
@@ -13,16 +13,14 @@ export default function (props) {
|
|
13
13
|
var loadConfig = /*#__PURE__*/function () {
|
14
14
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
|
15
15
|
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
16
|
-
while (1) {
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
return _context.stop();
|
25
|
-
}
|
16
|
+
while (1) switch (_context.prev = _context.next) {
|
17
|
+
case 0:
|
18
|
+
_context.next = 2;
|
19
|
+
return editDispatchers.getConditions();
|
20
|
+
|
21
|
+
case 2:
|
22
|
+
case "end":
|
23
|
+
return _context.stop();
|
26
24
|
}
|
27
25
|
}, _callee);
|
28
26
|
}));
|
@@ -61,16 +59,14 @@ export default function (props) {
|
|
61
59
|
var updateConfig = /*#__PURE__*/function () {
|
62
60
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(config) {
|
63
61
|
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
64
|
-
while (1) {
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
return _context2.stop();
|
73
|
-
}
|
62
|
+
while (1) switch (_context2.prev = _context2.next) {
|
63
|
+
case 0:
|
64
|
+
_context2.next = 2;
|
65
|
+
return editDispatchers.update(config);
|
66
|
+
|
67
|
+
case 2:
|
68
|
+
case "end":
|
69
|
+
return _context2.stop();
|
74
70
|
}
|
75
71
|
}, _callee2);
|
76
72
|
}));
|
@@ -182,28 +178,26 @@ export default function (props) {
|
|
182
178
|
_updateGroupResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(groupData, resources) {
|
183
179
|
var config;
|
184
180
|
return _regeneratorRuntime.wrap(function _callee3$(_context3) {
|
185
|
-
while (1) {
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
return _context3.stop();
|
206
|
-
}
|
181
|
+
while (1) switch (_context3.prev = _context3.next) {
|
182
|
+
case 0:
|
183
|
+
config = getConfig();
|
184
|
+
config.groups = config.groups.map(function (group) {
|
185
|
+
// 匹配到容器,
|
186
|
+
if (matchGroup(group, groupData)) {
|
187
|
+
return _extends({}, group, {
|
188
|
+
resources: resources
|
189
|
+
});
|
190
|
+
} // 未匹配到容器
|
191
|
+
|
192
|
+
|
193
|
+
return group;
|
194
|
+
});
|
195
|
+
_context3.next = 4;
|
196
|
+
return updateConfig(config);
|
197
|
+
|
198
|
+
case 4:
|
199
|
+
case "end":
|
200
|
+
return _context3.stop();
|
207
201
|
}
|
208
202
|
}, _callee3);
|
209
203
|
}));
|
@@ -229,30 +223,28 @@ export default function (props) {
|
|
229
223
|
_addLayerStaticResources = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data, newResourceIds) {
|
230
224
|
var config;
|
231
225
|
return _regeneratorRuntime.wrap(function _callee4$(_context4) {
|
232
|
-
while (1) {
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
return _context4.stop();
|
255
|
-
}
|
226
|
+
while (1) switch (_context4.prev = _context4.next) {
|
227
|
+
case 0:
|
228
|
+
config = getConfig();
|
229
|
+
config.groups = config.groups.map(function (group) {
|
230
|
+
// 匹配到容器, 增加
|
231
|
+
if (matchGroup(group, data)) {
|
232
|
+
return _extends({}, group, {
|
233
|
+
resources: _extends({}, group.resources, {
|
234
|
+
"static": [].concat(group.resources["static"], newResourceIds)
|
235
|
+
})
|
236
|
+
});
|
237
|
+
} // 未匹配到容器
|
238
|
+
|
239
|
+
|
240
|
+
return group;
|
241
|
+
});
|
242
|
+
_context4.next = 4;
|
243
|
+
return updateConfig(config);
|
244
|
+
|
245
|
+
case 4:
|
246
|
+
case "end":
|
247
|
+
return _context4.stop();
|
256
248
|
}
|
257
249
|
}, _callee4);
|
258
250
|
}));
|