diff --git a/packages/core/client/src/block-provider/GanttBlockProvider.tsx b/packages/core/client/src/block-provider/GanttBlockProvider.tsx index f0b898ab56..c036bc0051 100644 --- a/packages/core/client/src/block-provider/GanttBlockProvider.tsx +++ b/packages/core/client/src/block-provider/GanttBlockProvider.tsx @@ -91,10 +91,10 @@ const formatData = (data = [], fieldNames, tasks: any[] = [], projectId: any = u } else { tasks.push({ start: new Date(item[fieldNames.start]), - end: new Date(item[fieldNames.end]), + end: new Date(item[fieldNames.end]||item[fieldNames.start]+1), name: item[fieldNames.title], id: item.id + '', - type: 'task', + type: fieldNames.end?'task':'milestone', progress: item[fieldNames.progress], project: projectId, }); @@ -125,7 +125,6 @@ const InternalGanttBlockProvider = (props) => { }; export const GanttBlockProvider = (props) => { - console.log(props); return ( diff --git a/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx b/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx index 590af99569..7bbff55361 100644 --- a/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/Gantt.Designer.tsx @@ -64,8 +64,8 @@ export const GanttDesigner = () => { value={fieldNames.range||'day'} options={[ { label: compile('{{t("Hour")}}'), value: 'hour', color: 'orange' }, - { label: compile('{{t("Quarter of day")}}'), value: 'quarterOfDay', color: 'default' }, - { label: compile('{{t("Half of day")}}'), value: 'halOfDay', color: 'blue' }, + { label: compile('{{t("Quarter of day")}}'), value: 'quarterDay', color: 'default' }, + { label: compile('{{t("Half of day")}}'), value: 'halfDay', color: 'blue' }, { label: compile('{{t("Day")}}'), value: 'day', color: 'yellow' }, { label: compile('{{t("Week")}}'), value: 'week', color: 'pule' }, { label: compile('{{t("Month")}}'), value: 'month', color: 'green' }, @@ -126,6 +126,25 @@ export const GanttDesigner = () => { }); dn.refresh(); }} + /> + { + const fieldNames = field.decoratorProps.fieldNames || {}; + fieldNames['progress'] = progress; + field.decoratorProps.fieldNames = fieldNames; + fieldSchema['x-decorator-props']['fieldNames'] = fieldNames; + service.refresh(); + dn.emit('patch', { + schema: { + ['x-uid']: fieldSchema['x-uid'], + 'x-decorator-props': field.decoratorProps, + }, + }); + dn.refresh(); + }} />