bfg-common 1.5.554 → 1.5.555

package/assets/localization/local_zh.json

@@ -946,8 +946,6 @@
     "moreInformation": "附加信息",
     "motherboardModel": "主板型號",
     "mountGuestTools": "挂载访客工具",
-    "mountingGuestTools": "安装访客工具",
-    "mountingGuestToolsDesc": "将访客工具安装到虚拟机中的 {0}。",
     "mountNfsReadOnly": "将 NFS 挂载为只读",
     "mouseMode": "鼠标模式",
     "moveDown": "下移",
@@ -1186,9 +1184,7 @@
     "poweredOn": "包括",
     "powerManagement": "能源管理",
     "powerOff": "关闭",
-    "poweringOff": "关闭电源",
     "powerOn": "打开",
-    "poweringOn": "开机中",
     "powerOnByDefault": "默认开机",
     "precisionTimeProtocol": "精确时间协议",
     "precisionTimeProtocolEnableMonitoringEventsHelpText": "事件是发生在 Sphere Zone 或主机上的对象上的用户操作或系统操作的记录。 请注意，只有在以下情况下才能启用回退 \"启用监控事件\" 被选中。",
@@ -1281,7 +1277,6 @@
     "reservationMustBe": "预订必须在 {0} 和 {1} 之间。",
     "reserveGuestMemory": "保留所有来宾内存（一切都被锁定）",
     "reset": "重置",
-    "resetting": "重置",
     "resetGreen": "重置为绿色",
     "resourceAllocation": "资源分配",
     "resourcePool": "资源池",
@@ -1290,7 +1285,6 @@
     "restart": "重啟",
     "restartDirectConsoleUIService": "重啟直接控制台 UI 服務？",
     "restartGuestOs": "重新启动来宾操作系统",
-    "restartingGuestOs": "重启客户操作系统",
     "restartLoadBasedTeamingDaemonService": "重启 Load-Based Teaming Daemon 服务",
     "restartTheService": "重啟服務",
     "restrictReuse": "限制重复使用",
@@ -1516,7 +1510,6 @@
     "supportedEvcModes": "支持的 EVC 模式",
     "suspend": "暂停",
     "suspended": "暂停",
-    "suspending": "暂停",
     "suspendThisVirtualMachineWhenRevertingToSelectedSnapshot": "恢复到选定的快照时暂停此虚拟机",
     "swapFileLocation": "交换文件位置",
     "switch": "开关,开关",
@@ -1583,9 +1576,8 @@
     "toggleFullscreenMode": "切换全屏模式",
     "togglePassthrough": "切换直通",
     "tokenTrustworthiness": "代币可信度",
-    "tools": "客机工具",
-    "toolsEnable": "气球",
-    "balloon": "Balloon",
+    "tools": "工具",
+    "toolsEnable": "启用工具",
     "toolsNotInstalledVm": "此虚拟机上未安装这些工具。",
     "total": "一般的",
     "total_migrations": "vMotion 迁移总数",
@@ -1611,8 +1603,6 @@
     "unlockTime": "解锁时间",
     "unlockUser": "取消阻止用户",
     "unmountGuestTools": "卸载访客工具",
-    "unmountingGuestTools": "卸载访客工具",
-    "unmountingGuestToolsDesc": "正在从“{0}”虚拟机中卸载客户机工具。",
     "unmountGuestToolsInstaller": "卸载来宾工具安装程序",
     "unsafe": "不安全",
     "unselected": "未选择",
@@ -1845,7 +1835,6 @@
     "paused": "已暂停",
     "blocked": "被阻止",
     "shuttingDown": "关闭",
-    "shuttingDownGuestOs": "关闭客户操作系统",
     "shuttingOff": "关闭",
     "observedIpRanges": "观察到的IP范围",
     "wakeOnLanSupported": "支持局域网唤醒",
@@ -2030,12 +2019,11 @@
     "coreCountMHz": "核心 {0} MHz",
     "cPUUsageMHzDuringInterval": "时间间隔内的 CPU 使用情况（以 MHz 为单位）",
     "usageCoreCount": "核心 {0} 的用法",
-    "hardStopConfirmation": "硬停止确认",
     "confirmHardStopVmOperation": "确认强制停止虚拟机。",
     "confirmGroupHardStopVmOperation": "请确认强制停止 {0} 台虚拟机的运行。",
