diff --git a/CHANGELOG.md b/CHANGELOG.md index 65c76e5d87d0ed4f77c8e9db1cb8bec36bcd7d2f..4dc86f295b45bd5878d3a3fce179cd2af7b4fde6 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 9f3caaf5c27b8bb7dd645bf570dc6376e0ac5095..d6b2cfbdee59ad706116d6e2239a91a2bbdb41be 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 2485ddb50dac57b323c1abd3752929d9e00dc000..475fad69d566adcbe56754cd91e2b5de5e5a5b8b 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 6bf86be7aa13c4d98a100fdcd861c4835290b367..5f9e9e7d990e11b7126a08291e9bf11a538efb79 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 f9f327027f6667ff42cb9ac68deac8834baa996e..08d8c940a412bf265b8aea2957181930ef392ada 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 6882b16669323937a01792b0087003abfaa4109d..008848b0822d7353438b8e94962003ce3fc260eb 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 b186268e8b1c6cd96053acb4c65346eb8f36e522..029122329c22443d1f35e795a9922714b9e821a8 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: '更多',