From 2aaeaa2c50182199c23e070dd726ed2974c89dd6 Mon Sep 17 00:00:00 2001
From: Cano1997 <1978141412@qq.com>
Date: Sun, 28 Sep 2025 20:02:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E6=B3=A8=E5=85=A5=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E8=8F=9C=E5=8D=95=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  4 ++++
 src/control/app-menu/app-menu.tsx | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98776db8..dbd7d96b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- 菜单部件支持注入属性，通过菜单逻辑模型配置
+
 ## [0.7.41-alpha.28] - 2025-09-28
 
 ### Added
diff --git a/src/control/app-menu/app-menu.tsx b/src/control/app-menu/app-menu.tsx
index 6051caf5..27ad1499 100644
--- a/src/control/app-menu/app-menu.tsx
+++ b/src/control/app-menu/app-menu.tsx
@@ -29,11 +29,30 @@ import {
   formatSeparator,
   IControlProvider,
   AppMenuController,
+  ScriptFactory,
 } from '@ibiz-template/runtime';
 import { useRoute } from 'vue-router';
 import { MenuDesign } from './custom-menu-design/custom-menu-design';
 import './app-menu.scss';
 
+/**
+ * @description 绘制成员的attrs
+ * @param {IAppMenu} model
+ * @param {IParams} params
+ * @returns {*}  {IParams}
+ */
+function renderAttrs(model: IAppMenu, params: IParams): IParams {
+  const attrs: IParams = {};
+  model.controlAttributes?.forEach(item => {
+    if (item.attrName && item.attrValue) {
+      attrs[item.attrName!] = ScriptFactory.execSingleLine(item.attrValue!, {
+        ...params,
+      });
+    }
+  });
+  return attrs;
+}
+
 /**
  * 递归生成菜单数据，递给 element 的 Menu 组件
  *
@@ -737,6 +756,9 @@ export const AppMenuControl = defineComponent({
             ellipsis-icon={() => this.ellipsisSvg()}
             ellipsis={this.menuMode === 'horizontal'}
             {...this.$attrs}
+            {...renderAttrs(this.c.model, {
+              ...this.c.getEventArgs(),
+            })}
           >
             {{
               default: () => {
-- 
Gitee


From 4744b8be9eb39d8e1380e576bf6a5130eeff0452 Mon Sep 17 00:00:00 2001
From: Cano1997 <1978141412@qq.com>
Date: Sun, 28 Sep 2025 20:06:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=20=E6=90=9C=E7=B4=A2=E6=A0=8F?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=90=9C=E7=B4=A2=E5=88=86=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E7=BB=84=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E9=85=8D=E7=BD=AE=E5=88=99=E9=80=89=E4=B8=AD=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E9=A1=B9=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                          | 4 ++++
 src/control/search-bar/search-bar.tsx | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbd7d96b..90329271 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@
 
 - 菜单部件支持注入属性，通过菜单逻辑模型配置
 
+### Changed
+
+- 搜索栏识别搜索分组的默认分组配置，未配置则选中第一项分组
+
 ## [0.7.41-alpha.28] - 2025-09-28
 
 ### Added
diff --git a/src/control/search-bar/search-bar.tsx b/src/control/search-bar/search-bar.tsx
index 24dbe26a..5345c68e 100644
--- a/src/control/search-bar/search-bar.tsx
+++ b/src/control/search-bar/search-bar.tsx
@@ -120,7 +120,8 @@ export const SearchBarControl = defineComponent({
       c.model.searchBarGroups &&
       c.model.searchBarGroups?.length > 0
     ) {
-      c.state.selectedGroupItem = c.model.searchBarGroups[0];
+      const defaultGroup = c.model.searchBarGroups.find(x => x.defaultGroup);
+      c.state.selectedGroupItem = defaultGroup || c.model.searchBarGroups[0];
     }
 
     const filterButtonRef = ref();
-- 
Gitee