diff --git a/src/control/form/search-form/search-form.scss b/src/control/form/search-form/search-form.scss
index df1d72067aa79ede5fc9fe75fdc480c7d50b345c..da744e5c770c3310bc370a5ef83bd4e842cfbc1c 100644
--- a/src/control/form/search-form/search-form.scss
+++ b/src/control/form/search-form/search-form.scss
@@ -1,15 +1,20 @@
 $control-search-form: (
   'bg-color': transparent,
   'padding': getCssVar(spacing, tight) getCssVar(spacing, base),
-  'right-gap': getCssVar(spacing, base),
+  'right-gap': 0,
+  'color-searchform-bottom': getCssVar(color, border),
+  'spacing-right-buttons-padding': getCssVar(spacing, tight)
+    getCssVar(spacing, base) getCssVar(spacing, tight) 0,
   'btn-margin': 0 0 0 getCssVar(spacing, tight),
+  'spacing-right-form-padding': getCssVar(spacing, base) 0,
   'form-page-item-padding-top': calc(getCssVar('padding') / 2),
   'form-item-container-padding-bottom': calc(getCssVar('padding', 'right') / 2),
 );
 
 @include b(control-searchform) {
   @include set-component-css-var('control-search-form', $control-search-form);
-
+  border-bottom: 1px solid
+    getCssVar('control-search-form', 'color-searchform-bottom');
   background-color: getCssVar('control-search-form', 'bg-color');
 
   .#{bem(form-page-item)} {
@@ -39,11 +44,15 @@ $control-search-form: (
 
   @include e('right') {
     @include flex(row, flex-start, center);
-
+    padding: getCssVar('control-search-form', 'spacing-right-form-padding');
     gap: getCssVar('control-search-form', 'right-gap');
 
     .#{bem(control-searchform,buttons)} {
-      flex-shrink: 0; 
+      flex-shrink: 0;
+      padding: getCssVar(
+        'control-search-form',
+        'spacing-right-buttons-padding'
+      );
     }
   }
 }
diff --git a/src/control/search-bar/search-bar.tsx b/src/control/search-bar/search-bar.tsx
index 4566f4addb2395931b6c3890ca3532540691d380..2a434da40a36b6e753b73ad64cd90de2187603da 100644
--- a/src/control/search-bar/search-bar.tsx
+++ b/src/control/search-bar/search-bar.tsx
@@ -15,6 +15,7 @@ import {
 import { ISearchBar, ISearchBarGroup } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
 import {
+  getOriginFilterNodes,
   IControlProvider,
   IOverlayPopoverContainer,
   SearchBarController,
@@ -337,6 +338,8 @@ export const SearchBarControl = defineComponent({
 
     // 分组点击
     const onGroupClick = (item: ISearchBarGroup) => {
+      c.state.filterNodes = getOriginFilterNodes();
+      c.state.customCond = '';
       if (c.state.selectedGroupItem?.id !== item?.id) {
         c.state.selectedGroupItem = item;
         c.evt.emit('onTabChange', { data: [item] });
diff --git a/src/editor/array/ibiz-array/ibiz-array.scss b/src/editor/array/ibiz-array/ibiz-array.scss
index 09b3c75d68ccdeb2947c492cb6a7e19e8c6e8cfa..49950bbe8f000cb177a3e6107ebb75b310097603 100644
--- a/src/editor/array/ibiz-array/ibiz-array.scss
+++ b/src/editor/array/ibiz-array/ibiz-array.scss
@@ -4,20 +4,17 @@ $array: (
   placeholder-color: getCssVar(editor, default, placeholder-color),
   disabled-color: getCssVar(editor, disabled, text-color),
   readonly-color: getCssVar(editor, readonly, text-color),
-  
+  color-array-item-border: getCssVar(color, border),
   // 字体大小
   font-size: getCssVar(editor, default, font-size),
-
   // 行高
   line-height: getCssVar(editor, default, line-height),
-
   // 文本对齐
   text-align: getCssVar(editor, default, text-align),
-
   // 高度
   min-height: getCssVar(editor, default, line-height),
   spacing-icons-gap: getCssVar(spacing, tight),
-  spacing-icons-margin-left: getCssVar(spacing,base),
+  spacing-icons-margin-left: getCssVar(spacing, base)
 );
 
 @include b(array) {
@@ -28,7 +25,7 @@ $array: (
   line-height: getCssVar(array, line-height);
   color: getCssVar(array, color);
   display: flex;
-  align-items: end; 
+  align-items: end;
   flex-direction: column;
 
   --van-field-input-text-color: #{getCssVar(array, color)};
@@ -61,8 +58,9 @@ $array: (
   }
 }
 
-@include b('array-item'){
+@include b('array-item') {
   width: 100%;
+  border-bottom: 1px solid getCssVar(array, color-array-item-border);
 }
 
 @include b(array-add-icon) {
diff --git a/src/panel-component/setting-container/setting-container.controller.ts b/src/panel-component/setting-container/setting-container.controller.ts
index f38fb3a39fe72011df57e3bd44eacb7f9bcbc828..48e09011e0bc5f55657377d93fd1db6f56369680 100644
--- a/src/panel-component/setting-container/setting-container.controller.ts
+++ b/src/panel-component/setting-container/setting-container.controller.ts
@@ -4,7 +4,7 @@ import {
   ISearchFormController,
   PanelContainerController,
 } from '@ibiz-template/runtime';
-import { IPanelContainer } from '@ibiz/model-core';
+import { IAppDEMultiDataView, IPanelContainer } from '@ibiz/model-core';
 
 /**
  * @description 设置容器控制器
@@ -57,7 +57,11 @@ export class SettingContainerController extends PanelContainerController<IPanelC
     if (!this.searchbar || !this.searchbar.model.enableQuickSearch) {
       return false;
     }
-    return this.isMDSortButton || !!this.searchform;
+    return (
+      this.isMDSortButton ||
+      (!!this.searchform &&
+        !(this.panel.view.model as IAppDEMultiDataView).expandSearchForm)
+    );
   }
 
   /**
@@ -71,13 +75,16 @@ export class SettingContainerController extends PanelContainerController<IPanelC
   }
 
   /**
-   * 是否显示高级搜索按钮
+   * 是否显示高级搜索按钮，存在搜索表单并且搜索表单不是默认展开时显示
    *
    * @readonly
    * @type {boolean}
    * @memberof SettingContainerController
    */
   get isMDSearchformBtn(): boolean {
-    return !!this.searchform;
+    return (
+      !!this.searchform &&
+      !(this.panel.view.model as IAppDEMultiDataView).expandSearchForm
+    );
   }
 }