From ed4c5757295f326123acc07c89d0bcec9ec6e647 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 23 May 2024 17:05:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86&=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98&?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=8F=92=E4=BB=B6=E5=AF=86=E7=A0=81=E6=A1=86?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E5=85=A8=E9=80=89=E4=B8=8D=E8=83=BD=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/pure/ms-card/index.vue     | 13 ++++++---
 .../ms-form-create/formcreate-password.vue    | 27 ++++++-------------
 .../components/caseDetail.vue                 | 10 ++++---
 .../testPlan/components/planTable.vue         | 15 ++++++++---
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/pure/ms-card/index.vue b/frontend/src/components/pure/ms-card/index.vue
index 43f0d88541..791fec1c64 100644
--- a/frontend/src/components/pure/ms-card/index.vue
+++ b/frontend/src/components/pure/ms-card/index.vue
@@ -56,11 +56,18 @@
         </div>
         <slot name="footerRight">
           <div class="flex justify-end gap-[16px]">
-            <a-button type="secondary" @click="back">{{ t('mscard.defaultCancelText') }}</a-button>
-            <a-button v-if="!props.hideContinue && !props.isEdit" type="secondary" @click="emit('saveAndContinue')">
+            <a-button :disabled="props.loading" type="secondary" @click="back">{{
+              t('mscard.defaultCancelText')
+            }}</a-button>
+            <a-button
+              v-if="!props.hideContinue && !props.isEdit"
+              :loading="props.loading"
+              type="secondary"
+              @click="emit('saveAndContinue')"
+            >
               {{ props.saveAndContinueText || t('mscard.defaultSaveAndContinueText') }}
             </a-button>
-            <a-button type="primary" @click="emit('save')">
+            <a-button :loading="props.loading" type="primary" @click="emit('save')">
               {{ props.saveText || t(props.isEdit ? 'mscard.defaultUpdate' : 'mscard.defaultConfirm') }}
             </a-button>
           </div>
diff --git a/frontend/src/components/pure/ms-form-create/formcreate-password.vue b/frontend/src/components/pure/ms-form-create/formcreate-password.vue
index c9e46c50b7..9c256b970c 100644
--- a/frontend/src/components/pure/ms-form-create/formcreate-password.vue
+++ b/frontend/src/components/pure/ms-form-create/formcreate-password.vue
@@ -1,23 +1,12 @@
 <template>
-  <a-input
+  <a-input-password
     v-model="inputValue"
-    :max-length="255"
-    :type="isShowPassword ? 'password' : 'text'"
     :placeholder="placeholder"
-    style="width: 100%"
-    autocomplete="username"
+    :default-visibility="false"
     allow-clear
     @clear="clearHandler"
-  >
-    <template #suffix>
-      <span v-if="!isShowPassword" @click="togglePasswordVisibility">
-        <icon-eye />
-      </span>
-      <span v-else>
-        <icon-eye-invisible @click="togglePasswordVisibility" />
-      </span>
-    </template>
-  </a-input>
+    @input="inputHandler"
+  />
 </template>
 
 <script setup lang="ts">
@@ -44,10 +33,10 @@
     emits('update:modelValue', inputValue.value);
   }
 
-  const isShowPassword = ref<boolean>(true);
-  const togglePasswordVisibility = () => {
-    isShowPassword.value = !isShowPassword.value;
-  };
+  function inputHandler(value: string) {
+    inputValue.value = value;
+    emits('update:modelValue', inputValue.value);
+  }
 </script>
 
 <style scoped></style>
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue
index 3e6f26306a..4dd51a3994 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue
@@ -16,14 +16,16 @@
     />
     <template #footerRight>
       <div class="flex justify-end gap-[16px]">
-        <a-button type="secondary" @click="cancelHandler">{{ t('mscard.defaultCancelText') }}</a-button>
-        <a-button v-if="!isEdit" type="secondary" @click="saveHandler(true)">
+        <a-button :disabled="loading" type="secondary" @click="cancelHandler">{{
+          t('mscard.defaultCancelText')
+        }}</a-button>
+        <a-button v-if="!isEdit" :loading="loading" type="secondary" @click="saveHandler(true)">
           {{ t('mscard.defaultSaveAndContinueText') }}
         </a-button>
-        <a-button v-if="!isFormReviewCase" type="primary" @click="saveHandler(false)">
+        <a-button v-if="!isFormReviewCase" :loading="loading" type="primary" @click="saveHandler(false)">
           {{ okText }}
         </a-button>
-        <a-button v-if="isFormReviewCase" type="primary" @click="saveHandler(false, true)">
+        <a-button v-if="isFormReviewCase" :loading="loading" type="primary" @click="saveHandler(false, true)">
           {{ t('caseManagement.featureCase.createAndLink') }}
         </a-button>
       </div>
diff --git a/frontend/src/views/test-plan/testPlan/components/planTable.vue b/frontend/src/views/test-plan/testPlan/components/planTable.vue
index d0ed26a890..d2e806a5d2 100644
--- a/frontend/src/views/test-plan/testPlan/components/planTable.vue
+++ b/frontend/src/views/test-plan/testPlan/components/planTable.vue
@@ -186,7 +186,11 @@
     <template #operation="{ record }">
       <div class="flex items-center">
         <div
-          v-if="record.functionalCaseCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE'])"
+          v-if="
+            record.functionalCaseCount > 0 &&
+            hasAnyPermission(['PROJECT_TEST_PLAN:READ+EXECUTE']) &&
+            record.status !== 'ARCHIVED'
+          "
           class="flex items-center"
         >
           <MsButton class="!mx-0" @click="openDetail(record.id)">{{ t('testPlan.testPlanIndex.execution') }}</MsButton>
@@ -269,7 +273,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
-  import { useRouter } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { Message } from '@arco-design/web-vue';
   import { cloneDeep } from 'lodash-es';
   import dayjs from 'dayjs';
@@ -321,6 +325,7 @@
   const tableStore = useTableStore();
   const appStore = useAppStore();
   const router = useRouter();
+  const route = useRoute();
   const { t } = useI18n();
   const { openModal } = useModal();
 
@@ -565,7 +570,8 @@
 
   function getMoreActions(status: planStatusType, useCount: number) {
     // 有用例数量才可以执行 否则不展示执行
-    const copyAction = useCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) ? copyActions : [];
+    const copyAction =
+      useCount > 0 && hasAnyPermission(['PROJECT_TEST_PLAN:READ+ADD']) && status !== 'ARCHIVED' ? copyActions : [];
     // 单独操作已归档和已完成 不展示归档
     if (status === 'ARCHIVED' || status === 'PREPARED' || status === 'UNDERWAY') {
       return [
@@ -996,6 +1002,9 @@
   );
 
   onBeforeMount(() => {
+    if (route.query.id) {
+      openDetail(route.query.id as string);
+    }
     fetchData();
   });