mirror of
https://github.com/usememos/memos.git
synced 2024-12-19 00:51:30 +03:00
chore: fix timestamp type
This commit is contained in:
parent
b6d1ded668
commit
319f679e30
@ -12,14 +12,14 @@ import "@/less/common/date-picker.less";
|
||||
interface DatePickerProps {
|
||||
className?: string;
|
||||
isFutureDateDisabled?: boolean;
|
||||
datestamp: DateStamp;
|
||||
handleDateStampChange: (datestamp: DateStamp) => void;
|
||||
datestamp: number;
|
||||
handleDateStampChange: (datestamp: number) => void;
|
||||
}
|
||||
|
||||
const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
|
||||
const t = useTranslate();
|
||||
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 currentUsername = useUserStore().getCurrentUsername();
|
||||
|
||||
@ -55,7 +55,7 @@ const DatePicker: React.FC<DatePickerProps> = (props: DatePickerProps) => {
|
||||
});
|
||||
}
|
||||
|
||||
const handleDateItemClick = (datestamp: DateStamp) => {
|
||||
const handleDateItemClick = (datestamp: number) => {
|
||||
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 currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`);
|
||||
const nextMonthDate =
|
||||
@ -133,7 +133,7 @@ function getMonthDayAmount(datestamp: DateStamp): number {
|
||||
return (nextMonthDate.getTime() - currentDate.getTime()) / DAILY_TIMESTAMP;
|
||||
}
|
||||
|
||||
function getMonthFirstDayDateStamp(timestamp: TimeStamp): DateStamp {
|
||||
function getMonthFirstDayDateStamp(timestamp: number): number {
|
||||
const dateTemp = new Date(timestamp);
|
||||
const currentDate = new Date(`${dateTemp.getFullYear()}/${dateTemp.getMonth() + 1}/1`);
|
||||
return currentDate.getTime();
|
||||
|
@ -5,7 +5,7 @@ export function convertToMillis(localSetting: LocalSetting) {
|
||||
return hoursToMillis;
|
||||
}
|
||||
|
||||
export function getTimeStampByDate(t: Date | number | string): number {
|
||||
export function getTimeStampByDate(t: Date | number | string | any): number {
|
||||
return new Date(t).getTime();
|
||||
}
|
||||
|
||||
|
@ -83,7 +83,7 @@ const DailyReview = () => {
|
||||
});
|
||||
};
|
||||
|
||||
const handleDataPickerChange = (datestamp: DateStamp): void => {
|
||||
const handleDataPickerChange = (datestamp: number): void => {
|
||||
setCurrentDateStamp(datestamp);
|
||||
toggleShowDatePicker(false);
|
||||
};
|
||||
|
4
web/src/types/common.d.ts
vendored
4
web/src/types/common.d.ts
vendored
@ -1,9 +1,5 @@
|
||||
type BasicType = undefined | null | boolean | number | string | Record<string, unknown> | Array<BasicType>;
|
||||
|
||||
type DateStamp = number;
|
||||
|
||||
type TimeStamp = number;
|
||||
|
||||
type FunctionType = (...args: unknown[]) => unknown;
|
||||
|
||||
interface KVObject<T = any> {
|
||||
|
8
web/src/types/modules/memo.d.ts
vendored
8
web/src/types/modules/memo.d.ts
vendored
@ -6,11 +6,11 @@ interface Memo {
|
||||
id: MemoId;
|
||||
|
||||
creatorUsername: string;
|
||||
createdTs: TimeStamp;
|
||||
updatedTs: TimeStamp;
|
||||
createdTs: number;
|
||||
updatedTs: number;
|
||||
rowStatus: RowStatus;
|
||||
|
||||
displayTs: TimeStamp;
|
||||
displayTs: number;
|
||||
content: string;
|
||||
visibility: Visibility;
|
||||
pinned: boolean;
|
||||
@ -29,7 +29,7 @@ interface MemoCreate {
|
||||
|
||||
interface MemoPatch {
|
||||
id: MemoId;
|
||||
createdTs?: TimeStamp;
|
||||
createdTs?: number;
|
||||
rowStatus?: RowStatus;
|
||||
content?: string;
|
||||
resourceIdList?: ResourceId[];
|
||||
|
4
web/src/types/modules/resource.d.ts
vendored
4
web/src/types/modules/resource.d.ts
vendored
@ -3,8 +3,8 @@ type ResourceId = number;
|
||||
interface Resource {
|
||||
id: ResourceId;
|
||||
|
||||
createdTs: TimeStamp;
|
||||
updatedTs: TimeStamp;
|
||||
createdTs: number;
|
||||
updatedTs: number;
|
||||
|
||||
filename: string;
|
||||
externalLink: string;
|
||||
|
4
web/src/types/modules/user.d.ts
vendored
4
web/src/types/modules/user.d.ts
vendored
@ -4,8 +4,8 @@ type UserRole = "HOST" | "USER";
|
||||
interface User {
|
||||
id: UserId;
|
||||
|
||||
createdTs: TimeStamp;
|
||||
updatedTs: TimeStamp;
|
||||
createdTs: number;
|
||||
updatedTs: number;
|
||||
rowStatus: RowStatus;
|
||||
|
||||
username: string;
|
||||
|
Loading…
Reference in New Issue
Block a user