@riil-frontend/component-topology 11.0.34 → 11.0.36

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.
Files changed (218) hide show
  1. package/build/1.js +2 -2
  2. package/build/2.js +1 -1
  3. package/build/index.css +4 -2
  4. package/build/index.js +49 -34
  5. package/es/components/MultiResourceDrawer/index.js +16 -18
  6. package/es/components/ResourceList/ResourceSelect.js +48 -50
  7. package/es/components/ResourceSelectDrawer/ResourceSelectDrawer.js +24 -26
  8. package/es/components/SingleResourceDrawer/SelectDrawer.js +18 -20
  9. package/es/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +23 -25
  10. package/es/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +78 -84
  11. package/es/core/components/titlebar/widgets/TitleWidget.js +5 -3
  12. package/es/core/editor/components/BackgroundView/UploadDialog/index.js +17 -18
  13. package/es/core/editor/components/BackgroundView/index.js +119 -129
  14. package/es/core/editor/components/CustomIconPlugin/RenameDialog.js +20 -22
  15. package/es/core/editor/components/CustomIconPlugin/UploadIconDialog.js +33 -34
  16. package/es/core/editor/components/CustomIconPlugin/utils/svgToShape.js +15 -17
  17. package/es/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +7 -9
  18. package/es/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +37 -41
  19. package/es/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +50 -54
  20. package/es/core/editor/components/Toolbar/widgets/FontColorButton.js +50 -54
  21. package/es/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +11 -13
  22. package/es/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +21 -23
  23. package/es/core/editor/components/settings/propertyViews/node/data/Data.js +15 -17
  24. package/es/core/editor/components/settings/propertyViews/view/BackgroundSize.js +10 -12
  25. package/es/core/editor/components/titlebar/TopoEditorTitleBar.js +21 -27
  26. package/es/core/editor/hooks/useKeyboardShortcut.js +2 -2
  27. package/es/core/editor/hooks/useNewElementTheme.js +2 -2
  28. package/es/core/editor/store/background.js +8 -10
  29. package/es/core/editor/store/topoEdit.js +4 -6
  30. package/es/core/editor/utils/edgeTypeStyleUtil.js +2 -4
  31. package/es/core/hooks/usePolling.js +117 -121
  32. package/es/core/hooks/useResourceConfig.js +58 -66
  33. package/es/core/hooks/useTopoEdit.js +473 -503
  34. package/es/core/models/Alarm.js +281 -298
  35. package/es/core/models/AttributeMetricDisplay.js +101 -107
  36. package/es/core/models/PluginManager.js +4 -3
  37. package/es/core/models/SelectionModel.js +4 -5
  38. package/es/core/models/TopoApp.js +205 -240
  39. package/es/core/models/TopoGraphView.js +18 -21
  40. package/es/core/models/cache/CiCache.js +28 -27
  41. package/es/core/models/cache/CiTypeCache.js +37 -41
  42. package/es/core/models/cache/DictCache.js +33 -35
  43. package/es/core/models/graph/Background.js +15 -17
  44. package/es/core/models/plugins/resourceWebControllUrl.js +76 -82
  45. package/es/core/models/tagstips/ElementTagTipConfig.js +34 -38
  46. package/es/core/models/topoData.js +68 -70
  47. package/es/core/models/utils/linkUtils.js +41 -43
  48. package/es/core/models/utils/nodeNameVisibleUtil.js +4 -4
  49. package/es/core/services/alarm.js +14 -16
  50. package/es/core/services/background.js +59 -67
  51. package/es/core/services/cmdb/metric.js +9 -11
  52. package/es/core/services/cmdb.js +18 -20
  53. package/es/core/services/index.js +39 -45
  54. package/es/core/services/overview.js +131 -151
  55. package/es/core/services/topo/basic.js +37 -41
  56. package/es/core/services/topo/tagtip.js +10 -12
  57. package/es/core/store/models/ciModel.js +58 -62
  58. package/es/core/store/models/customIcon.js +120 -134
  59. package/es/core/store/models/displayConfig.js +15 -19
  60. package/es/core/store/models/selection.js +4 -6
  61. package/es/core/store/models/topoAlarm.js +162 -145
  62. package/es/core/store/models/topoBaseInfoOverview.js +4 -6
  63. package/es/core/store/models/topoBizMod.js +9 -11
  64. package/es/core/store/models/topoConfig.js +215 -231
  65. package/es/core/store/models/topoGraphView.js +4 -6
  66. package/es/core/store/models/topoMod.js +373 -395
  67. package/es/core/utils/edgeUtil.js +2 -1
  68. package/es/core/utils/imageUtil.js +18 -20
  69. package/es/core/utils/saveSerialize.js +9 -11
  70. package/es/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +56 -58
  71. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +15 -17
  72. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +343 -357
  73. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +86 -92
  74. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +39 -41
  75. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +189 -205
  76. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +107 -109
  77. package/es/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +57 -59
  78. package/es/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +33 -37
  79. package/es/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +25 -29
  80. package/es/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +32 -36
  81. package/es/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +17 -19
  82. package/es/networkTopo/components/Link/hook.js +73 -77
  83. package/es/networkTopo/components/Link/index.js +86 -94
  84. package/es/networkTopo/components/Link/setting.js +42 -44
  85. package/es/networkTopo/getTopoData.js +63 -69
  86. package/es/networkTopo/hooks/viewer/useRelateTopo.js +30 -32
  87. package/es/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  88. package/es/networkTopo/models/TopoCenter.js +18 -22
  89. package/es/networkTopo/services/alert.js +18 -22
  90. package/es/networkTopo/services/authorization.js +45 -55
  91. package/es/networkTopo/services/cmdb.js +422 -470
  92. package/es/networkTopo/services/funcAuth.js +22 -24
  93. package/es/networkTopo/services/link.js +107 -117
  94. package/es/networkTopo/services/mdc.js +18 -24
  95. package/es/networkTopo/services/metric.js +23 -27
  96. package/es/networkTopo/services/model.js +445 -509
  97. package/es/networkTopo/services/risk.js +9 -11
  98. package/es/networkTopo/services/topo/auth.js +27 -33
  99. package/es/networkTopo/services/topo/basic.js +251 -289
  100. package/es/networkTopo/services/topo/blacklist.js +20 -24
  101. package/es/networkTopo/services/topo/ciInfo.js +27 -31
  102. package/es/networkTopo/services/topo/icon.js +49 -59
  103. package/es/networkTopo/services/topo/networkLink.js +32 -36
  104. package/es/networkTopo/services/topo/relation.js +9 -11
  105. package/es/networkTopo/services/topo/resourceWebUrl.js +36 -42
  106. package/es/networkTopo/store/functionAuth.js +31 -37
  107. package/es/networkTopo/store/topoCenter.js +142 -152
  108. package/es/networkTopo/store/topoLinkMod.js +4 -6
  109. package/es/networkTopo/store/topoTreeMod.js +170 -182
  110. package/es/networkTopo/utils/exportData.js +52 -54
  111. package/lib/components/MultiResourceDrawer/index.js +16 -18
  112. package/lib/components/ResourceList/ResourceSelect.js +48 -50
  113. package/lib/components/ResourceSelectDrawer/ResourceSelectDrawer.js +27 -29
  114. package/lib/components/SingleResourceDrawer/SelectDrawer.js +18 -20
  115. package/lib/core/components/DisplaySettingDrawer/DisplaySettingDrawer.js +30 -32
  116. package/lib/core/components/DisplaySettingDrawer/hooks/useDisplaySetting.js +78 -84
  117. package/lib/core/components/titlebar/widgets/TitleWidget.js +5 -3
  118. package/lib/core/editor/components/BackgroundView/UploadDialog/index.js +18 -18
  119. package/lib/core/editor/components/BackgroundView/index.js +118 -128
  120. package/lib/core/editor/components/CustomIconPlugin/RenameDialog.js +22 -24
  121. package/lib/core/editor/components/CustomIconPlugin/UploadIconDialog.js +34 -34
  122. package/lib/core/editor/components/CustomIconPlugin/utils/svgToShape.js +19 -21
  123. package/lib/core/editor/components/GroupAddResourceDrawerPlugin/GroupAddResourceDrawer.js +8 -10
  124. package/lib/core/editor/components/Sidebar/views/CanvasPanel/hooks/useCanvasThemeConfig.js +37 -41
  125. package/lib/core/editor/components/Toolbar/widgets/BoxBackgroundButton/BoxBackgroundSetting.js +50 -54
  126. package/lib/core/editor/components/Toolbar/widgets/FontColorButton.js +50 -54
  127. package/lib/core/editor/components/settings/propertyViews/layer/DataTab/DefaultLayerAddResourceDrawer.js +12 -14
  128. package/lib/core/editor/components/settings/propertyViews/node/data/BindResourceDrawer.js +26 -28
  129. package/lib/core/editor/components/settings/propertyViews/node/data/Data.js +15 -17
  130. package/lib/core/editor/components/settings/propertyViews/view/BackgroundSize.js +12 -14
  131. package/lib/core/editor/components/titlebar/TopoEditorTitleBar.js +25 -31
  132. package/lib/core/editor/hooks/useKeyboardShortcut.js +2 -2
  133. package/lib/core/editor/hooks/useNewElementTheme.js +2 -2
  134. package/lib/core/editor/store/background.js +8 -10
  135. package/lib/core/editor/store/topoEdit.js +4 -6
  136. package/lib/core/editor/utils/edgeTypeStyleUtil.js +2 -4
  137. package/lib/core/hooks/usePolling.js +116 -120
  138. package/lib/core/hooks/useResourceConfig.js +58 -66
  139. package/lib/core/hooks/useTopoEdit.js +465 -495
  140. package/lib/core/models/Alarm.js +275 -292
  141. package/lib/core/models/AttributeMetricDisplay.js +104 -110
  142. package/lib/core/models/PluginManager.js +4 -3
  143. package/lib/core/models/SelectionModel.js +4 -5
  144. package/lib/core/models/TopoApp.js +205 -240
  145. package/lib/core/models/TopoGraphView.js +18 -21
  146. package/lib/core/models/cache/CiCache.js +33 -32
  147. package/lib/core/models/cache/CiTypeCache.js +38 -42
  148. package/lib/core/models/cache/DictCache.js +33 -35
  149. package/lib/core/models/graph/Background.js +16 -18
  150. package/lib/core/models/plugins/resourceWebControllUrl.js +74 -80
  151. package/lib/core/models/tagstips/ElementTagTipConfig.js +34 -38
  152. package/lib/core/models/topoData.js +69 -71
  153. package/lib/core/models/utils/linkUtils.js +41 -43
  154. package/lib/core/models/utils/nodeNameVisibleUtil.js +4 -4
  155. package/lib/core/services/alarm.js +18 -20
  156. package/lib/core/services/background.js +70 -78
  157. package/lib/core/services/cmdb/metric.js +10 -12
  158. package/lib/core/services/cmdb.js +20 -22
  159. package/lib/core/services/index.js +45 -51
  160. package/lib/core/services/overview.js +131 -151
  161. package/lib/core/services/topo/basic.js +37 -41
  162. package/lib/core/services/topo/tagtip.js +12 -14
  163. package/lib/core/store/models/ciModel.js +66 -70
  164. package/lib/core/store/models/customIcon.js +120 -134
  165. package/lib/core/store/models/displayConfig.js +15 -19
  166. package/lib/core/store/models/selection.js +4 -6
  167. package/lib/core/store/models/topoAlarm.js +163 -145
  168. package/lib/core/store/models/topoBaseInfoOverview.js +4 -6
  169. package/lib/core/store/models/topoBizMod.js +9 -11
  170. package/lib/core/store/models/topoConfig.js +222 -238
  171. package/lib/core/store/models/topoGraphView.js +4 -6
  172. package/lib/core/store/models/topoMod.js +375 -397
  173. package/lib/core/utils/edgeUtil.js +2 -1
  174. package/lib/core/utils/imageUtil.js +22 -24
  175. package/lib/core/utils/saveSerialize.js +9 -11
  176. package/lib/core/viewer/components/plugins/ResourceDetail/components/ClusterMemberTable.js +56 -58
  177. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/EventsCard.js +15 -17
  178. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/ResourceOverview.js +344 -358
  179. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/Configurator/index.js +86 -92
  180. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/LinkTopoCard.js +39 -41
  181. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/components/LinkTopo/services/index.js +190 -206
  182. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useAlarmAndRiskData.js +107 -109
  183. package/lib/core/viewer/components/plugins/ResourceDetail/components/ResourceOverview/hooks/useMetricModels.js +57 -59
  184. package/lib/core/viewer/components/plugins/ResourceDetail/components/WebConsole/WebConsoleForm/hooks/useWebConsole.js +29 -33
  185. package/lib/core/viewer/components/plugins/ResourceDetail/getCiDisplayMetricModels.js +25 -29
  186. package/lib/core/viewer/components/plugins/ResourceDetail/hooks/useUserId.js +32 -36
  187. package/lib/core/viewer/components/plugins/ResourceWebControllUrlSettingDialog.js +18 -20
  188. package/lib/networkTopo/components/Link/hook.js +73 -77
  189. package/lib/networkTopo/components/Link/index.js +87 -95
  190. package/lib/networkTopo/components/Link/setting.js +42 -44
  191. package/lib/networkTopo/getTopoData.js +63 -69
  192. package/lib/networkTopo/hooks/viewer/useRelateTopo.js +31 -33
  193. package/lib/networkTopo/models/LinkDynamicStyleExecutor.js +2 -2
  194. package/lib/networkTopo/models/TopoCenter.js +18 -22
  195. package/lib/networkTopo/services/alert.js +18 -22
  196. package/lib/networkTopo/services/authorization.js +55 -65
  197. package/lib/networkTopo/services/cmdb.js +422 -470
  198. package/lib/networkTopo/services/funcAuth.js +24 -26
  199. package/lib/networkTopo/services/link.js +108 -118
  200. package/lib/networkTopo/services/mdc.js +21 -27
  201. package/lib/networkTopo/services/metric.js +27 -31
  202. package/lib/networkTopo/services/model.js +445 -509
  203. package/lib/networkTopo/services/risk.js +11 -13
  204. package/lib/networkTopo/services/topo/auth.js +27 -33
  205. package/lib/networkTopo/services/topo/basic.js +252 -290
  206. package/lib/networkTopo/services/topo/blacklist.js +20 -24
  207. package/lib/networkTopo/services/topo/ciInfo.js +34 -38
  208. package/lib/networkTopo/services/topo/icon.js +59 -69
  209. package/lib/networkTopo/services/topo/networkLink.js +32 -36
  210. package/lib/networkTopo/services/topo/relation.js +11 -13
  211. package/lib/networkTopo/services/topo/resourceWebUrl.js +44 -50
  212. package/lib/networkTopo/store/functionAuth.js +31 -37
  213. package/lib/networkTopo/store/topoCenter.js +142 -152
  214. package/lib/networkTopo/store/topoLinkMod.js +4 -6
  215. package/lib/networkTopo/store/topoTreeMod.js +166 -178
  216. package/lib/networkTopo/utils/exportData.js +59 -61
  217. package/lib/utils/htElementDataUtil.js +4 -2
  218. package/package.json +4 -3
