This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/0.7.x by this push:
new 05883caa4 Merge #3152 and fix conflicts
05883caa4 is described below
commit 05883caa45d35c4d4251d77973bf8661c54fa7df
Author: chouchouji <[email protected]>
AuthorDate: Tue Sep 3 19:27:23 2024 +0800
Merge #3152 and fix conflicts
---
amoro-ams/amoro-ams-dashboard/src/types/common.type.ts | 1 +
.../amoro-ams-dashboard/src/views/tables/components/Selector.vue | 4 ++--
2 files changed, 3 insertions(+), 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
index c2e0ba208..6c28088a2 100644
--- 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
index bc9162d80..44560972b 100644
--- 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')">
