bfg-common 1.6.95 → 1.6.97
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/.idea/inspectionProfiles/Project_Default.xml +3 -1
- package/assets/img/icons/icons-sprite-dark-5.svg +15 -2
- package/assets/img/icons/icons-sprite-light-5.svg +18 -5
- package/assets/localization/local_be.json +667 -51
- package/assets/localization/local_en.json +690 -73
- package/assets/localization/local_hy.json +670 -54
- package/assets/localization/local_kk.json +668 -52
- package/assets/localization/local_ru.json +704 -88
- package/assets/localization/local_zh.json +667 -51
- package/assets/scss/clarity/local_ar.json +12 -12
- package/assets/scss/common/global.scss +11 -0
- package/assets/scss/common/normalize.scss +3 -0
- package/assets/scss/common/theme.scss +2 -2
- package/components/atoms/dropdown/dropdown/Dropdown.vue +10 -8
- package/components/atoms/dropdown/dropdown/lib/models/interfaces.ts +1 -0
- package/components/atoms/list/dragDropList/DragDropList.vue +14 -10
- package/components/atoms/stack/StackBlock.vue +1 -1
- package/components/atoms/table/dataGrid/DataGrid.vue +4 -0
- package/components/atoms/table/dataGrid/DataGridColumnSwitch.vue +2 -2
- package/components/atoms/tooltip/TooltipError.vue +3 -0
- package/components/common/adapterManager/AdapterManagerNew.vue +128 -6
- package/components/common/adapterManager/addAdapterModal/AddAdapterModalNew.vue +64 -31
- package/components/common/adapterManager/addAdapterWarningModal/AddAdapterWarningModalNew.vue +3 -4
- package/components/common/adapterManager/ui/actions/bar/Bar.vue +2 -0
- package/components/common/adapterManager/ui/actions/bar/BarNew.vue +3 -2
- package/components/common/adapterManager/ui/actions/moveDownAdapterButton/MoveDownAdapterButtonNew.vue +1 -0
- package/components/common/adapterManager/ui/actions/moveUpAdapterButton/MoveUpAdapterButtonNew.vue +1 -0
- package/components/common/adapterManager/ui/noSelectedAdapter/NoSelectedAdapterNew.vue +10 -4
- package/components/common/adapterManager/ui/secondTitle/SecondTitleNew.vue +16 -1
- package/components/common/adapterManager/ui/table/TableNew.vue +3 -2
- package/components/common/adapterManager/ui/table/adapters/AdaptersNew.vue +70 -36
- package/components/common/adapterManager/ui/table/header/HeaderNew.vue +5 -1
- package/components/common/certificate/Certificate.vue +16 -6
- package/components/common/certificate/Info/Info.vue +61 -0
- package/components/common/certificate/{CertificateInfo.vue → Info/Old.vue} +6 -28
- package/components/common/certificate/Info/new/New.vue +285 -0
- package/components/common/certificate/Info/new/lib/config/index.ts +59 -0
- package/components/common/certificate/Info/new/lib/models/interfaces.ts +3 -0
- package/components/common/certificate/Info/new/lib/utils/index.ts +10 -0
- package/components/common/certificate/Old.vue +27 -0
- package/components/common/certificate/new/New.vue +30 -0
- package/components/common/certificate/new/Skeleton.vue +155 -0
- package/components/common/certificate/tools/New.vue +48 -0
- package/components/common/certificate/tools/Old.vue +39 -0
- package/components/common/certificate/{Tools.vue → tools/Tools.vue} +18 -23
- package/components/common/certificate/tools/lib/config/tabsPannel.ts +20 -0
- package/components/common/configure/physicalAdapters/PhysicalAdapters.vue +190 -0
- package/components/common/configure/physicalAdapters/PhysicalAdaptersNew.vue +392 -0
- package/components/common/configure/physicalAdapters/PhysicalAdaptersOld.vue +307 -0
- package/components/common/configure/physicalAdapters/buttons/Buttons.vue +106 -0
- package/components/common/configure/physicalAdapters/emptyBlock/EmptyBlock.vue +17 -0
- package/components/common/configure/physicalAdapters/emptyBlock/EmptyBlockNew.vue +37 -0
- package/components/common/configure/physicalAdapters/emptyBlock/EmptyBlockOld.vue +26 -0
- package/components/common/configure/physicalAdapters/modals/edit/Edit.vue +124 -0
- package/components/common/configure/physicalAdapters/modals/edit/EditNew.vue +232 -0
- package/components/common/configure/physicalAdapters/modals/edit/EditOld.vue +170 -0
- package/components/common/configure/physicalAdapters/modals/edit/lib/config/config.ts +59 -0
- package/components/common/configure/physicalAdapters/modals/edit/lib/models/interfaces.ts +17 -0
- package/components/common/configure/physicalAdapters/modals/edit/lib/validations/validations.ts +19 -0
- package/components/common/configure/physicalAdapters/tableView/TableView.vue +43 -0
- package/components/common/configure/physicalAdapters/tableView/TableViewNew.vue +345 -0
- package/components/common/configure/physicalAdapters/tableView/TableViewOld.vue +334 -0
- package/components/common/configure/physicalAdapters/tableView/lib/config/physicalAdaptersTableConfig.ts +177 -0
- package/components/common/configure/physicalAdapters/tableView/lib/config/physicalAdaptersTableConfigNew.ts +191 -0
- package/components/common/configure/physicalAdapters/tableView/lib/config/settings.ts +129 -0
- package/components/common/configure/physicalAdapters/tableView/lib/config/tableKeys.ts +14 -0
- package/components/common/configure/physicalAdapters/tableView/lib/models/interfaces.ts +33 -0
- package/components/common/configure/physicalAdapters/tableView/lib/models/types.ts +11 -0
- package/components/common/configure/physicalAdapters/tableView/mappers/mappers.ts +43 -0
- package/components/common/context/recursion/RecursionNew.vue +1 -2
- package/components/common/context/recursion/RecursionOld.vue +2 -2
- package/components/common/diagramMain/Diagram.vue +169 -85
- package/components/common/diagramMain/DiagramMain.vue +40 -10
- package/components/common/diagramMain/header/Header.vue +49 -0
- package/components/common/diagramMain/header/HeaderNew.vue +155 -0
- package/components/common/diagramMain/{Header.vue → header/HeaderOld.vue} +78 -67
- package/components/common/diagramMain/modals/Modals.vue +5 -5
- package/components/common/diagramMain/modals/UnsavedChangesModal.vue +32 -0
- package/components/common/diagramMain/modals/editSettings/EditSettings.vue +104 -102
- package/components/common/diagramMain/modals/editSettings/EditSettingsNew.vue +285 -0
- package/components/common/diagramMain/modals/editSettings/EditSettingsOld.vue +254 -0
- package/components/common/diagramMain/modals/editSettings/confirmTeamingSettingsModal/ConfirmTeamingSettingsModal.vue +31 -0
- package/components/common/diagramMain/modals/editSettings/confirmTeamingSettingsModal/ConfirmTeamingSettingsModalNew.vue +82 -0
- package/components/common/diagramMain/modals/editSettings/{ConfirmTeamingSettingsModal.vue → confirmTeamingSettingsModal/ConfirmTeamingSettingsModalOld.vue} +2 -5
- package/components/common/diagramMain/modals/editSettings/lib/config/config.ts +15 -0
- package/components/common/diagramMain/modals/editSettings/lib/models/interfaces.ts +6 -0
- package/components/common/diagramMain/modals/editSettings/lib/utils/utils.ts +177 -0
- package/components/common/diagramMain/modals/editSettings/modal/EditSettingsModal.vue +137 -0
- package/components/common/diagramMain/modals/editSettings/modal/EditSettingsModalNew.vue +91 -0
- package/components/common/diagramMain/modals/editSettings/{EditSettingsModal.vue → modal/EditSettingsModalOld.vue} +12 -51
- package/components/common/diagramMain/modals/editSettings/tabs/networkProperties/NetworkProperties.vue +158 -0
- package/components/common/diagramMain/modals/editSettings/tabs/networkProperties/NetworkPropertiesNew.vue +262 -0
- package/components/common/diagramMain/modals/editSettings/tabs/{NetworkProperties.vue → networkProperties/NetworkPropertiesOld.vue} +12 -110
- package/components/common/diagramMain/modals/editSettings/tabs/port/ipvFourSettings/IpvFourSettings.vue +192 -0
- package/components/common/diagramMain/modals/editSettings/tabs/port/ipvFourSettings/IpvFourSettingsNew.vue +388 -0
- package/components/common/diagramMain/modals/editSettings/tabs/port/{IpvFourSettings.vue → ipvFourSettings/IpvFourSettingsOld.vue} +11 -152
- package/components/common/diagramMain/modals/editSettings/tabs/port/portProperties/PortProperties.vue +139 -0
- package/components/common/diagramMain/modals/editSettings/tabs/port/portProperties/PortPropertiesNew.vue +286 -0
- package/components/common/diagramMain/modals/editSettings/tabs/port/{PortProperties.vue → portProperties/PortPropertiesOld.vue} +12 -103
- package/components/common/diagramMain/modals/editSettings/tabs/security/Security.vue +209 -0
- package/components/common/diagramMain/modals/editSettings/tabs/security/SecurityNew.vue +233 -0
- package/components/common/diagramMain/modals/editSettings/tabs/{Security.vue → security/SecurityOld.vue} +25 -48
- package/components/common/diagramMain/modals/editSettings/tabs/switchProperties/SwitchProperties.vue +128 -0
- package/components/common/diagramMain/modals/editSettings/tabs/switchProperties/SwitchPropertiesNew.vue +235 -0
- package/components/common/diagramMain/modals/editSettings/tabs/{SwitchProperties.vue → switchProperties/SwitchPropertiesOld.vue} +12 -89
- package/components/common/diagramMain/modals/editSettings/tabs/teamingFailover/TeamingFailover.vue +99 -0
- package/components/common/diagramMain/modals/editSettings/tabs/teamingFailover/TeamingFailoverNew.vue +319 -0
- package/components/common/diagramMain/modals/editSettings/tabs/{TeamingFailover.vue → teamingFailover/TeamingFailoverOld.vue} +11 -48
- package/components/common/diagramMain/modals/editSettings/tabs/trafficShaping/TrafficShaping.vue +173 -0
- package/components/common/diagramMain/modals/editSettings/tabs/trafficShaping/TrafficShapingNew.vue +348 -0
- package/components/common/diagramMain/modals/editSettings/tabs/{TrafficShaping.vue → trafficShaping/TrafficShapingOld.vue} +12 -134
- package/components/common/diagramMain/modals/lib/config/adapterModal.ts +9 -9
- package/components/common/diagramMain/modals/lib/config/diagramConfig.ts +43 -2
- package/components/common/diagramMain/modals/lib/config/index.ts +2 -1
- package/components/common/diagramMain/modals/lib/config/networkModal.ts +15 -15
- package/components/common/diagramMain/modals/lib/config/portModal.ts +12 -12
- package/components/common/diagramMain/modals/lib/config/vCenterModal.ts +2 -2
- package/components/common/diagramMain/modals/lib/config/vmKernelAdapter.ts +1 -1
- package/components/common/diagramMain/modals/lib/utils/index.ts +34 -4
- package/components/common/diagramMain/modals/managePhysicalAdapters/ManagePhysicalAdapters.vue +164 -0
- package/components/common/diagramMain/modals/managePhysicalAdapters/ManagePhysicalAdaptersNew.vue +306 -0
- package/components/common/diagramMain/modals/{ManagePhysicalAdaptersModal.vue → managePhysicalAdapters/ManagePhysicalAdaptersOld.vue} +33 -119
- package/components/common/diagramMain/modals/migrateVmkernelAdapter/MigrateVmkernelAdapter.vue +2 -2
- package/components/common/diagramMain/modals/migrateVmkernelAdapter/steps/ConnectionSettings.vue +3 -2
- package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/common.ts +8 -3
- package/components/common/diagramMain/modals/migrateVmkernelAdapter/validations/connectionSettings.ts +2 -2
- package/components/common/diagramMain/modals/remove/RemoveModalNew.vue +67 -16
- package/components/common/diagramMain/modals/viewSettings/info/InfoNew.vue +17 -0
- package/components/common/diagramMain/modals/viewSettings/viewSettings/ViewSettings.vue +3 -0
- package/components/common/diagramMain/modals/viewSettings/viewSettings/ViewSettingsNew.vue +66 -20
- package/components/common/diagramMain/modals/viewSettings/viewSettingsModal/ViewSettingsModalNew.vue +8 -0
- package/components/common/diagramMain/skeleton/Header.vue +31 -0
- package/components/common/diagramMain/skeleton/Switch.vue +75 -0
- package/components/common/layout/theHeader/Old.vue +1 -5
- package/components/common/layout/theHeader/ThemeSwitch.vue +1 -1
- package/components/common/layout/theHeader/modals/reconnect/New.vue +38 -30
- package/components/common/layout/theHeader/userMenu/modals/changePassword/ChangePassword.vue +16 -10
- package/components/common/layout/theHeader/userMenu/modals/changePassword/New.vue +8 -9
- package/components/common/layout/theHeader/userMenu/modals/preferences/New.vue +7 -0
- package/components/common/layout/theHeader/userMenu/modals/preferences/Old.vue +10 -2
- package/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/ChangeLanguage.vue +12 -8
- package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/DefaultConsole.vue +7 -1
- package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/config/consoleOptions.ts +8 -5
- package/components/common/layout/theHeader/userMenu/modals/preferences/security/Security.vue +48 -28
- package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/TimeFormat.vue +9 -5
- package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions.ts +1 -1
- package/components/common/layout/theHeader/userMenu/modals/preferences/view/New.vue +20 -8
- package/components/common/layout/theHeader/userMenu/modals/preferences/view/Old.vue +11 -11
- package/components/common/layout/theHeader/userMenu/modals/preferences/view/View.vue +12 -6
- package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue +3 -1
- package/components/common/modals/Rename.vue +3 -1
- package/components/common/modals/newFolder/new/Location.vue +21 -1
- package/components/common/monitor/advanced/Advanced.vue +8 -5
- package/components/common/monitor/advanced/AdvancedNew.vue +4 -2
- package/components/common/monitor/advanced/AdvancedOld.vue +8 -3
- package/components/common/monitor/advanced/table/lib/models/interfaces.ts +1 -0
- package/components/common/monitor/advanced/table/lib/models/types.ts +1 -4
- package/components/common/monitor/advanced/table/tableNew/TableNew.vue +1 -0
- package/components/common/monitor/advanced/table/tableNew/lib/config/options.ts +8 -38
- package/components/common/monitor/advanced/table/tableNew/lib/utils/constructBody.ts +5 -7
- package/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable.ts +27 -31
- package/components/common/monitor/advanced/tools/Tools.vue +17 -13
- package/components/common/monitor/advanced/tools/ToolsNew.vue +4 -2
- package/components/common/monitor/advanced/tools/ToolsOld.vue +4 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue +38 -18
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalNew.vue +99 -80
- package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModalOld.vue +9 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/actions/ActionsOld.vue +1 -1
- package/components/common/monitor/advanced/tools/chartOptionsModal/actions/lib/utils/optionsActions.ts +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue +13 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersNew.vue +22 -4
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/CountersOld.vue +9 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue +7 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/config/utils.ts +1901 -493
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/models/interfaces.ts +5 -0
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +9 -0
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/tableOld/lib/config/tableConfig.ts +4 -4
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/Timespan.vue +3 -3
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanNew.vue +14 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/TimespanOld.vue +2 -2
- package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue +22 -21
- package/components/common/monitor/advanced/tools/chartOptionsModal/lib/config/index.ts +2 -0
- package/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit.ts +11 -4
- package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/MetricsNew.vue +2 -0
- package/components/common/monitor/advanced/tools/chartOptionsModal/metrics/lib/config/optionsMetrics.ts +34 -1
- package/components/common/monitor/advanced/tools/lib/config/advancedToolbar.ts +80 -11
- package/components/common/monitor/lib/utils/local_be.json +714 -0
- package/components/common/monitor/lib/utils/local_en.json +714 -0
- package/components/common/monitor/lib/utils/local_hy.json +714 -0
- package/components/common/monitor/lib/utils/local_kk.json +714 -0
- package/components/common/monitor/lib/utils/local_ru.json +714 -0
- package/components/common/monitor/lib/utils/local_zh.json +714 -0
- package/components/common/monitor/lib/utils/localization.ts +43 -0
- package/components/common/monitor/overview/filters/lib/config/filterOptions.ts +3 -1
- package/components/common/monitor/utilization/Old.vue +120 -0
- package/components/common/monitor/utilization/Utilization.vue +65 -0
- package/components/common/monitor/utilization/infoBlock/InfoBlock.vue +146 -0
- package/components/common/monitor/utilization/infoBlock/New.vue +185 -0
- package/components/common/monitor/utilization/infoBlock/Old.vue +190 -0
- package/components/common/monitor/utilization/infoBlock/progressBar/New.vue +64 -0
- package/components/common/monitor/utilization/infoBlock/progressBar/Old.vue +65 -0
- package/components/common/monitor/utilization/infoBlock/progressBar/ProgressBar.vue +84 -0
- package/components/common/monitor/utilization/infoBlock/progressBar/lib/models/interfaces.ts +10 -0
- package/components/common/monitor/utilization/lib/models/interfaces.ts +27 -0
- package/components/common/monitor/utilization/lib/models/types.ts +1 -0
- package/components/common/monitor/utilization/lib/utils/index.ts +112 -0
- package/components/common/monitor/utilization/new/New.vue +195 -0
- package/components/common/monitor/utilization/new/Portlet.vue +42 -0
- package/components/common/monitor/utilization/new/Skeleton.vue +120 -0
- package/components/common/monitor/utilization/new/lib/utils/newPortlet.ts +7 -0
- package/components/common/noDataProvided/NoDataProvided.vue +17 -0
- package/components/common/noDataProvided/NoDataProvidedNew.vue +66 -0
- package/components/common/noDataProvided/NoDataProvidedOld.vue +18 -0
- package/components/common/pages/auth/TheFooter.vue +9 -0
- package/components/common/pages/backups/lib/models/interfaces.ts +1 -0
- package/components/common/pages/backups/modals/Modals.vue +1 -0
- package/components/common/pages/backups/modals/createBackup/New.vue +4 -0
- package/components/common/pages/backups/modals/createBackup/Old.vue +1 -1
- package/components/common/pages/backups/modals/createBackup/datastores/tableView/new/lib/config/table.ts +4 -4
- package/components/common/pages/backups/modals/createBackup/datastores/tableView/old/lib/config/table.ts +4 -4
- package/components/common/pages/backups/modals/createBackup/disks/tableView/new/TableView.vue +0 -1
- package/components/common/pages/backups/modals/createBackup/disks/tableView/new/lib/config/table.ts +1 -1
- package/components/common/pages/backups/modals/createBackup/general/General.vue +1 -0
- package/components/common/pages/backups/modals/createBackup/general/GeneralNew.vue +1 -1
- package/components/common/pages/backups/modals/createBackup/general/GeneralOld.vue +59 -9
- package/components/common/pages/backups/modals/lib/config/restore.ts +1 -0
- package/components/common/pages/backups/modals/lib/models/interfaces.ts +1 -0
- package/components/common/pages/backups/modals/restore/New.vue +40 -35
- package/components/common/pages/backups/modals/restore/Restore.vue +4 -5
- package/components/common/pages/backups/modals/restore/disks/tableView/new/Table.vue +6 -1
- package/components/common/pages/backups/modals/restore/disks/tableView/new/lib/config/table.ts +1 -0
- package/components/common/pages/backups/modals/restore/lib/config/steps.ts +1 -1
- package/components/common/pages/backups/modals/restore/name/NameNew.vue +3 -0
- package/components/common/pages/backups/modals/restore/networks/table/new/Table.vue +7 -0
- package/components/common/pages/hardwareHealth/HardwareHealth.vue +69 -148
- package/components/common/pages/hardwareHealth/HardwareHealthNew.vue +252 -0
- package/components/common/pages/hardwareHealth/HardwareHealthOld.vue +192 -0
- package/components/common/pages/hardwareHealth/historyTestimony/Graph.vue +204 -251
- package/components/common/pages/hardwareHealth/historyTestimony/GraphNew.vue +211 -0
- package/components/common/pages/hardwareHealth/historyTestimony/GraphOld.vue +212 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue +96 -248
- package/components/common/pages/hardwareHealth/historyTestimony/tools/ToolsNew.vue +227 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/ToolsOld.vue +289 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModal.vue +110 -112
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalNew.vue +173 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModalOld.vue +168 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/NotificationNew.vue +22 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/Actions.vue +34 -55
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsNew.vue +145 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsOld.vue +81 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/{SaveOptionsModal.vue → saveOptionsModal/SaveOptionsModal.vue} +2 -2
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/Counters.vue +70 -49
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/CountersNew.vue +108 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/CountersOld.vue +93 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/Table.vue +25 -78
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/lib/models/interfaces.ts +13 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/TableNew.vue +58 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/lib/config/options.ts +19 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/lib/config/tableData.ts +73 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableNew/lib/utils/constructTable.ts +31 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/tableOld/TableOld.vue +103 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/{lib → tableOld/lib}/config/tableConfig.ts +3 -1
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/Timespan.vue +50 -33
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/TimespanNew.vue +177 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/timespan/TimespanOld.vue +65 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/metrics/Metrics.vue +15 -9
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/metrics/MetricsNew.vue +121 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/metrics/MetricsOld.vue +22 -0
- package/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar.ts +68 -5
- package/components/common/pages/hardwareHealth/indicators/Indicators.vue +96 -0
- package/components/common/pages/hardwareHealth/indicators/lib/models/interfaces.ts +5 -0
- package/components/common/pages/hardwareHealth/lib/config/status.ts +14 -0
- package/components/common/pages/hardwareHealth/lib/config/tabsPannel.ts +38 -0
- package/components/common/pages/hardwareHealth/lib/models/enums.ts +1 -1
- package/components/common/pages/hardwareHealth/tableView/new/New.vue +230 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/alertWarningTable.ts +99 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/historyTestimonyTable.ts +126 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/sensorTable.ts +164 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/storageSensorsTable.ts +88 -0
- package/components/common/pages/hardwareHealth/tableView/new/lib/config/systemLogTable.ts +74 -0
- package/components/common/pages/hardwareHealth/tableView/{TableView.vue → old/Old.vue} +16 -7
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/alertWarningTable.ts +2 -2
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/historyTestimonyTable.ts +2 -2
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/sensorTable.ts +2 -2
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/storageSensorTable.ts +2 -2
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/systemLogTable.ts +2 -2
- package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/tableKeys.ts +1 -1
- package/components/common/pages/hardwareHealth/tableView/{modal → old/modal}/SensorWarning.vue +3 -0
- package/components/common/pages/hardwareHealth/tooltip/Tooltip.vue +73 -0
- package/components/common/pages/licensing/listView/lib/config/list.ts +1 -1
- package/components/common/pages/scheduledTasks/lib/models/interfaces.ts +6 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue +51 -42
- package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/AfterStartup.vue +20 -48
- package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/New.vue +73 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/Old.vue +65 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/end/End.vue +18 -69
- package/components/common/pages/scheduledTasks/modals/common/frequency/end/New.vue +104 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/end/Old.vue +112 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Interval.vue +22 -53
- package/components/common/pages/scheduledTasks/modals/common/frequency/interval/New.vue +79 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/interval/Old.vue +68 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/lib/utils.ts +1 -1
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/New.vue +170 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/Old.vue +234 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/On.vue +30 -168
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/lib/config/options.ts +17 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/New.vue +66 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/Old.vue +44 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/SelectWeek.vue +17 -28
- package/components/common/pages/scheduledTasks/modals/common/frequency/on/selectWeek/lib/config/weekOptions.ts +20 -50
- package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/New.vue +83 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/Old.vue +77 -0
- package/components/common/pages/scheduledTasks/modals/common/frequency/startOn/StartOn.vue +20 -51
- package/components/common/pages/scheduledTasks/modals/common/taskForm/New.vue +338 -0
- package/components/common/pages/scheduledTasks/modals/common/{newTaskForm/NewTaskForm.vue → taskForm/Old.vue} +12 -69
- package/components/common/pages/scheduledTasks/modals/common/taskForm/TaskForm.vue +129 -0
- package/components/common/pages/scheduledTasks/table/Table.vue +27 -81
- package/components/common/pages/scheduledTasks/table/expandDetails/ExpandDetails.vue +2 -2
- package/components/common/pages/scheduledTasks/table/expandDetails/New.vue +47 -17
- package/components/common/pages/scheduledTasks/table/expandDetails/Old.vue +4 -9
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/HistoryRun.vue +16 -54
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/new/New.vue +146 -0
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/new/lib/config/historyRunsTable.ts +161 -0
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/old/Old.vue +68 -0
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/{lib → old/lib}/config/historyRunsTable.ts +4 -4
- package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/{lib → old/lib}/config/tableKeys.ts +1 -1
- package/components/common/pages/scheduledTasks/table/expandDetails/lib/config/expandDetails.ts +7 -5
- package/components/common/pages/scheduledTasks/table/expandDetails/lib/models/interfaces.ts +8 -0
- package/components/common/pages/scheduledTasks/table/lib/models/enums.ts +13 -0
- package/components/common/pages/scheduledTasks/table/new/New.vue +318 -0
- package/components/common/pages/scheduledTasks/table/new/lib/config/scheduledTasksTable.ts +192 -0
- package/components/common/pages/scheduledTasks/table/new/lib/models/enums.ts +14 -0
- package/components/common/pages/scheduledTasks/table/old/Old.vue +93 -0
- package/components/common/pages/scheduledTasks/table/{lib → old/lib}/config/scheduledTasksTable.ts +13 -9
- package/components/common/pages/scheduledTasks/table/{lib → old/lib}/config/tableKeys.ts +1 -1
- package/components/common/pages/shortcuts/Shortcuts.vue +1 -1
- package/components/common/pages/shortcuts/category/CategoryNew.vue +1 -0
- package/components/common/pages/shortcuts/category/CategoryOld.vue +1 -0
- package/components/common/pages/shortcuts/lib/models/interfaces.ts +2 -0
- package/components/common/pages/tasks/Tasks.vue +4 -1
- package/components/common/pages/tasks/table/Table.vue +25 -23
- package/components/common/readyToComplete/New.vue +1 -0
- package/components/common/spiceConsole/SpiceConsole.vue +38 -0
- package/components/common/spiceConsole/keyboard/Keyboard.vue +5 -2
- package/components/common/split/horizontal/New.vue +6 -3
- package/components/common/split/horizontal/Old.vue +1 -1
- package/components/common/split/vertical/New.vue +42 -8
- package/components/common/split/vertical/Old.vue +31 -2
- package/components/common/split/vertical/Vertical.vue +4 -0
- package/components/common/tools/Actions.vue +8 -3
- package/components/common/tools/lib/models/interfaces.ts +2 -0
- package/components/common/tooltip/Help.vue +28 -28
- package/components/common/vm/actions/add/New.vue +21 -6
- package/components/common/vm/actions/clone/Clone.vue +78 -68
- package/components/common/vm/actions/clone/lib/config/steps.ts +8 -8
- package/components/common/vm/actions/clone/new/New.vue +71 -36
- package/components/common/vm/actions/clone/new/SkeletonName.vue +22 -0
- package/components/common/vm/actions/clone/old/Old.vue +10 -4
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/VirtualHardware.vue +6 -3
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue +4 -0
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/New.vue +2 -1
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/Old.vue +6 -3
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Media.vue +14 -1
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/New.vue +5 -0
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cdDvdDrive/media/Old.vue +1 -0
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Cpu.vue +30 -9
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/New.vue +7 -2
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/Old.vue +6 -2
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/coresPerSocket/CoresPerSocket.vue +29 -7
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/shares/Shares.vue +2 -1
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/Limit.vue +3 -2
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/limit/lib/config/options.ts +6 -3
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Memory.vue +12 -0
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/New.vue +6 -1
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/memory/Old.vue +6 -2
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue +6 -4
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/reservation/New.vue +2 -0
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/reservation/Reservation.vue +9 -12
- package/components/common/vm/actions/common/customizeHardware/vmoptions/bootOptions/order/Order.vue +11 -3
- package/components/common/vm/actions/common/select/createType/lib/config/items.ts +1 -1
- package/components/common/vm/actions/common/select/options/New.vue +56 -48
- package/components/common/vm/actions/common/select/options/Old.vue +42 -24
- package/components/common/vm/actions/common/select/options/Options.vue +33 -2
- package/components/common/vm/actions/common/select/storage/Old.vue +0 -1
- package/components/common/vm/actions/common/select/storage/Storage.vue +2 -3
- package/components/common/vm/actions/common/select/storage/new/New.vue +13 -10
- package/components/common/vm/actions/common/select/storage/new/lib/config/table.ts +13 -15
- package/components/common/vm/actions/confirm/Confirm.vue +3 -0
- package/components/common/vm/actions/consolidate/New.vue +1 -1
- package/components/common/vm/actions/consolidate/Old.vue +2 -2
- package/components/common/vm/actions/editSettings/EditSettings.vue +20 -1
- package/components/common/vm/actions/register/New.vue +55 -27
- package/components/common/vm/actions/register/lib/config/steps.ts +1 -1
- package/components/common/vm/actions/rename/New.vue +11 -1
- package/components/common/vm/actions/rename/Old.vue +1 -0
- package/components/common/vm/actions/rename/Rename.vue +6 -0
- package/components/common/vm/snapshots/DetailView.vue +6 -6
- package/components/common/vm/snapshots/lib/models/types.ts +1 -0
- package/components/common/vm/snapshots/modals/confirm/New.vue +3 -2
- package/components/common/vm/snapshots/modals/confirm/Old.vue +3 -3
- package/components/common/vm/snapshots/modals/confirm/lib/models/enums.ts +2 -0
- package/components/common/vm/snapshots/modals/lib/config/modalTexts.ts +1 -0
- package/components/common/wizards/common/steps/name/New.vue +56 -35
- package/components/common/wizards/datastore/add/New.vue +6 -0
- package/components/common/wizards/datastore/add/lib/config/steps.ts +1 -1
- package/components/common/wizards/datastore/add/steps/_vmfsVersion/lib/config/versionOptions.ts +2 -2
- package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue +60 -42
- package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/AdvancedOptions.vue +7 -1
- package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/New.vue +53 -76
- package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/Old.vue +13 -61
- package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/lib/config/raidOptions.ts +35 -0
- package/components/common/wizards/network/add/Add.vue +99 -109
- package/components/common/wizards/network/add/AddNew.vue +50 -21
- package/components/common/wizards/network/add/AddOld.vue +2 -2
- package/components/common/wizards/network/add/lib/config/config.ts +1 -1
- package/components/common/wizards/network/add/lib/config/initialData.ts +23 -9
- package/components/common/wizards/network/add/lib/config/selectSwitch.ts +5 -4
- package/components/common/wizards/network/add/lib/config/steps.ts +4 -2
- package/components/common/wizards/network/add/lib/models/interfaces.ts +1 -0
- package/components/common/wizards/network/add/lib/utils/utils.ts +8 -3
- package/components/common/wizards/network/add/mappers/mappers.ts +12 -5
- package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettings.vue +19 -13
- package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettingsNew.vue +10 -2
- package/components/common/wizards/network/add/steps/connectionSettings/ConnectionSettingsOld.vue +11 -4
- package/components/common/wizards/network/add/steps/createStandardSwitch/CreateStandardSwitch.vue +8 -26
- package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettings.vue +25 -16
- package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsNew.vue +84 -17
- package/components/common/wizards/network/add/steps/ipFourSettings/IpFourSettingsOld.vue +3 -0
- package/components/common/wizards/network/add/steps/portProperties/PortProperties.vue +13 -9
- package/components/common/wizards/network/add/steps/portProperties/PortPropertiesNew.vue +29 -5
- package/components/common/wizards/network/add/steps/portProperties/PortPropertiesOld.vue +8 -3
- package/components/common/wizards/network/add/steps/readyComplete/ReadyComplete.vue +8 -6
- package/components/common/wizards/network/add/steps/readyComplete/ReadyCompleteNew.vue +16 -7
- package/components/common/wizards/network/add/steps/selectConnectionType/SelectConnectionType.vue +7 -8
- package/components/common/wizards/network/add/steps/selectConnectionType/SelectConnectionTypeNew.vue +4 -0
- package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDevice.vue +11 -12
- package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDeviceNew.vue +89 -19
- package/components/common/wizards/network/add/steps/selectTargetDevice/SelectTargetDeviceOld.vue +4 -0
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/SelectNetwork.vue +8 -9
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/SelectStandardSwitch.vue +8 -9
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/SelectSwitch.vue +9 -10
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/new/SelectNetwork.vue +21 -0
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/new/SelectStandardSwitch.vue +18 -1
- package/components/common/wizards/network/add/steps/selectTargetDevice/modals/new/SelectSwitch.vue +18 -1
- package/components/common/wizards/network/add/validations/common.ts +8 -3
- package/components/common/wizards/network/add/validations/connectionSettings.ts +2 -2
- package/components/common/wizards/network/add/validations/networkValidation.ts +2 -2
- package/components/common/wizards/network/add/validations/portProperties.ts +2 -2
- package/components/common/wizards/vm/migrate/New.vue +15 -4
- package/components/common/wizards/vm/migrate/Old.vue +1 -1
- package/components/common/wizards/vm/migrate/lib/config/constructDataReady.ts +5 -0
- package/components/common/wizards/vm/migrate/lib/config/steps.ts +3 -2
- package/components/common/wizards/vm/migrate/steps/computeResource/ComputeResource.vue +30 -9
- package/components/common/wizards/vm/migrate/steps/computeResource/New.vue +2 -2
- package/components/common/wizards/vm/migrate/steps/computeResource/Old.vue +0 -1
- package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/New.vue +40 -21
- package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/clusterTable.ts +340 -0
- package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/config/hostTable.ts +44 -14
- package/components/common/wizards/vm/migrate/steps/computeResource/tableView/new/lib/models/enums.ts +4 -0
- package/components/common/wizards/vm/migrate/steps/priority/New.vue +7 -2
- package/components/common/wizards/vm/migrate/steps/selectStorage/New.vue +22 -7
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/batch/New.vue +6 -0
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/batch/table/new/New.vue +4 -1
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/batch/table/new/lib/config/datastoreTable.ts +12 -16
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/New.vue +10 -5
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/new/lib/config/diskTable.ts +16 -11
- package/components/common/wizards/vm/migrate/steps/selectStorage/configure/disk/table/old/lib/config/diskTable.ts +7 -1
- package/components/common/wizards/vm/migrate/steps/selectStorage/selectedPerDisk/New.vue +17 -10
- package/components/common/wizards/vm/migrate/steps/type/TypeNew.vue +1 -0
- package/components/common/wizards/vm/migrate/vmOrigin/New.vue +35 -15
- package/composables/useLocalStorage.ts +1 -1
- package/lib/models/interfaces.ts +3 -0
- package/lib/models/store/tasks/enums.ts +3 -0
- package/lib/models/store/tasks/types.ts +7 -6
- package/lib/utils/validation.ts +3 -2
- package/package.json +3 -3
- package/plugins/directives.ts +3 -5
- package/public/spice-console/application/WorkerProcess.js +411 -303
- package/public/spice-console/application/agent.js +18 -17
- package/public/spice-console/application/application.js +7 -6
- package/public/spice-console/lib/graphic.js +55 -11
- package/public/spice-console/process/mainprocess.js +10 -2
- package/public/spice-console/run.js +19 -8
- package/public/spice-console-minify/WorkerProcess.min.js +1 -1
- package/public/spice-console-minify/run.min.js +1 -1
- package/store/tasks/actions.ts +26 -8
- package/store/tasks/mappers/recentTasks.ts +1 -0
- package/components/common/certificate/lib/config/tabsPannel.ts +0 -22
- package/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus.ts +0 -4
- package/components/common/pages/scheduledTasks/table/lib/models/interfaces.ts +0 -11
- /package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/{Notification.vue → NotificationOld.vue} +0 -0
- /package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/counters/table/{lib → tableOld/lib}/models/types.ts +0 -0
- /package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/models/interfaces.ts +0 -0
- /package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/models/types.ts +0 -0
- /package/components/common/pages/scheduledTasks/modals/common/{newTaskForm → taskForm}/lib/models/interfaces.ts +0 -0
- /package/components/common/pages/scheduledTasks/modals/common/{newTaskForm → taskForm}/lib/utils.ts +0 -0
- /package/components/common/pages/scheduledTasks/table/expandDetails/historyRun/{lib → old/lib}/models/types.ts +0 -0
- /package/components/common/pages/scheduledTasks/table/{lib → old/lib}/models/types.ts +0 -0
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="utilization-info-block">
|
|
3
|
+
<div class="header-block">
|
|
4
|
+
<p class="title">{{ props.infoData.title }}</p>
|
|
5
|
+
</div>
|
|
6
|
+
<div class="flex">
|
|
7
|
+
<div class="body-block">
|
|
8
|
+
<common-monitor-utilization-info-block-progress-bar
|
|
9
|
+
:percent="props.barPercent"
|
|
10
|
+
:color="`var(${props.consumedItem.colorKey})`"
|
|
11
|
+
:info-data="null"
|
|
12
|
+
:max-item="props.maxItem"
|
|
13
|
+
/>
|
|
14
|
+
<common-monitor-utilization-info-block-progress-bar
|
|
15
|
+
v-if="props.demandItem"
|
|
16
|
+
:percent="props.barPercent"
|
|
17
|
+
:info-data="props.infoData"
|
|
18
|
+
:max-item="props.maxItem"
|
|
19
|
+
:color="`var(${props.demandItem.colorKey})`"
|
|
20
|
+
/>
|
|
21
|
+
<common-monitor-utilization-info-block-progress-bar
|
|
22
|
+
v-if="props.overheadItem"
|
|
23
|
+
:percent="props.barPercent"
|
|
24
|
+
:info-data="props.infoData"
|
|
25
|
+
:max-item="props.maxItem"
|
|
26
|
+
:color="`var(${props.overheadItem.colorKey})`"
|
|
27
|
+
/>
|
|
28
|
+
<div class="footer-body-block">
|
|
29
|
+
<p>{{ props.minValue }}</p>
|
|
30
|
+
<p>{{ props.maxItem?.value }}</p>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
<ui-icon
|
|
34
|
+
v-if="props.limitItem"
|
|
35
|
+
name="arrow3"
|
|
36
|
+
class="limit-icon"
|
|
37
|
+
width="18px"
|
|
38
|
+
height="18px"
|
|
39
|
+
/>
|
|
40
|
+
<ui-icon
|
|
41
|
+
v-if="props.entitlementItem"
|
|
42
|
+
name="arrow3"
|
|
43
|
+
class="entitlement-icon"
|
|
44
|
+
width="18px"
|
|
45
|
+
height="18px"
|
|
46
|
+
/>
|
|
47
|
+
</div>
|
|
48
|
+
<div class="footer-block">
|
|
49
|
+
<div
|
|
50
|
+
v-for="(item, key) in props.infoData.data"
|
|
51
|
+
:key="key"
|
|
52
|
+
class="footer-item"
|
|
53
|
+
>
|
|
54
|
+
<div class="left-block">
|
|
55
|
+
<div
|
|
56
|
+
v-if="item.color"
|
|
57
|
+
:style="`background-color: ${
|
|
58
|
+
item.colorKey ? `var(${item.colorKey})` : item.color
|
|
59
|
+
}`"
|
|
60
|
+
class="color-block"
|
|
61
|
+
></div>
|
|
62
|
+
<p class="name">{{ item.label }}</p>
|
|
63
|
+
</div>
|
|
64
|
+
<p class="value">{{ item.value }}</p>
|
|
65
|
+
</div>
|
|
66
|
+
</div>
|
|
67
|
+
</div>
|
|
68
|
+
</template>
|
|
69
|
+
|
|
70
|
+
<script setup lang="ts">
|
|
71
|
+
import type { UI_I_UtilizationDataItem } from '~/components/common/monitor/utilization/lib/models/interfaces'
|
|
72
|
+
|
|
73
|
+
const props = defineProps<{
|
|
74
|
+
infoData: UI_I_UtilizationDataItem
|
|
75
|
+
maxItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
76
|
+
consumedItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
77
|
+
overheadItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
78
|
+
demandItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
79
|
+
limitItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
80
|
+
entitlementItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
81
|
+
barPercent: string
|
|
82
|
+
currentTitle: string
|
|
83
|
+
minValue: string
|
|
84
|
+
}>()
|
|
85
|
+
</script>
|
|
86
|
+
|
|
87
|
+
<style scoped lang="scss">
|
|
88
|
+
.utilization-info-block {
|
|
89
|
+
width: 522px;
|
|
90
|
+
padding: 20px;
|
|
91
|
+
border: 1px solid #ccc;
|
|
92
|
+
border-radius: 4px;
|
|
93
|
+
box-shadow: 0 0 2px #ccc;
|
|
94
|
+
|
|
95
|
+
.header-block {
|
|
96
|
+
margin-bottom: 20px;
|
|
97
|
+
|
|
98
|
+
.title {
|
|
99
|
+
font-size: 16px;
|
|
100
|
+
font-weight: 500;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
.body-block {
|
|
105
|
+
width: 80%;
|
|
106
|
+
display: flex;
|
|
107
|
+
flex-direction: column;
|
|
108
|
+
align-items: flex-start;
|
|
109
|
+
gap: 8px;
|
|
110
|
+
margin-bottom: 20px;
|
|
111
|
+
position: relative;
|
|
112
|
+
|
|
113
|
+
.bar {
|
|
114
|
+
width: 100%;
|
|
115
|
+
display: grid;
|
|
116
|
+
grid-template-columns: auto max-content;
|
|
117
|
+
position: relative;
|
|
118
|
+
|
|
119
|
+
.track {
|
|
120
|
+
height: 18px;
|
|
121
|
+
background: #e5e7eb;
|
|
122
|
+
border-radius: 4px;
|
|
123
|
+
overflow: hidden;
|
|
124
|
+
border: 1px solid gray;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
.fill {
|
|
128
|
+
height: 100%;
|
|
129
|
+
border-radius: 2px;
|
|
130
|
+
transition: width 0.8s cubic-bezier(0.4, 0, 0.2, 1);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
.limit-icon {
|
|
134
|
+
position: absolute;
|
|
135
|
+
right: -18px;
|
|
136
|
+
}
|
|
137
|
+
.entitlement-icon {
|
|
138
|
+
position: absolute;
|
|
139
|
+
right: -36px;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
.footer-body-block {
|
|
143
|
+
width: 100%;
|
|
144
|
+
display: flex;
|
|
145
|
+
align-items: center;
|
|
146
|
+
justify-content: space-between;
|
|
147
|
+
|
|
148
|
+
p {
|
|
149
|
+
font-size: 11px;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
.footer-block {
|
|
155
|
+
display: grid;
|
|
156
|
+
grid-row-gap: 5px;
|
|
157
|
+
width: 70%;
|
|
158
|
+
|
|
159
|
+
.footer-item {
|
|
160
|
+
display: grid;
|
|
161
|
+
align-items: center;
|
|
162
|
+
gap: 5px;
|
|
163
|
+
grid-template-columns: 70% 30%;
|
|
164
|
+
|
|
165
|
+
.left-block {
|
|
166
|
+
display: flex;
|
|
167
|
+
align-items: center;
|
|
168
|
+
gap: 5px;
|
|
169
|
+
|
|
170
|
+
.color-block {
|
|
171
|
+
width: 15px;
|
|
172
|
+
height: 15px;
|
|
173
|
+
border: 1px solid black;
|
|
174
|
+
border-radius: 4px;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
.name {
|
|
178
|
+
font-size: 14px;
|
|
179
|
+
font-weight: 500;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
.value {
|
|
184
|
+
font-size: 14px;
|
|
185
|
+
font-weight: 500;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
</style>
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="progress-line">
|
|
3
|
+
<div class="bg w-full">
|
|
4
|
+
<div
|
|
5
|
+
v-if="props.percent !== 0"
|
|
6
|
+
:style="props.innerFillContainerStyles"
|
|
7
|
+
class="inner-fill-container"
|
|
8
|
+
></div>
|
|
9
|
+
<div class="cutted-container-block">
|
|
10
|
+
<div
|
|
11
|
+
v-for="(item, key) in props.itemsForPrint"
|
|
12
|
+
:key="key"
|
|
13
|
+
:style="`width: ${item.width}%;background-color: ${item.color}; left: ${item.left}%`"
|
|
14
|
+
:class="[
|
|
15
|
+
'inner-fill-container',
|
|
16
|
+
{ one: props.itemsForPrint.length === 1 },
|
|
17
|
+
]"
|
|
18
|
+
></div>
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
</div>
|
|
22
|
+
</template>
|
|
23
|
+
|
|
24
|
+
<script setup lang="ts">
|
|
25
|
+
import type {
|
|
26
|
+
UI_I_UtilizationProgressInnerFillStyles,
|
|
27
|
+
UI_I_UtilizationProgressItemForPrint,
|
|
28
|
+
} from '~/components/common/monitor/utilization/infoBlock/progressBar/lib/models/interfaces'
|
|
29
|
+
|
|
30
|
+
const props = defineProps<{
|
|
31
|
+
percent: number | string
|
|
32
|
+
innerFillContainerStyles: UI_I_UtilizationProgressInnerFillStyles
|
|
33
|
+
itemsForPrint: UI_I_UtilizationProgressItemForPrint[]
|
|
34
|
+
}>()
|
|
35
|
+
</script>
|
|
36
|
+
|
|
37
|
+
<style scoped lang="scss">
|
|
38
|
+
.progress-line {
|
|
39
|
+
.bg {
|
|
40
|
+
background: var(--progress-bar-bg);
|
|
41
|
+
height: 20px;
|
|
42
|
+
border-radius: 20px;
|
|
43
|
+
|
|
44
|
+
.inner-fill-container {
|
|
45
|
+
position: absolute;
|
|
46
|
+
height: 20px;
|
|
47
|
+
border-radius: 16px;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
.cutted-container-block {
|
|
51
|
+
.inner-fill-container:not(.one) {
|
|
52
|
+
border-radius: 0;
|
|
53
|
+
|
|
54
|
+
&:first-child {
|
|
55
|
+
border-radius: 16px 0 0 16px;
|
|
56
|
+
}
|
|
57
|
+
&:last-child {
|
|
58
|
+
border-radius: 0 16px 16px 0;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
</style>
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div class="bg w-full">
|
|
3
|
+
<div
|
|
4
|
+
v-if="props.percent !== 0"
|
|
5
|
+
:style="props.innerFillContainerStyles"
|
|
6
|
+
class="inner-fill-container"
|
|
7
|
+
></div>
|
|
8
|
+
<div class="cutted-container-block">
|
|
9
|
+
<div
|
|
10
|
+
v-for="(item, key) in props.itemsForPrint"
|
|
11
|
+
:key="key"
|
|
12
|
+
:style="`width: ${item.width}%;background-color: ${item.color}; left: ${item.left}%`"
|
|
13
|
+
:class="[
|
|
14
|
+
'inner-fill-container',
|
|
15
|
+
{ one: props.itemsForPrint.length === 1 },
|
|
16
|
+
]"
|
|
17
|
+
></div>
|
|
18
|
+
</div>
|
|
19
|
+
</div>
|
|
20
|
+
</template>
|
|
21
|
+
|
|
22
|
+
<script setup lang="ts">
|
|
23
|
+
import type {
|
|
24
|
+
UI_I_UtilizationProgressInnerFillStyles,
|
|
25
|
+
UI_I_UtilizationProgressItemForPrint,
|
|
26
|
+
} from '~/components/common/monitor/utilization/infoBlock/progressBar/lib/models/interfaces'
|
|
27
|
+
|
|
28
|
+
const props = defineProps<{
|
|
29
|
+
percent: number | string
|
|
30
|
+
innerFillContainerStyles: UI_I_UtilizationProgressInnerFillStyles
|
|
31
|
+
itemsForPrint: UI_I_UtilizationProgressItemForPrint[]
|
|
32
|
+
}>()
|
|
33
|
+
</script>
|
|
34
|
+
|
|
35
|
+
<style scoped lang="scss">
|
|
36
|
+
.bg {
|
|
37
|
+
background: #ffffff;
|
|
38
|
+
border: 1px solid #666666;
|
|
39
|
+
height: 20px;
|
|
40
|
+
border-radius: 5px;
|
|
41
|
+
|
|
42
|
+
.inner-fill-container {
|
|
43
|
+
position: absolute;
|
|
44
|
+
height: 20px;
|
|
45
|
+
border-radius: 5px;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
.cutted-container-block {
|
|
49
|
+
.inner-fill-container:not(.one) {
|
|
50
|
+
border-radius: 0;
|
|
51
|
+
|
|
52
|
+
&:first-child {
|
|
53
|
+
border-radius: 5px 0 0 5px;
|
|
54
|
+
}
|
|
55
|
+
&:not(:first-child):not(:last-child) {
|
|
56
|
+
border-left: 1px solid #ffffff;
|
|
57
|
+
border-right: 1px solid #ffffff;
|
|
58
|
+
}
|
|
59
|
+
&:last-child {
|
|
60
|
+
border-radius: 0 5px 5px 0;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
</style>
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<component
|
|
3
|
+
:is="currentComponent"
|
|
4
|
+
:percent="percent"
|
|
5
|
+
:inner-fill-container-styles="innerFillContainerStyles"
|
|
6
|
+
:items-for-print="itemsForPrint"
|
|
7
|
+
/>
|
|
8
|
+
</template>
|
|
9
|
+
|
|
10
|
+
<script setup lang="ts">
|
|
11
|
+
import type { UI_I_UtilizationDataItem } from '~/components/common/monitor/utilization/lib/models/interfaces'
|
|
12
|
+
import type {
|
|
13
|
+
UI_I_UtilizationProgressInnerFillStyles,
|
|
14
|
+
UI_I_UtilizationProgressItemForPrint,
|
|
15
|
+
} from '~/components/common/monitor/utilization/infoBlock/progressBar/lib/models/interfaces'
|
|
16
|
+
|
|
17
|
+
const props = defineProps<{
|
|
18
|
+
infoData: UI_I_UtilizationDataItem | null
|
|
19
|
+
maxItem: UI_I_UtilizationDataItem['data'][0] | null
|
|
20
|
+
percent: number | string
|
|
21
|
+
color: string
|
|
22
|
+
}>()
|
|
23
|
+
|
|
24
|
+
const { $store }: any = useNuxtApp()
|
|
25
|
+
|
|
26
|
+
const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
|
|
27
|
+
const currentComponent = computed(() =>
|
|
28
|
+
isNewView.value
|
|
29
|
+
? defineAsyncComponent(() => import('./New.vue'))
|
|
30
|
+
: defineAsyncComponent(() => import('./Old.vue'))
|
|
31
|
+
)
|
|
32
|
+
|
|
33
|
+
const percent = computed<number>(() => Number(props.percent))
|
|
34
|
+
|
|
35
|
+
const itemsForPrint = ref<UI_I_UtilizationProgressItemForPrint[]>([])
|
|
36
|
+
|
|
37
|
+
const innerFillContainerStyles =
|
|
38
|
+
computed<UI_I_UtilizationProgressInnerFillStyles>(() => ({
|
|
39
|
+
width: `${percent.value}%`,
|
|
40
|
+
backgroundColor: `${props.color}`,
|
|
41
|
+
}))
|
|
42
|
+
|
|
43
|
+
watch(
|
|
44
|
+
() => props.infoData,
|
|
45
|
+
(newValue) => {
|
|
46
|
+
if (!newValue) return
|
|
47
|
+
|
|
48
|
+
newValue.data.forEach((item) => {
|
|
49
|
+
if (
|
|
50
|
+
item.color &&
|
|
51
|
+
!['consumed'].find((item2) =>
|
|
52
|
+
item.labelKey.toLowerCase().includes(item2)
|
|
53
|
+
) &&
|
|
54
|
+
parseFloat(item.value.replace(/[^\d.-]/g, '')) !== 0
|
|
55
|
+
)
|
|
56
|
+
itemsForPrint.value.push(item)
|
|
57
|
+
})
|
|
58
|
+
itemsForPrint.value = itemsForPrint.value.filter((item) =>
|
|
59
|
+
item.value ? parseFloat(item.value.replace(/[^\d.-]/g, '')) !== 0 : false
|
|
60
|
+
)
|
|
61
|
+
|
|
62
|
+
let currentLeft = 0
|
|
63
|
+
|
|
64
|
+
const total = parseFloat(props.maxItem.value.replace(/[^\d.-]/g, ''))
|
|
65
|
+
|
|
66
|
+
itemsForPrint.value = itemsForPrint.value.map((item) => {
|
|
67
|
+
const width = item.value
|
|
68
|
+
? (parseFloat(item.value.replace(/[^\d.-]/g, '')) / total) * 100
|
|
69
|
+
: 0
|
|
70
|
+
|
|
71
|
+
const segment = {
|
|
72
|
+
left: currentLeft,
|
|
73
|
+
width: width,
|
|
74
|
+
color: item.colorKey ? `var(${item.colorKey})` : item.color,
|
|
75
|
+
}
|
|
76
|
+
currentLeft += width
|
|
77
|
+
return segment
|
|
78
|
+
})
|
|
79
|
+
},
|
|
80
|
+
{ immediate: true, deep: true }
|
|
81
|
+
)
|
|
82
|
+
</script>
|
|
83
|
+
|
|
84
|
+
<style scoped lang="scss"></style>
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { UI_T_UtilizationDataItemType } from '~/components/common/monitor/utilization/lib/models/types'
|
|
2
|
+
|
|
3
|
+
export interface API_UI_I_UtilizationDataItem {
|
|
4
|
+
items: {
|
|
5
|
+
label: string
|
|
6
|
+
value: string
|
|
7
|
+
}[]
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export interface API_UI_I_UtilizationData {
|
|
11
|
+
[key: string]: API_UI_I_UtilizationDataItem
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface UI_I_UtilizationDataItem {
|
|
15
|
+
id: string
|
|
16
|
+
isShow: boolean
|
|
17
|
+
title: string
|
|
18
|
+
type: UI_T_UtilizationDataItemType
|
|
19
|
+
data: {
|
|
20
|
+
label: string
|
|
21
|
+
labelKey: string
|
|
22
|
+
value: string
|
|
23
|
+
color: string
|
|
24
|
+
colorKey: string
|
|
25
|
+
iconName: string
|
|
26
|
+
}[]
|
|
27
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type UI_T_UtilizationDataItemType = 'cpu' | 'memory'
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
API_UI_I_UtilizationData,
|
|
3
|
+
UI_I_UtilizationDataItem,
|
|
4
|
+
} from '~/components/common/monitor/utilization/lib/models/interfaces'
|
|
5
|
+
import type { UI_I_Localization } from '~/lib/models/interfaces'
|
|
6
|
+
import type { T_NodeType } from '~/components/templates/inventory/lib/models/types'
|
|
7
|
+
import { getMetricsLocalizationByKey } from '~/components/common/monitor/lib/utils/localization'
|
|
8
|
+
|
|
9
|
+
const currentColorKey = (value: string): string => {
|
|
10
|
+
let result: string = ''
|
|
11
|
+
const valueLowerCase = value.toLowerCase()
|
|
12
|
+
if (valueLowerCase.includes('consumed'))
|
|
13
|
+
result = '--utilization-settings-consumed-info-color'
|
|
14
|
+
if (valueLowerCase.includes('demand'))
|
|
15
|
+
result = '--utilization-settings-demand-info-color'
|
|
16
|
+
if (valueLowerCase.includes('overhead'))
|
|
17
|
+
result = '--utilization-settings-overhead-info-color'
|
|
18
|
+
if (valueLowerCase.includes('granted'))
|
|
19
|
+
result = '--utilization-settings-granted-info-color'
|
|
20
|
+
if (valueLowerCase.includes('active'))
|
|
21
|
+
result = '--utilization-settings-active-info-color'
|
|
22
|
+
if (valueLowerCase.includes('swapped'))
|
|
23
|
+
result = '--utilization-settings-swapped-info-color'
|
|
24
|
+
if (valueLowerCase.includes('ballooned'))
|
|
25
|
+
result = '--utilization-settings-ballooned-info-color'
|
|
26
|
+
if (valueLowerCase.includes('unaccessed'))
|
|
27
|
+
result = '--utilization-settings-unaccessed-info-color'
|
|
28
|
+
|
|
29
|
+
return result
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const currentTitle = (
|
|
33
|
+
routeType: T_NodeType,
|
|
34
|
+
currentType: string,
|
|
35
|
+
localization: UI_I_Localization
|
|
36
|
+
): string => {
|
|
37
|
+
let result: string = ''
|
|
38
|
+
|
|
39
|
+
if (routeType === 'host') {
|
|
40
|
+
if (currentType === 'cpu') result = localization.common.hostCpu
|
|
41
|
+
if (currentType === 'memory') result = localization.common.hostMem
|
|
42
|
+
} else if (routeType === 'vm') {
|
|
43
|
+
if (currentType === 'cpu')
|
|
44
|
+
result = localization.inventoryMonitor.virtualMachineCpu
|
|
45
|
+
if (currentType === 'memory')
|
|
46
|
+
result = localization.inventoryMonitor.virtualMachineMemory
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
return result
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
export const constructApiData = (
|
|
53
|
+
apiData: API_UI_I_UtilizationData | null,
|
|
54
|
+
localization: UI_I_Localization,
|
|
55
|
+
routeType: T_NodeType
|
|
56
|
+
): UI_I_UtilizationDataItem[] => {
|
|
57
|
+
if (!apiData) return []
|
|
58
|
+
|
|
59
|
+
const result: UI_I_UtilizationDataItem[] = []
|
|
60
|
+
const utilizationPortletsShow = useLocalStorage('utilization-portlets-show')
|
|
61
|
+
|
|
62
|
+
Object.keys(apiData).forEach((key) => {
|
|
63
|
+
let currentType = ''
|
|
64
|
+
if (key.includes('cpu')) currentType = 'cpu'
|
|
65
|
+
else if (key.includes('memory')) currentType = 'memory'
|
|
66
|
+
|
|
67
|
+
let isShow = true
|
|
68
|
+
if (utilizationPortletsShow) isShow = utilizationPortletsShow.includes(key)
|
|
69
|
+
|
|
70
|
+
result.push({
|
|
71
|
+
isShow,
|
|
72
|
+
id: key,
|
|
73
|
+
title: currentTitle(routeType, currentType, localization) || key,
|
|
74
|
+
type: currentType,
|
|
75
|
+
data: apiData[key].items.map((item) => {
|
|
76
|
+
const color = ![
|
|
77
|
+
'capacity',
|
|
78
|
+
'limit',
|
|
79
|
+
'vcpus',
|
|
80
|
+
'usagepercent',
|
|
81
|
+
'ballooncurrentbytes',
|
|
82
|
+
'balloonmaxbytes',
|
|
83
|
+
'entitlement',
|
|
84
|
+
].find((item2) => item.label.toLowerCase().includes(item2))
|
|
85
|
+
? '#' +
|
|
86
|
+
Math.floor(Math.random() * 0xffffff)
|
|
87
|
+
.toString(16)
|
|
88
|
+
.padStart(6, '0')
|
|
89
|
+
: ''
|
|
90
|
+
const colorKey = currentColorKey(item.label)
|
|
91
|
+
const labelKey = item.label
|
|
92
|
+
const label = getMetricsLocalizationByKey(item.label)
|
|
93
|
+
|
|
94
|
+
const iconName =
|
|
95
|
+
labelKey.toLowerCase().includes('limit') ||
|
|
96
|
+
labelKey.toLowerCase().includes('entitlement')
|
|
97
|
+
? 'arrow3'
|
|
98
|
+
: ''
|
|
99
|
+
|
|
100
|
+
return {
|
|
101
|
+
...item,
|
|
102
|
+
color,
|
|
103
|
+
colorKey,
|
|
104
|
+
labelKey,
|
|
105
|
+
label,
|
|
106
|
+
iconName,
|
|
107
|
+
}
|
|
108
|
+
}),
|
|
109
|
+
})
|
|
110
|
+
})
|
|
111
|
+
return result
|
|
112
|
+
}
|