@@ -40,118 +40,116 @@ var useAlarmAndRiskData = function useAlarmAndRiskData(props) {
40
40
 
41
41
  function _getAlarmRiskData() {
42
42
  _getAlarmRiskData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
43
- var _alarmList, _yield$resourceOvervi, alarmList, _yield$alarmService$g, _alarmList2, AllComponentsByCiId, _yield$service$getRis, riskList;
43
+ var _alarmList, _yield$resourceOvervi2, alarmList, _yield$alarmService$g2, _alarmList2, AllComponentsByCiId, _yield$service$getRis2, riskList;
44
44
 
45
45
  return _regenerator["default"].wrap(function _callee$(_context) {
46
- while (1) {
47
- switch (_context.prev = _context.next) {
48
- case 0:
49
- if (!isAppTopo) {
50
- _context.next = 9;
51
- break;
52
- }
53
-
54
- _context.next = 3;
55
- return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
56
- id: id // metrics: topModelMetrics,
57
-
58
- });
59
-
60
- case 3:
61
- _yield$resourceOvervi = _context.sent;
62
- alarmList = _yield$resourceOvervi.alarms;
63
- alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
64
- return {
65
- type: 'alarm',
66
- icon: 'gaojing-3',
67
- className: "alarm-color-icon-lv" + item.alertLevel,
68
- title: "[" + item.alertObject + "] " + item.alertTitle,
69
- link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
70
- time: item.createTime,
71
- status: item.status,
72
- params: [{
73
- alertId: item.alertId,
74
- status: 'dealing',
75
- userId: userId,
76
- isBaseAlert: false
77
- }]
78
- };
79
- })) || [];
80
- setAlarmRiskList(alarmList);
81
- _context.next = 24;
46
+ while (1) switch (_context.prev = _context.next) {
47
+ case 0:
48
+ if (!isAppTopo) {
49
+ _context.next = 9;
82
50
  break;
83
-
84
- case 9:
85
- _context.next = 11;
86
- return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
87
- alertStatusList: ['toDeal', 'woDealing', 'dealing'],
88
- // toDeal: 待处理, dealing:处理中
89
- pageNum: 1,
90
- pageSize: 10000,
91
- sortField: 'alertLevel',
92
- sortOrder: 'asc'
93
- });
94
-
95
- case 11:
96
- _yield$alarmService$g = _context.sent;
97
- _alarmList2 = _yield$alarmService$g.datas;
98
- // 2022-07-16 后端不支持多列排序,暂通过前端实现,按创建时间倒序
99
- _alarmList2 = _alarmList2.sort(function (a, b) {
100
- return b.createTime - a.createTime;
101
- });
102
- _alarmList2 = _alarmList2.map(function (item) {
103
- return {
104
- type: 'alarm',
105
- icon: 'gaojing-3',
106
- className: "alarm-color-icon-lv" + item.alertLevel,
107
- title: "" + item.alertObject + item.alertTitle,
108
- link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
109
- time: item.createTime,
110
- status: item.status,
111
- params: [{
112
- alertId: item.alertId,
113
- status: 'dealing',
114
- userId: userId,
115
- isBaseAlert: false
116
- }]
117
- };
118
- }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
119
-
120
- _context.next = 17;
121
- return _overview["default"].queryAllComponentsByCiId(id);
122
-
123
- case 17:
124
- AllComponentsByCiId = _context.sent;
125
- _context.next = 20;
126
- return _overview["default"].getRiskByIds({
127
- ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
128
- return item.id;
129
- })),
130
- statusList: ['toDeal', 'dealing'],
131
- current: 1,
132
- pageSize: 10000
133
- });
134
-
135
- case 20:
136
- _yield$service$getRis = _context.sent;
137
- riskList = _yield$service$getRis.content;
138
- riskList = riskList.map(function (item) {
139
- return {
140
- type: 'risk',
141
- icon: 'Overall_risk_full',
142
- className: 'risk-icon',
143
- title: "" + item.ciName + item.itemName,
144
- link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
145
- time: item.firstFoundTime
146
- };
147
- }); // console.log('告警和风险', alarmList, riskList);
148
-
149
- setAlarmRiskList([].concat(_alarmList2, riskList));
150
-
151
- case 24:
152
- case "end":
153
- return _context.stop();
154
- }
51
+ }
52
+
53
+ _context.next = 3;
54
+ return resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getData({
55
+ id: id // metrics: topModelMetrics,
56
+
57
+ });
58
+
59
+ case 3:
60
+ _yield$resourceOvervi2 = _context.sent;
61
+ alarmList = _yield$resourceOvervi2.alarms;
62
+ alarmList = ((_alarmList = alarmList) === null || _alarmList === void 0 ? void 0 : _alarmList.map(function (item) {
63
+ return {
64
+ type: 'alarm',
65
+ icon: 'gaojing-3',
66
+ className: "alarm-color-icon-lv" + item.alertLevel,
67
+ title: "[" + item.alertObject + "] " + item.alertTitle,
68
+ link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
69
+ time: item.createTime,
70
+ status: item.status,
71
+ params: [{
72
+ alertId: item.alertId,
73
+ status: 'dealing',
74
+ userId: userId,
75
+ isBaseAlert: false
76
+ }]
77
+ };
78
+ })) || [];
79
+ setAlarmRiskList(alarmList);
80
+ _context.next = 24;
81
+ break;
82
+
83
+ case 9:
84
+ _context.next = 11;
85
+ return _alarm["default"].getAlarmByIds([id].concat(childrenIds), {
86
+ alertStatusList: ['toDeal', 'woDealing', 'dealing'],
87
+ // toDeal: 待处理, dealing:处理中
88
+ pageNum: 1,
89
+ pageSize: 10000,
90
+ sortField: 'alertLevel',
91
+ sortOrder: 'asc'
92
+ });
93
+
94
+ case 11:
95
+ _yield$alarmService$g2 = _context.sent;
96
+ _alarmList2 = _yield$alarmService$g2.datas;
97
+ // 2022-07-16 后端不支持多列排序,暂通过前端实现,按创建时间倒序
98
+ _alarmList2 = _alarmList2.sort(function (a, b) {
99
+ return b.createTime - a.createTime;
100
+ });
101
+ _alarmList2 = _alarmList2.map(function (item) {
102
+ return {
103
+ type: 'alarm',
104
+ icon: 'gaojing-3',
105
+ className: "alarm-color-icon-lv" + item.alertLevel,
106
+ title: "" + item.alertObject + item.alertTitle,
107
+ link: "/default/pagecenter/alertDetail/view/" + item.alertId + "?alertId=" + item.alertId + "&resId=" + item.ciId + "&title=" + item.alertObject + "&ruleId=" + item.ruleId,
108
+ time: item.createTime,
109
+ status: item.status,
110
+ params: [{
111
+ alertId: item.alertId,
112
+ status: 'dealing',
113
+ userId: userId,
114
+ isBaseAlert: false
115
+ }]
116
+ };
117
+ }); // fix NEWITOM-33635【南昌大学】网络拓扑上双击设备拉开的抽屉中无法看到风险
118
+
119
+ _context.next = 17;
120
+ return _overview["default"].queryAllComponentsByCiId(id);
121
+
122
+ case 17:
123
+ AllComponentsByCiId = _context.sent;
124
+ _context.next = 20;
125
+ return _overview["default"].getRiskByIds({
126
+ ciIdList: [id].concat(childrenIds, AllComponentsByCiId.map(function (item) {
127
+ return item.id;
128
+ })),
129
+ statusList: ['toDeal', 'dealing'],
130
+ current: 1,
131
+ pageSize: 10000
132
+ });
133
+
134
+ case 20:
135
+ _yield$service$getRis2 = _context.sent;
136
+ riskList = _yield$service$getRis2.content;
137
+ riskList = riskList.map(function (item) {
138
+ return {
139
+ type: 'risk',
140
+ icon: 'Overall_risk_full',
141
+ className: 'risk-icon',
142
+ title: "" + item.ciName + item.itemName,
143
+ link: "/default/healthCheck/riskReport/" + item.id + "?title=\u68C0\u67E5\u62A5\u544A",
144
+ time: item.firstFoundTime
145
+ };
146
+ }); // console.log('告警和风险', alarmList, riskList);
147
+
148
+ setAlarmRiskList([].concat(_alarmList2, riskList));
149
+
150
+ case 24:
151
+ case "end":
152
+ return _context.stop();
155
153
  }
