Compare commits
No commits in common. "8ca5bb4e31e1e88d4dc1768c019d032f1d9b8de6" and "fdd657a1b30b284cb995644f2e8fd2e0d3a842bc" have entirely different histories.
8ca5bb4e31
...
fdd657a1b3
|
|
@ -24,8 +24,7 @@
|
|||
"react-dom": "^18",
|
||||
"react-virtualized": "^9.22.6",
|
||||
"sass": "^1.77.3",
|
||||
"tailwindcss": "3.3.3",
|
||||
"uuid": "^11.1.0"
|
||||
"tailwindcss": "3.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/js-cookie": "^3.0.6",
|
||||
|
|
@ -34,7 +33,6 @@
|
|||
"@types/react-big-calendar": "^1.8.9",
|
||||
"@types/react-dom": "^18",
|
||||
"@types/react-virtualized": "^9.22.2",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"@vercel/style-guide": "^5.0.1",
|
||||
"eslint": "^8",
|
||||
"eslint-config-next": "14.2.29",
|
||||
|
|
@ -1672,12 +1670,6 @@
|
|||
"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/uuid": {
|
||||
"version": "10.0.0",
|
||||
"resolved": "https://registry.npmmirror.com/@types/uuid/-/uuid-10.0.0.tgz",
|
||||
"integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/warning": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmmirror.com/@types/warning/-/warning-3.0.3.tgz",
|
||||
|
|
@ -7542,18 +7534,6 @@
|
|||
"resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
|
||||
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
|
||||
},
|
||||
"node_modules/uuid": {
|
||||
"version": "11.1.0",
|
||||
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.1.0.tgz",
|
||||
"integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
|
||||
"funding": [
|
||||
"https://github.com/sponsors/broofa",
|
||||
"https://github.com/sponsors/ctavan"
|
||||
],
|
||||
"bin": {
|
||||
"uuid": "dist/esm/bin/uuid"
|
||||
}
|
||||
},
|
||||
"node_modules/validate-npm-package-license": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
|
||||
|
|
@ -8989,12 +8969,6 @@
|
|||
"integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/uuid": {
|
||||
"version": "10.0.0",
|
||||
"resolved": "https://registry.npmmirror.com/@types/uuid/-/uuid-10.0.0.tgz",
|
||||
"integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/warning": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmmirror.com/@types/warning/-/warning-3.0.3.tgz",
|
||||
|
|
@ -13446,11 +13420,6 @@
|
|||
"resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
|
||||
"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
|
||||
},
|
||||
"uuid": {
|
||||
"version": "11.1.0",
|
||||
"resolved": "https://registry.npmmirror.com/uuid/-/uuid-11.1.0.tgz",
|
||||
"integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A=="
|
||||
},
|
||||
"validate-npm-package-license": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@
|
|||
"react-dom": "^18",
|
||||
"react-virtualized": "^9.22.6",
|
||||
"sass": "^1.77.3",
|
||||
"tailwindcss": "3.3.3",
|
||||
"uuid": "^11.1.0"
|
||||
"tailwindcss": "3.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/js-cookie": "^3.0.6",
|
||||
|
|
@ -35,7 +34,6 @@
|
|||
"@types/react-big-calendar": "^1.8.9",
|
||||
"@types/react-dom": "^18",
|
||||
"@types/react-virtualized": "^9.22.2",
|
||||
"@types/uuid": "^10.0.0",
|
||||
"@vercel/style-guide": "^5.0.1",
|
||||
"eslint": "^8",
|
||||
"eslint-config-next": "14.2.29",
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 103 KiB |
|
|
@ -1,14 +1,15 @@
|
|||
'use client'
|
||||
import {ProConfigProvider} from "@ant-design/pro-components";
|
||||
import React, {lazy, Suspense} from "react";
|
||||
import Page from "@/ui/login/Page";
|
||||
import Loading from "@/app/loading";
|
||||
import XcxLoginPage from "@/ui/login/XcxLoginPage";
|
||||
// const Page = lazy(() => import('@/ui/login/Page'));
|
||||
export default function Login() {
|
||||
|
||||
return (
|
||||
<Suspense fallback={<Loading/>}>
|
||||
<ProConfigProvider dark>
|
||||
<XcxLoginPage/>
|
||||
<Page/>
|
||||
</ProConfigProvider>
|
||||
</Suspense>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
.reverseScrollList {
|
||||
display: flex;
|
||||
flex-direction: column; /* 垂直反转 */
|
||||
/*overflow-y: auto;*/
|
||||
}
|
||||
/* 容器样式 */
|
||||
.container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
/* 水平居中 */
|
||||
align-items: center;
|
||||
/* 垂直居中 */
|
||||
width: 100%;
|
||||
}
|
||||
/* 线条与文本容器 */
|
||||
.lineWithText {
|
||||
position: relative;
|
||||
width: 80%;
|
||||
/* 根据需要调整宽度 */
|
||||
text-align: center;
|
||||
}
|
||||
/* 使用伪元素创建线条 */
|
||||
.lineWithText::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
border-top: 1px solid #c8c7cc;
|
||||
/* 线条颜色和粗细 */
|
||||
z-index: 0;
|
||||
/* 在文本下面 */
|
||||
}
|
||||
|
||||
/* 中间文本 */
|
||||
.centerText {
|
||||
background-color: white;
|
||||
/* 背景色，确保文本清晰可见 */
|
||||
padding: 0 10px;
|
||||
/* 给文本一些内边距 */
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
/* 确保文本在上面 */
|
||||
font-size: 16px;
|
||||
/* 文本大小 */
|
||||
color: #c8c7cc;
|
||||
}
|
||||
|
||||
.logTaskContent {
|
||||
width: 80%;
|
||||
padding: 10rpx 40rpx;
|
||||
|
||||
.detailLine {
|
||||
margin-top: 0.5rem;
|
||||
display: inline-block;
|
||||
padding: 4rpx 20rpx;
|
||||
border: solid;
|
||||
border-radius: 20rpx;
|
||||
border-color: #1677FF;
|
||||
white-space: normal;
|
||||
word-break: break-all;
|
||||
word-wrap: break-word;
|
||||
font-size: 1rem;
|
||||
}
|
||||
.detailLineClick {
|
||||
background-color: #1677FF;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
import React, {useEffect, useState} from 'react';
|
||||
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} from "@/components/service/Diary";
|
||||
|
||||
const CONTAINER_HEIGHT = 400;
|
||||
const PAGE_SIZE = 20;
|
||||
|
||||
const DiaryOption = (props: SelectDiary) => {
|
||||
// 抽屉 start
|
||||
const [open, setOpen] = useState(false);
|
||||
const showDrawer = () => {
|
||||
setOpen(true);
|
||||
};
|
||||
const onClose = () => {
|
||||
setOpen(false);
|
||||
};
|
||||
// 抽屉 end
|
||||
|
||||
// 头按钮设置 start
|
||||
const [currentIndex, setCurrentIndex] = useState(1);
|
||||
// 头按钮设置 end
|
||||
// 数据 start
|
||||
const [diaryList, setDiaryList] = useState<ListDiary[]>([]);
|
||||
const [diaryReduceList, setDiaryReduceList] = useState<ListDiary[]>([])
|
||||
const [page, setPage] = useState(1);
|
||||
const noMore = {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);
|
||||
const handleSend = ()=>{
|
||||
if(sendValueFlag){
|
||||
return
|
||||
}
|
||||
setSendValueFlag(true);
|
||||
if (!sendValue?.trim()) {
|
||||
message.info("发送信息不能为空");
|
||||
return;
|
||||
}
|
||||
addTaskLogAPI({
|
||||
description: sendValue!,
|
||||
taskId: props.taskId,
|
||||
enableFlag: '1'
|
||||
}).then(res => {
|
||||
setDiaryList([res.data.data, ...diaryList])
|
||||
setSendValue(undefined)
|
||||
}).finally(() => {
|
||||
setSendValueFlag(false);
|
||||
})
|
||||
}
|
||||
|
||||
const appendData = (showMessage = true) => {
|
||||
const fakeDataUrl = process.env.NEXT_PUBLIC_TODO_REQUEST_URL + `/task/message/diary/select`;
|
||||
fetch(fakeDataUrl, {
|
||||
method: 'POST', headers: {
|
||||
'Content-Type': 'application/json', // 指定 JSON 格式
|
||||
'Authorization': `Bearer ${localStorage.getItem('platform-security')}`,
|
||||
}, body: JSON.stringify({pageNumber: page, pageSize: 100, data: {taskId: props.taskId}})
|
||||
})
|
||||
.then((res) => res.json())
|
||||
.then((body) => {
|
||||
const results = Array.isArray(body.data.content) ? body.data.content : [];
|
||||
if (results.length === 0) {
|
||||
diaryList.push(noMore);
|
||||
setNoMoreFlag(true);
|
||||
}
|
||||
setDiaryList(diaryList.concat(results));
|
||||
setPage(page + 1);
|
||||
showMessage && message.success(`${results.length} more items loaded!`);
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
appendData(false);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
console.log("处理日志集合",diaryList)
|
||||
const returnResult: ListDiary[] = []
|
||||
diaryList.filter(taskLog => {
|
||||
if (currentIndex === 0) { return true }
|
||||
else if (currentIndex === 1 && taskLog.enableFlag === "1") { return true }
|
||||
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"), []);
|
||||
}
|
||||
map.get(dayjs(taskLog.createdDate).format("YYYY-MM-DD"))?.push(taskLog);
|
||||
return map;
|
||||
}, new Map()).forEach((value, Key) => {
|
||||
returnResult.push(...value)
|
||||
returnResult.push({
|
||||
description: dayjs(Key).isSame(dayjs(), 'date') ? "今天" : dayjs(Key).format("YYYY-MM-DD"),
|
||||
id: dayjs(Key).format("YYYY-MM-DD"),
|
||||
enableFlag: "day-separate",
|
||||
taskId: props.taskId,
|
||||
createdDate: new Date()
|
||||
})
|
||||
})
|
||||
setDiaryReduceList(returnResult);
|
||||
}, [diaryList]);
|
||||
|
||||
const onScroll = (e: React.UIEvent<HTMLElement, UIEvent>) => {
|
||||
// Refer to: https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight#problems_and_solutions
|
||||
if (
|
||||
Math.abs(e.currentTarget.scrollHeight - e.currentTarget.scrollTop - CONTAINER_HEIGHT) <= 1 &&
|
||||
!noMoreFlag
|
||||
) {
|
||||
appendData();
|
||||
}
|
||||
};
|
||||
|
||||
// 数据 end
|
||||
|
||||
// 点击操作 start
|
||||
const [clickTaskDiary, setClickTaskDiary] = useState<ListDiary>()
|
||||
// 点击操作 end
|
||||
|
||||
return (
|
||||
<>
|
||||
<Button type="primary" onClick={showDrawer}>
|
||||
日志心得
|
||||
</Button>
|
||||
<Drawer
|
||||
style={{boxSizing:"border-box"}}
|
||||
mask={false}
|
||||
title={props.taskName}
|
||||
closable={{'aria-label': 'Close Button'}}
|
||||
onClose={onClose}
|
||||
open={open}
|
||||
footer={
|
||||
<div style={{
|
||||
display: 'flex',
|
||||
alignItems: 'stretch', // 关键：强制子项等高
|
||||
justifyContent: 'space-between',
|
||||
height: 'auto', // 父容器高度由内容决定
|
||||
}}>
|
||||
<TextArea
|
||||
rows={4}
|
||||
maxLength={255}
|
||||
showCount
|
||||
classNames={{count: 'ant-input-data-count-inner'}}
|
||||
styles={{
|
||||
count: {
|
||||
// color:"red",
|
||||
bottom: "0px"
|
||||
}
|
||||
}}
|
||||
style={{
|
||||
resize: 'none',
|
||||
flex: 1, // 占据剩余空间
|
||||
}}
|
||||
value={sendValue}
|
||||
onChange={(val) => setSendValue(val.target.value)}
|
||||
placeholder='输入日记心得，长按日记心得有惊喜'
|
||||
onKeyDown={event => {
|
||||
console.log({event})
|
||||
if (event.ctrlKey && event.key === 'Enter') {
|
||||
handleSend();
|
||||
// 阻止换行符插入
|
||||
event.preventDefault();
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<Button
|
||||
type="primary"
|
||||
style={{
|
||||
flexShrink: 0,
|
||||
width: '2rem',
|
||||
whiteSpace: 'normal',
|
||||
wordWrap: 'break-word',
|
||||
margin: 0,
|
||||
padding: "2px",
|
||||
height: 'auto'// 移除 ，依赖父容器的 alignItems: 'stretch'
|
||||
}}
|
||||
loading={sendValueFlag}
|
||||
onClick={handleSend}
|
||||
>
|
||||
{sendValueFlag ? '发送中...' : '发送'}
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<div className="displayFlexRow">
|
||||
<Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(0)}
|
||||
type={currentIndex == 0 ? "primary" : "default"}>全部</Button>
|
||||
<Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(1)}
|
||||
type={currentIndex == 1 ? "primary" : "default"}>生效</Button>
|
||||
<Button style={{flexGrow: 1}} onClick={() => setCurrentIndex(2)}
|
||||
type={currentIndex == 2 ? "primary" : "default"}>失效</Button>
|
||||
</div>
|
||||
<div>
|
||||
<List>
|
||||
<VirtualList
|
||||
data={diaryReduceList}
|
||||
height={CONTAINER_HEIGHT}
|
||||
itemHeight={47}
|
||||
itemKey="email"
|
||||
onScroll={onScroll}
|
||||
className={style.reverseScrollList}
|
||||
>
|
||||
{item => (
|
||||
item.enableFlag === 'day-separate' ?
|
||||
<div className={style.container} key={item.keyId}>
|
||||
<div className={style.lineWithText}>
|
||||
<text className={style.centerText}>{item.description}</text>
|
||||
</div>
|
||||
</div>
|
||||
: <div className={style.logTaskContent} key={item.id}>
|
||||
<div
|
||||
className={`${style.detailLine} ${item.id === clickTaskDiary?.id ? style.detailLineClick : ''}`}
|
||||
onClick={() => setClickTaskDiary(item)}>
|
||||
<text
|
||||
style={{textDecoration: item.enableFlag === '0' && currentIndex === 0 ? 'line-through' : ''}}>
|
||||
{item.description}
|
||||
</text>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</VirtualList>
|
||||
</List>
|
||||
</div>
|
||||
</Drawer>
|
||||
</>
|
||||
);
|
||||
};
|
||||
export default DiaryOption;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
import {httpReq} from "@/utils/axiosReq";
|
||||
import {AddDiary, ListDiary} from "@/components/type/Diary";
|
||||
import {ResponseVO} from "@/lib/definitions";
|
||||
import {AxiosResponse} from "axios";
|
||||
|
||||
export const addTaskLogAPI= (data:AddDiary):Promise<AxiosResponse<ResponseVO<ListDiary>>> =>{
|
||||
return httpReq.post(process.env.NEXT_PUBLIC_TODO_REQUEST_URL + "/task/message/diary",
|
||||
data)
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
export type ListDiary = AddDiary & {
|
||||
generateTaskId?: string,
|
||||
lastModifiedDate?: Date,
|
||||
id: string,
|
||||
// 不能以数字开头，用户滚动定位
|
||||
keyId?:string,
|
||||
createdDate: Date,
|
||||
deleteFlag?: number
|
||||
}
|
||||
export type AddDiary = {
|
||||
enableFlag: string,
|
||||
description: string,
|
||||
taskId: string,
|
||||
}
|
||||
export type SelectDiary = {
|
||||
taskName: string,
|
||||
taskId: string,
|
||||
}
|
||||
|
||||
async function postJsonData(url: string, data: object) {
|
||||
const response = await fetch(url, {
|
||||
method: 'POST', // 或 'PUT'、'PATCH'
|
||||
headers: {
|
||||
'Content-Type': 'application/json', // 指定 JSON 格式
|
||||
},
|
||||
body: JSON.stringify(data), // 将对象转为 JSON 字符串
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP error! status: ${response.status}`);
|
||||
}
|
||||
return response.json(); // 解析响应为 JSON
|
||||
}
|
||||
|
||||
// 使用示例
|
||||
interface User {
|
||||
name: string;
|
||||
age: number;
|
||||
}
|
||||
|
||||
const user: User = { name: 'Alice', age: 25 };
|
||||
postJsonData('https://api.example.com/users', user)
|
||||
.then((result) => console.log('Success:', result))
|
||||
.catch((error) => console.error('Error:', error));
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
/**
|
||||
* 复制文本到剪贴板
|
||||
* // 使用示例
|
||||
* copyToClipboard('要复制的文本')
|
||||
* .then(() => console.log('复制成功'))
|
||||
* .catch(() => console.error('复制失败'));
|
||||
* @param text 要复制的文本
|
||||
* @returns 返回 Promise，成功时 resolve(true)，失败时 reject(false)
|
||||
*/
|
||||
export const copyToClipboard = (text: string): Promise<boolean> => {
|
||||
return new Promise((resolve, reject) => {
|
||||
// 方案1: 使用现代 Clipboard API
|
||||
if (navigator.clipboard && window.isSecureContext) {
|
||||
navigator.clipboard.writeText(text)
|
||||
.then(() => resolve(true))
|
||||
.catch(() => {
|
||||
// 现代 API 失败时回退到传统方法
|
||||
fallbackCopy(text) ? resolve(true) : reject(false);
|
||||
});
|
||||
}
|
||||
// 方案2: 传统 document.execCommand 方法
|
||||
else {
|
||||
fallbackCopy(text) ? resolve(true) : reject(false);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 传统复制方法兼容方案
|
||||
const fallbackCopy = (text: string): boolean => {
|
||||
try {
|
||||
// 创建临时文本域
|
||||
const textArea = document.createElement('textarea');
|
||||
textArea.value = text;
|
||||
|
||||
// 隐藏文本域（不在视口中显示）
|
||||
textArea.style.position = 'fixed';
|
||||
textArea.style.top = '-9999px';
|
||||
textArea.style.left = '-9999px';
|
||||
textArea.style.opacity = '0';
|
||||
|
||||
document.body.appendChild(textArea);
|
||||
|
||||
// 选择并复制
|
||||
textArea.select();
|
||||
const successful = document.execCommand('copy');
|
||||
|
||||
// 清理DOM
|
||||
document.body.removeChild(textArea);
|
||||
|
||||
return successful;
|
||||
} catch (err) {
|
||||
console.error('复制失败:', err);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
|
@ -50,7 +50,6 @@ export type DataType = TaskMessage&{
|
|||
actualEndTime?:Date;
|
||||
actualTimeRange?:(string|Dayjs|undefined)[]
|
||||
children: DataType[]|undefined;
|
||||
sortNo?:number;
|
||||
}
|
||||
export type DictType={
|
||||
id:number;
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
import {httpReq} from "@/utils/axiosReq";
|
||||
|
||||
export const generateQrcodeAPI = (data:{}) => {
|
||||
return httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/V2/wx/login/generate/qrcode",
|
||||
data)
|
||||
}
|
||||
export const askLoginAPI = (data:{})=>{
|
||||
return httpReq.post(process.env.NEXT_PUBLIC_SECURITY_REQUEST_URL + "/V2/wx/login/pc/ask/login",
|
||||
data)
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
import {httpReq} from "@/utils/axiosReq";
|
||||
import {unstable_noStore as noStore} from "next/dist/server/web/spec-extension/unstable-no-store";
|
||||
|
||||
export const editExpectAPI = (requestParam: {}) =>{
|
||||
noStore();
|
||||
return httpReq.put(
|
||||
process.env.NEXT_PUBLIC_TODO_REQUEST_URL + '/task/editExpect', requestParam)
|
||||
}
|
||||
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
'use client'
|
||||
import {
|
||||
LoginFormPage,
|
||||
} from '@ant-design/pro-components';
|
||||
|
||||
import {message, theme, Modal, Button, Skeleton, Image, QRCode} from 'antd';
|
||||
import React, {useLayoutEffect} from 'react';
|
||||
import {useState} from 'react';
|
||||
import {LoginObject} from "@/lib/login/definitions";
|
||||
import {useRouter} from 'next/navigation'
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import {askLoginAPI, generateQrcodeAPI} from "@/lib/login/service";
|
||||
import Cookies from "js-cookie";
|
||||
|
||||
export default function XcxLoginPage() {
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
useLayoutEffect(() => {
|
||||
setLoaded(true);
|
||||
})
|
||||
// 二维码 start
|
||||
const [qrCodeShow, setQrCodeShow] = useState<boolean>(false);
|
||||
const [qrCodeStatus, setQrCodeStatus] = useState<'active' | 'expired' | 'loading' | 'scanned'>();
|
||||
const [qrCodeValue, setQrCodeValue] = useState<string>("-");
|
||||
const generateQrcode = () => {
|
||||
if (qrCodeStatus=='loading') {
|
||||
message.info({content:"请耐心等待"})
|
||||
}else if (qrCodeStatus=='expired') {
|
||||
setQrCode()
|
||||
}else if (qrCodeStatus=='active') {
|
||||
|
||||
}else if (qrCodeStatus=='scanned') {
|
||||
|
||||
}else {
|
||||
setQrCode()
|
||||
}
|
||||
}
|
||||
function setQrCode(){
|
||||
// 生成唯一id
|
||||
setQrCodeStatus("loading")
|
||||
const clientId: string = uuidv4();
|
||||
generateQrcodeAPI({clientId}).then(res=>{
|
||||
let qrCodeData={
|
||||
clientId,serverId:res.data.data,local:"马上行计划管理"
|
||||
}
|
||||
setQrCodeValue(JSON.stringify(qrCodeData))
|
||||
setQrCodeStatus("active")
|
||||
let timeout=undefined;
|
||||
// 设置定时器，每2000毫秒（2秒）执行一次myFunction
|
||||
let timerId =undefined;
|
||||
timerId = setInterval(askLogin,2000,timeout,timerId,qrCodeData);
|
||||
// 如果需要停止定时器，可以调用 clearInterval(timerId);
|
||||
// 例如：1分钟后停止定时器
|
||||
timeout = setTimeout(() => {
|
||||
setQrCodeStatus("expired")
|
||||
clearInterval(timerId);
|
||||
console.log("定时器已停止");
|
||||
}, 60000);
|
||||
}).catch(()=>{
|
||||
setQrCodeStatus("expired")
|
||||
})
|
||||
}
|
||||
function askLogin(timeout:any,timerId:any,qrCodeData:{}){
|
||||
askLoginAPI(qrCodeData).then(res=>{
|
||||
if (res.data.status.success&&res.data.data.length>0){
|
||||
setQrCodeStatus("scanned")
|
||||
if(timeout){
|
||||
clearTimeout(timeout);
|
||||
clearInterval(timerId);
|
||||
}
|
||||
// localStorage.removeItem("platform-security")
|
||||
localStorage.setItem('platform-security', res.data.data[0].token)
|
||||
// 删除名为 'platform-security' 的Cookie
|
||||
// Cookies.remove('platform-security');
|
||||
// 设置一个有效期为7天的Cookie
|
||||
Cookies.set('platform-security', res.data.data[0].token, { expires: 7 });
|
||||
router.push('/task/project')
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
// 二维码 end
|
||||
const {token} = theme.useToken();
|
||||
const router = useRouter()
|
||||
const [messageApi, contextHolder] = message.useMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [captchaLoginSuccessList, setCaptchaLoginSuccessList] = useState([]);
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
backgroundColor: 'white',
|
||||
height: '100vh',
|
||||
}}
|
||||
>
|
||||
{contextHolder}
|
||||
{loaded ? <LoginFormPage
|
||||
backgroundImageUrl="/20-1733751222585.jpg"
|
||||
title="马上行计划管理"
|
||||
subTitle={qrCodeShow?undefined:"使用微信扫码打开小程序"}
|
||||
containerStyle={{
|
||||
backgroundColor: 'rgba(0, 0, 0,0.65)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
}}
|
||||
onFinish={(formData: LoginObject) => {
|
||||
// 二维码和小程序扫码来回切换
|
||||
if (!qrCodeShow) {
|
||||
// 生成二维码
|
||||
generateQrcode()
|
||||
}
|
||||
setQrCodeShow(!qrCodeShow)
|
||||
}}
|
||||
submitter={{ searchConfig: { submitText: qrCodeShow?"在我的-PC扫码登录或者返回":"已打开微信小程序，生成登录码。",resetText: '重置2'}}}
|
||||
>
|
||||
<div className="displayFlexColumn" style={{margin:'20px'}}>
|
||||
{
|
||||
qrCodeShow?<QRCode value={qrCodeValue} size={300} status={qrCodeStatus} onRefresh={generateQrcode} />:
|
||||
<Image width={300} src="/static/pc-Web.png"/>
|
||||
}
|
||||
</div>
|
||||
</LoginFormPage> : <Skeleton/>}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
|
@ -3,7 +3,7 @@ import {
|
|||
ProFormText,
|
||||
QueryFilter,
|
||||
} from '@ant-design/pro-components';
|
||||
import '@/ui/task/CustomSearchForm.modules.css'
|
||||
import '@/ui/task/CustomSearchForm.module.css'
|
||||
import {taskStateList} from "@/lib/task/project/data";
|
||||
const CustomSearchForm= () => {
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import {Button, DatePicker, 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 style from '@/ui/task/TitleOperation.module.css'
|
||||
import '@/ui/task/TitleOperation.modules.css'
|
||||
import LocalContext from "@/ui/LocalContent";
|
||||
import {RequestDateType} from "@/ui/task/RequestDateType";
|
||||
import dayjs, {Dayjs} from "dayjs";
|
||||
|
|
@ -38,7 +38,7 @@ export const TitleOperation: React.FC<TitleOperationProps> = ({
|
|||
document.title = pName;
|
||||
}
|
||||
}, [pName]);
|
||||
return <div className={style.container}>
|
||||
return <div className="container">
|
||||
<Space style={{marginTop: 0, "height": "42px", "alignContent": "center"}}>
|
||||
<DetailModelForm haveButton={true} open={false} operationId={OPERATION_BUTTON_TYPE.ADD}
|
||||
description='添加主线任务' reloadData={refreshData}/>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ import {SearchObject} from "@/lib/definitions";
|
|||
import LocalContext from "@/ui/LocalContent";
|
||||
import withDragAndDrop, {EventInteractionArgs} from "react-big-calendar/lib/addons/dragAndDrop";
|
||||
import {TaskEvent} from "@/lib/task/calendar/data";
|
||||
import {editExpectAPI} from "@/lib/task/calendar/service";
|
||||
import {number} from "prop-types";
|
||||
import {DATE_TIME} from "@/lib/constants";
|
||||
|
||||
/**
|
||||
* https://github.com/jquense/react-big-calendar?tab=readme-ov-file
|
||||
|
|
@ -44,11 +45,9 @@ const CalShow: React.FC = () => {
|
|||
setView(newView);
|
||||
};
|
||||
var pid = useSearchParams().get('pid');
|
||||
|
||||
function clearClickTimeout(){
|
||||
clickRef && typeof clickRef.current=== 'number' &&!isNaN(clickRef.current) && isFinite(clickRef.current)&&window.clearTimeout(clickRef.current)
|
||||
}
|
||||
|
||||
const handleNavigate = (newDate: Date) => {
|
||||
console.log('handleNavigate', newDate)
|
||||
setDate(newDate);
|
||||
|
|
@ -197,16 +196,29 @@ const CalShow: React.FC = () => {
|
|||
}
|
||||
|
||||
const moveEvent = useCallback(
|
||||
async ({event, start, end, isAllDay: droppedOnAllDaySlot = false}: EventInteractionArgs<TaskEvent>) => {
|
||||
console.log("onEventResize || onEventDrop :", start, end, event)
|
||||
({event, start, end, isAllDay: droppedOnAllDaySlot = false}: EventInteractionArgs<TaskEvent>) => {
|
||||
console.log("onEventResize || onEventDrop :",start,end)
|
||||
const {allDay} = event
|
||||
if (!allDay && droppedOnAllDaySlot) {
|
||||
event.allDay = true
|
||||
}
|
||||
editExpectAPI({
|
||||
expectedStartTime: start,
|
||||
expectedEndTime: end,
|
||||
id: event.resource
|
||||
// 数据落库
|
||||
commonUpdate({
|
||||
updateColumnList: [{
|
||||
name: 'expectedStartTime',
|
||||
code: '',
|
||||
value: start.toLocaleString()
|
||||
}, {
|
||||
name: 'expectedEndTime',
|
||||
code: '',
|
||||
value: end.toLocaleString()
|
||||
}],
|
||||
conditionColumnList: [{
|
||||
name: 'id',
|
||||
code: 'id',
|
||||
operateType: '=',
|
||||
value: event.resource
|
||||
}]
|
||||
})
|
||||
setEvents((prev: TaskEvent[]) => {
|
||||
const existing: TaskEvent | undefined = prev.find((ev: TaskEvent) => ev.resource === event.resource);
|
||||
|
|
@ -266,7 +278,7 @@ const CalShow: React.FC = () => {
|
|||
}
|
||||
return <div className="App" style={{height: '90vh'}}>
|
||||
{open && <DetailModelForm operationId={operationId} description={description} open={open} haveButton={false}
|
||||
itemId={itemId}
|
||||
itemId={itemId} pid={pid?pid:'0'}
|
||||
reloadData={reloadData} expectedStartTime={expectedStartTime}
|
||||
expectedEndTime={expectedEndTime}/>}
|
||||
<DragAndDropCalendar
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import dayjs from "dayjs";
|
|||
import {getTaskState, taskPriorityList} from "@/lib/task/project/data";
|
||||
import 'react-virtualized/styles.css';
|
||||
import RightOption from "@/ui/task/RightOption";
|
||||
import {CopyOutlined} from "@ant-design/icons";
|
||||
|
||||
interface DroppableTableProps {
|
||||
tableCode: string,
|
||||
|
|
@ -71,7 +70,7 @@ export const DroppableTable = React.memo((props: DroppableTableProps) => {
|
|||
<ConfigProvider>
|
||||
{/* 表头 */}
|
||||
<div style={headerStyle} className='displayFlexRow'>
|
||||
<div style={{width: '20%',paddingLeft:"1rem"}} className='displayFlexRow'>{stateName}</div>
|
||||
<div style={{width: '20%'}} className='displayFlexRow'>{stateName}</div>
|
||||
<div style={{width: '45%'}} className='displayFlexRow'>任务描述</div>
|
||||
<div style={{width: '15%'}} className='displayFlexRow'>任务状态</div>
|
||||
<div style={{width: '20%'}} className='displayFlexRow'>期望时间</div>
|
||||
|
|
@ -90,7 +89,7 @@ export const DroppableTable = React.memo((props: DroppableTableProps) => {
|
|||
style={getItemStyle(snapshot.isDragging, {...provided.draggableProps.style})}
|
||||
className="virtualized-row displayFlexRow"
|
||||
>
|
||||
<div style={{width: '20%',paddingLeft:"1rem"}} className='displayFlexRow'>
|
||||
<div style={{width: '20%'}} className='displayFlexRow'>
|
||||
<Tooltip placement="topLeft" title={record.name}
|
||||
className='displayFlexRow'>
|
||||
<div className='displayFlexRow'>{record.name}</div>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import {
|
|||
} from "@/lib/task/project/data";
|
||||
import {DataType} from "@/lib/definitions";
|
||||
import dayjs, {Dayjs} from "dayjs";
|
||||
import DiaryOption from "@/components/DiaryOption";
|
||||
|
||||
export type DetailModelFormProps={
|
||||
// 当前内容id
|
||||
|
|
@ -43,7 +42,7 @@ export type PidSelectTree = { label: string; value: string; pid: string; childre
|
|||
export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
||||
console.log("DetailModelForm:props:",props)
|
||||
const [form] = Form.useForm<DataType>();
|
||||
const [requestTask,setRequestTask]=useState<DataType>()
|
||||
const [pid, setPid] = useState<string>(props.pid?props.pid:'0');
|
||||
const [editFormDisable, setEditFormDisable] = useState(props.operationId === OPERATION_BUTTON_TYPE.DETAIL)
|
||||
// 团队第一层 pid必须为0
|
||||
const [taskType, setTaskType] = useState('0')
|
||||
|
|
@ -61,10 +60,6 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
task.data.expectedTimeRange = [task.data.expectedStartTime ? dayjs(task.data.expectedStartTime) : undefined,
|
||||
task.data.expectedEndTime ? dayjs(task.data.expectedEndTime) : undefined];
|
||||
form.setFieldsValue(task.data)
|
||||
if (task.data.pid=="0"){
|
||||
form.setFieldValue("pid",undefined)
|
||||
}
|
||||
setRequestTask(task.data)
|
||||
console.log("form.setFieldsValue(task.data)"+JSON.stringify(task.data))
|
||||
} else {
|
||||
message.error(task.status.message);
|
||||
|
|
@ -72,14 +67,10 @@ 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
|
||||
};
|
||||
let data={'expectedTimeRange':[props.expectedStartTime?props.expectedStartTime:dayjs(), props.expectedEndTime],'pid':props.pid};
|
||||
form.setFieldsValue(data)
|
||||
}
|
||||
}, [props])
|
||||
|
||||
function childReduce(child:DataType[]):PidSelectTree[]{
|
||||
const result:PidSelectTree[] = [];
|
||||
child.map(data=> {
|
||||
|
|
@ -91,12 +82,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
})
|
||||
return result;
|
||||
}
|
||||
|
||||
// 如果不是添加任务需要回显
|
||||
// Form 当中的 initialValues
|
||||
// ProComponents 底层也是封装的 antd ，所以用法也和 antd 相同。注意 initialValues 不能被 setState 动态更新，
|
||||
// 所以你需要用 setFieldsValue 来更新。 initialValues 只在 form 初始化时生效且只生效一次，如果你需要异步加载，
|
||||
// 推荐使用 request，或者 initialValues ? <Form/> : null
|
||||
return (
|
||||
<ModalForm<DataType>
|
||||
title={props.description}
|
||||
|
|
@ -128,8 +114,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
>
|
||||
编辑
|
||||
</Button>:undefined,
|
||||
props.operationId === OPERATION_BUTTON_TYPE.DETAIL || props.operationId === OPERATION_BUTTON_TYPE.UPDATE ?
|
||||
<Popconfirm
|
||||
props.operationId === OPERATION_BUTTON_TYPE.DETAIL||props.operationId === OPERATION_BUTTON_TYPE.UPDATE?<Popconfirm
|
||||
key ='delete'
|
||||
title="删除任务"
|
||||
description="确认要删除任务?"
|
||||
|
|
@ -147,23 +132,17 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
}));
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Button type="primary" danger>
|
||||
><Button type="primary" danger>
|
||||
删除
|
||||
</Button>
|
||||
</Popconfirm>:undefined
|
||||
,
|
||||
requestTask&&requestTask.id?<DiaryOption taskId={requestTask.id} taskName={requestTask.name}/>:undefined,
|
||||
...defaultDoms
|
||||
];
|
||||
},
|
||||
}:undefined}
|
||||
onFinish={async (values) => {
|
||||
console.log('Received values of form: ', values,{...requestTask,...values});
|
||||
if (requestTask) {
|
||||
const {sortNo}=requestTask;
|
||||
values.sortNo=sortNo;
|
||||
}
|
||||
console.log('Received values of form: ', values);
|
||||
if (values.pid===undefined){
|
||||
values.pid='0'
|
||||
}
|
||||
|
|
@ -244,8 +223,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
setTaskType(value)
|
||||
}}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
{required:true,
|
||||
message:"请输入计划类型"
|
||||
}
|
||||
]}
|
||||
|
|
@ -265,28 +243,12 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
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"}]
|
||||
}
|
||||
{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)
|
||||
},
|
||||
}}
|
||||
fieldProps={{onSelect: (e,node) => {console.log('onSelect',e,node);setPid(e)}}}
|
||||
disabled ={editFormDisable}
|
||||
/>
|
||||
<ProFormText
|
||||
|
|
@ -298,8 +260,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
placeholder="请输入任务名称"
|
||||
disabled ={editFormDisable}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
{required:true,
|
||||
message:"请输入计划名称"
|
||||
},{
|
||||
max:10,
|
||||
|
|
@ -331,8 +292,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
initialValue='3'
|
||||
disabled ={editFormDisable}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
{required:true,
|
||||
message:"请选择计划优先级"
|
||||
}
|
||||
]}
|
||||
|
|
@ -350,8 +310,7 @@ export const DetailModelForm: React.FC<DetailModelFormProps> = (props) => {
|
|||
initialValue='8'
|
||||
disabled ={editFormDisable}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
{required:true,
|
||||
message:"请选择计划状态"
|
||||
}
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ httpReq.interceptors.request.use((config) => {
|
|||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`;
|
||||
}
|
||||
config.headers.set("source-client","web")
|
||||
return config;
|
||||
},
|
||||
(error) => {
|
||||
|
|
@ -38,8 +37,6 @@ httpReq.interceptors.response.use(
|
|||
message.error('系统异常');
|
||||
} else if (response.status >= 400 && response.status <= 500) {
|
||||
message.warning('无权限');
|
||||
}else if(response.data.status.success == false){
|
||||
message.error(response.data.status.message);
|
||||
}
|
||||
return response;
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue