diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/calendar.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/calendar.tsx index ec81615d9f..4024a5faa8 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/calendar.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/calendar.tsx @@ -52,12 +52,7 @@ export const Calendar: React.FC = ({ const date = dateSetup.dates[i]; const bottomValue = date.getFullYear(); bottomValues.push( - + {bottomValue} , ); @@ -98,7 +93,7 @@ export const Calendar: React.FC = ({ key={date.getTime()} y={headerHeight * 0.8} x={columnWidth * i + columnWidth * 0.5} - className={cx('calendarBottomText')} + className={styles.calendarBottomText} > {quarter} , @@ -118,7 +113,7 @@ export const Calendar: React.FC = ({ x1Line={columnWidth * i} y1Line={0} y2Line={topDefaultHeight} - xText={Math.abs(xText)} + xText={Math.abs(xText) - 200} yText={topDefaultHeight * 0.9} />, ); @@ -139,7 +134,7 @@ export const Calendar: React.FC = ({ key={bottomValue + date.getFullYear()} y={headerHeight * 0.8} x={columnWidth * i + columnWidth * 0.5} - className={cx('calendarBottomText')} + className={styles.calendarBottomText} > {bottomValue} , @@ -189,7 +184,7 @@ export const Calendar: React.FC = ({ key={date.getTime()} y={headerHeight * 0.8} x={columnWidth * (i + +rtl)} - className={cx('calendarBottomText')} + className={styles.calendarBottomText} > {bottomValue} , diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/style.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/style.tsx index b222628f6f..306b91e70d 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/style.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/calendar/style.tsx @@ -23,6 +23,9 @@ const useStyles = createStyles(({ token, css }) => { background: ${colorFillAlterSolid}; border-bottom: 1px solid ${token.colorBorderSecondary}; `, + calendarBottomText: css` + font-size: 11px; + `, nbGanttCalendar: css` .calendarbottomtext: { textanchor: middle; diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx index 27ad8c0123..4764299ba3 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx @@ -47,7 +47,7 @@ import { TaskGantt } from './task-gantt'; import { TaskGanttContentProps } from './task-gantt-content'; const getColumnWidth = (dataSetLength: any, clientWidth: any) => { - const columnWidth = clientWidth / dataSetLength > 50 ? Math.floor(clientWidth / dataSetLength) + 20 : 50; + const columnWidth = clientWidth / dataSetLength > 50 ? Math.floor(clientWidth / dataSetLength) + 20 : 60; return columnWidth; };