diff --git a/src/components/CalHeader.tsx b/src/components/CalHeader.tsx
new file mode 100644
index 0000000..d91c7b6
--- /dev/null
+++ b/src/components/CalHeader.tsx
@@ -0,0 +1,20 @@
+import React, {Fragment} from 'react';
+import {DateHeaderProps} from "react-big-calendar";
+import {solarToLunar} from "lunar-calendar";
+import {lunarDateShow} from "@/utils/timeFormatUtil";
+
+// 定义为 React 函数组件
+const CalHeader: React.FC = ({date, label, drilldownView, onDrillDown}) => {
+ if (!drilldownView) {
+ return {label}
+ }
+ return (
+ (null);
const onScroll = (e: React.UIEvent) => {
diff --git a/src/components/SettingCron.tsx b/src/components/SettingCron.tsx
index ea950da..bfadc10 100644
--- a/src/components/SettingCron.tsx
+++ b/src/components/SettingCron.tsx
@@ -183,7 +183,7 @@ const CronGenerator: React.FC = ({setCronFunction,setExpecte
console.log({fullCronExpression})
setCanReadCron(cronToChinese(fullCronExpression))
}
- }, [fullCronExpression]);
+ }, [fullCronExpression,cron]);
const onClickConfirmCron = () => {
if (fullCronExpression) {
diff --git a/src/components/TaskRemindComponent.tsx b/src/components/TaskRemindComponent.tsx
index 72e72e8..298fd5c 100644
--- a/src/components/TaskRemindComponent.tsx
+++ b/src/components/TaskRemindComponent.tsx
@@ -206,7 +206,7 @@ const TaskRemindComponent = (props: ITaskRemind) => {
) : (
props.remindTypeList.map((remindType, index) => (
//
+
void, reloadData?
return () => {
isMounted = false;
};
- }, [open])
+ }, [open,props.taskId])
const removeTeam = (teamMember: TeamMemberVO) => {
removeTeamAPI(teamMember).then(res => {
if (res.data.status.success) {
diff --git a/src/lib/type/lunar.d.ts b/src/lib/type/lunar.d.ts
index e99b647..6145964 100644
--- a/src/lib/type/lunar.d.ts
+++ b/src/lib/type/lunar.d.ts
@@ -11,6 +11,12 @@ declare module 'lunar-calendar' {
lunarDayName: string;
solarTerm: string;
// 其他农历字段...
+ // 二十四节气
+ term:string;
+ // 农历节日
+ lunarFestival:string;
+ // 公历节日
+ solarFestival:string;
}
export function solarToLunar(
diff --git a/src/ui/task/TitleOperation.tsx b/src/ui/task/TitleOperation.tsx
index 69e620e..58c60e1 100644
--- a/src/ui/task/TitleOperation.tsx
+++ b/src/ui/task/TitleOperation.tsx
@@ -1,15 +1,16 @@
'use client'
import React, {Fragment, useContext, useEffect, useState} from "react";
-import {Button, Checkbox, CheckboxOptionType, DatePicker, MenuProps, message, Select, Space} from "antd";
+import {Button, Checkbox, CheckboxOptionType, DatePicker, MenuProps, message, Popconfirm, Select, Space} from "antd";
import {usePathname, useRouter} from "next/navigation";
import {DetailModelForm} from "@/ui/task/project/DetailModelForm";
-import {OPERATION_BUTTON_TYPE, taskStateList} from "@/lib/task/project/data";
+import {deleteTask, OPERATION_BUTTON_TYPE, taskStateList} from "@/lib/task/project/data";
import style from '@/ui/task/TitleOperation.module.css'
import LocalContext from "@/ui/LocalContent";
import {RequestDateType} from "@/ui/task/RequestDateType";
import dayjs, {Dayjs} from "dayjs";
import {useSearchParams} from "next/dist/client/components/navigation";
import Dropdown from "antd/es/dropdown/dropdown";
+import {QuestionCircleOutlined} from "@ant-design/icons";
interface TitleOperationProps {
setTaskState: (value: string) => void;
@@ -42,7 +43,7 @@ export const TitleOperation: React.FC = ({
expectStartTimeParseResult[0] && expectStartTimeParseResult[0].value ? dayjs(expectStartTimeParseResult[0].value.toString()) : undefined,
expectStartTimeParseResult[1] && expectStartTimeParseResult[1].value ? dayjs(expectStartTimeParseResult[1].value.toString()) : undefined
];
- const [nickName,setNickName]=useState("微信用户")
+ const [nickName, setNickName] = useState("微信用户")
const typeList: CheckboxOptionType[] = [
{label: '计划', value: '0,1,2,3'},
{label: '打卡', value: '4'},
@@ -61,7 +62,7 @@ export const TitleOperation: React.FC = ({
useEffect(() => {
let userMessage = localStorage.getItem('user-message');
- if (userMessage){
+ if (userMessage) {
let parse = JSON.parse(userMessage);
setNickName(parse.nickname)
}
@@ -69,8 +70,8 @@ export const TitleOperation: React.FC = ({
const onClick: MenuProps['onClick'] = ({key}) => {
if (key == "1") {
- localStorage.removeItem('platform-security')
- replace(`/login`)
+ // localStorage.removeItem('platform-security')
+ // replace(`/login`)
} else if (key == "2") {
replace(pathName)
setPathParam(undefined)
@@ -80,13 +81,33 @@ export const TitleOperation: React.FC = ({
const items: MenuProps['items'] = [
{
- label: '退出登录',
+ label: = ({
allowClear
style={{minWidth: '100px'}}
placeholder="任务状态"
- defaultValue={data.taskState!=''&&data.taskState.split(",").length>0?data.taskState.split(","):[]}
+ defaultValue={data.taskState != '' && data.taskState.split(",").length > 0 ? data.taskState.split(",") : []}
onChange={(value) => {
- console.log('onChange',{value})
- if(value.length == 0){
+ console.log('onChange', {value})
+ if (value.length == 0) {
setTaskState("")
- }else {
+ } else {
setTaskState(value.join(','))
}
}}
- onClear={()=>{
+ onClear={() => {
console.log('onChange,点击了清除无效果')
setTaskState("")
}}
@@ -209,8 +230,8 @@ export const TitleOperation: React.FC = ({
}
- = (props) => {
if (props.operationId === OPERATION_BUTTON_TYPE.ADD_CHILD) {
addTask(request).then(response => {
console.log('response', response)
- if (response.status.success) {
+ if (response.data.status.success) {
message.success("添加任务成功：" + response.data)
props.handleCancel()
}
@@ -140,11 +140,11 @@ export const DetailForm: React.FC = (props) => {
}
updateTask(request).then(response => {
console.log('response', response)
- if (response.status.success) {
+ if (response.data.status.success) {
message.success("修改任务成功：" + response.data)
props.handleCancel()
}else {
- message.error(response.status.message)
+ message.error(response.data.status.message)
}
}
)
diff --git a/src/utils/timeFormatUtil.ts b/src/utils/timeFormatUtil.ts
index ae0e0a1..4a1c07f 100644
--- a/src/utils/timeFormatUtil.ts
+++ b/src/utils/timeFormatUtil.ts
@@ -1,5 +1,6 @@
import dayjs, { Dayjs, isDayjs } from "dayjs";
import utc from "dayjs/plugin/utc";
+import {solarToLunar} from "lunar-calendar";
dayjs.extend(utc)
const DATE_FORMAT = "YYYY-MM-DD"
// 到秒没啥意义
@@ -236,8 +237,26 @@ function dayjsWeek(day: Dayjs): string {
}
return ""
}
+
+function lunarDateShow(date:Date){
+ const lunarDate = solarToLunar(
+ date.getFullYear(),
+ date.getMonth() + 1,
+ date.getDate()
+ );
+ if(lunarDate.term){
+ return lunarDate.term;
+ }
+ if(lunarDate.lunarFestival){
+ return lunarDate.lunarFestival;
+ }
+ if(lunarDate.solarFestival){
+ return lunarDate.solarFestival
+ }
+ return lunarDate.lunarMonthName+lunarDate.lunarDayName;
+}
export {
DATE_TIME_FORMAT, DATE_FORMAT, DATE_TIME_FORMAT_SIMPLE,
dayStartUtcFormat, nextDayStartUtcFormat, betweenTime,
- dateStartUtcFormat, nextDateStartUtcFormat, cronToChinese, dayjsWeek
+ dateStartUtcFormat, nextDateStartUtcFormat, cronToChinese, dayjsWeek,lunarDateShow
}
\ No newline at end of file
+
+ )
+};
+
+export default CalHeader;
\ No newline at end of file
diff --git a/src/components/DiaryOption.tsx b/src/components/DiaryOption.tsx
index edca23f..9fb2764 100644
--- a/src/components/DiaryOption.tsx
+++ b/src/components/DiaryOption.tsx
@@ -159,7 +159,7 @@ const DiaryOption = (props: SelectDiary) => {
})
})
setDiaryReduceList(returnResult.reverse());
- }, [diaryList, currentIndex]);
+ }, [diaryList, currentIndex,props.taskId]);
const listRef = useRef{label}
+ {lunarDateShow(date)}
+ {remindType.split(",").join(", ")}
-
-
}
diff --git a/src/ui/task/drag/DetailForm.tsx b/src/ui/task/drag/DetailForm.tsx
index d1c98a2..a4acbe4 100644
--- a/src/ui/task/drag/DetailForm.tsx
+++ b/src/ui/task/drag/DetailForm.tsx
@@ -123,7 +123,7 @@ export const DetailForm: React.FC