-    "confirmHardStopVmOperationFirstDescription": "强制停止操作会终止所有当前正在运行的进程并立即关闭虚拟机。继续执行此操作可能会导致未保存的数据丢失或意外停机。",
-    "confirmHardStopVmOperationSecondDescription": "在执行强制停止操作之前，请尝试正常关闭虚拟机。仅当虚拟机无法正常关闭或无响应时才使用此操作。有关更多信息，请参阅",
-    "confirmHardStopVmOperationThirdDescription": "确认时，请在下方字段中输入“{0}”。",
+    "confirmHardStopVmOperationFirstDescription": "硬停止虚拟机操作会强制终止当前在虚拟机上运行的所有进程并关闭虚拟机电源。继续执行此操作可能会导致未保存的信息丢失和/或虚拟机不必要的停机。",
+    "confirmHardStopVmOperationSecondDescription": "在使用硬停止虚拟机操作之前，首先尝试关闭虚拟机电源。仅当您无法关闭虚拟机电源或虚拟机变得无响应时，才使用硬停止虚拟机操作。有关详细信息。",
+    "confirmHardStopVmOperationThirdDescription": "有关详细信息，请参阅知识库文章 {0}.",
     "doYouWantHardStopVm": "您想硬停止虚拟机吗？",
     "confirmGuestShutDown": "确认访客关闭",
     "confirmGuestShutDownDescription": "关闭所选虚拟机的来宾操作系统？",
@@ -2168,8 +2156,6 @@
     "networksCount": "网络 ({0})",
     "applyTheRule": "应用规则",
     "restoreFromBackup": "从备份恢复",
-    "restoreConfirmation": "从备份恢复",
-    "restoreConfirmationDesc": "您确定要恢复虚拟机吗？此操作将覆盖当前虚拟机，所有未保存的数据都将",
     "backupType": "备份类型",
     "ipAddressIsRequired": "IP 地址为必填项",
     "portIsRequired": "端口为必填项",
@@ -2615,8 +2601,6 @@
     "selectAdvancedAction": "选择高级操作",
     "migrateVm": "迁移虚拟机",
     "powerOffVm": "关闭虚拟机",
-    "powerOffConfirmation": "断电确认",
-    "powerOffConfirmationDesc": "您确定要关闭 “{0}” 虚拟机吗？",
     "powerOnVm": "启动虚拟机",
     "rebootGuestOnVm": "重新启动虚拟机上的客户机",
     "resetVm": "重置虚拟机",

package/components/common/modals/confirmByInput/ConfirmByInput.vue

@@ -8,15 +8,9 @@
     :sub-title="props.subTitle"
     :modal-texts="props.modalTexts"
     :test-id="props.testId"
-    :width="props.width"
-    :placeholder="props.placeholder"
     @hide="emits('hide')"
     @confirm="onConfirm"
-  >
-  <template #content>
-    <slot name="content" />
-  </template>
-  </common-modals-confirm-by-input-new>
+  />
   <common-modals-confirm-by-input-old
     v-else
     v-model="confirmationForm"
