From 25a8a43b03ad865b80ac8e3994b23323c52fab42 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 24 Jul 2024 11:02:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E6=A0=87=E7=AD=BE=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/pure/ms-tags-input/index.vue        | 6 +++++-
 frontend/src/locale/en-US/common.ts                         | 1 +
 frontend/src/locale/zh-CN/common.ts                         | 1 +
 .../management/components/management/api/apiTable.vue       | 2 +-
 .../management/components/management/case/caseTable.vue     | 2 +-
 .../management/components/management/mock/mockTable.vue     | 2 +-
 .../views/api-test/scenario/components/scenarioTable.vue    | 2 +-
 .../src/views/bug-management/components/batchEditModal.vue  | 3 ++-
 .../caseManagementFeature/components/batchEditModal.vue     | 2 +-
 .../case-management/caseManagementFeature/locale/en-US.ts   | 1 -
 .../case-management/caseManagementFeature/locale/zh-CN.ts   | 1 -
 .../views/test-plan/testPlan/components/batchEditModal.vue  | 2 +-
 12 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/pure/ms-tags-input/index.vue b/frontend/src/components/pure/ms-tags-input/index.vue
index 993b49efff..a872098431 100644
--- a/frontend/src/components/pure/ms-tags-input/index.vue
+++ b/frontend/src/components/pure/ms-tags-input/index.vue
@@ -35,7 +35,11 @@
         </template>
       </a-input-tag>
     </div>
-    <div v-if="isError" class="ml-[1px] flex justify-start text-[12px] text-[rgb(var(--danger-6))]">
+    <!-- 为空优先级最高，为空则提示外部校验的内容输入回车并且不超过64 -->
+    <div
+      v-if="isError && innerModelValue.length"
+      class="ml-[1px] mr-[4px] flex justify-start text-[12px] text-[rgb(var(--danger-6))]"
+    >
       {{ t('common.tagInputMaxLength', { number: props.maxLength }) }}
     </div>
   </a-tooltip>
diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts
index 15a9b1027d..e0a98f5afc 100644
--- a/frontend/src/locale/en-US/common.ts
+++ b/frontend/src/locale/en-US/common.ts
@@ -200,4 +200,5 @@ export default {
   'common.default': 'Default',
   'common.jump': 'Jump',
   'common.gotIt': 'Got it',
+  'common.inputPleaseEnterTags': 'Please enter the update tag enter add, not more than 64 characters',
 };
diff --git a/frontend/src/locale/zh-CN/common.ts b/frontend/src/locale/zh-CN/common.ts
index 627230f760..eb4f8a24ef 100644
--- a/frontend/src/locale/zh-CN/common.ts
+++ b/frontend/src/locale/zh-CN/common.ts
@@ -199,4 +199,5 @@ export default {
   'common.default': '默认',
   'common.jump': '跳转',
   'common.gotIt': '知道了',
+  'common.inputPleaseEnterTags': '请输入更新标签回车添加，不得超过64字符',
 };
diff --git a/frontend/src/views/api-test/management/components/management/api/apiTable.vue b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
index e3c91dcaaf..f760efc2bd 100644
--- a/frontend/src/views/api-test/management/components/management/api/apiTable.vue
+++ b/frontend/src/views/api-test/management/components/management/api/apiTable.vue
@@ -146,7 +146,7 @@
         field="values"
         :label="t('apiTestManagement.batchUpdate')"
         :validate-trigger="['blur', 'input']"
-        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         asterisk-position="end"
         class="mb-0"
         required
diff --git a/frontend/src/views/api-test/management/components/management/case/caseTable.vue b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
index 314318513c..d50cab5605 100644
--- a/frontend/src/views/api-test/management/components/management/case/caseTable.vue
+++ b/frontend/src/views/api-test/management/components/management/case/caseTable.vue
@@ -196,7 +196,7 @@
         field="values"
         :label="t('apiTestManagement.batchUpdate')"
         :validate-trigger="['blur', 'input']"
-        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         asterisk-position="end"
         class="mb-0"
         required
diff --git a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
index 7422f229a5..e50f67198d 100644
--- a/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
+++ b/frontend/src/views/api-test/management/components/management/mock/mockTable.vue
@@ -125,7 +125,7 @@
         field="values"
         :label="t('apiTestManagement.batchUpdate')"
         :validate-trigger="['blur', 'input']"
