From 38f06605ecb43e43608f95f24382dfeb654e30e2 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 31 Jul 2025 22:37:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E4=B8=8A=E4=BC=A0=E7=B1=BB=E7=BC=96=E8=BE=91=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E4=B8=8A=E4=BC=A0=E7=B1=BB=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E5=8F=82=E6=95=B0=20infoMap=EF=BC=88?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A7=84=E5=88=99=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/runtime/src/config/global-config.ts | 6 ++++++ .../global-config/i-api-global-config.ts | 8 ++++++++ .../i-api-global-upload-editor-config.ts | 19 +++++++++++++++++++ .../api/common/global-config/index.ts | 1 + .../i-global-upload-editor-config.ts | 9 +++++++++ .../interface/common/i-global-config/index.ts | 1 + .../runtime/src/interface/common/index.ts | 1 + 7 files changed, 45 insertions(+) create mode 100644 packages/runtime/src/interface/api/common/global-config/i-api-global-upload-editor-config.ts create mode 100644 packages/runtime/src/interface/common/i-global-config/i-global-upload-editor-config.ts diff --git a/packages/runtime/src/config/global-config.ts b/packages/runtime/src/config/global-config.ts index 6803ae85f..c2668342e 100644 --- a/packages/runtime/src/config/global-config.ts +++ b/packages/runtime/src/config/global-config.ts @@ -5,6 +5,7 @@ import { IGlobalCodeListConfig, IGlobalViewConfig, IGlobalPickerEditorConfig, + IGlobalUploadEditorConfig, IGlobalFormConfig, IGlobalSearchFormConfig, IGlobalTreeConfig, @@ -73,6 +74,11 @@ export class GlobalConfig implements IGlobalConfig { overflowMode: 'auto', }; + // 全局上传类编辑器配置 + uploadEditor: IGlobalUploadEditorConfig = { + infoMap: '', + }; + // 全局搜索表单配置 searchform: IGlobalSearchFormConfig = { enableStoredFilters: true, diff --git a/packages/runtime/src/interface/api/common/global-config/i-api-global-config.ts b/packages/runtime/src/interface/api/common/global-config/i-api-global-config.ts index ccb1b2d1f..ee68be346 100644 --- a/packages/runtime/src/interface/api/common/global-config/i-api-global-config.ts +++ b/packages/runtime/src/interface/api/common/global-config/i-api-global-config.ts @@ -5,6 +5,7 @@ import { IApiGlobalFormConfig } from './i-api-global-form-config'; import { IApiGlobalGridConfig } from './i-api-global-grid-config'; import { IApiGlobalKanbanConfig } from './i-api-global-kanban-config'; import { IApiGlobalPickerEditorConfig } from './i-api-global-picker-editor-config'; +import { IApiGlobalUploadEditorConfig } from './i-api-global-upload-editor-config'; import { IApiGlobalSearchFormConfig } from './i-api-global-search-form-config'; import { IApiGlobalTreeConfig } from './i-api-global-tree-config'; import { IApiGlobalViewConfig } from './i-api-global-view-config'; @@ -73,6 +74,13 @@ export interface IApiGlobalConfig { */ pickerEditor: IApiGlobalPickerEditorConfig; + /** + * @description 全局上传类编辑器配置 + * @type {IApiGlobalUploadEditorConfig} + * @memberof IApiGlobalConfig + */ + uploadEditor: IApiGlobalUploadEditorConfig; + /** * @description 全局搜索表单配置 * @type {IApiGlobalSearchFormConfig} diff --git a/packages/runtime/src/interface/api/common/global-config/i-api-global-upload-editor-config.ts b/packages/runtime/src/interface/api/common/global-config/i-api-global-upload-editor-config.ts new file mode 100644 index 000000000..165cae698 --- /dev/null +++ b/packages/runtime/src/interface/api/common/global-config/i-api-global-upload-editor-config.ts @@ -0,0 +1,19 @@ +/** + * @description 全局上传类编辑器配置 + * @export + * @interface IApiGlobalUploadEditorConfig + */ +export interface IApiGlobalUploadEditorConfig { + /** + * @description 上传文件信息的映射规则字符串,用于将上传成功后返回的文件数据转换为服务端存储所需格式。 + * 格式要求:多组映射关系用分号(;)分隔,每组映射格式为"目标属性:源属性",即"targetKey:sourceKey;targetKey2:sourceKey2" + * 功能:按照配置规则对文件信息对象进行属性转换,将源数据中的指定属性映射到新对象的目标属性 + * @example + * // 映射规则:'size:filesize;ext:fileext' + * // 源数据:{ filesize:'10000', fileext:'.gif' } + * // 转换结果:{ size:'10000', ext:'.gif' } + * @type {string} + * @memberof IApiGlobalUploadEditorConfig + */ + infoMap: string; +} diff --git a/packages/runtime/src/interface/api/common/global-config/index.ts b/packages/runtime/src/interface/api/common/global-config/index.ts index 314eb6f32..f153a7d01 100644 --- a/packages/runtime/src/interface/api/common/global-config/index.ts +++ b/packages/runtime/src/interface/api/common/global-config/index.ts @@ -4,6 +4,7 @@ export type { IApiGlobalCommonConfig } from './i-api-global-common-config'; export type { IApiGlobalFormConfig } from './i-api-global-form-config'; export type { IApiGlobalGridConfig } from './i-api-global-grid-config'; export type { IApiGlobalPickerEditorConfig } from './i-api-global-picker-editor-config'; +export type { IApiGlobalUploadEditorConfig } from './i-api-global-upload-editor-config'; export type { IApiGlobalSearchFormConfig } from './i-api-global-search-form-config'; export type { IApiGlobalTreeConfig } from './i-api-global-tree-config'; export type { IApiGlobalViewConfig } from './i-api-global-view-config'; diff --git a/packages/runtime/src/interface/common/i-global-config/i-global-upload-editor-config.ts b/packages/runtime/src/interface/common/i-global-config/i-global-upload-editor-config.ts new file mode 100644 index 000000000..a6f858164 --- /dev/null +++ b/packages/runtime/src/interface/common/i-global-config/i-global-upload-editor-config.ts @@ -0,0 +1,9 @@ +import { IApiGlobalUploadEditorConfig } from '../../api'; +/** + * @description 全局上传类编辑器配置 + * @export + * @interface IGlobalUploadEditorConfig + * @extends {IApiGlobalUploadEditorConfig} + */ +export interface IGlobalUploadEditorConfig + extends IApiGlobalUploadEditorConfig {} diff --git a/packages/runtime/src/interface/common/i-global-config/index.ts b/packages/runtime/src/interface/common/i-global-config/index.ts index 48f0c4228..6c7a26bf1 100644 --- a/packages/runtime/src/interface/common/i-global-config/index.ts +++ b/packages/runtime/src/interface/common/i-global-config/index.ts @@ -5,6 +5,7 @@ export * from './i-global-app-menu-config'; export * from './i-global-view-config'; export * from './i-global-form-config'; export * from './i-global-picker-editor-config'; +export * from './i-global-upload-editor-config'; export * from './i-global-search-form-config'; export * from './i-global-tree-config'; export * from './i-global-common-config'; diff --git a/packages/runtime/src/interface/common/index.ts b/packages/runtime/src/interface/common/index.ts index c893d218b..b4987b06d 100644 --- a/packages/runtime/src/interface/common/index.ts +++ b/packages/runtime/src/interface/common/index.ts @@ -21,6 +21,7 @@ export type { IGlobalAppMenuConfig, IGlobalViewConfig, IGlobalPickerEditorConfig, + IGlobalUploadEditorConfig, IGlobalFormConfig, IGlobalSearchFormConfig, IGlobalTreeConfig, -- Gitee From 42f3745610df07c2107271cce113624fb292f1e1 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 31 Jul 2025 22:53:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=94=98?= =?UTF-8?q?=E7=89=B9=E5=9B=BE=E9=83=A8=E4=BB=B6=E5=8F=82=E6=95=B0=20unit?= =?UTF-8?q?=EF=BC=88=E6=A0=B9=E6=8D=AE=E8=AF=A5=E6=97=B6=E9=97=B4=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=91=88=E7=8E=B0=E5=8F=B3=E4=BE=A7=E7=94=98=E7=89=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/controller/control/gantt/gantt.controller.ts | 4 ++++ .../api/controller/control/i-api-gantt.controller.ts | 9 +++++---- .../src/interface/api/state/control/i-api-gantt.state.ts | 8 ++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/runtime/src/controller/control/gantt/gantt.controller.ts b/packages/runtime/src/controller/control/gantt/gantt.controller.ts index 5989e27a5..79aa25444 100644 --- a/packages/runtime/src/controller/control/gantt/gantt.controller.ts +++ b/packages/runtime/src/controller/control/gantt/gantt.controller.ts @@ -78,6 +78,7 @@ export class GanttController this.state.ganttStyle = {}; this.state.sliderDraggable = true; this.state.mustShowColumns = null; + this.state.unit = 'day'; } /** @@ -99,6 +100,9 @@ export class GanttController this.controlParams.mustshowcolumns, ); } + if (this.controlParams.unit) { + this.state.unit = this.controlParams.unit; + } } /** diff --git a/packages/runtime/src/interface/api/controller/control/i-api-gantt.controller.ts b/packages/runtime/src/interface/api/controller/control/i-api-gantt.controller.ts index 07e04a2b3..ee7ddba0f 100644 --- a/packages/runtime/src/interface/api/controller/control/i-api-gantt.controller.ts +++ b/packages/runtime/src/interface/api/controller/control/i-api-gantt.controller.ts @@ -10,10 +10,11 @@ import { * 甘特图 * @description 基础的项目管理控件,通过横向时间轴展示任务的开始与结束时间、进度、依赖关系及资源分配,直观呈现项目整体计划与执行状态。 * @primary - * @ctrlparams {name:sliderdraggable,title:启用滑块拖拽,parameterType:boolean,defaultvalue:false,description:设置是否启用滑块拖拽,即是否允许拖拽任务项事件} - * @ctrlparams {"name":"mustshowcolumns","title":"必须显示的列","parameterType":"string[] | null","defaultvalue":"null","description":"在配置甘特左侧表格列显示中,设置必须显示的列,避免将所有表格列隐藏"} - * @ctrlparams {name:limitsize,title:最大限制数,parameterType:string,defaultvalue:'0',description:在配置甘特左侧表格列显示中,用于计算除必须显示的列之外,最多可显示的列数。其默认值为 '0',代表不限制显示列数} - * @ctrlparams {name:enablecustomized,title:允许设置,parameterType:boolean,defaultvalue:true,description:是否允许在甘特图左侧绘制表格列选择按钮,点击该按钮可配置需要显示的表格列} + * @ctrlparams {name:sliderdraggable,title:启用滑块拖拽,parameterType:boolean,defaultvalue:true,description:设置是否启用滑块拖拽,即是否允许拖拽任务项事件} + * @ctrlparams {"name":"mustshowcolumns","title":"必须显示的列","parameterType":"string[]","defaultvalue":"["sn","name"]","description":"该参数指定的列在表格列选择弹框中将不能配置为隐藏列"} + * @ctrlparams {name:limitsize,title:最大限制数,parameterType:string,defaultvalue:'0',description:在列选择弹框中,用于计算除了`mustshowcolumns`参数配置的列之外,最多可显示的列数。其默认值为 '0',代表不限制显示列数} + * @ctrlparams {name:enablecustomized,title:允许设置,parameterType:boolean,defaultvalue:false,description:是否允许在甘特图左侧表格中绘制列选择按钮,通过点击该按钮打开表格列选择弹框} + * @ctrlparams {name:unit,title:时间单位,parameterType:'month' | 'week' | 'day' | 'hour',defaultvalue:'day',description:甘特图将根据该时间单位呈现右侧甘特页面样式} * @export * @interface IApiGanttController * @extends {IApiGridController} diff --git a/packages/runtime/src/interface/api/state/control/i-api-gantt.state.ts b/packages/runtime/src/interface/api/state/control/i-api-gantt.state.ts index 262872202..994e2312e 100644 --- a/packages/runtime/src/interface/api/state/control/i-api-gantt.state.ts +++ b/packages/runtime/src/interface/api/state/control/i-api-gantt.state.ts @@ -24,6 +24,14 @@ export interface IApiGanttState extends IApiTreeGridExState { * @memberof IApiGanttState */ sliderDraggable: boolean; + + /** + * @description 甘特图将根据当前时间单位呈现右侧甘特页面样式 + * @type {('month' | 'week' | 'day' | 'hour')} + * @default 'day' + * @memberof IGanttState + */ + unit: 'month' | 'week' | 'day' | 'hour'; } /** -- Gitee From 9368237e8cf02afb29442a563fa3a693c8853a11 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Thu, 31 Jul 2025 22:55:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0CHANGELOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/runtime/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md index 620b3649e..ce812ba2b 100644 --- a/packages/runtime/CHANGELOG.md +++ b/packages/runtime/CHANGELOG.md @@ -7,6 +7,11 @@ ## [Unreleased] +### Added + +- 新增全局上传类编辑器配置和上传类编辑器参数 infoMap(上传文件信息的映射规则字符串) +- 新增甘特图部件参数 unit(根据该时间单位呈现右侧甘特页面样式) + ### Changed - 更新搜索表单支持抛出草稿加载成功事件 -- Gitee