Merge #3152 and fix conflicts

apache · Oct 11, 2024 · 05883ca · 05883ca
1 parent aebd12c
commit 05883ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/amoro-ams/amoro-ams-dashboard/src/types/common.type.ts b/amoro-ams/amoro-ams-dashboard/src/types/common.type.ts
@@ -59,6 +59,7 @@ export interface IKeyAndValue {
   value: string
 }
 export interface IBaseDetailInfo {
+  optimizingStatus: string
   tableType: string
   tableName: string
   createTime: string

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
@@ -88,8 +88,8 @@ onMounted(() => {
       <template #overlay>
         <div>
           <div class="branch-selector-search">
-            <a-input v-show="tabActiveKey === branchTypeMap.BRANCH" v-model:value="branchSearchKey" :placeholder="$t('filterBranchesOrTags')" @click="onClickInput" />
-            <a-input v-show="tabActiveKey === branchTypeMap.TAG" v-model:value="tagSearchKey" :placeholder="$t('filterBranchesOrTags')" @click="onClickInput" />
+            <a-input v-show="tabActiveKey === branchTypeMap.BRANCH" v-model:value="branchSearchKey" :placeholder="$t('filterBranchesOrTagsOrConsumers')" @click="onClickInput" />
+            <a-input v-show="tabActiveKey === branchTypeMap.TAG" v-model:value="tagSearchKey" :placeholder="$t('filterBranchesOrTagsOrConsumers')" @click="onClickInput" />
           </div>
           <a-tabs v-model:activeKey="tabActiveKey" type="card">
             <a-tab-pane :key="branchTypeMap.BRANCH" :tab="$t('branches')">