Compare commits
2 Commits
e1a40a8980
...
4e3bc8ddc2
| Author | SHA1 | Date |
|---|---|---|
1708-huayu
|
4e3bc8ddc2 | |
|
1708-huayu
|
5493acab8e |
|
|
@ -16,16 +16,13 @@ import {OPERATION_BUTTON_TYPE} from "@/lib/task/project/data";
|
|||
const DiaryOption = (props: SelectDiary) => {
|
||||
// 抽屉 start
|
||||
const [open, setOpen] = useState(false);
|
||||
const showDrawer = () => {
|
||||
setOpen(true);
|
||||
};
|
||||
const onClose = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
// 抽屉 end
|
||||
const [shouldScroll, setShouldScroll] = React.useState(true);
|
||||
// 设置高度 start
|
||||
const { height } = useWindowSize();
|
||||
const {height} = useWindowSize();
|
||||
const [containerHeight, setContainerHeight] = useState(400);
|
||||
useEffect(() => {
|
||||
setDiaryList([])
|
||||
|
|
@ -55,7 +52,7 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
// observer.observe(contentRef.current);
|
||||
//
|
||||
// return () => observer.disconnect();
|
||||
}, [open,height]);
|
||||
}, [open, height]);
|
||||
// 设置高度 end
|
||||
|
||||
// 头按钮设置 start
|
||||
|
|
@ -99,7 +96,7 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
}
|
||||
|
||||
const appendData = (showMessage = true) => {
|
||||
if (!open){
|
||||
if (!open) {
|
||||
return
|
||||
}
|
||||
const fakeDataUrl = process.env.NEXT_PUBLIC_TODO_REQUEST_URL + `/task/message/diary/select`;
|
||||
|
|
@ -202,56 +199,58 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
const [popConfirmLoading, setPopConfirmLoading] = useState(false);
|
||||
const popConfirmOk = () => {
|
||||
setPopConfirmLoading(true)
|
||||
if (clickTaskDiary){
|
||||
deleteTaskLogByIdAPI(clickTaskDiary.id).then(res=>{
|
||||
if (res.data.status.success){
|
||||
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 {
|
||||
} else {
|
||||
message.error(res.data.status.message)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
const handleCancel = () =>{
|
||||
const handleCancel = () => {
|
||||
setPopConfirmOpen(false)
|
||||
}
|
||||
|
||||
const editEnableFlag = (enableFlag:string) => {
|
||||
if (clickTaskDiary){
|
||||
editEnableFlagAPI(clickTaskDiary.id,enableFlag).then(res=>{
|
||||
if (res.data.status.success){
|
||||
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){
|
||||
if (taskLog.id == clickTaskDiary.id) {
|
||||
taskLog.enableFlag = enableFlag;
|
||||
}
|
||||
return taskLog;
|
||||
}))
|
||||
message.info("设置成功")
|
||||
}else {
|
||||
} else {
|
||||
message.error(res.data.status.message)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const [addTaskOpen,setAddTaskOpen] = useState(false)
|
||||
const [addTaskOpen, setAddTaskOpen] = useState(false)
|
||||
|
||||
const commonItems: MenuProps['items'] = [
|
||||
{
|
||||
label: '复制',
|
||||
key: '1',
|
||||
onClick: () => {
|
||||
copyToClipboard(clickTaskDiary!.description)
|
||||
copyToClipboard(clickTaskDiary!.description).then(res => {
|
||||
res && message.info(`复制成功${clickTaskDiary!.description.length > 5 ? clickTaskDiary!.description.substring(0, 5) + "..." : clickTaskDiary!.description}`)
|
||||
})
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '创建计划',
|
||||
key: '3',
|
||||
onClick:()=>{
|
||||
// 打开添加任务窗口
|
||||
onClick: () => {
|
||||
// 打开添加任务窗口
|
||||
setAddTaskOpen(true)
|
||||
}
|
||||
},
|
||||
|
|
@ -265,28 +264,26 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
{
|
||||
label: '取消',
|
||||
key: '5',
|
||||
onClick:()=>{
|
||||
onClick: () => {
|
||||
setClickTaskDiary(undefined)
|
||||
}
|
||||
},
|
||||
]
|
||||
const items: MenuProps['items'] = [
|
||||
];
|
||||
const items: MenuProps['items'] = [];
|
||||
items.push(...commonItems)
|
||||
items.splice(1,0,{
|
||||
items.splice(1, 0, {
|
||||
label: '失效',
|
||||
key: '2',
|
||||
onClick:()=>{
|
||||
onClick: () => {
|
||||
editEnableFlag("0")
|
||||
},
|
||||
})
|
||||
const itemsEnable: MenuProps['items'] = [
|
||||
];
|
||||
const itemsEnable: MenuProps['items'] = [];
|
||||
itemsEnable.push(...commonItems)
|
||||
itemsEnable.splice(1,0,{
|
||||
itemsEnable.splice(1, 0, {
|
||||
label: '生效',
|
||||
key: '2',
|
||||
onClick:()=>{
|
||||
onClick: () => {
|
||||
editEnableFlag("1")
|
||||
},
|
||||
})
|
||||
|
|
@ -294,7 +291,7 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
|
||||
return (
|
||||
<Fragment>
|
||||
<Button type="primary" onClick={showDrawer}>
|
||||
<Button type={open?"primary":"default"} onClick={() => setOpen(!open)}>
|
||||
日志心得
|
||||
</Button>
|
||||
<Drawer
|
||||
|
|
@ -392,7 +389,7 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
<Popconfirm
|
||||
title="警告"
|
||||
description={`确认要删除日志:${item.description.length > 5 ? item.description.substring(0, 5) + '...' : item.description}?`}
|
||||
open={popConfirmOpen&&clickTaskDiary?.id==item.id}
|
||||
open={popConfirmOpen && clickTaskDiary?.id == item.id}
|
||||
onConfirm={popConfirmOk}
|
||||
okButtonProps={{loading: popConfirmLoading}}
|
||||
onCancel={handleCancel}
|
||||
|
|
@ -418,13 +415,13 @@ const DiaryOption = (props: SelectDiary) => {
|
|||
</VirtualList>
|
||||
</List>
|
||||
</Drawer>
|
||||
{addTaskOpen&&<DetailModelForm pid={props.taskId}
|
||||
operationId={OPERATION_BUTTON_TYPE.ADD_CHILD}
|
||||
description={"新增计划"}
|
||||
open={addTaskOpen}
|
||||
haveButton={false}
|
||||
reloadData={()=>setAddTaskOpen(false)}
|
||||
taskContent={clickTaskDiary?.description}
|
||||
{addTaskOpen && <DetailModelForm pid={props.taskId}
|
||||
operationId={OPERATION_BUTTON_TYPE.ADD_CHILD}
|
||||
description={"新增计划"}
|
||||
open={addTaskOpen}
|
||||
haveButton={false}
|
||||
reloadData={() => setAddTaskOpen(false)}
|
||||
taskContent={clickTaskDiary?.description}
|
||||
/>}
|
||||
</Fragment>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,270 @@
|
|||
import React, {useState, useEffect, Fragment} from 'react';
|
||||
import dayjs, {Dayjs} from 'dayjs';
|
||||
import {Button, Input, Modal, Segmented} from 'antd';
|
||||
import style from "@/components/SettingCton.module.css"
|
||||
|
||||
type PresetType = 'everyMinute' | 'everyHour' | 'daily' | 'weekly' | 'monthly';
|
||||
|
||||
interface CronGeneratorProps {
|
||||
setCronFunction: (data: boolean) => void;
|
||||
cron?: string;
|
||||
}
|
||||
|
||||
const CronGenerator: React.FC<CronGeneratorProps> = ({setCronFunction, cron}) => {
|
||||
const [showModal,setShowModal] = useState(false);
|
||||
const [current, setCurrent] = useState<number>(0);
|
||||
const [cronSeconds, setCronSeconds] = useState<string>(cron ? cron.split(' ')[0] : '*');
|
||||
const [cronMinutes, setCronMinutes] = useState<string>(cron ? cron.split(' ')[1] : '*');
|
||||
const [cronHours, setCronHours] = useState<string>(cron ? cron.split(' ')[2] : '*');
|
||||
const [cronDayOfMonth, setCronDayOfMonth] = useState<string>(cron ? cron.split(' ')[3] : '*');
|
||||
const [cronMonth, setCronMonth] = useState<string>(cron ? cron.split(' ')[4] : '*');
|
||||
const [cronDayOfWeek, setCronDayOfWeek] = useState<string>(cron ? cron.split(' ')[5] : '*');
|
||||
const [everyNumber, setEveryNumber] = useState<number>(1);
|
||||
const [nextOccurrences, setNextOccurrences] = useState<Dayjs[]>([]);
|
||||
const [fullCronExpression, setFullCronExpression] = useState<string>(
|
||||
`${cronMinutes} ${cronHours} ${cronDayOfMonth} ${cronMonth} ${cronDayOfWeek}`.trim()
|
||||
);
|
||||
|
||||
const titleItem = ['具体时间', '周期', '自定义cron'];
|
||||
|
||||
useEffect(() => {
|
||||
setFullCronExpression(`${cronMinutes} ${cronHours} ${cronDayOfMonth} ${cronMonth} ${cronDayOfWeek}`.trim());
|
||||
}, [cronMinutes, cronHours, cronDayOfMonth, cronMonth, cronDayOfWeek]);
|
||||
|
||||
const onClickItem = (index: number) => {
|
||||
setCurrent(index);
|
||||
};
|
||||
|
||||
const onClickConfirmCron = () => {
|
||||
if (fullCronExpression) {
|
||||
try {
|
||||
// Replace generateNextTimeAPI with your actual API call
|
||||
// generateNextTimeAPI('0 ' + fullCronExpression).then(res => {
|
||||
// setNextOccurrences(res.map((next: string) => dayjs(next)));
|
||||
// setCronFunction(false);
|
||||
// });
|
||||
console.log('Cron confirmed:', fullCronExpression);
|
||||
setCronFunction(false);
|
||||
} catch (error) {
|
||||
console.error('Cron expression is invalid', error);
|
||||
}
|
||||
} else {
|
||||
setCronFunction(false);
|
||||
}
|
||||
};
|
||||
|
||||
const resetOccurrences = () => {
|
||||
setCronSeconds('0');
|
||||
setCronMinutes('*');
|
||||
setCronHours('*');
|
||||
setCronDayOfMonth('*');
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek('*');
|
||||
};
|
||||
|
||||
const generateNextOccurrences = () => {
|
||||
try {
|
||||
if (!fullCronExpression) {
|
||||
console.error('Please set the next generation time correctly');
|
||||
return;
|
||||
}
|
||||
console.log('cron' + fullCronExpression);
|
||||
// Replace generateNextTimeAPI with your actual API call
|
||||
// generateNextTimeAPI('0 ' + fullCronExpression).then(res => {
|
||||
// setNextOccurrences(res.map((next: string) => dayjs(next)));
|
||||
// });
|
||||
} catch (error) {
|
||||
console.error('Cron expression is invalid', error);
|
||||
}
|
||||
};
|
||||
|
||||
const setPreset = (type: PresetType) => {
|
||||
switch (type) {
|
||||
case 'everyMinute':
|
||||
setCronSeconds('0');
|
||||
setCronMinutes(`*/${everyNumber}`);
|
||||
setCronHours('*');
|
||||
setCronDayOfMonth('*');
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek('*');
|
||||
break;
|
||||
case 'everyHour':
|
||||
setCronSeconds('0');
|
||||
setCronMinutes('0');
|
||||
setCronHours(`*/${everyNumber}`);
|
||||
setCronDayOfMonth('*');
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek('*');
|
||||
break;
|
||||
case 'daily':
|
||||
setCronSeconds('0');
|
||||
setCronMinutes('0');
|
||||
setCronHours('0');
|
||||
setCronDayOfMonth(`*/${everyNumber}`);
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek('*');
|
||||
break;
|
||||
case 'weekly':
|
||||
setCronSeconds('0');
|
||||
setCronMinutes('0');
|
||||
setCronHours('0');
|
||||
setCronDayOfMonth('*');
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek(`${everyNumber}`);
|
||||
break;
|
||||
case 'monthly':
|
||||
setCronSeconds('0');
|
||||
setCronMinutes('0');
|
||||
setCronHours('0');
|
||||
setCronDayOfMonth('1');
|
||||
setCronMonth('*');
|
||||
setCronDayOfWeek('*');
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<Button type="primary" onClick={()=>setShowModal(!showModal)}>
|
||||
设置时间
|
||||
</Button>
|
||||
<Modal
|
||||
title="设置时间"
|
||||
closable={{ 'aria-label': 'Custom Close Button' }}
|
||||
open={showModal}
|
||||
// onOk={handleOk}
|
||||
onCancel={()=>setShowModal(false)}
|
||||
>
|
||||
<div className={style.container}>
|
||||
<div className={style.cronForm}>
|
||||
<div>
|
||||
<Segmented
|
||||
value={titleItem[current]}
|
||||
options={titleItem}
|
||||
onChange={(value) => onClickItem(titleItem.indexOf(value as string))}
|
||||
block
|
||||
/>
|
||||
</div>
|
||||
<div className={style.content}>
|
||||
{current === 0 && (
|
||||
<>
|
||||
<div className={style.formItem}>
|
||||
<div className={style.label}>分钟（0-59）</div>
|
||||
<Input
|
||||
className={style.input}
|
||||
value={cronMinutes}
|
||||
onChange={(e) =>
|
||||
setCronMinutes(e.target.value)}
|
||||
placeholder="*"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={style.formItem}>
|
||||
<div className={style.label}>小时（0-23）</div>
|
||||
<Input
|
||||
className={style.input}
|
||||
value={cronHours}
|
||||
onChange={(e) =>
|
||||
setCronHours(e.target.value)}
|
||||
placeholder="*"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={style.formItem}>
|
||||
<div className={style.label}>日期（1-31）</div>
|
||||
<Input
|
||||
className={style.input}
|
||||
value={cronDayOfMonth}
|
||||
onChange={(e) => setCronDayOfMonth(e.target.value)}
|
||||
placeholder="*"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={style.formItem}>
|
||||
<div className={style.label}>月份（1-12）</div>
|
||||
<Input
|
||||
className={style.input}
|
||||
value={cronMonth}
|
||||
onChange={(e) => setCronMonth(e.target.value)}
|
||||
placeholder="*"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className={style.formItem}>
|
||||
<div className={style.label}>星期（0-6，0=周日）</div>
|
||||
<Input
|
||||
className={style.input}
|
||||
value={cronDayOfWeek}
|
||||
onChange={(e) => setCronDayOfWeek(e.target.value)}
|
||||
placeholder="*"
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{current === 1 && (
|
||||
<div className={style.presetButtons}>
|
||||
<div>
|
||||
<Input
|
||||
type="number"
|
||||
value={everyNumber}
|
||||
onChange={(e) => setEveryNumber(parseInt(e.target.value) || 1)}
|
||||
placeholder="1"
|
||||
/>
|
||||
</div>
|
||||
<Button className={style.presetBtn} onClick={() => setPreset('everyMinute')}>
|
||||
每{everyNumber}分钟
|
||||
</Button>
|
||||
<Button className={style.presetBtn} onClick={() => setPreset('everyHour')}>
|
||||
每{everyNumber}小时
|
||||
</Button>
|
||||
<Button className={style.presetBtn} onClick={() => setPreset('daily')}>
|
||||
每{everyNumber}天
|
||||
</Button>
|
||||
<Button className={style.presetBtn} onClick={() => setPreset('weekly')}>
|
||||
每周{everyNumber}
|
||||
</Button>
|
||||
<Button className={style.presetBtn} onClick={() => setPreset('monthly')}>
|
||||
每月
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
{current === 2 && (
|
||||
<div className={style.presetButtons}>
|
||||
<div style={{color: 'red'}}>!!!目前只支持5位设定，分钟、小时、日、月、星期</div>
|
||||
<Input value={fullCronExpression}
|
||||
onChange={(e) => setFullCronExpression(e.target.value)}/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className={style.buttonFlex}>
|
||||
<Button size="small" danger onClick={resetOccurrences}>
|
||||
重置
|
||||
</Button>
|
||||
<Button size="small" type="primary" onClick={generateNextOccurrences}>
|
||||
查看最近触发时间
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{nextOccurrences.length > 0 && (
|
||||
<div className={style.results}>
|
||||
<div className={style.resultsTitle}>最近触发时间：</div>
|
||||
{nextOccurrences.map((item, index) => (
|
||||
<div className={style.occurrenceItem} key={index}>
|
||||
<div>{dayjs(item).format('YYYY-MM-DD HH:mm')}</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
<Button type="primary" onClick={onClickConfirmCron}>
|
||||
确认
|
||||
</Button>
|
||||
</div>
|
||||
</Modal>
|
||||
</Fragment>
|
||||
|
||||
);
|
||||
};
|
||||
|
||||
export default CronGenerator;
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
.container {
|
||||
padding: 20px;
|
||||
background-color: #f5f5f5;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.header {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.cronForm {
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 15px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.formItem {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.label {
|
||||
display: block;
|
||||
margin-bottom: 5px;
|
||||
font-size: 14px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.input {
|
||||
width: 90%;
|
||||
padding: 10px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.results {
|
||||
background-color: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 15px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.resultsTitle {
|
||||
font-weight: bold;
|
||||
margin-bottom: 10px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.occurrence-item {
|
||||
padding: 8px 0;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.presetButtons {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.buttonFlex {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.presetBtn {
|
||||
background-color: #f0f0f0;
|
||||
color: #000;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
flex: 1;
|
||||
min-width: 100px;
|
||||
border: 1px solid #d9d9d9;
|
||||
}
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
import React, {Fragment, useEffect, useState} from 'react';
|
||||
import {Button, Image, Input, Modal, QRCode, Space } from 'antd';
|
||||
import {v4 as uuidv4} from 'uuid';
|
||||
import {copyToClipboard} from "@/lib/copyToClipboard";
|
||||
|
||||
const ShareOption = (props: { taskId: string }) => {
|
||||
// const [loading, setLoading] = useState(false);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [buttonIndex, setButtonIndex] = useState(1);
|
||||
const [qrCodeValue, setQrCodeValue] = useState<string>("-");
|
||||
const [qrCodeStatus, setQrCodeStatus] = useState<'active' | 'expired' | 'loading' | 'scanned'>("loading");
|
||||
|
||||
function doDownload(url: string, fileName: string) {
|
||||
const a = document.createElement('a');
|
||||
a.download = fileName;
|
||||
a.href = url;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
document.body.removeChild(a);
|
||||
}
|
||||
|
||||
const downloadCanvasQRCode = () => {
|
||||
const canvas = document.getElementById('myqrcode')?.querySelector<HTMLCanvasElement>('canvas');
|
||||
if (canvas) {
|
||||
const url = canvas.toDataURL();
|
||||
doDownload(url, 'QRCode.png');
|
||||
}
|
||||
};
|
||||
|
||||
const downloadSvgQRCode = () => {
|
||||
const svg = document.getElementById('myqrcode')?.querySelector<SVGElement>('svg');
|
||||
const svgData = new XMLSerializer().serializeToString(svg!);
|
||||
const blob = new Blob([svgData], {type: 'image/svg+xml;charset=utf-8'});
|
||||
const url = URL.createObjectURL(blob);
|
||||
console.log({url})
|
||||
doDownload(url, '微信小程序马上行计划管理扫码加入计划.svg');
|
||||
};
|
||||
|
||||
const generateQrcode = () => {
|
||||
|
||||
}
|
||||
const showModal = () => {
|
||||
setOpen(true);
|
||||
};
|
||||
|
||||
const handleCancel = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
useEffect(() => {
|
||||
// 分享人必须有权限
|
||||
// 生成分享信息同时适用链接和二维码
|
||||
const clientId: string = uuidv4();
|
||||
let qrCodeData = {
|
||||
taskId: props.taskId, pass: clientId, local: "马上行计划管理", opType: "SHARE_OPTION"
|
||||
}
|
||||
setQrCodeValue(JSON.stringify(qrCodeData))
|
||||
setQrCodeStatus("active")
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<Button type="primary" onClick={showModal}>
|
||||
分享
|
||||
</Button>
|
||||
<Modal
|
||||
open={open}
|
||||
title="分享好友"
|
||||
// onOk={handleOk}
|
||||
onCancel={handleCancel}
|
||||
width={700}
|
||||
footer={[
|
||||
<Button key="back" onClick={handleCancel}>
|
||||
返回
|
||||
</Button>,
|
||||
<Button key="qrcode"
|
||||
type={buttonIndex == 1 ? "primary" : "default"}
|
||||
// loading={loading}
|
||||
onClick={() => setButtonIndex(1)}>
|
||||
使用二维码
|
||||
</Button>,
|
||||
<Button
|
||||
key="link"
|
||||
// href="https://google.com"
|
||||
// target="_blank"
|
||||
type={buttonIndex == 2 ? "primary" : "default"}
|
||||
// loading={loading}
|
||||
onClick={() => setButtonIndex(2)}
|
||||
>
|
||||
使用连接
|
||||
</Button>,
|
||||
]}
|
||||
>
|
||||
{buttonIndex == 1 && <div className="displayFlexRow">
|
||||
<div className="displayFlexColumn">
|
||||
<div className="title">微信小程序二维码</div>
|
||||
<Image width={300} src="/static/pc-Web.png"/>
|
||||
<Button
|
||||
onClick={() => doDownload("/static/pc-Web.png", '微信小程序马上行计划管理.png')}>下载</Button>
|
||||
</div>
|
||||
<div className="displayFlexColumn" id="myqrcode">
|
||||
<div className="title">小程序扫描二维码，有效期7天</div>
|
||||
<QRCode type="svg" value={qrCodeValue} size={300} status={qrCodeStatus}
|
||||
onRefresh={generateQrcode}/>
|
||||
<Button onClick={downloadSvgQRCode}>下载</Button>
|
||||
</div>
|
||||
</div>}
|
||||
{buttonIndex == 2 && <div>
|
||||
<div className="title">分享链接7日内有效</div>
|
||||
<Space.Compact style={{width: '100%'}}>
|
||||
<Input defaultValue="https://www.huaruyu.com" readOnly/>
|
||||
<Button loading={qrCodeStatus=="loading"}
|
||||
onClick={()=>copyToClipboard("https://www.huaruyu.com")}
|
||||
type="primary">复制链接</Button>
|
||||
</Space.Compact>
|
||||
</div>}
|
||||
</Modal>
|
||||
</Fragment>
|
||||
);
|
||||
};
|
||||
export default ShareOption;
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
import React, {CSSProperties, Fragment, useState} from "react";
|
||||
import {DragDropContext, Droppable, Draggable, DropResult, DraggingStyle, NotDraggingStyle} from "react-beautiful-dnd";
|
||||
import {TaskStepSortVO} from "@/components/type/TaskSort.d";
|
||||
import {Button, Drawer} from "antd";
|
||||
|
||||
// fake data generator
|
||||
const getItems = (count: number, offset = 0) =>
|
||||
Array.from({length: count}, (v, k) => k).map(k => ({
|
||||
id: `item-${k + offset}-${new Date().getTime()}`,
|
||||
stepDesc: `item ${k + offset}`,
|
||||
sortIndex: k + offset,
|
||||
}));
|
||||
|
||||
const reorder = (list: TaskStepSortVO[], startIndex: number, endIndex: number) => {
|
||||
const result = Array.from(list);
|
||||
const [removed] = result.splice(startIndex, 1);
|
||||
result.splice(endIndex, 0, removed);
|
||||
|
||||
return result;
|
||||
};
|
||||
const grid = 8;
|
||||
|
||||
const getItemStyle = (isDragging: boolean, draggableStyle: DraggingStyle | NotDraggingStyle | undefined): CSSProperties => ({
|
||||
// some basic styles to make the items look a bit nicer
|
||||
userSelect: "none",
|
||||
padding: grid * 2,
|
||||
margin: `0 0 ${grid}px 0`,
|
||||
|
||||
// change background colour if dragging
|
||||
background: isDragging ? "lightgreen" : "grey",
|
||||
|
||||
// styles we need to apply on draggables
|
||||
...draggableStyle
|
||||
});
|
||||
const getListStyle = (isDraggingOver: boolean) => ({
|
||||
background: isDraggingOver ? "lightblue" : "lightgrey",
|
||||
padding: grid,
|
||||
width: 250
|
||||
});
|
||||
|
||||
const StepSort = (props: { taskId: string }) => {
|
||||
const [state, setState] = useState<TaskStepSortVO[]>(getItems(5, 10));
|
||||
// 抽屉 start
|
||||
const [open, setOpen] = useState(false);
|
||||
|
||||
function onDragEnd(result: DropResult) {
|
||||
const {source, destination} = result;
|
||||
// dropped outside the list
|
||||
if (!destination) {
|
||||
return;
|
||||
}
|
||||
const items = reorder(state, source.index, destination.index);
|
||||
let newState = [...state];
|
||||
newState = items;
|
||||
setState(newState);
|
||||
}
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<Button type={open ? "primary" : "default"} onClick={() => setOpen(!open)}>
|
||||
查看步骤
|
||||
</Button>
|
||||
<Drawer>
|
||||
<div style={{display: "flex"}}>
|
||||
<DragDropContext onDragEnd={onDragEnd}>
|
||||
<Droppable key="sortDroppable" droppableId="sortDroppableId">
|
||||
{(provided, snapshot) => (
|
||||
<div
|
||||
ref={provided.innerRef}
|
||||
style={getListStyle(snapshot.isDraggingOver)}
|
||||
{...provided.droppableProps}
|
||||
>
|
||||
{state.map((item, index) => (
|
||||
<Draggable
|
||||
key={item.id}
|
||||
draggableId={item.id}
|
||||
index={index}
|
||||
>
|
||||
{(provided, snapshot) => (
|
||||
<div
|
||||
ref={provided.innerRef}
|
||||
{...provided.draggableProps}
|
||||
{...provided.dragHandleProps}
|
||||
style={getItemStyle(
|
||||
snapshot.isDragging,
|
||||
provided.draggableProps.style
|
||||
)}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
display: "flex",
|
||||
justifyContent: "space-around"
|
||||
}}
|
||||
>
|
||||
{item.stepDesc}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</Draggable>
|
||||
))}
|
||||
{provided.placeholder}
|
||||
</div>
|
||||
)}
|
||||
</Droppable>
|
||||
</DragDropContext>
|
||||
</div>
|
||||
</Drawer>
|
||||
</Fragment>
|
||||
);
|
||||
}
|
||||
export default StepSort
|
||||
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
export type TaskStepSortVO = {
|
||||
id: string,
|
||||
sortIndex: number,
|
||||
stepDesc: string
|
||||
}
|
||||
|
|
@ -40,7 +40,8 @@ export default function XcxLoginPage() {
|
|||
const clientId: string = uuidv4();
|
||||
generateQrcodeAPI({clientId}).then(res=>{
|
||||
let qrCodeData={
|
||||
clientId,serverId:res.data.data,local:"马上行计划管理"
|
||||
clientId,serverId:res.data.data,local:"马上行计划管理",
|
||||
opType:"LOGIN_OPTION"
|
||||
}
|
||||
setQrCodeValue(JSON.stringify(qrCodeData))
|
||||
setQrCodeStatus("active")
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import Link from "next/link";
|
|||
import {DetailModelForm} from "@/ui/task/project/DetailModelForm";
|
||||
interface OperationButtonProps {
|
||||
itemId: string,
|
||||
taskType?:string,
|
||||
itemName: string,
|
||||
priority?:string,
|
||||
pid: string,
|
||||
|
|
@ -124,11 +125,13 @@ const RightOption: React.FC<OperationButtonProps> = (props) => {
|
|||
itemId={operateState.operationId === OPERATION_BUTTON_TYPE.UPDATE||operateState.operationId === OPERATION_BUTTON_TYPE.DETAIL?props.itemId:undefined}
|
||||
pPid={props.pPid}
|
||||
pid={operateState.operationId === OPERATION_BUTTON_TYPE.ADD_CHILD ?props.itemId:undefined}
|
||||
taskType={props.taskType}
|
||||
operationId={operateState.operationId}
|
||||
description={operateState.operationId === OPERATION_BUTTON_TYPE.DETAIL ? '任务详情' :
|
||||
operateState.operationId === OPERATION_BUTTON_TYPE.ADD_CHILD ? '添加支线任务' :
|
||||
operateState.operationId === OPERATION_BUTTON_TYPE.UPDATE ? '修改任务' : '未知操作'}
|
||||
open={operateState.openModal}
|
||||
closeOpen={() => setOperateState({...operateState, openModal: false})}
|
||||
reloadData={handleCancel}/>}
|
||||
</Fragment>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ const CalShow: React.FC = () => {
|
|||
clearClickTimeout()
|
||||
clickRef.current = window.setTimeout(() => {
|
||||
// window.alert(event.title);
|
||||
console.log(event)
|
||||
console.log("event")
|
||||
setOperationId(OPERATION_BUTTON_TYPE.DETAIL)
|
||||
setDescription("任务详情")
|
||||
setItemId(event.resource)
|
||||
|
|
@ -265,7 +265,10 @@ const CalShow: React.FC = () => {
|
|||
|
||||
}
|
||||
return <div className="App" style={{height: '90vh'}}>
|
||||
{open && <DetailModelForm operationId={operationId} description={description} open={open} haveButton={false}
|
||||
{open && <DetailModelForm operationId={operationId}
|
||||
description={description}
|
||||
open={open}
|
||||
haveButton={false}
|
||||
itemId={itemId}
|
||||
reloadData={reloadData} expectedStartTime={expectedStartTime}
|
||||
closeOpen={()=>setOpen(false)}
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ export const DroppableTable = React.memo((props: DroppableTableProps) => {
|
|||
{(provided, snapshot) => (
|
||||
<RightOption refreshDate={props.refreshDate} itemId={record.id}
|
||||
itemName={record.name} pid={record.pid}
|
||||
taskType={record.taskType}
|
||||
pPid={record.pPid} children={<div
|
||||
ref={provided.innerRef}
|
||||
{...provided.draggableProps}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import {
|
|||
ProFormSelect,
|
||||
ProFormText, ProFormTextArea, ProFormTreeSelect,
|
||||
} from '@ant-design/pro-components';
|
||||
import {Button, Form, message, Popconfirm} from 'antd';
|
||||
import React, {useEffect, useState} from "react";
|
||||
import {Button, Form, message, Popconfirm, Spin} from 'antd';
|
||||
import React, {Fragment, useEffect, useState} from "react";
|
||||
import {
|
||||
addTask, deleteTask, getTask,
|
||||
getTaskTreeResult,
|
||||
|
|
@ -18,11 +18,15 @@ import {
|
|||
import {DataType} from "@/lib/definitions";
|
||||
import dayjs, {Dayjs} from "dayjs";
|
||||
import DiaryOption from "@/components/DiaryOption";
|
||||
import ShareOption from "@/components/ShareOption";
|
||||
import StepSort from "@/components/StepSort";
|
||||
import SettingCron from "@/components/SettingCron";
|
||||
|
||||
export type DetailModelFormProps = {
|
||||
// 当前内容id
|
||||
itemId?: string,
|
||||
pid?: string,
|
||||
taskType?: string,
|
||||
// 祖宗任务id
|
||||
pPid?: string,
|
||||
// 操作id
|
||||
|
|
@ -50,6 +54,8 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
const [editFormDisable, setEditFormDisable] = useState(props.operationId === OPERATION_BUTTON_TYPE.DETAIL)
|
||||
// 团队第一层 pid必须为0
|
||||
const [taskType, setTaskType] = useState('0')
|
||||
const [spinning, setSpinning] = useState(true)
|
||||
const [operationRequest,setOperationRequest] = useState(false)
|
||||
useEffect(() => {
|
||||
if (props.itemId != undefined && (
|
||||
props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE)) {
|
||||
|
|
@ -67,13 +73,19 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
if (task.data.pid == "0") {
|
||||
form.setFieldValue("pid", undefined)
|
||||
}
|
||||
if (task.data.taskType) {
|
||||
setTaskType(task.data.taskType)
|
||||
}
|
||||
setRequestTask(task.data)
|
||||
console.log("form.setFieldsValue(task.data)" + JSON.stringify(task.data))
|
||||
} else {
|
||||
message.error(task.status.message);
|
||||
props.reloadData?.()
|
||||
}
|
||||
})
|
||||
}).finally(() => {
|
||||
setSpinning(false)
|
||||
}
|
||||
)
|
||||
} 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],
|
||||
|
|
@ -82,6 +94,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
'name': props.taskContent && props.taskContent?.length > 10 ? props.taskContent.substring(0, 10) : props.taskContent,
|
||||
};
|
||||
form.setFieldsValue(data)
|
||||
setSpinning(false)
|
||||
}
|
||||
}, [props])
|
||||
|
||||
|
|
@ -103,308 +116,324 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
// 所以你需要用 setFieldsValue 来更新。 initialValues 只在 form 初始化时生效且只生效一次，如果你需要异步加载，
|
||||
// 推荐使用 request，或者 initialValues ? <Form/> : null
|
||||
return (
|
||||
<ModalForm<DataType>
|
||||
title={props.description}
|
||||
open={props.open && !props.haveButton}
|
||||
trigger={props.haveButton ?
|
||||
<Button type="primary">
|
||||
<PlusOutlined/>
|
||||
{props.description}
|
||||
</Button> : undefined
|
||||
}
|
||||
form={form}
|
||||
autoFocusFirstInput
|
||||
modalProps={{
|
||||
destroyOnClose: true,
|
||||
onCancel: () => {
|
||||
props.reloadData?.();
|
||||
},
|
||||
}}
|
||||
readonly={editFormDisable}
|
||||
submitter={props.itemId !== undefined && props.itemId !== '-1' ? {
|
||||
render: (prop, defaultDoms) => {
|
||||
console.log("submitter render: ", {prop})
|
||||
let result = [
|
||||
editFormDisable ? <Button
|
||||
key="edit"
|
||||
onClick={() => {
|
||||
// props.submit();
|
||||
setEditFormDisable(false)
|
||||
}}
|
||||
>编辑</Button> : undefined,
|
||||
props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE ?
|
||||
<Popconfirm
|
||||
key='delete'
|
||||
title="删除任务"
|
||||
description="确认要删除任务?"
|
||||
icon={<QuestionCircleOutlined style={{color: 'red'}}/>}
|
||||
okText="确认"
|
||||
cancelText="取消"
|
||||
onConfirm={() => {
|
||||
if (props.itemId !== undefined) {
|
||||
deleteTask(props.itemId).then((response => {
|
||||
console.log('response', response)
|
||||
if (response.status.success) {
|
||||
message.success("删除任务成功：" + response.data)
|
||||
props.reloadData?.()
|
||||
}
|
||||
}));
|
||||
}
|
||||
<Fragment>
|
||||
<Spin spinning={spinning} fullscreen />
|
||||
<ModalForm<DataType>
|
||||
title={props.description}
|
||||
open={!spinning&&props.open && !props.haveButton}
|
||||
trigger={props.haveButton ?
|
||||
<Button type="primary">
|
||||
<PlusOutlined/>
|
||||
{props.description}
|
||||
</Button> : undefined
|
||||
}
|
||||
form={form}
|
||||
loading={operationRequest}
|
||||
autoFocusFirstInput
|
||||
modalProps={{
|
||||
destroyOnClose: true,
|
||||
onCancel: () => {
|
||||
props.reloadData?.();
|
||||
},
|
||||
}}
|
||||
readonly={editFormDisable}
|
||||
submitter={props.itemId !== undefined && props.itemId !== '-1' ? {
|
||||
render: (prop, defaultDoms) => {
|
||||
console.log("submitter render: ", {prop})
|
||||
let result = [
|
||||
editFormDisable ? <Button
|
||||
key="edit"
|
||||
onClick={() => {
|
||||
// props.submit();
|
||||
setEditFormDisable(false)
|
||||
}}
|
||||
>
|
||||
<Button type="primary" key="delete" danger>
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm> : undefined,
|
||||
requestTask && requestTask.id ?
|
||||
<DiaryOption key="diary" taskId={requestTask.id} taskName={requestTask.name}/> : undefined,
|
||||
]
|
||||
>编辑</Button> : undefined,
|
||||
props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE ?
|
||||
<Popconfirm
|
||||
key='delete'
|
||||
title="删除任务"
|
||||
description="确认要删除任务?"
|
||||
icon={<QuestionCircleOutlined style={{color: 'red'}}/>}
|
||||
okText="确认"
|
||||
cancelText="取消"
|
||||
onConfirm={() => {
|
||||
if (props.itemId !== undefined) {
|
||||
deleteTask(props.itemId).then((response => {
|
||||
console.log('response', response)
|
||||
if (response.status.success) {
|
||||
message.success("删除任务成功：" + response.data)
|
||||
props.reloadData?.()
|
||||
}
|
||||
}));
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Button type="primary" key="delete" danger>
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm> : undefined,
|
||||
requestTask && requestTask.id ?
|
||||
<DiaryOption key="diary" taskId={requestTask.id}
|
||||
taskName={requestTask.name}/> : undefined,
|
||||
]
|
||||
|
||||
// 非新增或者编辑状态不展示
|
||||
if (!editFormDisable) {
|
||||
result.push(...defaultDoms)
|
||||
// 非新增或者编辑状态不展示
|
||||
if (!editFormDisable) {
|
||||
result.push(...defaultDoms)
|
||||
} else {
|
||||
if (editFormDisable && taskType == '1') {
|
||||
result.push(<ShareOption taskId={props.itemId!}/>)
|
||||
}
|
||||
if (editFormDisable && taskType == '2') {
|
||||
result.push(<StepSort taskId={props.itemId!}/>)
|
||||
}
|
||||
result.push(<Button type="primary" key="close"
|
||||
onClick={() => props.closeOpen?.()}>关闭</Button>)
|
||||
}
|
||||
return result;
|
||||
},
|
||||
} : {
|
||||
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});
|
||||
setOperationRequest(true)
|
||||
if (requestTask) {
|
||||
const {sortNo} = requestTask;
|
||||
values.sortNo = sortNo;
|
||||
}
|
||||
if (values.pid === undefined) {
|
||||
values.pid = '0'
|
||||
}
|
||||
if (values.expectedTimeRange?.[0] != undefined) {
|
||||
values.expectedStartTime = dayjs(values.expectedTimeRange[0]).format()
|
||||
}
|
||||
if (values.expectedTimeRange?.[1] != undefined) {
|
||||
values.expectedEndTime = dayjs(values.expectedTimeRange[1]).format()
|
||||
}
|
||||
if (values.actualTimeRange?.[0] != undefined) {
|
||||
values.actualStartTime = dayjs(values.actualTimeRange[0]).toDate()
|
||||
}
|
||||
if (values.actualTimeRange?.[1] != undefined) {
|
||||
values.actualEndTime = dayjs(values.actualTimeRange[1]).toDate()
|
||||
}
|
||||
var result: boolean = false;
|
||||
|
||||
let state = taskStateList.find(taskState => taskState.name === values.state?.toString());
|
||||
if (state) {
|
||||
values.state = state.code
|
||||
}
|
||||
let priority = taskPriorityList.find(taskPriority => taskPriority.name === values.priority?.toString())
|
||||
if (priority) {
|
||||
values.priority = priority.code
|
||||
}
|
||||
// todo 修改
|
||||
if (props.operationId === OPERATION_BUTTON_TYPE.UPDATE || (props.operationId === OPERATION_BUTTON_TYPE.DETAIL && !editFormDisable)) {
|
||||
await updateTask(values).then(response => {
|
||||
console.log('response', response)
|
||||
if (response.status.success) {
|
||||
message.success("修改任务成功：" + response.data)
|
||||
// 树任务重新刷新
|
||||
// 四象限任务重新刷新
|
||||
// 如果可以直接更新列表而不请求。。。。。。
|
||||
console.log('props.reloadData?.()', props.reloadData)
|
||||
props.reloadData?.()
|
||||
result = true
|
||||
} else {
|
||||
message.error(response.status.message)
|
||||
result = false
|
||||
}
|
||||
}
|
||||
);
|
||||
} else {
|
||||
result.push(<Button type="primary" key="join"
|
||||
onClick={() => props.closeOpen?.()}>邀请小伙伴加入</Button>)
|
||||
result.push(<Button type="primary" key="close"
|
||||
onClick={() => props.closeOpen?.()}>关闭</Button>)
|
||||
await addTask(values).then(response => {
|
||||
console.log('response', response)
|
||||
if (response.data.status.success) {
|
||||
message.success(`添加计划${response.data.data.name}成功`)
|
||||
// 树任务重新刷新
|
||||
// 四象限任务重新刷新
|
||||
// 如果可以直接更新列表而不请求。。。。。。
|
||||
console.log('props.reloadData?.()', props.reloadData)
|
||||
result = (taskType != '1')
|
||||
props.reloadData?.()
|
||||
} else {
|
||||
message.error(response.data.status.message)
|
||||
result = false
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
setOperationRequest(false)
|
||||
return result;
|
||||
},
|
||||
} : {
|
||||
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;
|
||||
values.sortNo = sortNo;
|
||||
}
|
||||
if (values.pid === undefined) {
|
||||
values.pid = '0'
|
||||
}
|
||||
if (values.expectedTimeRange?.[0] != undefined) {
|
||||
values.expectedStartTime = dayjs(values.expectedTimeRange[0]).format()
|
||||
}
|
||||
if (values.expectedTimeRange?.[1] != undefined) {
|
||||
values.expectedEndTime = dayjs(values.expectedTimeRange[1]).format()
|
||||
}
|
||||
if (values.actualTimeRange?.[0] != undefined) {
|
||||
values.actualStartTime = dayjs(values.actualTimeRange[0]).toDate()
|
||||
}
|
||||
if (values.actualTimeRange?.[1] != undefined) {
|
||||
values.actualEndTime = dayjs(values.actualTimeRange[1]).toDate()
|
||||
}
|
||||
var result: boolean = false;
|
||||
|
||||
let state = taskStateList.find(taskState => taskState.name === values.state?.toString());
|
||||
if (state) {
|
||||
values.state = state.code
|
||||
}
|
||||
let priority = taskPriorityList.find(taskPriority => taskPriority.name === values.priority?.toString())
|
||||
if (priority) {
|
||||
values.priority = priority.code
|
||||
}
|
||||
// todo 修改
|
||||
if (props.operationId === OPERATION_BUTTON_TYPE.UPDATE || (props.operationId === OPERATION_BUTTON_TYPE.DETAIL && !editFormDisable)) {
|
||||
await updateTask(values).then(response => {
|
||||
console.log('response', response)
|
||||
if (response.status.success) {
|
||||
message.success("修改任务成功：" + response.data)
|
||||
// 树任务重新刷新
|
||||
// 四象限任务重新刷新
|
||||
// 如果可以直接更新列表而不请求。。。。。。
|
||||
console.log('props.reloadData?.()', props.reloadData)
|
||||
props.reloadData?.()
|
||||
result = true
|
||||
} else {
|
||||
message.error(response.status.message)
|
||||
result = false
|
||||
}
|
||||
}
|
||||
);
|
||||
} else {
|
||||
await addTask(values).then(response => {
|
||||
console.log('response', response)
|
||||
if (response.data.status.success) {
|
||||
message.success(`添加计划${response.data.data.name}成功`)
|
||||
// 树任务重新刷新
|
||||
// 四象限任务重新刷新
|
||||
// 如果可以直接更新列表而不请求。。。。。。
|
||||
console.log('props.reloadData?.()', props.reloadData)
|
||||
result = (taskType!='1')
|
||||
props.reloadData?.()
|
||||
} else {
|
||||
message.error(response.data.status.message)
|
||||
result = false
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
return result;
|
||||
}}
|
||||
>
|
||||
<ProFormText width="sm" name="id" hidden={true} label="主键"/>
|
||||
<ProFormText width="sm" name="code" initialValue={props.itemId} hidden={true} label="任务编码"/>
|
||||
<ProFormText width="sm" name="pPid" initialValue={props.pPid} hidden={true} label="祖宗id"/>
|
||||
<ProForm.Group>
|
||||
<ProFormSelect
|
||||
required={true}
|
||||
options={TASK_TYPE}
|
||||
width="sm"
|
||||
name="taskType"
|
||||
label="任务类型"
|
||||
initialValue={taskType}
|
||||
disabled={editFormDisable}
|
||||
onChange={(value: string, option) => {
|
||||
setTaskType(value)
|
||||
}}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: "请输入计划类型"
|
||||
}
|
||||
]}
|
||||
/>
|
||||
<ProFormText
|
||||
required={true}
|
||||
hidden={taskType != '1'}
|
||||
width="sm"
|
||||
name="fName"
|
||||
label="团队名称"
|
||||
tooltip="最长为 10 位"
|
||||
placeholder="请输入团队名称"
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormTreeSelect
|
||||
hidden={taskType == '1'}
|
||||
width="sm"
|
||||
request={() => {
|
||||
return getTaskTreeResult(JSON.stringify(
|
||||
{
|
||||
pageSize: 1000,
|
||||
pageNumber: 1,
|
||||
data: [{code: 'pid', value: '0', operateType: '='},
|
||||
// 如果父任务完成会导致父任务不展示
|
||||
// {
|
||||
// code: 'state',
|
||||
// value: '8,9',
|
||||
// operateType: 'IN'
|
||||
// },
|
||||
{code: '', value: true, operateType: "TREE"}]
|
||||
}
|
||||
)).then(result => childReduce(result.data.content))
|
||||
}}
|
||||
name="pid"
|
||||
label="父级任务"
|
||||
fieldProps={{
|
||||
onSelect: (e, node) => {
|
||||
console.log('onSelect', e, node);
|
||||
// setPid(e)
|
||||
},
|
||||
}}
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormText
|
||||
required={true}
|
||||
width="sm"
|
||||
name="name"
|
||||
label="任务名称"
|
||||
tooltip="最长为 10 位"
|
||||
placeholder="请输入任务名称"
|
||||
disabled={editFormDisable}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: "请输入计划名称"
|
||||
}, {
|
||||
max: 10,
|
||||
message: "名称长度不易超过10个字"
|
||||
}
|
||||
]}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
<ProFormTextArea
|
||||
width="xl"
|
||||
name="description"
|
||||
label="任务描述"
|
||||
tooltip="最长255个字"
|
||||
placeholder="请输入任务描述"
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
|
||||
<ProForm.Group>
|
||||
<ProFormSelect
|
||||
request={async () =>
|
||||
taskPriorityList.map
|
||||
(
|
||||
taskState => {
|
||||
return {'label': taskState.name, 'value': taskState.code}
|
||||
}
|
||||
)
|
||||
}
|
||||
width="sm"
|
||||
name="priority"
|
||||
label="任务优先级"
|
||||
initialValue='3'
|
||||
disabled={editFormDisable}
|
||||
rules={[{required: true, message: "请选择计划优先级"}]}
|
||||
/>
|
||||
<ProFormSelect
|
||||
width="sm"
|
||||
options={taskStateList.map(taskState => {
|
||||
return {'label': taskState.name, 'value': taskState.code}
|
||||
})}
|
||||
name="state"
|
||||
label="任务状态"
|
||||
initialValue='8'
|
||||
disabled={editFormDisable}
|
||||
rules={
|
||||
[
|
||||
}}
|
||||
>
|
||||
<ProFormText width="sm" name="id" hidden={true} label="主键"/>
|
||||
<ProFormText width="sm" name="code" initialValue={props.itemId} hidden={true} label="任务编码"/>
|
||||
<ProFormText width="sm" name="pPid" initialValue={props.pPid} hidden={true} label="祖宗id"/>
|
||||
<ProForm.Group>
|
||||
<ProFormSelect
|
||||
required={true}
|
||||
options={TASK_TYPE}
|
||||
width="sm"
|
||||
name="taskType"
|
||||
label="任务类型"
|
||||
initialValue={taskType}
|
||||
disabled={editFormDisable}
|
||||
onChange={(value: string, option) => {
|
||||
setTaskType(value)
|
||||
}}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: "请选择计划状态"
|
||||
message: "请输入计划类型"
|
||||
}
|
||||
]
|
||||
}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
|
||||
<ProForm.Group>
|
||||
<ProFormDateTimeRangePicker
|
||||
initialValue={[dayjs(), undefined]}
|
||||
name="expectedTimeRange"
|
||||
label="期望时间"
|
||||
fieldProps={{allowEmpty: [true, true], showTime: true, needConfirm: true}}
|
||||
placeholder={['开始时间', '结束时间']}
|
||||
]}
|
||||
/>
|
||||
<ProFormText
|
||||
required={true}
|
||||
hidden={taskType != '1'}
|
||||
width="sm"
|
||||
name="fName"
|
||||
label="团队名称"
|
||||
tooltip="最长为 10 位"
|
||||
placeholder="请输入团队名称"
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormTreeSelect
|
||||
hidden={taskType == '1'}
|
||||
width="sm"
|
||||
request={() => {
|
||||
return getTaskTreeResult(JSON.stringify(
|
||||
{
|
||||
pageSize: 1000,
|
||||
pageNumber: 1,
|
||||
data: [{code: 'pid', value: '0', operateType: '='},
|
||||
// 如果父任务完成会导致父任务不展示
|
||||
// {
|
||||
// code: 'state',
|
||||
// value: '8,9',
|
||||
// operateType: 'IN'
|
||||
// },
|
||||
{code: '', value: true, operateType: "TREE"}]
|
||||
}
|
||||
)).then(result => childReduce(result.data.content))
|
||||
}}
|
||||
name="pid"
|
||||
label="父级任务"
|
||||
fieldProps={{
|
||||
onSelect: (e, node) => {
|
||||
console.log('onSelect', e, node);
|
||||
// setPid(e)
|
||||
},
|
||||
}}
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormText
|
||||
required={true}
|
||||
width="sm"
|
||||
name="name"
|
||||
label="任务名称"
|
||||
tooltip="最长为 10 位"
|
||||
placeholder="请输入任务名称"
|
||||
disabled={editFormDisable}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: "请输入计划名称"
|
||||
}, {
|
||||
max: 10,
|
||||
message: "名称长度不易超过10个字"
|
||||
}
|
||||
]}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
<ProFormTextArea
|
||||
width="xl"
|
||||
name="description"
|
||||
label="任务描述"
|
||||
tooltip="最长255个字"
|
||||
placeholder="请输入任务描述"
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormDateTimeRangePicker
|
||||
name="actualTimeRange"
|
||||
label="实际时间"
|
||||
fieldProps={{allowEmpty: [true, true], showTime: true, needConfirm: true}}
|
||||
placeholder={['开始时间', '结束时间']}
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
|
||||
</ModalForm>
|
||||
<ProForm.Group>
|
||||
<ProFormSelect
|
||||
request={async () =>
|
||||
taskPriorityList.map
|
||||
(
|
||||
taskState => {
|
||||
return {'label': taskState.name, 'value': taskState.code}
|
||||
}
|
||||
)
|
||||
}
|
||||
width="sm"
|
||||
name="priority"
|
||||
label="任务优先级"
|
||||
initialValue='3'
|
||||
disabled={editFormDisable}
|
||||
rules={[{required: true, message: "请选择计划优先级"}]}
|
||||
/>
|
||||
<ProFormSelect
|
||||
width="sm"
|
||||
options={taskStateList.map(taskState => {
|
||||
return {'label': taskState.name, 'value': taskState.code}
|
||||
})}
|
||||
name="state"
|
||||
label="任务状态"
|
||||
initialValue='8'
|
||||
disabled={editFormDisable}
|
||||
rules={
|
||||
[
|
||||
{
|
||||
required: true,
|
||||
message: "请选择计划状态"
|
||||
}
|
||||
]
|
||||
}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
|
||||
<ProForm.Group>
|
||||
<ProFormDateTimeRangePicker
|
||||
initialValue={[dayjs(), undefined]}
|
||||
name="expectedTimeRange"
|
||||
label="期望时间"
|
||||
fieldProps={{allowEmpty: [true, true], showTime: true, needConfirm: true}}
|
||||
placeholder={['开始时间', '结束时间']}
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
<ProFormDateTimeRangePicker
|
||||
name="actualTimeRange"
|
||||
label="实际时间"
|
||||
fieldProps={{allowEmpty: [true, true], showTime: true, needConfirm: true}}
|
||||
placeholder={['开始时间', '结束时间']}
|
||||
disabled={editFormDisable}
|
||||
/>
|
||||
</ProForm.Group>
|
||||
{taskType=="3"&&<SettingCron setCronFunction={
|
||||
()=>{}
|
||||
}/>}
|
||||
|
||||
</ModalForm>
|
||||
</Fragment>
|
||||
|
||||
);
|
||||
};
|
||||
Loading…
Reference in New Issue