src/components/DiaryOption.module.css

@@ -1,3 +1,8 @@
+.reverseScrollList {
+    display: flex;
+    flex-direction: column; /* 垂直反转 */
+    /*overflow-y: auto;*/
+}
 /* 容器样式 */
 .container {
     display: flex;
@@ -50,7 +55,7 @@
         display: inline-block;
         padding: 4rpx 20rpx;
         border: solid;
-        border-radius: 0.5rem;
+        border-radius: 20rpx;
         border-color: #1677FF;
         white-space: normal;
         word-break: break-all;

src/components/DiaryOption.tsx

@@ -1,17 +1,15 @@
-import React, {Fragment, useEffect, useRef, useState} from 'react';
+import React, {useEffect, useState} from 'react';
-import {Dropdown, List, MenuProps, message, Popconfirm} from 'antd';
+import {Avatar, Input, List, message} from 'antd';
 import VirtualList from 'rc-virtual-list';
 import {Button, Drawer} from 'antd';
 import {ListDiary, SelectDiary} from "@/components/type/Diary";
 import TextArea from "antd/es/input/TextArea";
 import style from "@/components/DiaryOption.module.css"
 import dayjs from "dayjs";
-import {addTaskLogAPI, deleteTaskLogByIdAPI, editEnableFlagAPI} from "@/components/service/Diary";
+import {addTaskLogAPI} from "@/components/service/Diary";
-import {ListRef} from "rc-virtual-list/lib/List";
+
-import {copyToClipboard} from "@/lib/copyToClipboard";
+const CONTAINER_HEIGHT = 400;
-import {useWindowSize} from "@/hooks/useWindowSize";
+const PAGE_SIZE = 20;
-import {DetailModelForm} from "@/ui/task/project/DetailModelForm";
-import {OPERATION_BUTTON_TYPE} from "@/lib/task/project/data";
 
 const DiaryOption = (props: SelectDiary) => {
     // 抽屉 start
@@ -23,40 +21,6 @@ const DiaryOption = (props: SelectDiary) => {
         setOpen(false);
     };
     // 抽屉 end
-    const [shouldScroll, setShouldScroll] = React.useState(true);
-    // 设置高度 start
-    const {  height } = useWindowSize();
-    const [containerHeight, setContainerHeight] = useState(400);
-    useEffect(() => {
-        setDiaryList([])
-    }, []);
-    useEffect(() => {
-        if (!open) return;
-        // 使用 setTimeout 确保 Drawer 内容已渲染
-        const timer = setTimeout(() => {
-            const innerDiv = document.querySelector('.ant-drawer-body');
-            const titleButtonHeight = document.querySelector('.titleButton');
-            // clientHeight：可视高度（包括 padding，但不包括 border、margin 和滚动条）
-            // offsetHeight：总高度（包括 padding、border 和滚动条，但不包括 margin）
-            // scrollHeight：内容总高度（包括不可见部分）
-            if (innerDiv && titleButtonHeight) {
-                console.log(innerDiv.clientHeight)
-                setContainerHeight(innerDiv.clientHeight - titleButtonHeight.clientHeight)
-            }
-        }, 100);
-
-        return () => clearTimeout(timer);
-        // console.log({contentRef})
-        // const observer = new ResizeObserver((entries) => {
-        //     const entry = entries[0];
-        //     setContentHeight(entry.contentRect.height);
-        // });
-        //
-        // observer.observe(contentRef.current);
-        //
-        // return () => observer.disconnect();
-    }, [open,height]);
-    // 设置高度 end
 
     // 头按钮设置 start
     const [currentIndex, setCurrentIndex] = useState(1);
@@ -65,14 +29,7 @@ const DiaryOption = (props: SelectDiary) => {
     const [diaryList, setDiaryList] = useState<ListDiary[]>([]);
     const [diaryReduceList, setDiaryReduceList] = useState<ListDiary[]>([])
     const [page, setPage] = useState(1);
-    const noMore = {
+    const noMore = {id: '0', keyId: 'o0',createdDate:new Date(), description: '没有更多了',taskId:props.taskId, enableFlag: 'day-separate'};
-        id: '0',
-        keyId: 'o0',
-        createdDate: new Date(),
-        description: '没有更多了',
-        taskId: props.taskId,
-        enableFlag: 'day-separate'
-    };
     const [noMoreFlag, setNoMoreFlag] = useState(false)
     const [sendValue,setSendValue] = useState<string>();
     const [sendValueFlag,setSendValueFlag] =useState(false);
@@ -92,16 +49,12 @@ const DiaryOption = (props: SelectDiary) => {
         }).then(res => {
             setDiaryList([res.data.data, ...diaryList])
             setSendValue(undefined)
-            setShouldScroll(true);
         }).finally(() => {
             setSendValueFlag(false);
         })
     }
 
     const appendData = (showMessage = true) => {
-        if (!open){
-            return
-        }
         const fakeDataUrl = process.env.NEXT_PUBLIC_TODO_REQUEST_URL + `/task/message/diary/select`;
         fetch(fakeDataUrl, {
             method: 'POST', headers: {
@@ -119,29 +72,21 @@ const DiaryOption = (props: SelectDiary) => {
                 setDiaryList(diaryList.concat(results));
                 setPage(page + 1);
                 showMessage && message.success(`${results.length} more items loaded!`);
-                if (!showMessage) {
-                    if (listRef && listRef.current && typeof listRef.current.scrollTo == 'function') {
-                        listRef.current.scrollTo({top: 9999999});
-                    }
-                }
             });
     };
 
     useEffect(() => {
         appendData(false);
-    }, [open]);
+    }, []);
 
     useEffect(() => {
         console.log("处理日志集合",diaryList)
         const returnResult: ListDiary[] = []
         diaryList.filter(taskLog => {
-            if (currentIndex === 0) {
+            if (currentIndex === 0) { return true }
-                return true
+            else if (currentIndex === 1 && taskLog.enableFlag === "1") { return true }
-            } else if (currentIndex === 1 && taskLog.enableFlag === "1") {
+            else if (currentIndex === 2 && taskLog.enableFlag === "0") { return true }
-                return true
+            else return false;
-            } else if (currentIndex === 2 && taskLog.enableFlag === "0") {
-                return true
-            } else return false;
         }).reduce((map, taskLog) => {
             if (!map.has(dayjs(taskLog.createdDate).format("YYYY-MM-DD"))) {
                 map.set(dayjs(taskLog.createdDate).format("YYYY-MM-DD"), []);
@@ -158,150 +103,32 @@ const DiaryOption = (props: SelectDiary) => {
                 createdDate: new Date()
             })
         })
-        setDiaryReduceList(returnResult.reverse());
+        setDiaryReduceList(returnResult);
-    }, [diaryList, currentIndex]);
+    }, [diaryList]);
 
