fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 23:19:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

style: calendar style improve

Browse Source
This commit is contained in:
katherinehhh 2023-03-27 11:34:27 +08:00
parent 62888dcfc1
commit 87e66ecc4d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/client/src/schema-component/antd/gantt/components/calendar/calendar.tsx
View File

@ -213,7 +213,8 @@ export const Calendar: React.FC<CalendarProps> = ({
const dates = dateSetup.dates; const dates = dateSetup.dates;
for (let i = 0; i < dates.length; i++) { for (let i = 0; i < dates.length; i++) {
const date = dates[i]; const date = dates[i];
const bottomValue = `${getLocalDayOfWeek(date, locale, 'short')}, ${date.getDate().toString()}`; // const bottomValue = `${getLocalDayOfWeek(date, locale, 'short')}, ${date.getDate().toString()}`;
const bottomValue = `${date.getDate().toString()}`;
bottomValues.push( bottomValues.push(
<text <text
@ -254,9 +255,10 @@ export const Calendar: React.FC<CalendarProps> = ({
const date = dates[i]; const date = dates[i];
const bottomValue = getCachedDateTimeFormat(locale, { const bottomValue = getCachedDateTimeFormat(locale, {
hour: 'numeric', hour: 'numeric',
})
//@ts-ignore //@ts-ignore
}).format(date); .format(date)
.replace('时', '');
bottomValues.push( bottomValues.push(
<text <text
key={date.getTime()} key={date.getTime()}
@ -299,9 +301,10 @@ export const Calendar: React.FC<CalendarProps> = ({
const date = dates[i]; const date = dates[i];
const bottomValue = getCachedDateTimeFormat(locale, { const bottomValue = getCachedDateTimeFormat(locale, {
hour: 'numeric', hour: 'numeric',
})
//@ts-ignore //@ts-ignore
}).format(date); .format(date)
?.replace('时', '');
bottomValues.push( bottomValues.push(
<text <text
key={date.getTime()} key={date.getTime()}

1
packages/core/client/src/schema-component/antd/gantt/components/calendar/style.tsx
View File

@ -9,6 +9,7 @@ export const calendarBottomText = css`
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
pointer-events: none; pointer-events: none;
font-size: 11px;
`; `;
export const calendarTopTick = css` export const calendarTopTick = css`

4
packages/core/client/src/schema-component/antd/gantt/components/gantt/gantt.tsx
View File

@ -21,6 +21,7 @@ import { ActionContext } from '../../../action';
import { useDesignable } from '../../../../../schema-component'; import { useDesignable } from '../../../../../schema-component';
import { useBlockRequestContext, useTableBlockContext, useGanttBlockContext } from '../../../../../block-provider'; import { useBlockRequestContext, useTableBlockContext, useGanttBlockContext } from '../../../../../block-provider';
import { RecordProvider } from '../../../../../record-provider'; import { RecordProvider } from '../../../../../record-provider';
import { useCurrentAppInfo } from '../../../../../appInfo';
const getColumnWidth = (dataSetLength: any, clientWidth: any) => { 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 : 50;
@ -58,7 +59,6 @@ export const Gantt: any = (props: any) => {
rowHeight = 55.56, rowHeight = 55.56,
ganttHeight = 0, ganttHeight = 0,
preStepsCount = 1, preStepsCount = 1,
locale = 'en-GB',
barFill = 60, barFill = 60,
barCornerRadius = 3, barCornerRadius = 3,
barProgressColor = '#a3a3ff', barProgressColor = '#a3a3ff',
@ -89,6 +89,8 @@ export const Gantt: any = (props: any) => {
} = props; } = props;
const { onExpanderClick, tasks, expandAndCollapseAll } = useProps(); const { onExpanderClick, tasks, expandAndCollapseAll } = useProps();
const ctx = useGanttBlockContext(); const ctx = useGanttBlockContext();
const appInfo = useCurrentAppInfo();
const locale = appInfo.data?.lang;
const tableCtx = useTableBlockContext(); const tableCtx = useTableBlockContext();
const { resource, service } = useBlockRequestContext(); const { resource, service } = useBlockRequestContext();
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();