From b1ad7f87d8122d7e7fd31af5231cceead4302564 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Wed, 26 Jun 2024 14:39:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=85=A8=E5=B1=80):=20bugFix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/assets/style/arco-reset.less          | 14 +++++++++++++-
 .../pure/ms-form-create/formcreate-password.vue    |  4 +++-
 .../pure/ms-form-create/ms-form-create.vue         |  4 ++++
 .../pure/ms-form-create/searchSelect.vue           |  2 ++
 .../components/pure/ms-json-schema/locale/en-US.ts |  0
 .../components/pure/ms-json-schema/locale/zh-CN.ts |  5 +++++
 frontend/src/locale/en-US/common.ts                |  4 ++--
 .../components/management/api/apiTable.vue         |  3 +++
 .../views/bug-management/components/basicInfo.vue  |  5 +----
 frontend/src/views/bug-management/index.vue        |  2 +-
 .../caseManagementFeature/locale/zh-CN.ts          |  2 +-
 11 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/components/pure/ms-json-schema/locale/en-US.ts
 create mode 100644 frontend/src/components/pure/ms-json-schema/locale/zh-CN.ts

diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less
index ba1bb28b04..4b012928ae 100644
--- a/frontend/src/assets/style/arco-reset.less
+++ b/frontend/src/assets/style/arco-reset.less
@@ -281,7 +281,13 @@
   width: 100%;
   border: 1px solid var(--color-text-n8);
   background-color: var(--color-text-fff);
-  &:not(:disabled, .arco-input-tag-disabled, .arco-input-disabled, .arco-select-view-disabled):hover {
+  &:not(
+      :disabled,
+      .arco-input-tag-disabled,
+      .arco-input-disabled,
+      .arco-textarea-disabled,
+      .arco-select-view-disabled
+    ):hover {
     border-color: rgb(var(--primary-5)) !important;
     background-color: white;
   }
@@ -291,10 +297,16 @@
 }
 .arco-input-tag-disabled,
 .arco-select-view-disabled,
+.arco-textarea-disabled,
 .arco-input-disabled {
   border-color: var(--color-text-n8) !important;
   background-color: var(--color-text-n8) !important;
 }
