From 64259969fd2ff3635ec0acd0e0eb71684aaa2475 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Sun, 10 Aug 2025 06:11:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=9C=A8=E8=A7=86=E5=9B=BE=E5=9B=BA=E5=AE=9A=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendar/components/custom-calendar/custom-calendar.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/control/calendar/components/custom-calendar/custom-calendar.scss b/src/control/calendar/components/custom-calendar/custom-calendar.scss index c8c4fd745..fe3802be9 100644 --- a/src/control/calendar/components/custom-calendar/custom-calendar.scss +++ b/src/control/calendar/components/custom-calendar/custom-calendar.scss @@ -201,6 +201,11 @@ min-width: 120px; } } + @include e(calendar-user){ + display: flex; + flex-direction: column; + height: 100%; + } @include e(calendar-user-header){ display: flex; align-items: center; -- Gitee From 40e999a922a26a153e42d09ebead8b134fd07af6 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Sun, 10 Aug 2025 06:12:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E5=BA=8F=E5=88=97=E6=A8=A1=E5=BC=8F=E4=B8=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=A0=BC=E5=88=97=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/chart/chart.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/control/chart/chart.tsx b/src/control/chart/chart.tsx index 5bf2c9be1..d85dfe9c3 100644 --- a/src/control/chart/chart.tsx +++ b/src/control/chart/chart.tsx @@ -240,6 +240,7 @@ const ChartControl = defineComponent({ border style={{ width: '100%' }} max-height={maxHeight.value} + span-method={c.spanMethod.bind(c)} header-row-class-name={ns.e('grid-header')} > {c.state.gridHeaders.map((column: IData) => { -- Gitee From 1c1d0364547f35d6330d3f3de4e52c5e4ba4903d Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Sun, 10 Aug 2025 06:13:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=A0=91?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=94=AF=E6=8C=81=E5=86=85=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/tree-grid/tree-grid.tsx | 167 ++++++++++++++-------------- 1 file changed, 86 insertions(+), 81 deletions(-) diff --git a/src/control/tree-grid/tree-grid.tsx b/src/control/tree-grid/tree-grid.tsx index ed7a8c8e0..99c9493c5 100644 --- a/src/control/tree-grid/tree-grid.tsx +++ b/src/control/tree-grid/tree-grid.tsx @@ -82,6 +82,7 @@ export const TreeGridControl = defineComponent({ onRowClick, onDbRowClick, onSelectionChange, + handleHeaderCellClassName, onSortChange, handleRowClassName, } = useITableEvent(c); @@ -220,6 +221,7 @@ export const TreeGridControl = defineComponent({ headerDragend, renderPopover, renderBatchToolBar, + handleHeaderCellClassName, headerCssVars, }; }, @@ -227,87 +229,90 @@ export const TreeGridControl = defineComponent({ const state = this.c.state; const { hideHeader, enablePagingBar } = this.c.model; return ( - - {this.c.state.isLoaded && ( - - {{ - empty: this.renderNoData, - default: (): VNodeArrayChildren => { - return [ - !state.singleSelect && ( - - ), - state.isCreated && - this.renderColumns.map((model, index) => { - return this.renderColumn(model, index); - }), - ]; - }, - append: () => { - return this.renderPopover(); - }, - }} - - )} - {enablePagingBar && ( - - )} - {this.c.model.enableCustomized && !hideHeader && ( -
- -
- )} - {this.renderBatchToolBar()} - + + + {this.c.state.isLoaded && ( + + {{ + empty: this.renderNoData, + default: (): VNodeArrayChildren => { + return [ + !state.singleSelect && ( + + ), + state.isCreated && + this.renderColumns.map((model, index) => { + return this.renderColumn(model, index); + }), + ]; + }, + append: () => { + return this.renderPopover(); + }, + }} + + )} + {enablePagingBar && ( + + )} + {this.c.model.enableCustomized && !hideHeader && ( +
+ +
+ )} + {this.renderBatchToolBar()} + + ); }, }); -- Gitee From 284238784fbd6536de2230147aa626f4863de566 Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Sun, 10 Aug 2025 06:14:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=88=97=E6=8D=A2=E8=A1=8C=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=BAellipsis=E6=97=B6=E5=8D=95=E5=85=83=E6=A0=BC=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E6=96=87=E6=9C=AC=E6=9C=AA=E5=87=BA=E7=9C=81=E7=95=A5?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grid/grid-column/grid-field-column/grid-field-column.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss index c647c2457..364f76e47 100644 --- a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss +++ b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss @@ -34,6 +34,8 @@ $grid-field-column: ( } @include m(ellipsis) { + overflow: hidden; + // 内部所有的span都呈现成省略号 .#{bem('grid-field-column-text-container')} { min-width: 0; -- Gitee From 1faa8e4972c4d2c04208275218f5a349688c53af Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Sun, 10 Aug 2025 06:16:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E5=9B=A0=E4=B8=BA=E8=AE=BE=E7=BD=AE=E5=86=85=E9=83=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E7=9A=84=E5=BF=AB=E9=80=9F=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=88=86=E5=89=B2=E6=8F=90=E7=A4=BA=E7=AC=A6=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E8=80=8C=E5=AF=BC=E8=87=B4=E7=9A=84=E6=AD=BB=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/exp-bar/render-util.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/control/exp-bar/render-util.tsx b/src/control/exp-bar/render-util.tsx index dc3d5d69a..7828fd617 100644 --- a/src/control/exp-bar/render-util.tsx +++ b/src/control/exp-bar/render-util.tsx @@ -67,15 +67,15 @@ export function useExpBarRender( ); if (modelData) { // 由于搜索栏部件参数无法配置，合并导航栏部件参数到搜索栏部件参数中 - if (modelData.controlParam) { - const { SEARCHPHSEPARATOR } = c.model.controlParam?.ctrlParams || {}; - if (SEARCHPHSEPARATOR) { - modelData.controlParam.ctrlParams = { - ...(modelData.controlParam.ctrlParams || {}), - SEARCHPHSEPARATOR, - }; - } - } + // if (modelData.controlParam) { + // const { SEARCHPHSEPARATOR } = c.model.controlParam?.ctrlParams || {}; + // if (SEARCHPHSEPARATOR) { + // modelData.controlParam.ctrlParams = { + // ...(modelData.controlParam.ctrlParams || {}), + // SEARCHPHSEPARATOR, + // }; + // } + // } const ctrlProps = { context: c.context, params: c.params, -- Gitee