From 6d578e53ea19ee214b47645350bda8cd43ce7c67 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Wed, 11 Oct 2023 17:58:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99=20(#2512)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/container/operate/index.vue     |  2 +-
 .../container/container/upgrade/index.vue     |  2 +-
 frontend/src/views/setting/safe/mfa/index.vue | 21 +++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/container/container/operate/index.vue b/frontend/src/views/container/container/operate/index.vue
index 0015f5dc1..fa3c18a10 100644
--- a/frontend/src/views/container/container/operate/index.vue
+++ b/frontend/src/views/container/container/operate/index.vue
@@ -328,7 +328,7 @@ const handleClose = () => {
 
 const rules = reactive({
     name: [Rules.requiredInput, Rules.containerName],
-    image: [Rules.requiredInput],
+    image: [Rules.imageName],
     cpuShares: [Rules.integerNumberWith0, checkNumberRange(0, 262144)],
     nanoCPUs: [Rules.floatNumber],
     memory: [Rules.floatNumber],
diff --git a/frontend/src/views/container/container/upgrade/index.vue b/frontend/src/views/container/container/upgrade/index.vue
index 4c0c75ca5..87d2da760 100644
--- a/frontend/src/views/container/container/upgrade/index.vue
+++ b/frontend/src/views/container/container/upgrade/index.vue
@@ -20,7 +20,7 @@
                         </el-tooltip>
                         <el-tag v-else>{{ form.imageName }}:{{ form.oldTag }}</el-tag>
                     </el-form-item>
-                    <el-form-item prop="newTag" :rules="Rules.requiredInput">
+                    <el-form-item prop="newTag" :rules="Rules.imageName">
                         <template #label>
                             <el-tooltip
                                 placement="top-start"
diff --git a/frontend/src/views/setting/safe/mfa/index.vue b/frontend/src/views/setting/safe/mfa/index.vue
index 26cb6c71c..109996e5b 100644
--- a/frontend/src/views/setting/safe/mfa/index.vue
+++ b/frontend/src/views/setting/safe/mfa/index.vue
@@ -139,10 +139,15 @@ const onCopy = async () => {
 
 const loadMfaCodeBefore = async (formEl: FormInstance | undefined) => {
     if (!formEl) return;
-    formEl.validate(async (valid) => {
-        if (!valid) return;
-        loadMfaCode();
-    });
+    const result = await formEl.validateField('interval', callback);
+    if (!result) {
+        return;
+    }
+    const result2 = await formEl.validateField('title', callback);
+    if (!result2) {
+        return;
+    }
+    loadMfaCode();
 };
 const loadMfaCode = async () => {
     let param = {
@@ -154,6 +159,14 @@ const loadMfaCode = async () => {
     qrImage.value = res.data.qrImage;
 };
 
+function callback(error: any) {
+    if (error) {
+        return error.message;
+    } else {
+        return;
+    }
+}
+
 const onBind = async (formEl: FormInstance | undefined) => {
     if (!formEl) return;
     formEl.validate(async (valid) => {