156
154
  }, _callee);
157
155
  }));
@@ -48,77 +48,75 @@ var useMetricModels = function useMetricModels(props) {
48
48
  var monitorMetrics, ciMonitorMetricModels, displayMetricModels, _metricCodes;
49
49
 
50
50
  return _regenerator["default"].wrap(function _callee$(_context) {
51
- while (1) {
52
- switch (_context.prev = _context.next) {
53
- case 0:
54
- _context.next = 2;
55
- return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
56
-
57
- case 2:
58
- monitorMetrics = _context.sent;
59
- ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
60
- return !!monitorMetrics.find(function (item) {
61
- return item === m.code;
62
- });
51
+ while (1) switch (_context.prev = _context.next) {
52
+ case 0:
53
+ _context.next = 2;
54
+ return ((resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.queryMonitorMetricCodes) || _getCiDisplayMetricModels.queryCiMonitorMetricCodes)(id);
55
+
56
+ case 2:
57
+ monitorMetrics = _context.sent;
58
+ ciMonitorMetricModels = ciTypeMeta.metrics.filter(function (m) {
59
+ return !!monitorMetrics.find(function (item) {
60
+ return item === m.code;
63
61
  });
64
-
65
- if (resourceData.attributes['network_link.is_crucial']) {
66
- ciMonitorMetricModels.unshift({
67
- changeValue: null,
68
- code: "netDelayRatio",
69
- id: "netDelayRatio",
70
- isGoldMetric: true,
71
- key: null,
72
- name: "RTT时延",
73
- unit: "ms"
74
- });
75
- ciMonitorMetricModels.unshift({
76
- changeValue: null,
77
- code: "retansRatio",
78
- id: "retansRatio",
79
- isGoldMetric: true,
80
- key: null,
81
- name: "重传率",
82
- unit: "%"
83
- });
84
- } // 未监控不显示指标,临时在这里处理
62
+ });
63
+
64
+ if (resourceData.attributes['network_link.is_crucial']) {
65
+ ciMonitorMetricModels.unshift({
66
+ changeValue: null,
67
+ code: "netDelayRatio",
68
+ id: "netDelayRatio",
69
+ isGoldMetric: true,
70
+ key: null,
71
+ name: "RTT时延",
72
+ unit: "ms"
73
+ });
74
+ ciMonitorMetricModels.unshift({
75
+ changeValue: null,
76
+ code: "retansRatio",
77
+ id: "retansRatio",
78
+ isGoldMetric: true,
79
+ key: null,
80
+ name: "重传率",
81
+ unit: "%"
82
+ });
83
+ } // 未监控不显示指标,临时在这里处理
85
84
 
86
85
 
87
- if (!isMonite) {
88
- ciMonitorMetricModels = [];
89
- }
86
+ if (!isMonite) {
87
+ ciMonitorMetricModels = [];
88
+ }
90
89
 
91
- displayMetricModels = null; // 支持自定义显示指标范围
90
+ displayMetricModels = null; // 支持自定义显示指标范围
92
91
 
93
- if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
94
- _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
95
- type: type,
96
- id: id,
97
- ciType: ciType
98
- });
92
+ if (resourceOverviewProps !== null && resourceOverviewProps !== void 0 && resourceOverviewProps.getMetricCodes) {
93
+ _metricCodes = resourceOverviewProps === null || resourceOverviewProps === void 0 ? void 0 : resourceOverviewProps.getMetricCodes({
94
+ type: type,
95
+ id: id,
96
+ ciType: ciType
97
+ });
99
98
 
100
- if (_metricCodes) {
101
- displayMetricModels = _metricCodes.map(function (code) {
102
- return ciMonitorMetricModels.find(function (item) {
103
- return item.code === code;
104
- });
105
- }).filter(function (item) {
106
- return !!item;
99
+ if (_metricCodes) {
100
+ displayMetricModels = _metricCodes.map(function (code) {
101
+ return ciMonitorMetricModels.find(function (item) {
102
+ return item.code === code;
107
103
  });
108
- }
104
+ }).filter(function (item) {
105
+ return !!item;
106
+ });
109
107
  }
108
+ }
110
109
 
111
- if (!displayMetricModels) {
112
- displayMetricModels = ciMonitorMetricModels;
113
- } // displayMetricModels = displayMetricModels.slice(0, 6);
110
+ if (!displayMetricModels) {
111
+ displayMetricModels = ciMonitorMetricModels;
112
+ } // displayMetricModels = displayMetricModels.slice(0, 6);
114
113
 
115
114
 
116
- return _context.abrupt("return", displayMetricModels);
115
+ return _context.abrupt("return", displayMetricModels);
117
116
 
118
- case 10:
119
- case "end":
120
- return _context.stop();
121
- }
117
+ case 10:
118
+ case "end":
119
+ return _context.stop();
122
120
  }
123
121
  }, _callee);
124
122
  }));
