From ace829f19b464f5ea12449dd9eeee78e4d848ac6 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Wed, 18 Sep 2024 15:18:40 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89-?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA&=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046458 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046458
--bug=1046495 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046495
--bug=1046413 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046413
---
 .../pure/ms-advance-filter/filterDrawer.vue     | 17 +++++++----------
 .../components/pure/ms-advance-filter/index.vue | 13 ++++++++++++-
 .../project/components/userDrawer.vue           |  8 --------
 .../components/userDrawer.vue                   | 11 -----------
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
index 9ba09d486c..163492fa84 100644
--- a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
+++ b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
@@ -57,14 +57,14 @@
             </div>
           </a-select>
         </a-form-item>
-        <a-form-item :field="`list[${listIndex}].operator`" class="w-[120px]" hide-asterisk>
+        <a-form-item :field="`list[${listIndex}].operator`" class="w-[105px]" hide-asterisk>
           <a-select v-model="item.operator" :disabled="!item.dataIndex" @change="operatorChange(item, listIndex)">
             <a-option v-for="option in operatorOptionsMap[item.type]" :key="option.value" :value="option.value">
               {{ t(option.label as string) }}
             </a-option>
           </a-select>
         </a-form-item>
-        <a-form-item class="flex-1 overflow-hidden" :field="`list[${listIndex}].value`" hide-asterisk>
+        <a-form-item class="flex-[1.5] overflow-hidden" :field="`list[${listIndex}].value`" hide-asterisk>
           <a-textarea
             v-if="item.type === FilterType.TEXTAREA"
             v-model:model-value="item.value"
@@ -126,6 +126,7 @@
             v-model:model-value="item.value"
             :data="item.treeSelectData"
             :disabled="isValueDisabled(item)"
+            allow-clear
             allow-search
             :placeholder="t('common.pleaseSelect')"
             :filter-tree-node="filterTreeNode"
@@ -137,6 +138,9 @@
             }"
             v-bind="item.treeSelectProps"
           >
+            <template #label="{ data }">
+              <div class="one-line-text">{{ data.label }}</div>
+            </template>
             <template #tree-slot-title="node">
               <a-tooltip :content="`${node.name}`" position="tr">
                 <div class="one-line-text max-w-[170px]">{{ node.name }}</div>
@@ -147,7 +151,7 @@
             v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
             v-model:model-value="item.value"
             show-time
-            format="YYYY-MM-DD hh:mm"
+            format="YYYY-MM-DD HH:mm"
             :disabled="isValueDisabled(item)"
           />
           <a-range-picker
@@ -564,13 +568,6 @@
     .arco-form-item-message {
       margin-bottom: 0;
     }
-    .arco-select-view {
-      height: 32px;
-      .arco-select-view-inner {
-        @apply overflow-y-auto overflow-x-hidden;
-        .ms-scroll-bar();
-      }
-    }
   }
 </style>
 
diff --git a/frontend/src/components/pure/ms-advance-filter/index.vue b/frontend/src/components/pure/ms-advance-filter/index.vue
index 82467d2a12..fce17ce1e0 100644
--- a/frontend/src/components/pure/ms-advance-filter/index.vue
+++ b/frontend/src/components/pure/ms-advance-filter/index.vue
@@ -118,7 +118,7 @@
       >
         <template #icon>
           <MsIcon
-            type="icon-icon_copy_outlined"
+            type="icon-icon_filter"
             :class="`${isAdvancedSearchMode ? 'text-[rgb(var(--primary-5))]' : 'text-[var(--color-text-4)]'}`"
           />
         </template>
@@ -241,6 +241,17 @@
     viewSelectOptionVisible.value = false;
   }
 
+  watch(
+    () => viewSelectOptionVisible.value,
+    (val) => {
+      if (!val) {
+        customViews.value.forEach((item) => {
+          item.isShowNameInput = false;
+        });
+      }
+    }
+  );
+
   async function changeViewToFirstCustom() {
     await getUserViewList();
     currentView.value = customViews.value[0].id;
diff --git a/frontend/src/views/setting/organization/project/components/userDrawer.vue b/frontend/src/views/setting/organization/project/components/userDrawer.vue
index ffb4a7f522..b2a75a1146 100644
--- a/frontend/src/views/setting/organization/project/components/userDrawer.vue
+++ b/frontend/src/views/setting/organization/project/components/userDrawer.vue
@@ -281,12 +281,4 @@
     height: 100vh !important;
     border: 1px solid red;
   }
-  // 下拉不折行
-  :deep(.arco-select-view) {
-    height: 32px;
-    .arco-select-view-inner {
-      @apply overflow-y-auto overflow-x-hidden;
-      .ms-scroll-bar();
-    }
-  }
 </style>
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
index d467106078..8268aced59 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
@@ -304,14 +304,3 @@
     }
   );
 </script>
-
-<style lang="less" scoped>
-  // 下拉不折行
-  :deep(.arco-select-view) {
-    height: 32px;
-    .arco-select-view-inner {
-      @apply overflow-y-auto overflow-x-hidden;
-      .ms-scroll-bar();
-    }
-  }
-</style>