diff --git a/packages/core/client/src/block-provider/GanttBlockProvider.tsx b/packages/core/client/src/block-provider/GanttBlockProvider.tsx index 0537ffa232..f0b898ab56 100644 --- a/packages/core/client/src/block-provider/GanttBlockProvider.tsx +++ b/packages/core/client/src/block-provider/GanttBlockProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; import { useField } from '@formily/react'; +import { Spin } from 'antd'; import React, { createContext, useContext, useEffect, useState } from 'react'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; @@ -75,8 +75,8 @@ export function mockTasks() { return tasks; } -const formatData = (data = [], fieldNames, tasks = [], projectId = undefined) => { - data.forEach((item) => { +const formatData = (data = [], fieldNames, tasks: any[] = [], projectId: any = undefined) => { + data.forEach((item: any) => { if (item.children && item.children.length) { tasks.push({ start: new Date(item[fieldNames.start]), @@ -103,12 +103,12 @@ const formatData = (data = [], fieldNames, tasks = [], projectId = undefined) => return tasks; }; const InternalGanttBlockProvider = (props) => { - const { fieldNames, timeRange } = props; + const { fieldNames, timeRange, resource } = props; const field = useField(); - const { resource, service } = useBlockRequestContext(); - // if (service.loading) { - // return ; - // } + const { service } = useBlockRequestContext(); + if (service.loading) { + return ; + } return ( { }; export const GanttBlockProvider = (props) => { + console.log(props); return ( @@ -138,9 +139,9 @@ export const useGanttBlockContext = () => { export const useGanttBlockProps = () => { const ctx = useGanttBlockContext(); - const [tasks, setTasks] = useState([]); + const [tasks, setTasks] = useState([]); const onExpanderClick = (task: any) => { - setTasks(tasks.map((t) => (t.id === task.id ? task : t))); + setTasks(tasks.map((t: any) => (t.id === task.id ? task : t))); }; useEffect(() => { if (!ctx?.service?.loading) { diff --git a/packages/core/client/src/schema-component/antd/gantt/components/grid/grid-body.tsx b/packages/core/client/src/schema-component/antd/gantt/components/grid/grid-body.tsx index 8c9dd7c094..271dba59bf 100644 --- a/packages/core/client/src/schema-component/antd/gantt/components/grid/grid-body.tsx +++ b/packages/core/client/src/schema-component/antd/gantt/components/grid/grid-body.tsx @@ -70,7 +70,6 @@ export const GridBody: React.FC = ({ } tickX += columnWidth; } - console.log(gridRows, rowLines, ticks, today); return ( {gridRows}