@@ -28,31 +28,29 @@ function _queryWebConsoleUrlById() {
28
28
  var _list, list;
29
29
 
30
30
  return _regenerator["default"].wrap(function _callee2$(_context2) {
31
- while (1) {
32
- switch (_context2.prev = _context2.next) {
33
- case 0:
34
- _context2.prev = 0;
35
- _context2.next = 3;
36
- return _topo["default"].resourceWebUrl.list([id]);
31
+ while (1) switch (_context2.prev = _context2.next) {
32
+ case 0:
33
+ _context2.prev = 0;
34
+ _context2.next = 3;
35
+ return _topo["default"].resourceWebUrl.list([id]);
37
36
 
38
- case 3:
39
- list = _context2.sent;
40
- ;
41
- return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
37
+ case 3:
38
+ list = _context2.sent;
39
+ ;
40
+ return _context2.abrupt("return", (_list = list[list.length - 1]) === null || _list === void 0 ? void 0 : _list.webUrl);
42
41
 
43
- case 8:
44
- _context2.prev = 8;
45
- _context2.t0 = _context2["catch"](0);
42
+ case 8:
43
+ _context2.prev = 8;
44
+ _context2.t0 = _context2["catch"](0);
46
45
 
47
- _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
46
+ _rlog["default"].error('资源web控制台.加载数据异常', _context2.t0);
48
47
 
49
- case 11:
50
- return _context2.abrupt("return", null);
48
+ case 11:
49
+ return _context2.abrupt("return", null);
51
50
 
52
- case 12:
53
- case "end":
54
- return _context2.stop();
55
- }
51
+ case 12:
52
+ case "end":
53
+ return _context2.stop();
56
54
  }
57
55
  }, _callee2, null, [[0, 8]]);
58
56
  }));
