diff --git a/src/control/list/list.tsx b/src/control/list/list.tsx index 3c108f617a9e9163184ea1c40ee717df96ca4518..22fe259e0cee9e090c6ad6df620bf740937fafe6 100644 --- a/src/control/list/list.tsx +++ b/src/control/list/list.tsx @@ -66,6 +66,20 @@ export const ListControl = defineComponent({ // 无限滚动元素标识 const infiniteScrollKey = ref(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({ {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 ( - + {c.state.groups?.map(group => { return (
{renderGroup(group)}
diff --git a/src/control/tree-grid/tree-grid.tsx b/src/control/tree-grid/tree-grid.tsx index d22dbcbac679c09e151a69520ab05c8740194f3f..eae983413ff845655019cb36a5b78f2e168838b0 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}