@@ -48,7 +42,6 @@ const props = withDefaults(
     testId?: string
     loading?: boolean
     width?: string
-    placeholder?: string
     modalTexts?: UI_I_ModalTexts
   }>(),
   {
@@ -59,7 +52,6 @@ const props = withDefaults(
     testId: 'common-confirmation',
     loading: false,
     width: '580px',
-    placeholder: '',
     modalTexts: {
       button1: 'Cancel',
       button2: 'Remove',

package/components/common/modals/confirmByInput/ConfirmByInputNew.vue

@@ -3,7 +3,6 @@
     :test-id="props.testId"
     :message="props.description"
     :texts="modalTextsLocal"
-    :width="props.width"
     icon-name="info-status"
     @submit="onSubmit"
     @hide="onHide"
@@ -11,14 +10,12 @@
     <template #content>
       <div class="confirm-modal__body-content">
         <span>{{ props.title }}</span>
-        <slot name="content">
-          <span>{{ props.description }}</span>
-        </slot>
+        <span>{{ props.description }}</span>
 
         <ui-input
           v-model="confirmationFormLocal"
           :test-id="`${props.testId}-confirm-input`"
-          :placeholder="props.placeholder || localization.vsphereHa.nodeIPAddress"
+          :placeholder="localization.vsphereHa.nodeIPAddress"
           :error="confirmInputErrorText"
           class="confirm-modal__input"
           input-style="rounded"
@@ -39,8 +36,6 @@ const props = defineProps<{
   description: string
   subTitle: string
   isValid: boolean
-  width?: string
-  placeholder?: string
   modalTexts: UI_I_ModalTexts
 }>()
 const confirmationFormLocal = defineModel<string>({ required: true })

package/components/common/pages/backups/modals/createBackup/New.vue

@@ -149,9 +149,8 @@
         </template>
         <template #content>
           <div class="mt-4">
-            <div class="ready-to-complete">
-              <common-ready-to-complete :data="props.readyToCompleteData" />
-            </div>
+            <div class="ready-to-complete"></div>
+            <common-ready-to-complete :data="props.readyToCompleteData" />
           </div>
         </template>
       </ui-wizard-block>
@@ -258,11 +257,6 @@ const onCreateDatastore = (): void => emits('submit')
 }
 
 .ready-to-complete {
-  :deep(.details-list__col-right) {
-    display: grid;
-    grid-template-columns: auto 1fr;
-    align-items: flex-start;
-  }
   :deep(.details-list):nth-child(1) {
     .details-item-value {
       white-space: break-spaces;

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -2,7 +2,6 @@
   <common-pages-backups-modals-restore-new
     v-if="isNewView"
     v-model="model"
-    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :alert-messages="alertMessages"
@@ -16,14 +15,12 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
-    @submit-confirm="onFinish"
     @hide="onHideModal"
-    @submit-wizard="onSubmitWizard"
+    @submit="onRestore"
   />
   <common-pages-backups-modals-restore-old
     v-else
     v-model="model"
-    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :ready-complete-data="readyToCompleteInfo"
@@ -38,9 +35,8 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
-    @submit-confirm="onFinish"
+    @finish="onRestore"
     @hide="onHideModal"
-    @submit-wizard="onSubmitWizard"
   />
 </template>
 
@@ -275,9 +271,7 @@ const onHideModal = (): void => {
   emits('hide')
 }
 
-const isShowConfirm = ref<boolean>(false)
-
-const onSubmitWizard = (): void => {
+const onRestore = (): void => {
   if (model.value.restore_code === restoreCodes.existing) {
     isShowConfirm.value = true
   } else {
@@ -285,6 +279,8 @@ const onSubmitWizard = (): void => {
   }
 }
 
+const isShowConfirm = ref<boolean>(false)
+
 const onGetNetworks = (hostId: string): void => {
   emits('get-networks', hostId)
 }

package/components/common/pages/backups/modals/restore/RestoreNew.vue

@@ -10,7 +10,7 @@
     class="restore-wizard"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
-    @submit="emits('submit-wizard')"
+    @submit="onCreateDatastore"
   >
     <template #content="{ selectedStep }">
       <ui-wizard-block
@@ -161,15 +161,6 @@
       </ui-wizard-block>
     </template>
   </ui-wizard>
-
-  <common-modals-confirmation
-    v-if="isShowConfirm"
-    :headline="localization.common.restoreConfirmation"
-    :description="localization.common.restoreConfirmationDesc"
-    icon-name="circle-warning"
-    @hide-modal="isShowConfirm = false"
-    @confirm="emits('submit-confirm')"
-  />
 </template>
 
 <script setup lang="ts">
@@ -187,7 +178,6 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
-const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
@@ -205,9 +195,8 @@ const emits = defineEmits<{
   (event: 'change-storage', value: UI_I_DatastoreTableItem | null): void
   (event: 'get-datastore', value: string): void
   (event: 'get-networks', value: string): void
-  (event: 'submit-confirm'): void
   (event: 'hide'): void
-  (event: 'submit-wizard'): void
+  (event: 'submit'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -261,6 +250,7 @@ const onGetNetworks = (hostId: string): void => {
 }
 
 const onHideModal = (): void => emits('hide')
+const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">

package/components/common/pages/backups/modals/restore/RestoreOld.vue

@@ -9,7 +9,7 @@
       test-id="restore"
       @change-steps="onChangeSteps"
       @hide="onHideModal"
-      @submit="emits('submit-wizard')"
+      @submit="onRestore"
     >
       <template #modalBody="{ selectedStep }">
         <div
@@ -79,7 +79,7 @@
     :headline="localization.common.attention"
     :description="localization.common.restoreBackupConfirmDescription"
     @hide-modal="isShowConfirm = false"
-    @confirm="emits('submit-confirm')"
+    @confirm="onFinish"
   />
 </template>
 
@@ -93,15 +93,15 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
-const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
   selectedScheme: number[]
   readyCompleteData: UI_I_TableInfoItem[]
-  // nameFormSubmit: null | Function
+  nameFormSubmit: null | Function
   storageSubmit: null | Function
   isLoading: boolean
   errors: string[]
@@ -116,8 +116,7 @@ const emits = defineEmits<{
   (event: 'get-networks', value: string): void
   (event: 'check-name', value: UI_I_NameCheck): void
   (event: 'change-steps', value: UI_I_WizardStep[]): void
-  (event: 'submit-confirm'): void
-  (event: 'submit-wizard'): void
+  (event: 'finish'): void
   (event: 'hide'): void
 }>()
 
@@ -139,10 +138,23 @@ const onCheckName = async (data: UI_I_NameCheck): Promise<void> => {
   emits('check-name', data)
 }
 
+const onFinish = (): void => {
+  emits('finish')
+}
 const onHideModal = (): void => {
   emits('hide')
 }
 
+const onRestore = (): void => {
+  if (model.value.restore_code === restoreCodes.existing) {
+    isShowConfirm.value = true
+  } else {
+    onFinish()
+  }
+}
+
+const isShowConfirm = ref<boolean>(false)
+
 const onGetNetworks = (hostId: string): void => {
   emits('get-networks', hostId)
 }