@@ -92,19 +90,17 @@ function useWebConsole(props) {
92
90
  function _save() {
93
91
  _save = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(newWebConsoleUrl) {
94
92
  return _regenerator["default"].wrap(function _callee$(_context) {
95
- while (1) {
96
- switch (_context.prev = _context.next) {
97
- case 0:
98
- _context.next = 2;
99
- return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
100
-
101
- case 2:
102
- _message["default"].success('保存成功');
103
-
104
- case 3:
105
- case "end":
106
- return _context.stop();
107
- }
93
+ while (1) switch (_context.prev = _context.next) {
94
+ case 0:
95
+ _context.next = 2;
96
+ return _topo["default"].resourceWebUrl.save(ciId, newWebConsoleUrl || null);
97
+
98
+ case 2:
99
+ _message["default"].success('保存成功');
100
+
101
+ case 3:
102
+ case "end":
103
+ return _context.stop();
108
104
  }
109
105
  }, _callee);
110
106
  }));
@@ -20,23 +20,21 @@ function _queryCiMonitorMetricStrategys() {
20
20
  _queryCiMonitorMetricStrategys = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(id) {
21
21
  var map, monitorMetrics;
22
22
  return _regenerator["default"].wrap(function _callee$(_context) {
23
- while (1) {
24
- switch (_context.prev = _context.next) {
25
- case 0:
26
- _context.next = 2;
27
- return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
23
+ while (1) switch (_context.prev = _context.next) {
24
+ case 0:
25
+ _context.next = 2;
26
+ return _componentTopologyUtils.request.post('/mdc/v1/api/strategy/queryMonitorMetrics', [id]);
28
27
 
29
- case 2:
30
- map = _context.sent;
31
- monitorMetrics = (map[id] || []).filter(function (item) {
32
- return item.metricType !== 'info';
33
- });
34
- return _context.abrupt("return", monitorMetrics);
28
+ case 2:
29
+ map = _context.sent;
30
+ monitorMetrics = (map[id] || []).filter(function (item) {
31
+ return item.metricType !== 'info';
32
+ });
33
+ return _context.abrupt("return", monitorMetrics);
35
34
 
36
- case 5:
37
- case "end":
38
- return _context.stop();
39
- }
35
+ case 5:
36
+ case "end":
37
+ return _context.stop();
40
38
  }
41
39
  }, _callee);
42
40
  }));
@@ -51,22 +49,20 @@ function _queryCiMonitorMetricCodes() {
51
49
  _queryCiMonitorMetricCodes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(id) {
52
50
  var arr;
53
51
  return _regenerator["default"].wrap(function _callee2$(_context2) {
54
- while (1) {
55
- switch (_context2.prev = _context2.next) {
56
- case 0:
57
- _context2.next = 2;
58
- return queryCiMonitorMetricStrategys(id);
52
+ while (1) switch (_context2.prev = _context2.next) {
53
+ case 0:
54
+ _context2.next = 2;
55
+ return queryCiMonitorMetricStrategys(id);
59
56
 
60
- case 2:
61
- arr = _context2.sent;
62
- return _context2.abrupt("return", arr.map(function (item) {
63
- return item.code;
64
- }));
57
+ case 2:
58
+ arr = _context2.sent;
59
+ return _context2.abrupt("return", arr.map(function (item) {
60
+ return item.code;
61
+ }));
65
62
 
66
- case 4:
67
- case "end":
68
- return _context2.stop();
69
- }
63
+ case 4:
64
+ case "end":
65
+ return _context2.stop();
70
66
  }
71
67
  }, _callee2);
72
68
  }));
@@ -29,42 +29,38 @@ function useUserId(props) {
29
29
  function _fetchUserId() {
30
30
  _fetchUserId = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
31
31
  return _regenerator["default"].wrap(function _callee2$(_context2) {
32
- while (1) {
33
- switch (_context2.prev = _context2.next) {
34
- case 0:
35
- setUserId(function (prev) {
36
- // console.log('获取用户id', prev);
37
- // 如果已经获取过,就不再重新获取
38
- if (!prev) {
39
- (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
40
- var res;
41
- return _regenerator["default"].wrap(function _callee$(_context) {
42
- while (1) {
43
- switch (_context.prev = _context.next) {
44
- case 0:
45
- _context.next = 2;
46
- return _overview["default"].getUserId();
47
-
48
- case 2:
49
- res = _context.sent;
50
- setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
51
-
52
- case 4:
53
- case "end":
54
- return _context.stop();
55
- }
56
- }
57
- }, _callee);
58
- }))();
59
- }
60
-
61
- return prev;
62
- });
63
-
64
- case 1:
65
- case "end":
66
- return _context2.stop();
67
- }
32
+ while (1) switch (_context2.prev = _context2.next) {
33
+ case 0:
34
+ setUserId(function (prev) {
35
+ // console.log('获取用户id', prev);
36
+ // 如果已经获取过,就不再重新获取
37
+ if (!prev) {
38
+ (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
39
+ var res;
40
+ return _regenerator["default"].wrap(function _callee$(_context) {
41
+ while (1) switch (_context.prev = _context.next) {
42
+ case 0:
43
+ _context.next = 2;
44
+ return _overview["default"].getUserId();
45
+
46
+ case 2:
47
+ res = _context.sent;
48
+ setUserId((res === null || res === void 0 ? void 0 : res.user_id) || '');
49
+
50
+ case 4:
51
+ case "end":
52
+ return _context.stop();
53
+ }
54
+ }, _callee);
55
+ }))();
56
+ }
57
+
58
+ return prev;
59
+ });
60
+
61
+ case 1:
62
+ case "end":
63
+ return _context2.stop();
68
64
  }
69
65
  }, _callee2);