-        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         asterisk-position="end"
         class="mb-0"
         required
diff --git a/frontend/src/views/api-test/scenario/components/scenarioTable.vue b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
index e42f0913d7..9c108c98b8 100644
--- a/frontend/src/views/api-test/scenario/components/scenarioTable.vue
+++ b/frontend/src/views/api-test/scenario/components/scenarioTable.vue
@@ -338,7 +338,7 @@
         field="values"
         :label="t('api_scenario.table.batchUpdate')"
         :validate-trigger="['blur', 'input']"
-        :rules="[{ required: true, message: t('api_scenario.table.valueRequired') }]"
+        :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         asterisk-position="end"
         class="mb-0"
         required
diff --git a/frontend/src/views/bug-management/components/batchEditModal.vue b/frontend/src/views/bug-management/components/batchEditModal.vue
index e08b22d4c3..c702f6bd28 100644
--- a/frontend/src/views/bug-management/components/batchEditModal.vue
+++ b/frontend/src/views/bug-management/components/batchEditModal.vue
@@ -57,10 +57,11 @@
           asterisk-position="end"
           :label="t('bugManagement.batchUpdate.update')"
           :validate-trigger="['blur', 'input']"
-          :rules="[{ required: true, message: t('bugManagement.batchUpdate.required.value') }]"
+          :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         >
           <template v-if="valueMode === 'tags'">
             <MsTagsInput v-model:modelValue="form.value" :disabled="!form.attribute"></MsTagsInput>
+            <div class="text-[12px] leading-[20px] text-[var(--color-text-4)]">{{ t('ms.tagsInput.tagLimitTip') }}</div>
           </template>
           <template v-else-if="valueMode === 'user_selector'">
             <MsUserSelector
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
index 28b2559e16..55d7486267 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/batchEditModal.vue
@@ -35,7 +35,7 @@
           :validate-trigger="['blur', 'input']"
           :label="t('caseManagement.featureCase.batchUpdate')"
           asterisk-position="end"
-          :rules="[{ required: true, message: t('caseManagement.featureCase.PleaseInputTags') }]"
+          :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         >
           <MsTagsInput v-model:modelValue="form.tags" allow-clear></MsTagsInput>
           <div class="text-[12px] leading-[20px] text-[var(--color-text-4)]">{{ t('ms.tagsInput.tagLimitTip') }}</div>
diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
index e55c6b48f1..c7a74ffcbc 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts
@@ -88,7 +88,6 @@ export default {
   'caseManagement.featureCase.batchCopy': 'Copy Successfully!',
   'caseManagement.featureCase.editSuccess': 'update Successfully',
   'caseManagement.featureCase.PleaseSelect': 'Please select',
-  'caseManagement.featureCase.PleaseInputTags': 'Please enter the update tag to add',
   'caseManagement.featureCase.expectedResult': 'Expected Result',
   'caseManagement.featureCase.remark': 'Remark',
   'caseManagement.featureCase.addAttachment': 'Add attachment',
diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
index 4e288c6fc6..02617a29f7 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
@@ -89,7 +89,6 @@ export default {
   'caseManagement.featureCase.batchMoveSuccess': '移动成功',
   'caseManagement.featureCase.editSuccess': '更新成功',
   'caseManagement.featureCase.PleaseSelect': '请选择',
-  'caseManagement.featureCase.PleaseInputTags': '请输入更新标签回车添加',
   'caseManagement.featureCase.expectedResult': '预期结果',
   'caseManagement.featureCase.remark': '备注',
   'caseManagement.featureCase.addAttachment': '添加附件',
diff --git a/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue b/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
index 5842439471..a2131cd5b6 100644
--- a/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
+++ b/frontend/src/views/test-plan/testPlan/components/batchEditModal.vue
@@ -27,7 +27,7 @@
         v-if="form.selectedAttrsId === 'tags'"
         field="tags"
         :label="t('apiTestManagement.batchUpdate')"
-        :rules="[{ required: true, message: t('apiTestManagement.valueRequired') }]"
+        :rules="[{ required: true, message: t('common.inputPleaseEnterTags') }]"
         asterisk-position="end"
         :validate-trigger="['blur', 'input']"
         class="mb-0"