From da6c3d796f89e1d9e049f8cad3f6ba61948f4ce7 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Wed, 25 Sep 2024 12:41:04 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89-?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF&?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1047063 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001047063
--bug=1047060 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001047060
---
 .../pure/ms-advance-filter/filterDrawer.vue         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
index 91717f07df..d47dca7ba2 100644
--- a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
+++ b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
@@ -161,7 +161,12 @@
         </a-button>
       </div>
     </a-form>
-    <MsButton type="text" class="mt-[5px] w-[fit-content]" @click="handleAddItem">
+    <MsButton
+      :disabled="formModel.list?.length === [...props.configList, ...(props.customList ?? [])].length"
+      type="text"
+      class="mt-[5px] w-[fit-content]"
+      @click="handleAddItem"
+    >
       <MsIcon type="icon-icon_add_outlined" class="mr-[3px]" />
       {{ t('advanceFilter.addCondition') }}
     </MsButton>
@@ -528,6 +533,10 @@
     async (val) => {
       // 新建视图关闭后重新获取数据
       if (!val) {
+        if (isShowNameInput.value) {
+          formModel.value.name = savedFormModel.value.name;
+          isShowNameInput.value = false;
+        }
         handleCancelSaveAsView();
         if (formModel.value?.id !== props.currentView) {
           await getUserViewDetail(props.currentView);
@@ -563,7 +572,7 @@
       height: 60px;
       .arco-form-item-content,
       .arco-input-wrapper,
-      .arco-form-item-wrapper-col {
+      .arco-form-item-content-wrapper {
         height: 26px;
         min-height: 26px;
       }