-    const listRef = useRef<ListRef>(null);
     const onScroll = (e: React.UIEvent<HTMLElement, UIEvent>) => {
         // Refer to: https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#problems_and_solutions
-        // if (
+        if (
-        //     Math.abs(e.currentTarget.scrollHeight - e.currentTarget.scrollTop - containerHeight) <= 1 &&
+            Math.abs(e.currentTarget.scrollHeight - e.currentTarget.scrollTop - CONTAINER_HEIGHT) <= 1 &&
-        //     !noMoreFlag
+            !noMoreFlag
-        // ) {
+        ) {
-        //     appendData();
-        // }
-        if (e.currentTarget.scrollTop === 0 && !noMoreFlag) {
             appendData();
-            setShouldScroll(false);
         }
     };
-    // 数据 end
-    // 滚动处理 start
 
-    // 条件滚动
+    // 数据 end
-    useEffect(() => {
+
-        console.log({shouldScroll}, {listRef})
-        if (shouldScroll && listRef.current) {
-            listRef.current.scrollTo({
-                top: 99999,
-            });
-        }
-    }, [diaryList, shouldScroll, open]);
-    // 滚动处理  end
     // 点击操作 start
     const [clickTaskDiary, setClickTaskDiary] = useState<ListDiary>()
-    const onClickTAskDiary = (item: ListDiary, operate: string) => {
-        if (clickTaskDiary == item && operate == 'L') {
-            setClickTaskDiary(undefined)
-        } else {
-            setClickTaskDiary(item)
-        }
-    }
-    // 删除操作
-    const [popConfirmOpen, setPopConfirmOpen] = useState(false);
-    const [popConfirmLoading, setPopConfirmLoading] = useState(false);
-    const popConfirmOk = () => {
-        setPopConfirmLoading(true)
-        if (clickTaskDiary){
-            deleteTaskLogByIdAPI(clickTaskDiary.id).then(res=>{
-                if (res.data.status.success){
-                    setDiaryList(diaryList.filter(taskLog => taskLog.id != clickTaskDiary.id))
-                    message.info("删除成功")
-                    setPopConfirmLoading(false)
-                    setPopConfirmOpen(false)
-                }else {
-                    message.error(res.data.status.message)
-                }
-            })
-        }
-    }
-    const handleCancel = () =>{
-        setPopConfirmOpen(false)
-    }
-
-    const editEnableFlag = (enableFlag:string) => {
-        if (clickTaskDiary){
-            editEnableFlagAPI(clickTaskDiary.id,enableFlag).then(res=>{
-                if (res.data.status.success){
-                    setDiaryList(diaryList.map(taskLog => {
-                        if(taskLog.id == clickTaskDiary.id){
-                            taskLog.enableFlag = enableFlag;
-                        }
-                        return taskLog;
-                    }))
-                    message.info("设置成功")
-                }else {
-                    message.error(res.data.status.message)
-                }
-            })
-        }
-    }
-
-    const [addTaskOpen,setAddTaskOpen] = useState(false)
-
-    const commonItems: MenuProps['items'] = [
-        {
-            label: '复制',
-            key: '1',
-            onClick: () => {
-                copyToClipboard(clickTaskDiary!.description)
-            }
-        },
-        {
-            label: '创建计划',
-            key: '3',
-            onClick:()=>{
-            //     打开添加任务窗口
-                setAddTaskOpen(true)
-            }
-        },
-        {
-            label: '删除',
-            key: '4',
-            onClick: () => {
-                setPopConfirmOpen(true)
-            }
-        },
-        {
-            label: '取消',
-            key: '5',
-            onClick:()=>{
-                setClickTaskDiary(undefined)
-            }
-        },
-    ]
-    const items: MenuProps['items'] = [
-    ];
-    items.push(...commonItems)
-    items.splice(1,0,{
-        label: '失效',
-        key: '2',
-        onClick:()=>{
-            editEnableFlag("0")
-        },
-    })
-    const itemsEnable: MenuProps['items'] = [
-    ];
-    itemsEnable.push(...commonItems)
-    itemsEnable.splice(1,0,{
-        label: '生效',
-        key: '2',
-        onClick:()=>{
-            editEnableFlag("1")
-        },
-    })
     // 点击操作 end
 
     return (
-        <Fragment>
+        <>
             <Button type="primary" onClick={showDrawer}>
                 日志心得
             </Button>
             <Drawer
                 style={{boxSizing:"border-box"}}
-                styles={{
-                    body: {padding: "0 24px"}
-                }}
                 mask={false}
                 title={props.taskName}
                 closable={{'aria-label': 'Close Button'}}
@@ -360,8 +187,7 @@ const DiaryOption = (props: SelectDiary) => {
                     </div>
                 }
             >
-                <div className="displayFlexRow titleButton"
+                <div className="displayFlexRow">
-                     style={{position: "sticky", top: "0", background: "white", zIndex: "100"}}>
                     <Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(0)}
                             type={currentIndex == 0 ? "primary" : "default"}>全部</Button>
                     <Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(1)}
