From 866ad4f47e13571d337e98cd51af78e1adbfb16b Mon Sep 17 00:00:00 2001 From: "jlj05024111@163.com" Date: Thu, 28 Nov 2024 21:39:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E8=AE=BE=E7=BD=AE=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=87=8C=E6=98=BE=E7=A4=BA=E5=88=97=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B=E5=9C=A8=E9=80=89=E6=8B=A9=E6=98=BE=E7=A4=BA=E5=88=97?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=E8=BE=BE=E5=88=B0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=BF=9B=E8=A1=8C=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ src/common/gantt-setting/gantt-setting.scss | 1 + src/common/gantt-setting/gantt-setting.tsx | 3 +++ src/control/form/form-detail/form-item/form-item.tsx | 1 - src/control/gantt/gantt.tsx | 10 +++++++--- src/locale/en/index.ts | 1 + src/locale/zh-CN/index.ts | 1 + 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c76e5d8..4dc86f295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Changed + +- 修改甘特表格列设置组件里显示列的样式；在选择显示列的数量达到限制时，进行消息提示 + ## [0.7.38-alpha.29] - 2024-11-28 ### Added diff --git a/src/common/gantt-setting/gantt-setting.scss b/src/common/gantt-setting/gantt-setting.scss index 9f3caaf5c..d6b2cfbde 100644 --- a/src/common/gantt-setting/gantt-setting.scss +++ b/src/common/gantt-setting/gantt-setting.scss @@ -143,6 +143,7 @@ $gantt-setting: ( } @include e('drag-icon'){ + margin: getCssVar(spacing,extra-tight) getCssVar(spacing,extra-tight) 0 0; opacity: 0; } diff --git a/src/common/gantt-setting/gantt-setting.tsx b/src/common/gantt-setting/gantt-setting.tsx index 2485ddb50..475fad69d 100644 --- a/src/common/gantt-setting/gantt-setting.tsx +++ b/src/common/gantt-setting/gantt-setting.tsx @@ -141,6 +141,9 @@ export const IBizGanttSetting = defineComponent({ return !must && !_item.hidden; }); if (columns && columns.length >= props.limitsize) { + ibiz.message.warning( + ibiz.i18n.t('component.ganttSetting.reachedMaximum'), + ); return; } } diff --git a/src/control/form/form-detail/form-item/form-item.tsx b/src/control/form/form-detail/form-item/form-item.tsx index 6bf86be7a..5f9e9e7d9 100644 --- a/src/control/form/form-detail/form-item/form-item.tsx +++ b/src/control/form/form-detail/form-item/form-item.tsx @@ -105,7 +105,6 @@ export const FormItem = defineComponent({ this.ns.m(this.modelData.id), ...this.controller.containerClass, ]} - controller={this.controller.editor} style={this.modelData.cssStyle} required={this.c.state.required} error={this.c.state.error} diff --git a/src/control/gantt/gantt.tsx b/src/control/gantt/gantt.tsx index f9f327027..08d8c940a 100644 --- a/src/control/gantt/gantt.tsx +++ b/src/control/gantt/gantt.tsx @@ -754,9 +754,13 @@ export const GanttControl = defineComponent({ * @param {number} width */ const onHeaderDragend = (index: number, width: number) => { - const columnState = c.state.columnStates[index]; - if (columnState) { - columnState.columnWidth = width; + // 此处的index是实际绘制列的index的顺序,所以需要先过滤一下才能找到对应的缓存列，参考上方172行 + const columnState = c.state.columnStates.filter((item: IColumnState) => { + const columnModel = c.columns[item.key]?.model; + return !item.hidden && columnModel; + }); + if (columnState && columnState[index]) { + columnState[index].columnWidth = width; c.saveColumnState(); } }; diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 6882b1666..008848b08 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -544,6 +544,7 @@ export default { optionalAttribute: 'Optional attributes', selectedAttribute: 'Selected attributes', limitsize: 'Maximum limit {max}', + reachedMaximum: 'Reached maximum value', }, actionToolbar: { more: 'More', diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index b186268e8..029122329 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -506,6 +506,7 @@ export default { optionalAttribute: '可选择属性', selectedAttribute: '已选择属性', limitsize: '上限{max}个', + reachedMaximum: '已达最大值', }, actionToolbar: { more: '更多', -- Gitee