70
66
  }));
@@ -59,29 +59,27 @@ function ResourceWebControllUrlSettingDialog(props) {
59
59
  var _yield$field$validate, errors, values;
60
60
 
61
61
  return _regenerator["default"].wrap(function _callee$(_context) {
62
- while (1) {
63
- switch (_context.prev = _context.next) {
64
- case 0:
65
- _context.next = 2;
66
- return field.validatePromise();
67
-
68
- case 2:
69
- _yield$field$validate = _context.sent;
70
- errors = _yield$field$validate.errors;
71
- values = _yield$field$validate.values;
72
-
73
- if (errors) {
74
- _context.next = 8;
75
- break;
76
- }
62
+ while (1) switch (_context.prev = _context.next) {
63
+ case 0:
64
+ _context.next = 2;
65
+ return field.validatePromise();
77
66
 
67
+ case 2:
68
+ _yield$field$validate = _context.sent;
69
+ errors = _yield$field$validate.errors;
70
+ values = _yield$field$validate.values;
71
+
72
+ if (errors) {
78
73
  _context.next = 8;
79
- return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
74
+ break;
75
+ }
76
+
77
+ _context.next = 8;
78
+ return resourceWebControllUrl.setting.saveResourceWebUrl(resourceWebControllUrl.setting.getCurrentId(), values.url);
80
79
 
81
- case 8:
82
- case "end":
83
- return _context.stop();
84
- }
80
+ case 8:
81
+ case "end":
82
+ return _context.stop();
85
83
  }
86
84
  }, _callee);
87
85
  }));