@@ -369,15 +195,15 @@ const DiaryOption = (props: SelectDiary) => {
                     <Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(2)}
                             type={currentIndex == 2 ? "primary" : "default"}>失效</Button>
                 </div>
+                <div>
                     <List>
                         <VirtualList
                             data={diaryReduceList}
-                        height={containerHeight}
+                            height={CONTAINER_HEIGHT}
-                        // itemHeight={47}
+                            itemHeight={47}
-                        itemKey="id"
+                            itemKey="email"
                             onScroll={onScroll}
-                        // style={{height: "auto"}}
+                            className={style.reverseScrollList}
-                        ref={listRef}
                         >
                             {item => (
                                 item.enableFlag === 'day-separate' ?
@@ -387,46 +213,21 @@ const DiaryOption = (props: SelectDiary) => {
                                         </div>
                                     </div>
                                     : <div className={style.logTaskContent} key={item.id}>
-                                    <Dropdown menu={{items: (item.enableFlag == "1" ? items : itemsEnable)}}
-                                              trigger={['contextMenu']}>
-                                        <Popconfirm
-                                            title="警告"
-                                            description={`确认要删除日志:${item.description.length > 5 ? item.description.substring(0, 5) + '...' : item.description}?`}
-                                            open={popConfirmOpen&&clickTaskDiary?.id==item.id}
-                                            onConfirm={popConfirmOk}
-                                            okButtonProps={{loading: popConfirmLoading}}
-                                            onCancel={handleCancel}
-                                            okText="Yes"
-                                            cancelText="No"
-                                        >
                                         <div
                                             className={`${style.detailLine} ${item.id === clickTaskDiary?.id ? style.detailLineClick : ''}`}
-                                                onClick={() => onClickTAskDiary(item, "L")}
+                                            onClick={() => setClickTaskDiary(item)}>
-                                                onContextMenu={() => onClickTAskDiary(item, "R")}>
                                             <text
-                                                    style={{
+                                                style={{textDecoration: item.enableFlag === '0' && currentIndex === 0 ? 'line-through' : ''}}>
-                                                        textDecoration: item.enableFlag === '0' && currentIndex === 0 ? 'line-through' : '',
-                                                        whiteSpace: 'pre-line'
-                                                    }}>
                                                 {item.description}
                                             </text>
                                         </div>
-                                        </Popconfirm>
-                                    </Dropdown>
                                     </div>
                             )}
                         </VirtualList>
                     </List>
+                </div>
             </Drawer>
-            {addTaskOpen&&<DetailModelForm pid={props.taskId}
+        </>
-                operationId={OPERATION_BUTTON_TYPE.ADD_CHILD}
-                             description={"新增计划"}
-                             open={addTaskOpen}
-                             haveButton={false}
-                             reloadData={()=>setAddTaskOpen(false)}
-                             taskContent={clickTaskDiary?.description}
-            />}
-        </Fragment>
     );
 };
 export default DiaryOption;

