From 996b2af3f1dee714e35853d3fdb4b5affa22ea8d Mon Sep 17 00:00:00 2001 From: slow123top Date: Thu, 26 Jun 2025 14:53:36 +0800 Subject: [PATCH 1/4] fix: restore tree entity updating data --- .../entity-tree-view/components/entity-tree-view.component.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/designer/src/components/components/entity-tree-view/components/entity-tree-view.component.tsx b/packages/designer/src/components/components/entity-tree-view/components/entity-tree-view.component.tsx index 7529953f486..797537b2798 100644 --- a/packages/designer/src/components/components/entity-tree-view/components/entity-tree-view.component.tsx +++ b/packages/designer/src/components/components/entity-tree-view/components/entity-tree-view.component.tsx @@ -72,7 +72,7 @@ export default defineComponent({ getTreeViewData(); if (entityTreeRef.value && entityTreeRef.value.updateDataSource) { - entityTreeRef.value.updateDataSource(treeViewData.value, {keepScrollPosition: true}); + entityTreeRef.value.updateDataSource(treeViewData.value); nextTick(() => { setTreeDraggable(); @@ -135,7 +135,6 @@ export default defineComponent({ return
Date: Thu, 26 Jun 2025 15:25:48 +0800 Subject: [PATCH 2/4] fix: restore select-all checkbox of tree grid --- .../components/column-header/column-header.component.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx index ede206663d4..4c9ce8b6533 100644 --- a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx +++ b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx @@ -197,7 +197,7 @@ export default function ( onDragenter={(payload: DragEvent) => dragenter(payload, columnIndex)} onDragend={(payload: DragEvent) => dragend(payload, headerCell)} onDragover={(payload: DragEvent) => dragover(payload, columnIndex)}> - { + {/* { // 树表第一列全选按钮 props.hierarchy && columnIndex === 0 && showSelectAll.value && ( @@ -207,7 +207,7 @@ export default function ( > ) - } + } */} { context.slots.headerCellTemplate ? context.slots.headerCellTemplate({ headerCell, headerCells, columnIndex }): -- Gitee From 439d1d5136673596189909b7ac3797b43d9ce2b9 Mon Sep 17 00:00:00 2001 From: slow123top Date: Thu, 26 Jun 2025 19:19:26 +0800 Subject: [PATCH 3/4] fix: line number title show ellipsis when title too long --- packages/ui-vue/components/data-grid/src/data-grid.props.ts | 1 + .../components/column-header/column-header.component.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ui-vue/components/data-grid/src/data-grid.props.ts b/packages/ui-vue/components/data-grid/src/data-grid.props.ts index 6c873be0dc5..17222c12595 100644 --- a/packages/ui-vue/components/data-grid/src/data-grid.props.ts +++ b/packages/ui-vue/components/data-grid/src/data-grid.props.ts @@ -386,6 +386,7 @@ export const dataGridProps = { type: Object as PropType, default: { enable: true, width: 32, + showEllipsis:true, heading: '序号' } }, diff --git a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx index 4c9ce8b6533..7d3753b8255 100644 --- a/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx +++ b/packages/ui-vue/components/data-view/components/column-header/column-header.component.tsx @@ -284,8 +284,8 @@ export default function ( style={rowNumberStyle.value}>
{sidebarTitle.value}
} -- Gitee From 2f317221989a47b33f659773f3ae3076c867ea4f Mon Sep 17 00:00:00 2001 From: slow123top Date: Fri, 27 Jun 2025 11:32:15 +0800 Subject: [PATCH 4/4] fix: restore lookup fitMode --- .../src/components/favorite/lookup-favorite.component.tsx | 2 +- .../components/selected-list/lookup-selected-list.component.tsx | 2 +- .../ui-vue/components/lookup/src/composition/use-check-props.ts | 2 +- .../ui-vue/components/lookup/src/composition/use-navigation.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ui-vue/components/lookup/src/components/favorite/lookup-favorite.component.tsx b/packages/ui-vue/components/lookup/src/components/favorite/lookup-favorite.component.tsx index b8e7e4c7210..c15dbacd4f2 100644 --- a/packages/ui-vue/components/lookup/src/components/favorite/lookup-favorite.component.tsx +++ b/packages/ui-vue/components/lookup/src/components/favorite/lookup-favorite.component.tsx @@ -113,7 +113,7 @@ export default defineComponent({ const columnOptions= { fitColumns: true, - fitMode: 'expand', + fitMode: 'percentage', resizeColumn: true }; diff --git a/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.component.tsx b/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.component.tsx index d5ba4e76933..f3d7d2e5a79 100644 --- a/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.component.tsx +++ b/packages/ui-vue/components/lookup/src/components/selected-list/lookup-selected-list.component.tsx @@ -72,7 +72,7 @@ export default defineComponent({ const columnOptions= { fitColumns: true, - fitMode: 'expand', + fitMode: 'percentage', resizeColumn: true }; diff --git a/packages/ui-vue/components/lookup/src/composition/use-check-props.ts b/packages/ui-vue/components/lookup/src/composition/use-check-props.ts index 0ba29c87062..aae2186bc73 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-check-props.ts +++ b/packages/ui-vue/components/lookup/src/composition/use-check-props.ts @@ -31,7 +31,7 @@ export function useCheckProps(props: LookupProps, lookupStates: LookupStates) { function checkColumnOptions() { return { fitColumns: props.fitColumns, - fitMode: 'expand', + fitMode: 'percentage', resizeColumn: true }; } diff --git a/packages/ui-vue/components/lookup/src/composition/use-navigation.tsx b/packages/ui-vue/components/lookup/src/composition/use-navigation.tsx index bc7ebdd7dcc..d2cb15df47e 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-navigation.tsx +++ b/packages/ui-vue/components/lookup/src/composition/use-navigation.tsx @@ -38,7 +38,7 @@ export function useNavigation(props: LookupProps, context) { const columnOptions = { fitColumns: true, - fitMode: 'expand', + fitMode: 'percentage', resizeColumn: true }; -- Gitee