diff --git a/.gitignore b/.gitignore index 9a5d10b..4538f0a 100755 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ backup **/node_modules/ volumes web-dist +web-dist.zip /.pnp .pnp.js *.tar diff --git a/apps/web/public/logo.svg b/apps/web/public/logo.svg index 101f9b4..349ac65 100644 --- a/apps/web/public/logo.svg +++ b/apps/web/public/logo.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/apps/web/public/vite.svg b/apps/web/public/vite.svg index 101f9b4..349ac65 100644 --- a/apps/web/public/vite.svg +++ b/apps/web/public/vite.svg @@ -1,10 +1 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/apps/web/src/app/admin/deptsettingpage/page.tsx b/apps/web/src/app/admin/deptsettingpage/page.tsx index 7715eb8..153c314 100755 --- a/apps/web/src/app/admin/deptsettingpage/page.tsx +++ b/apps/web/src/app/admin/deptsettingpage/page.tsx @@ -41,7 +41,7 @@ export default function DeptSettingPage() { () : (
- + 烽火快传
diff --git a/apps/web/src/app/admin/sharecode/sharecodegenerator.tsx b/apps/web/src/app/admin/sharecode/sharecodegenerator.tsx index e20a02e..b246181 100755 --- a/apps/web/src/app/admin/sharecode/sharecodegenerator.tsx +++ b/apps/web/src/app/admin/sharecode/sharecodegenerator.tsx @@ -54,10 +54,10 @@ export const ShareCodeGenerator: React.FC = ({ try { const data: ShareCodeResponse = await generateShareCode.mutateAsync({ fileId, - expiresAt: form.getFieldsValue()?.expiresAt ? form.getFieldsValue().expiresAt.toDate() : dayjs().add(1, 'day').tz('Asia/Shanghai').toDate(), + expiresAt: form.getFieldsValue()?.expiresAt ? form.getFieldsValue().expiresAt.tz('Asia/Shanghai').toDate() : dayjs().add(1, 'day').tz('Asia/Shanghai').toDate(), canUseTimes: form.getFieldsValue()?.canUseTimes ? form.getFieldsValue().canUseTimes : 10, }); - console.log('data', data) + console.log('data', data) setShareCode(data.code); setIsGenerate(true); onSuccess?.(data.code); @@ -97,7 +97,7 @@ export const ShareCodeGenerator: React.FC = ({ }); }, [form]); - useEffect(()=>{ + useEffect(() => { if (fileId) { generateCode() } @@ -117,6 +117,21 @@ export const ShareCodeGenerator: React.FC = ({ current && current < dayjs().startOf('day')} + disabledTime={(current) => { + if (current && current.isSame(dayjs(), 'day')) { + return { + disabledHours: () => [...Array(dayjs().hour() + 1).keys()], + disabledMinutes: (selectedHour) => { + if (selectedHour === dayjs().hour()) { + return [...Array(dayjs().minute() + 1).keys()]; + } + return []; + } + }; + } + return {}; + }} />