YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix timestamp type

Browse Source
This commit is contained in:
Steven
2023-09-10 23:52:35 +08:00
parent b6d1ded668
commit 319f679e30
7 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/components/kit/DatePicker.tsx
View File

@ -12,14 +12,14 @@ import "@/less/common/date-picker.less";
interface DatePickerProps { interface DatePickerProps {
className?: string; className?: string;
isFutureDateDisabled?: boolean; isFutureDateDisabled?: boolean;
datestamp: DateStamp; datestamp: number;
handleDateStampChange: (datestamp: DateStamp) => void; handleDateStampChange: (datestamp: number) => void;
} }
const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => { const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
const t = useTranslate(); const t = useTranslate();
const { className, isFutureDateDisabled, datestamp, handleDateStampChange } = props; const { className, isFutureDateDisabled, datestamp, handleDateStampChange } = props;
const [currentDateStamp, setCurrentDateStamp] = useState<DateStamp>(getMonthFirstDayDateStamp(datestamp)); const [currentDateStamp, setCurrentDateStamp] = useState<number>(getMonthFirstDayDateStamp(datestamp));
const [countByDate, setCountByDate] = useState(new Map()); const [countByDate, setCountByDate] = useState(new Map());
const currentUsername = useUserStore().getCurrentUsername(); const currentUsername = useUserStore().getCurrentUsername();
@ -55,7 +55,7 @@ const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
}); });
} }
const handleDateItemClick = (datestamp: DateStamp) => { const handleDateItemClick = (datestamp: number) => {
handleDateStampChange(datestamp); handleDateStampChange(datestamp);
}; };
@ -122,7 +122,7 @@ const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
); );
}; };
function getMonthDayAmount(datestamp: DateStamp): number { function getMonthDayAmount(datestamp: number): number {
const dateTemp = new Date(datestamp); const dateTemp = new Date(datestamp);
const currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`); const currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`);
const nextMonthDate = const nextMonthDate =
@ -133,7 +133,7 @@ function getMonthDayAmount(datestamp: DateStamp): number {
return (nextMonthDate.getTime() - currentDate.getTime()) / DAILY_TIMESTAMP; return (nextMonthDate.getTime() - currentDate.getTime()) / DAILY_TIMESTAMP;
} }
function getMonthFirstDayDateStamp(timestamp: TimeStamp): DateStamp { function getMonthFirstDayDateStamp(timestamp: number): number {
const dateTemp = new Date(timestamp); const dateTemp = new Date(timestamp);
const currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`); const currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`);
return currentDate.getTime(); return currentDate.getTime();

2
web/src/helpers/datetime.ts
View File

@ -5,7 +5,7 @@ export function convertToMillis(localSetting: LocalSetting) {
return hoursToMillis; return hoursToMillis;
} }
export function getTimeStampByDate(t: Date | number | string): number { export function getTimeStampByDate(t: Date | number | string | any): number {
return new Date(t).getTime(); return new Date(t).getTime();
} }

2
web/src/pages/DailyReview.tsx
View File

@ -83,7 +83,7 @@ const DailyReview = () => {
}); });
}; };
const handleDataPickerChange = (datestamp: DateStamp): void => { const handleDataPickerChange = (datestamp: number): void => {
setCurrentDateStamp(datestamp); setCurrentDateStamp(datestamp);
toggleShowDatePicker(false); toggleShowDatePicker(false);
}; };

4
web/src/types/common.d.ts vendored
View File

@ -1,9 +1,5 @@
type BasicType = undefined | null | boolean | number | string | Record<string, unknown> | Array<BasicType>; type BasicType = undefined | null | boolean | number | string | Record<string, unknown> | Array<BasicType>;
type DateStamp = number;
type TimeStamp = number;
type FunctionType = (...args: unknown[]) => unknown; type FunctionType = (...args: unknown[]) => unknown;
interface KVObject<T = any> { interface KVObject<T = any> {

8
web/src/types/modules/memo.d.ts vendored
View File

@ -6,11 +6,11 @@ interface Memo {
id: MemoId; id: MemoId;
creatorUsername: string; creatorUsername: string;
createdTs: TimeStamp; createdTs: number;
updatedTs: TimeStamp; updatedTs: number;
rowStatus: RowStatus; rowStatus: RowStatus;
displayTs: TimeStamp; displayTs: number;
content: string; content: string;
visibility: Visibility; visibility: Visibility;
pinned: boolean; pinned: boolean;
@ -29,7 +29,7 @@ interface MemoCreate {
interface MemoPatch { interface MemoPatch {
id: MemoId; id: MemoId;
createdTs?: TimeStamp; createdTs?: number;
rowStatus?: RowStatus; rowStatus?: RowStatus;
content?: string; content?: string;
resourceIdList?: ResourceId[]; resourceIdList?: ResourceId[];

4
web/src/types/modules/resource.d.ts vendored
View File

@ -3,8 +3,8 @@ type ResourceId = number;
interface Resource { interface Resource {
id: ResourceId; id: ResourceId;
createdTs: TimeStamp; createdTs: number;
updatedTs: TimeStamp; updatedTs: number;
filename: string; filename: string;
externalLink: string; externalLink: string;

4
web/src/types/modules/user.d.ts vendored
View File

@ -4,8 +4,8 @@ type UserRole = "HOST" | "USER";
interface User { interface User {
id: UserId; id: UserId;
createdTs: TimeStamp; createdTs: number;
updatedTs: TimeStamp; updatedTs: number;
rowStatus: RowStatus; rowStatus: RowStatus;
username: string; username: string;