src/components/service/Diary.tsx

@@ -7,9 +7,3 @@ export const addTaskLogAPI= (data:AddDiary):Promise<AxiosResponse<ResponseVO<Lis
     return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + "/task/message/diary",
         data)
 }
-export const deleteTaskLogByIdAPI = (id:string) => {
-    return httpReq.delete( process.env.NEXT_PUBLIC_TODO_REQUEST_URL+`/task/message/diary?id=${id}`);
-}
-export const editEnableFlagAPI = (id:string,enableFlag:string) => {
-    return httpReq.put( process.env.NEXT_PUBLIC_TODO_REQUEST_URL+`/task/message/diary/enable?id=${id}&enableFlag=${enableFlag}`);
-}

src/hooks/useWindowSize.ts

@@ -1,21 +0,0 @@
-import { useState, useEffect } from 'react';
-
-export function useWindowSize() {
-    const [windowSize, setWindowSize] = useState({
-        width: window.innerWidth,
-        height: window.innerHeight,
-    });
-
-    useEffect(() => {
-        const handleResize = () => {
-            setWindowSize({
-                width: window.innerWidth,
-                height: window.innerHeight,
-            });
-        };
-        window.addEventListener('resize', handleResize);
-        return () => window.removeEventListener('resize', handleResize);
-    }, []);
-
-    return windowSize;
-}

src/lib/task/project/data.tsx

@@ -1,7 +1,7 @@
 import {unstable_noStore as noStore} from 'next/cache';
 import {AxiosResponse} from "axios";
 import {httpReq} from "@/utils/axiosReq";
