diff --git a/packages/core/client/src/block-provider/GanttBlockProvider.tsx b/packages/core/client/src/block-provider/GanttBlockProvider.tsx index 7e886fe0d..3ebbd9c9b 100644 --- a/packages/core/client/src/block-provider/GanttBlockProvider.tsx +++ b/packages/core/client/src/block-provider/GanttBlockProvider.tsx @@ -13,6 +13,7 @@ const formatData = ( hideChildren: boolean = false, ) => { data.forEach((item: any) => { + const percent=item[fieldNames.progress] * 100; if (item.children && item.children.length) { tasks.push({ start: new Date(item[fieldNames.start]), @@ -20,7 +21,7 @@ const formatData = ( name: item[fieldNames.title], id: item.id + '', type: 'project', - progress: item[fieldNames.progress] * 100 || 0, + progress: percent>100?100:percent || 0, hideChildren: hideChildren, project: projectId, color: item.color, @@ -33,7 +34,7 @@ const formatData = ( name: item[fieldNames.title], id: item.id + '', type: fieldNames.end ? 'task' : 'milestone', - progress: item[fieldNames.progress] * 100 || 0, + progress: percent>100?100:percent || 0, project: projectId, color: item.color, }); diff --git a/packages/core/client/src/schema-component/antd/gantt/components/gantt/task-gantt.tsx b/packages/core/client/src/schema-component/antd/gantt/components/gantt/task-gantt.tsx index 1128e5327..0010bbd59 100644 --- a/packages/core/client/src/schema-component/antd/gantt/components/gantt/task-gantt.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/components/gantt/task-gantt.tsx @@ -39,7 +39,7 @@ export const TaskGantt: React.FC = forwardRef( width={gridProps.svgWidth} height={calendarProps.headerHeight} fontFamily={barProps.fontFamily} - style={{ borderBottom: '1px solid #f0f0f0',fontWeight:700 }} + style={{ borderBottom: '1px solid #f0f0f0', fontWeight: 700 }} > diff --git a/packages/core/client/src/schema-component/antd/gantt/components/task-item/task-item.tsx b/packages/core/client/src/schema-component/antd/gantt/components/task-item/task-item.tsx index 4356c3929..1017c3fd5 100644 --- a/packages/core/client/src/schema-component/antd/gantt/components/task-item/task-item.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/components/task-item/task-item.tsx @@ -98,7 +98,7 @@ export const TaskItem: React.FC = (props) => { {taskItem}