From 30192a5c917ed7543822e8f736dcc8ab9e7ccca9 Mon Sep 17 00:00:00 2001
From: RedPig97 <1978141412@qq.com>
Date: Mon, 15 Jul 2024 20:19:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=88=86=E7=BB=84=E9=BB=98=E8=AE=A4=E5=85=A8=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/control/list/list.tsx | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/control/list/list.tsx b/src/control/list/list.tsx
index 3c108f617..22fe259e0 100644
--- a/src/control/list/list.tsx
+++ b/src/control/list/list.tsx
@@ -66,6 +66,20 @@ export const ListControl = defineComponent({
     // 无限滚动元素标识
     const infiniteScrollKey = ref<string>(createUUID());
 
+    // 分组默认展开项
+    const defaultOpens = ref();
+    if (c.controlParams.defaultexpandall === 'true') {
+      watch(
+        () => c.state.groups,
+        () => {
+          if (c.state.groups.length > 0) {
+            defaultOpens.value = c.state.groups.map(x => x.key);
+          }
+        },
+      );
+      defaultOpens.value = c.state.groups.map(x => x.key);
+    }
+
     watch(
       () => c.state.curPage,
       () => {
@@ -131,6 +145,7 @@ export const ListControl = defineComponent({
         <el-collapse-item
           title={showTitle(group.caption)}
           class={ns.be('group-content', 'item')}
+          name={group.key}
         >
           {group.children.length > 0 ? (
             group.children.map(item => {
@@ -151,7 +166,10 @@ export const ListControl = defineComponent({
     const renderListContent = (): VNode => {
       if (c.model.enableGroup && !c.state.isSimple) {
         return (
-          <el-collapse class={[ns.b('group-content'), ns.b('content')]}>
+          <el-collapse
+            v-model={defaultOpens.value}
+            class={[ns.b('group-content'), ns.b('content')]}
+          >
             {c.state.groups?.map(group => {
               return (
                 <div class={[ns.b('scroll-item')]}>{renderGroup(group)}</div>
-- 
Gitee


From b6fbea7c4cb8ff13233d723e73851520d00af8fe Mon Sep 17 00:00:00 2001
From: RedPig97 <1978141412@qq.com>
Date: Mon, 15 Jul 2024 20:19:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E6=A0=91=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=A1=A8=E6=A0=BC=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E5=88=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/control/tree-grid/tree-grid.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/control/tree-grid/tree-grid.tsx b/src/control/tree-grid/tree-grid.tsx
index d22dbcbac..eae983413 100644
--- a/src/control/tree-grid/tree-grid.tsx
+++ b/src/control/tree-grid/tree-grid.tsx
@@ -63,8 +63,13 @@ export const TreeGridControl = defineComponent({
     } = useITableEvent(c);
     const { onPageChange, onPageRefresh, onPageSizeChange } =
       useAppGridPagination(c);
-    const { tableData, renderColumns, defaultSort, summaryMethod } =
-      useAppGridBase(c, props as IGridProps);
+    const {
+      tableData,
+      renderColumns,
+      defaultSort,
+      summaryMethod,
+      headerDragend,
+    } = useAppGridBase(c, props as IGridProps);
     const { renderPopover } = useRowEditPopover(tableRef, c);
 
     const { headerCssVars } = useGridHeaderStyle(tableRef, ns);
@@ -211,6 +216,7 @@ export const TreeGridControl = defineComponent({
       renderNoData,
       loadData,
       summaryMethod,
+      headerDragend,
       renderPopover,
       renderBatchToolBar,
       headerCssVars,
@@ -238,6 +244,7 @@ export const TreeGridControl = defineComponent({
             class={this.ns.e('table')}
             default-sort={this.defaultSort}
             border
+            default-expand-all
             show-header={!hideHeader}
             show-summary={this.c.enableAgg}
             summary-method={this.summaryMethod}
@@ -251,6 +258,7 @@ export const TreeGridControl = defineComponent({
             onRowDblclick={this.onDbRowClick}
             onSelectionChange={this.onSelectionChange}
             onSortChange={this.onSortChange}
+            onHeaderDragend={this.headerDragend}
             tooltip-effect={'light'}
             tree-props={{ children: 'children', hasChildren: 'hasChildren' }}
             load={this.loadData}
-- 
Gitee