+.arco-textarea-disabled {
+  .arco-textarea {
+    @apply cursor-not-allowed;
+  }
+}
 .arco-select,
 .arco-input-tag {
   .arco-icon {
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 cc67533e9a..6d7998dadb 100644
--- a/frontend/src/components/pure/ms-form-create/formcreate-password.vue
+++ b/frontend/src/components/pure/ms-form-create/formcreate-password.vue
@@ -3,6 +3,7 @@
     v-model="inputValue"
     :placeholder="placeholder"
     :default-visibility="true"
+    :disabled="props.disabled"
     allow-clear
     @clear="clearHandler"
     @input="inputHandler"
@@ -12,9 +13,10 @@
 <script setup lang="ts">
   import { ref, watch } from 'vue';
 
-  defineProps<{
+  const props = defineProps<{
     placeholder?: string;
     value?: string;
+    disabled?: boolean;
   }>();
   const inputValue = ref('');
   const emits = defineEmits<{
diff --git a/frontend/src/components/pure/ms-form-create/ms-form-create.vue b/frontend/src/components/pure/ms-form-create/ms-form-create.vue
index 1030c24f92..5acd99a7de 100644
--- a/frontend/src/components/pure/ms-form-create/ms-form-create.vue
+++ b/frontend/src/components/pure/ms-form-create/ms-form-create.vue
@@ -43,6 +43,7 @@
     formRule: FormItem[]; // 表单的规则
     formItem: FormRuleItem[]; // 处理后的表单
     api: any; // 表单对象
+    disabled?: boolean; // 是否禁用
   }>();
 
   const emit = defineEmits(['update:api', 'update', 'update:formItem', 'change', 'mounted']);
@@ -328,6 +329,9 @@
 
   function handleMounted() {
     // setValue();
+    if (props.disabled) {
+      fApi.value.disabled(true);
+    }
     emit('mounted');
   }
 
diff --git a/frontend/src/components/pure/ms-form-create/searchSelect.vue b/frontend/src/components/pure/ms-form-create/searchSelect.vue
index 046b5d11d9..428011917f 100644
--- a/frontend/src/components/pure/ms-form-create/searchSelect.vue
+++ b/frontend/src/components/pure/ms-form-create/searchSelect.vue
@@ -6,6 +6,7 @@
       allow-search
       allow-clear
       :multiple="props.multiple"
+      :disabled="props.disabled"
       @search="searchHandler"
     >
       <a-option v-for="opt of optionsList" :key="opt.value" :value="opt.value">{{ opt.label }}</a-option>
@@ -37,6 +38,7 @@
       options?: { label: string; value: string }[];
       multiple?: boolean; // 是否多选
       placeholder?: string;
+      disabled?: boolean;
     }>(),
     {
       inputSearch: false,
diff --git a/frontend/src/components/pure/ms-json-schema/locale/en-US.ts b/frontend/src/components/pure/ms-json-schema/locale/en-US.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frontend/src/components/pure/ms-json-schema/locale/zh-CN.ts b/frontend/src/components/pure/ms-json-schema/locale/zh-CN.ts
new file mode 100644
index 0000000000..83988541a6
--- /dev/null
+++ b/frontend/src/components/pure/ms-json-schema/locale/zh-CN.ts
@@ -0,0 +1,5 @@
+export default {
+  'ms.json.schema.name': '参数名称',
+  'ms.json.schema.type': '类型',
+  'ms.json.schema.value': '参数值',
+};
diff --git a/frontend/src/locale/en-US/common.ts b/frontend/src/locale/en-US/common.ts
index ac409e5a89..72aebfca8e 100644
--- a/frontend/src/locale/en-US/common.ts
+++ b/frontend/src/locale/en-US/common.ts
@@ -166,8 +166,8 @@ export default {
   'common.resourceDeleted': 'Resource has been deleted',
   'common.resourceExpired': 'Link has failed, please get it again',
   'common.refresh': 'Refresh',
-  'common.searchByIdName': 'Search by ID or name',
-  'common.searchByNameAndId': 'Search by ID, name, or tag',
+  'common.searchByIdName': 'Search by ID/name',
+  'common.searchByIDNameTag': 'Search by ID/name/tag',
   'common.archive': 'archive',
   'common.running': 'Running',
   'common.unExecute': 'Pending',
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 8f2694cf9a..7abcb55732 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
@@ -656,6 +656,9 @@
 
   onBeforeMount(() => {
     initProtocolList();
+    if (props.selectedProtocols.length > 0) {
+      loadApiList(true);
+    }
   });
 
   const tableSelected = ref<(string | number)[]>([]);
diff --git a/frontend/src/views/bug-management/components/basicInfo.vue b/frontend/src/views/bug-management/components/basicInfo.vue
index 39f89fdeea..bcad2ff0bb 100644
--- a/frontend/src/views/bug-management/components/basicInfo.vue
+++ b/frontend/src/views/bug-management/components/basicInfo.vue
@@ -17,10 +17,7 @@
             @change="handelFormCreateChange"
           />
           <!-- 自定义字段结束 -->
-          <div
-            v-if="!props.isPlatformDefaultTemplate && hasAnyPermission(['PROJECT_BUG:READ+UPDATE'])"
-            class="baseItem"
-          >
+          <div v-if="!props.isPlatformDefaultTemplate" class="baseItem">
             <a-form
               :model="{}"
               :label-col-props="{
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index 7260328da7..96d1f203a2 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -17,7 +17,7 @@
             </a-button>
             <a-button
               v-if="currentPlatform !== 'Local'"
-              v-permission="['PROJECT_BUG:READ+ADD']"
+              v-permission="['PROJECT_BUG:READ+UPDATE']"
               :loading="!isComplete"
               type="outline"
               @click="handleSync"
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 592dd410a3..4e288c6fc6 100644
--- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
+++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts
@@ -261,7 +261,7 @@ export default {
   'caseManagement.featureCase.zentao': '禅道',
   'caseManagement.featureCase.jira': 'JIRA',
   'caseManagement.featureCase.tapd': 'TAPD',
-  'caseManagement.featureCase.searchPlaceholder': '通过ID、名称或标签搜索',
+  'caseManagement.featureCase.searchPlaceholder': '通过 ID/名称/标签搜索',
   'caseManagement.featureCase.ModuleOwned': '所属模块',
   'caseManagement.featureCase.excelImportTip': '仅支持 xls/xlsx 格式的文件',
   'caseManagement.featureCase.xmindImportTip': '仅支持xmind格式的文件',