-import {DataType, DictType, Request, ResponseVO, ResultPage, TaskMessage} from "@/lib/definitions";
+import {DataType, DictType, Request, ResponseVO, ResultPage} from "@/lib/definitions";
 import {TaskWebSelectVO} from "@/lib/task/project/definitions";
 
 export async function getTaskTreeResult(requestParam: string): Promise<ResponseVO<ResultPage<DataType>>> {
@@ -52,20 +52,12 @@ export async function getTask(id: string): Promise<ResponseVO<DataType>> {
     return response.data;
 }
 
-export function addTask(task: DataType): Promise<AxiosResponse<ResponseVO<TaskMessage>>> {
+export async function addTask(task: DataType): Promise<ResponseVO<string>> {
     noStore();
     // 使用 Axios 发送 POST 请求添加数据
-    switch(task.taskType){
+    const response: AxiosResponse<ResponseVO<string>> = await httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task', task);
-        // 常规任务
+    // 从响应中提取数据并返回
-        case '0':return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/V2/task', task);
+    return response.data;
-        // 团队任务
-        case '1':return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/V2/task', task);
-        // 顺序
-        case '2':return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/step/sort', task);
-        // 周期
-        case '3':return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/schedule', task);
-        default:throw new Error("创建任务必选任务类型");
-    }
 }
 
 export async function updateTask(task: DataType): Promise<ResponseVO<string>> {

src/ui/task/calendar/CalShow.tsx

@@ -268,7 +268,6 @@ const CalShow: React.FC = () => {
         {open && <DetailModelForm operationId={operationId} description={description} open={open} haveButton={false}
                                   itemId={itemId}
                                   reloadData={reloadData} expectedStartTime={expectedStartTime}
-                                  closeOpen={()=>setOpen(false)}
                                   expectedEndTime={expectedEndTime}/>}
         <DragAndDropCalendar
             // 本地设置

src/ui/task/project/DetailModelForm.tsx

@@ -2,7 +2,7 @@ import {PlusOutlined, QuestionCircleOutlined} from '@ant-design/icons';
 import {
     ModalForm,
     ProForm,
-    ProFormDateTimeRangePicker,
+    ProFormDateRangePicker, ProFormDateTimeRangePicker,
     ProFormSelect,
     ProFormText, ProFormTextArea, ProFormTreeSelect,
 } from '@ant-design/pro-components';
@@ -29,13 +29,10 @@ export type DetailModelFormProps = {
     operationId: OPERATION_BUTTON_TYPE,
     // 标题描述
     description: string,
-    // 任务内容描述
-    taskContent?: string,
     // 是否打开界面，用于非按钮操作
     open: boolean,
     // 使用按钮操作
     haveButton: boolean,
-    closeOpen?: () => void,
     expectedStartTime?: Dayjs,
     expectedEndTime?: Dayjs,
     // 重新加载数据
@@ -77,9 +74,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
         } else if (props.operationId === OPERATION_BUTTON_TYPE.ADD || props.operationId === OPERATION_BUTTON_TYPE.ADD_CHILD) {
             let data = {
                 'expectedTimeRange': [props.expectedStartTime ? props.expectedStartTime : dayjs(), props.expectedEndTime],
-                'pid': props.pid,
+                'pid': props.pid
-                'description': props.taskContent,
-                'name': props.taskContent && props.taskContent?.length > 10 ? props.taskContent.substring(0, 10) : props.taskContent,
             };
             form.setFieldsValue(data)
         }
@@ -117,21 +112,22 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
             modalProps={{
                 destroyOnClose: true,
                 onCancel: () => {
+                    console.log('run');
                     props.reloadData?.();
                 },
             }}
-            readonly={editFormDisable}
             submitter={props.itemId !== undefined && props.itemId !== '-1' ? {
                 render: (prop, defaultDoms) => {
-                    console.log("submitter render: ", {prop})
+                    return [
-                    let result = [
                         editFormDisable ? <Button
                             key="edit"
                             onClick={() => {
                                 // props.submit();
                                 setEditFormDisable(false)
                             }}
-                        >编辑</Button> : undefined,
+                        >
+                            编辑
+                        </Button> : undefined,
                         props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE ?
                             <Popconfirm
                                 key='delete'
@@ -152,46 +148,17 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                                     }
                                 }}
                             >
-                                <Button type="primary" key="delete" danger>
+                                <Button type="primary" danger>
                                     删除
                                 </Button>
-                            </Popconfirm> : undefined,
+                            </Popconfirm> : undefined
-                        requestTask && requestTask.id ?
+                        ,
-                            <DiaryOption key="diary" taskId={requestTask.id} taskName={requestTask.name}/> : undefined,
+                        requestTask&&requestTask.id?<DiaryOption taskId={requestTask.id} taskName={requestTask.name}/>:undefined,
-                    ]
+                        ...defaultDoms
-
+                    ];
-                    // 非新增或者编辑状态不展示
-                    if (!editFormDisable) {
-                        result.push(...defaultDoms)
-                    } else {
-                        result.push(<Button type="primary" key="join"
-                                            onClick={() => props.closeOpen?.()}>邀请小伙伴加入</Button>)
-                        result.push(<Button type="primary" key="close"
-                                            onClick={() => props.closeOpen?.()}>关闭</Button>)
-                    }
-                    return result;
                 },
-            } : {
+            } : undefined}
-                render: (prop, defaultDoms) => {
-                    console.log("submitter render: ", {prop}, {props},{taskType},{defaultDoms})
-                    // if ( prop.searchConfig) {
-                    //     if (taskType == '1') {
-                    //         prop.searchConfig.submitText = "创建团队"
-                    //     }else {
-                    //         prop.searchConfig.submitText = "确认"
-                    //     }
-                    // }
-                    // return defaultDoms;
-                    const result = defaultDoms.filter(defaultButton=>defaultButton.key=='rest');
-                    result.push(<Button type="primary" key="create-team" onClick={() => form.submit()}>{taskType=='1'?"创建团队":"确认"}
-                    </Button>)
-                    return result;
-                }
-            }
-            }
             onFinish={async (values) => {
-                {/* onFinish 返回true关闭窗口，范湖false不关闭窗口 */
-                }
                 console.log('Received values of form: ', values,{...requestTask,...values});
                 if (requestTask) {
                     const {sortNo}=requestTask;
@@ -243,16 +210,16 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                 } else {
                     await addTask(values).then(response => {
                             console.log('response', response)
-                            if (response.data.status.success) {
+                            if (response.status.success) {
-                                message.success(`添加计划${response.data.data.name}成功`)
+                                message.success("添加任务成功：" + response.data)
                                 // 树任务重新刷新
                                 // 四象限任务重新刷新
                                 // 如果可以直接更新列表而不请求。。。。。。
                                 console.log('props.reloadData?.()', props.reloadData)
-                                result = (taskType!='1')
                                 props.reloadData?.()
+                                result = true
                             } else {
-                                message.error(response.data.status.message)
+                                message.error(response.status.message)
                                 result = false
                             }
                         }
@@ -271,7 +238,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                     width="sm"
                     name="taskType"
                     label="任务类型"
-                    initialValue={taskType}
+                    initialValue='0'
                     disabled={editFormDisable}
                     onChange={(value: string, option) => {
                         setTaskType(value)
@@ -342,48 +309,52 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
                 />
             </ProForm.Group>
             <ProFormTextArea
-                width="xl"
+                // width="md"
                 name="description"
                 label="任务描述"
-                tooltip="最长255个字"
+                // tooltip="最长为 24 位"
                 placeholder="请输入任务描述"
                 disabled={editFormDisable}
             />
 
             <ProForm.Group>
                 <ProFormSelect
-                    request={async () =>
+                    request={async () => taskPriorityList.map(taskState => {
-                        taskPriorityList.map
+                        return {
-                        (
+                            'label': taskState.name,
-                            taskState => {
+                            'value': taskState.code
-                                return {'label': taskState.name, 'value': taskState.code}
-                            }
-                        )
                         }
+                    })}
                     width="sm"
                     name="priority"
                     label="任务优先级"
                     initialValue='3'
                     disabled={editFormDisable}
-                    rules={[{required: true, message: "请选择计划优先级"}]}
+                    rules={[
+                        {
+                            required: true,
+                            message: "请选择计划优先级"
+                        }
+                    ]}
                 />
                 <ProFormSelect
                     width="sm"
                     options={taskStateList.map(taskState => {
-                        return {'label': taskState.name, 'value': taskState.code}
+                        return {
+                            'label': taskState.name,
+                            'value': taskState.code
+                        }
                     })}
                     name="state"
                     label="任务状态"
                     initialValue='8'
                     disabled={editFormDisable}
-                    rules={
+                    rules={[
-                        [
                         {
                             required: true,
                             message: "请选择计划状态"
                         }
-                        ]
+                    ]}
-                    }
                 />
             </ProForm.Group>