diff --git a/main/manager-web/src/components/DictDataDialog.vue b/main/manager-web/src/components/DictDataDialog.vue index 3731eeff..e98c2a39 100644 --- a/main/manager-web/src/components/DictDataDialog.vue +++ b/main/manager-web/src/components/DictDataDialog.vue @@ -13,7 +13,7 @@
diff --git a/main/manager-web/src/components/ParamDialog.vue b/main/manager-web/src/components/ParamDialog.vue index d72b3768..8980ec1a 100644 --- a/main/manager-web/src/components/ParamDialog.vue +++ b/main/manager-web/src/components/ParamDialog.vue @@ -107,16 +107,9 @@ export default { this.$refs.form.validate((valid) => { if (valid) { this.saving = true; // 开始加载 - this.$emit('submit', { - form: this.form, - done: () => { - this.saving = false; // 加载完成 - } - }); + this.$emit('submit', this.form); - setTimeout(() => { - this.saving = false; - }, 3000); + // 在父组件处理完成后,通过watch visible的变化来重置saving状态 } }); }, diff --git a/main/manager-web/src/i18n/en.js b/main/manager-web/src/i18n/en.js index 2c35bdf3..8b5e7ac0 100644 --- a/main/manager-web/src/i18n/en.js +++ b/main/manager-web/src/i18n/en.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': 'Mobile number cannot be empty', 'register.passwordRequired': 'Password cannot be empty', 'register.confirmPasswordRequired': 'Confirm password cannot be empty', + 'register.goToLogin': 'Already have an account, go to login', + 'register.agreeTo': 'Registering means you agree to the', + 'register.userAgreement': 'User Agreement', + 'register.and': 'and', + 'register.privacyPolicy': 'Privacy Policy', + 'register.sendCaptcha': 'Get Verification Code', + 'register.notAllowRegister': 'User registration is not allowed currently', + 'register.captchaLoadFailed': 'Verification code loading failed, click to refresh', + 'register.inputCorrectMobile': 'Please enter correct mobile number', + 'register.inputCaptcha': 'Please enter captcha', + 'register.captchaSendSuccess': 'Verification code sent successfully', + 'register.captchaSendFailed': 'Failed to send verification code', + 'register.registerSuccess': 'Registration successful!', + 'register.registerFailed': 'Registration failed', + 'register.passwordsNotMatch': 'The two passwords do not match', // Retrieve password page text 'retrievePassword.title': 'Reset Password', diff --git a/main/manager-web/src/i18n/zh_CN.js b/main/manager-web/src/i18n/zh_CN.js index 1f5e7b31..15382204 100644 --- a/main/manager-web/src/i18n/zh_CN.js +++ b/main/manager-web/src/i18n/zh_CN.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': '手机号不能为空', 'register.passwordRequired': '密码不能为空', 'register.confirmPasswordRequired': '确认密码不能为空', + 'register.goToLogin': '已有账号,去登录', + 'register.agreeTo': '注册即同意', + 'register.userAgreement': '《用户协议》', + 'register.and': '和', + 'register.privacyPolicy': '《隐私政策》', + 'register.sendCaptcha': '获取验证码', + 'register.notAllowRegister': '当前不允许普通用户注册', + 'register.captchaLoadFailed': '验证码加载失败,点击刷新', + 'register.inputCorrectMobile': '请输入正确的手机号码', + 'register.inputCaptcha': '请输入图形验证码', + 'register.captchaSendSuccess': '验证码发送成功', + 'register.captchaSendFailed': '验证码发送失败', + 'register.registerSuccess': '注册成功!', + 'register.registerFailed': '注册失败', + 'register.passwordsNotMatch': '两次输入的密码不一致', // 忘记密码页面文本 'retrievePassword.title': '重置密码', diff --git a/main/manager-web/src/i18n/zh_TW.js b/main/manager-web/src/i18n/zh_TW.js index 6f1e345c..7e17d35c 100644 --- a/main/manager-web/src/i18n/zh_TW.js +++ b/main/manager-web/src/i18n/zh_TW.js @@ -198,6 +198,21 @@ export default { 'register.mobileRequired': '手機號不能為空', 'register.passwordRequired': '密碼不能為空', 'register.confirmPasswordRequired': '確認密碼不能為空', + 'register.goToLogin': '已有賬號,去登錄', + 'register.agreeTo': '註冊即同意', + 'register.userAgreement': '《用戶協議》', + 'register.and': '和', + 'register.privacyPolicy': '《隱私政策》', + 'register.sendCaptcha': '獲取驗證碼', + 'register.notAllowRegister': '當前不允許普通用戶註冊', + 'register.captchaLoadFailed': '驗證碼加載失敗,點擊刷新', + 'register.inputCorrectMobile': '請輸入正確的手機號碼', + 'register.inputCaptcha': '請輸入圖形驗證碼', + 'register.captchaSendSuccess': '驗證碼發送成功', + 'register.captchaSendFailed': '驗證碼發送失敗', + 'register.registerSuccess': '註冊成功!', + 'register.registerFailed': '註冊失敗', + 'register.passwordsNotMatch': '兩次輸入的密碼不一致', // 忘记密码页面文本 'retrievePassword.title': '重置密碼', diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue index 670bca8d..5247c87b 100644 --- a/main/manager-web/src/views/DeviceManagement.vue +++ b/main/manager-web/src/views/DeviceManagement.vue @@ -74,7 +74,7 @@