bfg-common 1.5.847 → 1.5.849
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/assets/localization/local_be.json +7 -1
- package/assets/localization/local_en.json +7 -1
- package/assets/localization/local_hy.json +7 -1
- package/assets/localization/local_kk.json +7 -1
- package/assets/localization/local_ru.json +7 -1
- package/assets/localization/local_zh.json +7 -1
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/Sa.vue +18 -12
- package/components/common/vm/actions/common/customizeHardware/virtualHardware/cpu/sa/lib/utils/validation.ts +4 -4
- package/package.json +1 -1
|
@@ -2663,8 +2663,14 @@
|
|
|
2663
2663
|
"select": "Выбраць",
|
|
2664
2664
|
"unselected": "Выбар не выбраны",
|
|
2665
2665
|
"userActionLock": "Адключыць",
|
|
2666
|
+
"userActionLockTitle": "Адключыць карыстальніка",
|
|
2667
|
+
"userActionLockDesc": "Адключыць карыстальніка?",
|
|
2666
2668
|
"userActionEnable": "Разблакіраваць",
|
|
2667
|
-
"
|
|
2669
|
+
"userActionEnableTitle": "Разблакіраваць карыстальніка",
|
|
2670
|
+
"userActionEnableDesc": "Разблакіраваць карыстальніка?",
|
|
2671
|
+
"userActionDisable": "Заблакіраваць",
|
|
2672
|
+
"userActionDisableTitle": "Заблакіраваць карыстальніка",
|
|
2673
|
+
"userActionDisableDesc": "Заблакіраваць карыстальніка?"
|
|
2668
2674
|
},
|
|
2669
2675
|
"inventoryConfigure": {
|
|
2670
2676
|
"acceptanceLevel": "узровень прыняцця",
|
|
@@ -2667,8 +2667,14 @@
|
|
|
2667
2667
|
"selected": "Selected",
|
|
2668
2668
|
"unselected": "Unselected",
|
|
2669
2669
|
"userActionLock": "Disconnect",
|
|
2670
|
+
"userActionLockTitle": "Disconnect user",
|
|
2671
|
+
"userActionLockDesc": "Disconnect User?",
|
|
2670
2672
|
"userActionEnable": "Unlock",
|
|
2671
|
-
"
|
|
2673
|
+
"userActionEnableTitle": "Unlock User",
|
|
2674
|
+
"userActionEnableDesc": "Unlock User?",
|
|
2675
|
+
"userActionDisable": "Block",
|
|
2676
|
+
"userActionDisableTitle": "Block User",
|
|
2677
|
+
"userActionDisableDesc": "Block User?"
|
|
2672
2678
|
},
|
|
2673
2679
|
"inventoryConfigure": {
|
|
2674
2680
|
"acceptanceLevel": "Acceptance level",
|
|
@@ -2667,8 +2667,14 @@
|
|
|
2667
2667
|
"select": "Ընտրել",
|
|
2668
2668
|
"unselected": "Չընտրված",
|
|
2669
2669
|
"userActionLock": "Անջատել",
|
|
2670
|
+
"userActionLockTitle": "Անջատել օգտվողին",
|
|
2671
|
+
"userActionLockDesc": "Անջատե՞լ օգտվողին",
|
|
2670
2672
|
"userActionEnable": "Ապակողպել",
|
|
2671
|
-
"
|
|
2673
|
+
"userActionEnableTitle": "Ապակողպել օգտվողին",
|
|
2674
|
+
"userActionEnableDesc": "Ապակողպե՞լ օգտվողին",
|
|
2675
|
+
"userActionDisable": "Արգելափակել",
|
|
2676
|
+
"userActionDisableTitle": "Արգելափակել օգտվողին",
|
|
2677
|
+
"userActionDisableDesc": "Արգելափակե՞լ օգտվողին"
|
|
2672
2678
|
},
|
|
2673
2679
|
"inventoryConfigure": {
|
|
2674
2680
|
"acceptanceLevel": "ընդունման մակարդակ",
|
|
@@ -2666,8 +2666,14 @@
|
|
|
2666
2666
|
"selected": "Таңдалған",
|
|
2667
2667
|
"unselected": "Таңдаудан алынды",
|
|
2668
2668
|
"userActionLock": "Ажырату",
|
|
2669
|
+
"userActionLockTitle": "Пайдаланушыны ажырату",
|
|
2670
|
+
"userActionLockDesc": "Пайдаланушыны ажырату керек пе?",
|
|
2669
2671
|
"userActionEnable": "Құлыптан ашу",
|
|
2670
|
-
"
|
|
2672
|
+
"userActionEnableTitle": "Пайдаланушыны құлыптан ашу",
|
|
2673
|
+
"userActionEnableDesc": "Пайдаланушыны құлыптан ашу керек пе?",
|
|
2674
|
+
"userActionDisable": "Бұғаттау",
|
|
2675
|
+
"userActionDisableTitle": "Пайдаланушыны бұғаттау",
|
|
2676
|
+
"userActionDisableDesc": "Пайдаланушыны бұғаттау керек пе?"
|
|
2671
2677
|
},
|
|
2672
2678
|
"inventoryConfigure": {
|
|
2673
2679
|
"acceptanceLevel": "қабылдау деңгейі",
|
|
@@ -2666,8 +2666,14 @@
|
|
|
2666
2666
|
"selected": "Выбрано",
|
|
2667
2667
|
"unselected": "Не выбрано",
|
|
2668
2668
|
"userActionLock": "Отключить",
|
|
2669
|
+
"userActionLockTitle": "Отключить пользователя",
|
|
2670
|
+
"userActionLockDesc": "Отключить пользователя?",
|
|
2669
2671
|
"userActionEnable": "Разблокировать",
|
|
2670
|
-
"
|
|
2672
|
+
"userActionEnableTitle": "Разблокировать пользователя",
|
|
2673
|
+
"userActionEnableDesc": "Разблокировать пользователя?",
|
|
2674
|
+
"userActionDisable": "Заблокировать",
|
|
2675
|
+
"userActionDisableTitle": "Заблокировать пользователя",
|
|
2676
|
+
"userActionDisableDesc": "Заблокировать пользователя?"
|
|
2671
2677
|
},
|
|
2672
2678
|
"inventoryConfigure": {
|
|
2673
2679
|
"acceptanceLevel": "Уровень приемлемости",
|
|
@@ -2664,8 +2664,14 @@
|
|
|
2664
2664
|
"selected": "已选择",
|
|
2665
2665
|
"unselected": "未选择",
|
|
2666
2666
|
"userActionLock": "断开连接",
|
|
2667
|
+
"userActionLockTitle": "断开用户连接",
|
|
2668
|
+
"userActionLockDesc": "是否断开用户连接?",
|
|
2667
2669
|
"userActionEnable": "解锁",
|
|
2668
|
-
"
|
|
2670
|
+
"userActionEnableTitle": "解锁用户",
|
|
2671
|
+
"userActionEnableDesc": "是否解锁用户?",
|
|
2672
|
+
"userActionDisable": "阻止",
|
|
2673
|
+
"userActionDisableTitle": "阻止用户",
|
|
2674
|
+
"userActionDisableDesc": "是否阻止用户?"
|
|
2669
2675
|
},
|
|
2670
2676
|
"inventoryConfigure": {
|
|
2671
2677
|
"acceptanceLevel": "接受級別",
|
|
@@ -64,14 +64,16 @@
|
|
|
64
64
|
<!-- <strong>{{ localization.common.availableCpus }}: </strong>-->
|
|
65
65
|
<!-- 8({{ localization.common.physicalCpus }})-->
|
|
66
66
|
<!-- </p>-->
|
|
67
|
-
<
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
67
|
+
<template v-if="numsLocal">
|
|
68
|
+
<div
|
|
69
|
+
v-for="item in numsLocal"
|
|
70
|
+
:key="item.label"
|
|
71
|
+
class="sa-help-text"
|
|
72
|
+
>
|
|
73
|
+
<strong>{{ item.label }} </strong>
|
|
74
|
+
<p>{{ item.value }}</p>
|
|
75
|
+
</div>
|
|
76
|
+
</template>
|
|
75
77
|
</atoms-tooltip-signpost>
|
|
76
78
|
</Teleport>
|
|
77
79
|
</div>
|
|
@@ -93,7 +95,7 @@ const schedulingAffinity = defineModel<string>({
|
|
|
93
95
|
})
|
|
94
96
|
|
|
95
97
|
const props = defineProps<{
|
|
96
|
-
nums
|
|
98
|
+
nums?: any // для прокуратора
|
|
97
99
|
}>()
|
|
98
100
|
const emits = defineEmits<{
|
|
99
101
|
(event: 'invalid', value: boolean): void
|
|
@@ -103,6 +105,8 @@ const emits = defineEmits<{
|
|
|
103
105
|
const isShowSaHelp = ref<boolean>(false)
|
|
104
106
|
|
|
105
107
|
const numsLocal = computed<any>(() => {
|
|
108
|
+
if (!props.nums) return []
|
|
109
|
+
|
|
106
110
|
const cpuTopology = []
|
|
107
111
|
for (const key in props.nums.cpu) {
|
|
108
112
|
cpuTopology.push({
|
|
@@ -119,9 +123,11 @@ const numsLocal = computed<any>(() => {
|
|
|
119
123
|
|
|
120
124
|
const errorText = ref<string>('')
|
|
121
125
|
const onBlur = (): void => {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
126
|
+
let cpuNums = []
|
|
127
|
+
if (props.nums) {
|
|
128
|
+
for (const key in props.nums.cpu) {
|
|
129
|
+
cpuNums.push(...props.nums.cpu[key])
|
|
130
|
+
}
|
|
125
131
|
}
|
|
126
132
|
const validation = validateAffinityInput(
|
|
127
133
|
schedulingAffinity.value,
|
|
@@ -152,7 +152,7 @@ export const validateAffinityInput = (
|
|
|
152
152
|
if (singleRegex.test(part)) {
|
|
153
153
|
const cpuNum = parseInt(part, 10)
|
|
154
154
|
|
|
155
|
-
if (!availableCPUSet.has(cpuNum)) {
|
|
155
|
+
if (!availableCPUSet.has(cpuNum) && availableCPUs.length) {
|
|
156
156
|
const availableList =
|
|
157
157
|
availableCPUs.length > 0
|
|
158
158
|
? groupConsecutiveNumbers(availableCPUs.sort((a, b) => a - b))
|
|
@@ -189,7 +189,7 @@ export const validateAffinityInput = (
|
|
|
189
189
|
}
|
|
190
190
|
|
|
191
191
|
// Проверяем доступность начала диапазона
|
|
192
|
-
if (!availableCPUSet.has(start)) {
|
|
192
|
+
if (!availableCPUSet.has(start) && availableCPUs.length) {
|
|
193
193
|
const availableList =
|
|
194
194
|
availableCPUs.length > 0
|
|
195
195
|
? availableCPUs.sort((a, b) => a - b).join(', ')
|
|
@@ -204,7 +204,7 @@ export const validateAffinityInput = (
|
|
|
204
204
|
}
|
|
205
205
|
|
|
206
206
|
// Проверяем доступность конца диапазона
|
|
207
|
-
if (!availableCPUSet.has(end)) {
|
|
207
|
+
if (!availableCPUSet.has(end) && availableCPUs.length) {
|
|
208
208
|
const availableList =
|
|
209
209
|
availableCPUs.length > 0
|
|
210
210
|
? availableCPUs.sort((a, b) => a - b).join(', ')
|
|
@@ -221,7 +221,7 @@ export const validateAffinityInput = (
|
|
|
221
221
|
// Проверяем все процессоры в диапазоне
|
|
222
222
|
let hasInvalidInRange = false
|
|
223
223
|
for (let cpu = start; cpu <= end; cpu++) {
|
|
224
|
-
if (!availableCPUSet.has(cpu)) {
|
|
224
|
+
if (!availableCPUSet.has(cpu) && availableCPUs.length) {
|
|
225
225
|
const availableList =
|
|
226
226
|
availableCPUs.length > 0
|
|
227
227
|
? availableCPUs.sort((a, b) => a - b).join(', ')
|