From 9a823c8d95c7eb925d6b80f0ed96749000427536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com>
Date: Mon, 11 Nov 2024 10:19:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E8=BF=87=E6=BB=A4=E5=99=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20--f1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/control/search-bar/filter-tree/filter-tree.scss | 5 +++++
 src/control/search-bar/search-bar.tsx               | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/control/search-bar/filter-tree/filter-tree.scss b/src/control/search-bar/filter-tree/filter-tree.scss
index 6159e98f4b..8ef4000ef1 100644
--- a/src/control/search-bar/filter-tree/filter-tree.scss
+++ b/src/control/search-bar/filter-tree/filter-tree.scss
@@ -77,6 +77,11 @@ $filter-tree: (
     position: absolute;
     top: getCssVar(spacing, base);
     left: rem(-40px);
+    .van-dropdown-menu__bar {
+      box-shadow: none;
+      background-color: transparent;
+      height: auto;
+    }
     .van-dropdown-menu__title {
       padding-left: 0;
     }
diff --git a/src/control/search-bar/search-bar.tsx b/src/control/search-bar/search-bar.tsx
index 11917d652c..8a2f9f79d0 100644
--- a/src/control/search-bar/search-bar.tsx
+++ b/src/control/search-bar/search-bar.tsx
@@ -80,6 +80,9 @@ export const SearchBarControl = defineComponent({
               onCancel={() => {
                 c.resetFilter();
                 c.state.customCond = '';
+                if (popover) {
+                  popover.dismiss();
+                }
               }}
             ></iBizFilterTreeControl>
           );
-- 
Gitee


From e4b9eb53e41be5111a0b0ee7905e8517f0585350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com>
Date: Mon, 11 Nov 2024 10:31:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../search-bar/filter-tree/filter-tree.tsx    | 30 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db2a5e5ae6..4560bd1307 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - 更新编辑器提供清除能力，更新富文本是否已折叠状态持久化，更新移动端列表如果支持排序，会给视图设置class
 - 返回顶部按钮、气泡工具栏按钮添加底部安全距离
 - 添加搜索栏过滤器组件
+- 过滤组件添加默认新建过滤功能
 
 ### Fixed
 
diff --git a/src/control/search-bar/filter-tree/filter-tree.tsx b/src/control/search-bar/filter-tree/filter-tree.tsx
index 2d7c0642e4..98a0595d38 100644
--- a/src/control/search-bar/filter-tree/filter-tree.tsx
+++ b/src/control/search-bar/filter-tree/filter-tree.tsx
@@ -14,6 +14,7 @@ import {
   computed,
   defineComponent,
   h,
+  onMounted,
   PropType,
   Ref,
   ref,
@@ -139,6 +140,22 @@ export const FilterTreeControl = defineComponent({
 
     const allFields: Array<FieldInfo> = [];
 
+    // 是否存在过滤数据
+    const hasFilter = () => {
+      // 无数据
+      if (!UiFilterNodes.value.length) {
+        return false;
+      }
+      const group = UiFilterNodes.value[0] as IFilterNodeGroup;
+      if (
+        group.children.length === 1 &&
+        !(group.children[0] as IFilterNodeField).field
+      ) {
+        return false;
+      }
+      return true;
+    };
+
     // !初始化所有属性字段信息
     props.filterControllers.forEach(filterC => {
       let find = allFields.find(x => x.name === filterC.key);
@@ -343,6 +360,13 @@ export const FilterTreeControl = defineComponent({
       showPopup.value = false;
     };
 
+    onMounted(() => {
+      const bol = hasFilter();
+      if (!bol) {
+        addItem();
+      }
+    });
+
     /**
      * 绘制编辑器
      * @param node
@@ -446,10 +470,8 @@ export const FilterTreeControl = defineComponent({
         return;
       }
       // 默认数据不绘制
-      if (
-        node.children.length === 1 &&
-        !(node.children[0] as IFilterNodeField).field
-      ) {
+      const bol = hasFilter();
+      if (!bol) {
         return;
       }
       return (
-- 
Gitee