Merge branch 'dev'

This commit is contained in:
viarotel 2024-12-20 14:01:13 +08:00
commit fe1d4df836
5 changed files with 10 additions and 1 deletions

View File

@ -91,6 +91,7 @@
"device.wireless.connect.qr": "QR Code Connection",
"device.wireless.connect.qr.pairing": "Pairing",
"device.wireless.connect.qr.connecting": "Connecting",
"device.wireless.connect.qr.connecting-fallback": "Connecting",
"device.wireless.connect.qr.connected": "Connection Successful",
"device.wireless.connect.qr.error": "QR Code Connection",
"device.wireless.connect.name": "Connect",

View File

@ -91,6 +91,7 @@
"device.wireless.connect.qr": "Подключение по QR-коду",
"device.wireless.connect.qr.pairing": "Сопряжение",
"device.wireless.connect.qr.connecting": "Подключение",
"device.wireless.connect.qr.connecting-fallback": "Подключение",
"device.wireless.connect.qr.connected": "Подключение успешно",
"device.wireless.connect.qr.error": "Подключение по QR-коду",
"device.wireless.connect.name": "Подключиться",

View File

@ -91,6 +91,7 @@
"device.wireless.connect.qr": "二维码连接",
"device.wireless.connect.qr.pairing": "配对中",
"device.wireless.connect.qr.connecting": "连接中",
"device.wireless.connect.qr.connecting-fallback": "连接中",
"device.wireless.connect.qr.connected": "连接成功",
"device.wireless.connect.qr.error": "二维码连接",
"device.wireless.connect.name": "连接设备",

View File

@ -91,6 +91,7 @@
"device.wireless.connect.qr": "二維碼連接",
"device.wireless.connect.qr.pairing": "配對中",
"device.wireless.connect.qr.connecting": "連接中",
"device.wireless.connect.qr.connecting-fallback": "連接中",
"device.wireless.connect.qr.connected": "連接成功",
"device.wireless.connect.qr.error": "二維碼連接",
"device.wireless.connect.name": "連接裝置",

View File

@ -1,5 +1,6 @@
<template>
<el-popover
ref="popoverRef"
placement="top"
:width="200"
trigger="click"
@ -39,6 +40,8 @@ const loading = ref(false)
const loadingText = ref('')
const popoverRef = ref()
function onStatus(type) {
loadingText.value = window.t(`device.wireless.connect.qr.${type}`)
}
@ -58,7 +61,9 @@ async function handleClick() {
console.warn(error.message)
}
props.handleRefresh()
await props.handleRefresh()
popoverRef.value.hide()
loading.value = false
}