From 6d08e1a8e8c57774b8a712477cc0ff40e94aa6d8 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Mon, 15 Jan 2024 15:57:48 +0800 Subject: [PATCH] Fix can not autoload in production mode bug --- src/components/Playground/Output/Preview/index.tsx | 7 +++---- src/components/Playground/Output/Preview/preview.scss | 1 + src/components/Playground/Output/Transform/index.tsx | 3 +-- src/components/Playground/index.tsx | 9 ++++----- src/components/common/Sidebar/Footer.tsx | 3 +-- src/pages/Sign/Forget.tsx | 5 ++--- src/pages/Sign/SignIn.tsx | 3 +-- src/pages/Sign/SignUp.tsx | 5 ++--- src/pages/Sign/Verify.tsx | 3 +-- src/pages/Sign/index.tsx | 3 +-- src/pages/System/Group.tsx | 3 +-- src/pages/System/Log.tsx | 3 +-- src/pages/System/Role.tsx | 3 +-- src/pages/System/Settings/Base.tsx | 3 +-- src/pages/System/Settings/Mail.tsx | 3 +-- src/pages/System/Settings/SensitiveWord.tsx | 3 +-- src/pages/System/Statistics/ActiveInfo.tsx | 5 ++--- src/pages/System/Statistics/CPUInfo.tsx | 5 ++--- src/pages/System/Statistics/HardwareInfo.tsx | 3 +-- src/pages/System/Statistics/OnlineInfo.tsx | 5 ++--- src/pages/System/Statistics/SoftwareInfo.tsx | 3 +-- src/pages/System/Statistics/StorageInfo.tsx | 5 ++--- src/pages/System/User.tsx | 3 +-- src/pages/UserFramework.tsx | 4 ++-- 24 files changed, 36 insertions(+), 57 deletions(-) diff --git a/src/components/Playground/Output/Preview/index.tsx b/src/components/Playground/Output/Preview/index.tsx index 753e70a..f0b4424 100644 --- a/src/components/Playground/Output/Preview/index.tsx +++ b/src/components/Playground/Output/Preview/index.tsx @@ -1,4 +1,3 @@ -import { useUpdatedEffect } from '@/util/hooks' import '@/components/Playground/Output/Preview/preview.scss' import { IFiles, IImportMap } from '@/components/Playground/shared' import Compiler from '@/components/Playground/compiler' @@ -52,7 +51,7 @@ const Preview = ({ iframeKey, files, importMap }: PreviewProps) => { } } - useUpdatedEffect(() => { + useEffect(() => { window.addEventListener('message', handleMessage) return () => { @@ -60,7 +59,7 @@ const Preview = ({ iframeKey, files, importMap }: PreviewProps) => { } }, []) - useUpdatedEffect(() => { + useEffect(() => { Compiler.compile(files, importMap) .then((result) => { if (loaded) { @@ -70,7 +69,7 @@ const Preview = ({ iframeKey, files, importMap }: PreviewProps) => { } as IMessage) } }) - .catch((e) => { + .catch((e: Error) => { setErrorMsg(`编译失败：${e.message}`) }) }, [files, Compiler, loaded]) diff --git a/src/components/Playground/Output/Preview/preview.scss b/src/components/Playground/Output/Preview/preview.scss index b7da9e6..37f7040 100644 --- a/src/components/Playground/Output/Preview/preview.scss +++ b/src/components/Playground/Output/Preview/preview.scss @@ -1,6 +1,7 @@ [data-component=playground-preview] { display: flex; position: relative; + iframe { border: none; flex: 1; diff --git a/src/components/Playground/Output/Transform/index.tsx b/src/components/Playground/Output/Transform/index.tsx index 419f4bc..51cd0f5 100644 --- a/src/components/Playground/Output/Transform/index.tsx +++ b/src/components/Playground/Output/Transform/index.tsx @@ -1,7 +1,6 @@ import MonacoEditor from '@monaco-editor/react' import { Loader } from 'esbuild-wasm' import '@/components/Playground/Output/Transform/transform.scss' -import { useUpdatedEffect } from '@/util/hooks' import { IFile, ITheme } from '@/components/Playground/shared' import { cssToJs, jsonToJs, addReactImport } from '@/components/Playground/files' import Compiler from '@/components/Playground/compiler' @@ -32,7 +31,7 @@ const Transform = ({ file, theme }: OutputProps) => { }) } - useUpdatedEffect(() => { + useEffect(() => { if (file) { try { const code = file.value diff --git a/src/components/Playground/index.tsx b/src/components/Playground/index.tsx index ac1a580..4eedc30 100644 --- a/src/components/Playground/index.tsx +++ b/src/components/Playground/index.tsx @@ -1,5 +1,4 @@ import '@/components/Playground/playground.scss' -import { useUpdatedEffect } from '@/util/hooks' import { IFiles, IImportMap, ITsconfig } from '@/components/Playground/shared' import { IMPORT_MAP_FILE_NAME, @@ -54,7 +53,7 @@ const Playground = ({ initFiles, initImportMapRaw, initTsconfigRaw }: Playground setFiles(files) } - useUpdatedEffect(() => { + useEffect(() => { try { setImportMap(JSON.parse(importMapRaw) as IImportMap) } catch (e) { @@ -62,7 +61,7 @@ const Playground = ({ initFiles, initImportMapRaw, initTsconfigRaw }: Playground } }, [importMapRaw]) - useUpdatedEffect(() => { + useEffect(() => { try { setTsconfig(JSON.parse(tsconfigRaw) as ITsconfig) } catch (e) { @@ -76,12 +75,12 @@ const Playground = ({ initFiles, initImportMapRaw, initTsconfigRaw }: Playground tsconfig={tsconfig} files={{ ...files, - 'import-map.json': { + [IMPORT_MAP_FILE_NAME]: { name: IMPORT_MAP_FILE_NAME, language: 'json', value: importMapRaw }, - 'tsconfig.json': { + [TS_CONFIG_FILE_NAME]: { name: TS_CONFIG_FILE_NAME, language: 'json', value: tsconfigRaw diff --git a/src/components/common/Sidebar/Footer.tsx b/src/components/common/Sidebar/Footer.tsx index a25a5f2..8095ef2 100644 --- a/src/components/common/Sidebar/Footer.tsx +++ b/src/components/common/Sidebar/Footer.tsx @@ -1,7 +1,6 @@ import Icon from '@ant-design/icons' import { COLOR_ERROR } from '@/constants/common.constants' import { getRedirectUrl } from '@/util/route' -import { useUpdatedEffect } from '@/util/hooks' import { getAvatar, getLoginStatus, getNickname, removeToken } from '@/util/auth' import { r_auth_logout } from '@/services/auth' @@ -42,7 +41,7 @@ const Footer = () => { const loginStatus = getLoginStatus() - useUpdatedEffect(() => { + useEffect(() => { if (getLoginStatus()) { void getNickname().then((nickname) => { setNickname(nickname) diff --git a/src/pages/Sign/Forget.tsx b/src/pages/Sign/Forget.tsx index 3e094e4..06a0b58 100644 --- a/src/pages/Sign/Forget.tsx +++ b/src/pages/Sign/Forget.tsx @@ -8,7 +8,6 @@ import { PERMISSION_USER_NOT_FOUND, SYSTEM_INVALID_CAPTCHA_CODE } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { r_auth_forget, r_auth_retrieve } from '@/services/auth' import FitCenter from '@/components/common/FitCenter' import FlexBox from '@/components/common/FlexBox' @@ -45,7 +44,7 @@ const Forget = () => { const [captchaCode, setCaptchaCode] = useState('') const [retrieveCaptchaCode, setRetrieveCaptchaCode] = useState('') - useUpdatedEffect(() => { + useEffect(() => { if (!isSending) { setCaptchaCode('') turnstileRef.current?.reset() @@ -53,7 +52,7 @@ const Forget = () => { } }, [isSending]) - useUpdatedEffect(() => { + useEffect(() => { if (!isChanging) { setRetrieveCaptchaCode('') retrieveTurnstileRef.current?.reset() diff --git a/src/pages/Sign/SignIn.tsx b/src/pages/Sign/SignIn.tsx index 85ab8af..11d86f0 100644 --- a/src/pages/Sign/SignIn.tsx +++ b/src/pages/Sign/SignIn.tsx @@ -8,7 +8,6 @@ import { PERMISSION_USERNAME_NOT_FOUND, SYSTEM_INVALID_CAPTCHA_CODE } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { getUserInfo, setToken } from '@/util/auth' import { utcToLocalTime } from '@/util/datetime' import { r_auth_login } from '@/services/auth' @@ -33,7 +32,7 @@ const SignIn = () => { const [isSigningIn, setIsSigningIn] = useState(false) const [captchaCode, setCaptchaCode] = useState('') - useUpdatedEffect(() => { + useEffect(() => { if (!isSigningIn) { setCaptchaCode('') turnstileRef.current?.reset() diff --git a/src/pages/Sign/SignUp.tsx b/src/pages/Sign/SignUp.tsx index 61b4f2e..0ee88f8 100644 --- a/src/pages/Sign/SignUp.tsx +++ b/src/pages/Sign/SignUp.tsx @@ -7,7 +7,6 @@ import { SYSTEM_INVALID_CAPTCHA_CODE, SYSTEM_MATCH_SENSITIVE_WORD } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { getLoginStatus, setToken } from '@/util/auth' import { r_auth_register, r_auth_resend } from '@/services/auth' import FitCenter from '@/components/common/FitCenter' @@ -32,7 +31,7 @@ const SignUp = () => { const [isSending, setIsSending] = useState(false) const [captchaCode, setCaptchaCode] = useState('') - useUpdatedEffect(() => { + useEffect(() => { if (!isSigningUp) { setCaptchaCode('') turnstileRef.current?.reset() @@ -40,7 +39,7 @@ const SignUp = () => { } }, [isSigningUp]) - useUpdatedEffect(() => { + useEffect(() => { if (location.pathname !== '/register') { return } diff --git a/src/pages/Sign/Verify.tsx b/src/pages/Sign/Verify.tsx index c370db5..049c684 100644 --- a/src/pages/Sign/Verify.tsx +++ b/src/pages/Sign/Verify.tsx @@ -5,7 +5,6 @@ import { PERMISSION_VERIFY_SUCCESS, SYSTEM_MATCH_SENSITIVE_WORD } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { getLoginStatus, getUserInfo, requestUserInfo } from '@/util/auth' import { getRedirectUrl } from '@/util/route' import { r_auth_resend, r_auth_verify } from '@/services/auth' @@ -26,7 +25,7 @@ const Verify = () => { const [avatar, setAvatar] = useState('') const [isVerifying, setIsVerifying] = useState(false) - useUpdatedEffect(() => { + useEffect(() => { if (location.pathname !== '/verify') { return } diff --git a/src/pages/Sign/index.tsx b/src/pages/Sign/index.tsx index 01417b6..7e7db24 100644 --- a/src/pages/Sign/index.tsx +++ b/src/pages/Sign/index.tsx @@ -1,5 +1,4 @@ import '@/assets/css/pages/sign.scss' -import { useUpdatedEffect } from '@/util/hooks' import FitFullscreen from '@/components/common/FitFullscreen' import FitCenter from '@/components/common/FitCenter' import FlexBox from '@/components/common/FlexBox' @@ -16,7 +15,7 @@ const Sign = () => { const leftPage = ['register', 'verify', 'forget'] - useUpdatedEffect(() => { + useEffect(() => { lastPage.current = currentPage.current currentPage.current = match.id diff --git a/src/pages/System/Group.tsx b/src/pages/System/Group.tsx index fcea149..1d9e64e 100644 --- a/src/pages/System/Group.tsx +++ b/src/pages/System/Group.tsx @@ -10,7 +10,6 @@ import { DATABASE_SELECT_SUCCESS, DATABASE_UPDATE_SUCCESS } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { hasPermission } from '@/util/auth' import { utcToLocalTime } from '@/util/datetime' import { @@ -484,7 +483,7 @@ const Group = () => { } }, [formValues]) - useUpdatedEffect(() => { + useEffect(() => { getGroup() }, [ JSON.stringify(tableParams.filters), diff --git a/src/pages/System/Log.tsx b/src/pages/System/Log.tsx index a596053..1de1dea 100644 --- a/src/pages/System/Log.tsx +++ b/src/pages/System/Log.tsx @@ -1,7 +1,6 @@ import { ChangeEvent, KeyboardEvent } from 'react' import dayjs from 'dayjs' import { COLOR_FONT_SECONDARY, DATABASE_SELECT_SUCCESS } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { dayjsToUtc, utcToLocalTime } from '@/util/datetime' import { r_sys_log_get } from '@/services/system' import FitFullscreen from '@/components/common/FitFullscreen' @@ -223,7 +222,7 @@ const Log = () => { }) } - useUpdatedEffect(() => { + useEffect(() => { getLog() }, [ JSON.stringify(tableParams.filters), diff --git a/src/pages/System/Role.tsx b/src/pages/System/Role.tsx index 00c0f28..a0be4af 100644 --- a/src/pages/System/Role.tsx +++ b/src/pages/System/Role.tsx @@ -10,7 +10,6 @@ import { DATABASE_SELECT_SUCCESS, DATABASE_UPDATE_SUCCESS } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { utcToLocalTime } from '@/util/datetime' import { hasPermission, powerListToPowerTree } from '@/util/auth' import { @@ -493,7 +492,7 @@ const Role = () => { } }, [formValues]) - useUpdatedEffect(() => { + useEffect(() => { getRole() }, [ JSON.stringify(tableParams.filters), diff --git a/src/pages/System/Settings/Base.tsx b/src/pages/System/Settings/Base.tsx index 8b52d43..f4839e5 100644 --- a/src/pages/System/Settings/Base.tsx +++ b/src/pages/System/Settings/Base.tsx @@ -1,4 +1,3 @@ -import { useUpdatedEffect } from '@/util/hooks' import { hasPermission } from '@/util/auth' import { r_sys_settings_base_get, r_sys_settings_base_update } from '@/services/system' import { SettingsCard } from '@/pages/System/Settings' @@ -40,7 +39,7 @@ const Base = () => { }) } - useUpdatedEffect(() => { + useEffect(() => { getBaseSettings() }, []) diff --git a/src/pages/System/Settings/Mail.tsx b/src/pages/System/Settings/Mail.tsx index 87802b5..d540030 100644 --- a/src/pages/System/Settings/Mail.tsx +++ b/src/pages/System/Settings/Mail.tsx @@ -1,5 +1,4 @@ import Icon from '@ant-design/icons' -import { useUpdatedEffect } from '@/util/hooks' import { hasPermission } from '@/util/auth' import { r_sys_settings_mail_get, @@ -95,7 +94,7 @@ const Mail = () => { }) } - useUpdatedEffect(() => { + useEffect(() => { getMailSettings() }, []) diff --git a/src/pages/System/Settings/SensitiveWord.tsx b/src/pages/System/Settings/SensitiveWord.tsx index ab2daf2..f61b713 100644 --- a/src/pages/System/Settings/SensitiveWord.tsx +++ b/src/pages/System/Settings/SensitiveWord.tsx @@ -1,7 +1,6 @@ import { ChangeEvent } from 'react' import Icon from '@ant-design/icons' import { DATABASE_DUPLICATE_KEY, DATABASE_INSERT_SUCCESS } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { r_sys_settings_sensitive_add, r_sys_settings_sensitive_delete, @@ -95,7 +94,7 @@ const SensitiveWord = () => { }) } - useUpdatedEffect(() => { + useEffect(() => { getSensitiveWordSettings() }, []) diff --git a/src/pages/System/Statistics/ActiveInfo.tsx b/src/pages/System/Statistics/ActiveInfo.tsx index d3e2000..c79c012 100644 --- a/src/pages/System/Statistics/ActiveInfo.tsx +++ b/src/pages/System/Statistics/ActiveInfo.tsx @@ -1,6 +1,5 @@ import Icon from '@ant-design/icons' import * as echarts from 'echarts/core' -import { useUpdatedEffect } from '@/util/hooks' import { getTimesBetweenTwoTimes } from '@/util/datetime' import { r_sys_statistics_active } from '@/services/system' import FlexBox from '@/components/common/FlexBox' @@ -13,7 +12,7 @@ const ActiveInfo = () => { const [isLoading, setIsLoading] = useState(false) const [scope, setScope] = useState('WEAK') - useUpdatedEffect(() => { + useEffect(() => { const chartResizeObserver = new ResizeObserver(() => { activeInfoEChartsRef.current?.resize() }) @@ -25,7 +24,7 @@ const ActiveInfo = () => { } }, [isLoading]) - useUpdatedEffect(() => { + useEffect(() => { getActiveInfo() }, []) diff --git a/src/pages/System/Statistics/CPUInfo.tsx b/src/pages/System/Statistics/CPUInfo.tsx index 885a236..1d53964 100644 --- a/src/pages/System/Statistics/CPUInfo.tsx +++ b/src/pages/System/Statistics/CPUInfo.tsx @@ -1,6 +1,5 @@ import * as echarts from 'echarts/core' import { BarSeriesOption } from 'echarts/charts' -import { useUpdatedEffect } from '@/util/hooks' import { r_sys_statistics_cpu } from '@/services/system' import FlexBox from '@/components/common/FlexBox' import { @@ -26,7 +25,7 @@ const CPUInfo = () => { } } - useUpdatedEffect(() => { + useEffect(() => { const chartResizeObserver = new ResizeObserver(() => { cpuInfoEChartsRef.current.forEach((value) => value.resize()) }) @@ -38,7 +37,7 @@ const CPUInfo = () => { } }, [cpuInfoDivRef.current]) - useUpdatedEffect(() => { + useEffect(() => { const intervalId = setInterval(getCpuInfo(), parseInt(refreshInterval) * 1000) return () => { diff --git a/src/pages/System/Statistics/HardwareInfo.tsx b/src/pages/System/Statistics/HardwareInfo.tsx index f571a90..96399ca 100644 --- a/src/pages/System/Statistics/HardwareInfo.tsx +++ b/src/pages/System/Statistics/HardwareInfo.tsx @@ -1,4 +1,3 @@ -import { useUpdatedEffect } from '@/util/hooks' import { r_sys_statistics_hardware } from '@/services/system' import FlexBox from '@/components/common/FlexBox' import { CommonCard } from '@/pages/System/Statistics' @@ -6,7 +5,7 @@ import { CommonCard } from '@/pages/System/Statistics' const HardwareInfo = () => { const [hardwareInfoData, setHardwareInfoData] = useState() - useUpdatedEffect(() => { + useEffect(() => { void r_sys_statistics_hardware().then((res) => { const response = res.data if (response.success) { diff --git a/src/pages/System/Statistics/OnlineInfo.tsx b/src/pages/System/Statistics/OnlineInfo.tsx index 29271ea..03ea1a4 100644 --- a/src/pages/System/Statistics/OnlineInfo.tsx +++ b/src/pages/System/Statistics/OnlineInfo.tsx @@ -1,6 +1,5 @@ import Icon from '@ant-design/icons' import * as echarts from 'echarts/core' -import { useUpdatedEffect } from '@/util/hooks' import { getTimesBetweenTwoTimes } from '@/util/datetime' import { r_sys_statistics_online } from '@/services/system' import FlexBox from '@/components/common/FlexBox' @@ -14,7 +13,7 @@ const OnlineInfo = () => { const [currentOnlineCount, setCurrentOnlineCount] = useState(-1) const [scope, setScope] = useState('WEAK') - useUpdatedEffect(() => { + useEffect(() => { const chartResizeObserver = new ResizeObserver(() => { onlineInfoEChartsRef.current?.resize() }) @@ -26,7 +25,7 @@ const OnlineInfo = () => { } }, [isLoading]) - useUpdatedEffect(() => { + useEffect(() => { getOnlineInfo() }, []) diff --git a/src/pages/System/Statistics/SoftwareInfo.tsx b/src/pages/System/Statistics/SoftwareInfo.tsx index a187349..65fe84a 100644 --- a/src/pages/System/Statistics/SoftwareInfo.tsx +++ b/src/pages/System/Statistics/SoftwareInfo.tsx @@ -1,4 +1,3 @@ -import { useUpdatedEffect } from '@/util/hooks' import { utcToLocalTime } from '@/util/datetime' import { r_sys_statistics_software } from '@/services/system' import FlexBox from '@/components/common/FlexBox' @@ -7,7 +6,7 @@ import { CommonCard } from '@/pages/System/Statistics' const SoftwareInfo = () => { const [softwareInfoData, setSoftwareInfoData] = useState() - useUpdatedEffect(() => { + useEffect(() => { void r_sys_statistics_software().then((res) => { const response = res.data if (response.success) { diff --git a/src/pages/System/Statistics/StorageInfo.tsx b/src/pages/System/Statistics/StorageInfo.tsx index 3e4fa34..c68a198 100644 --- a/src/pages/System/Statistics/StorageInfo.tsx +++ b/src/pages/System/Statistics/StorageInfo.tsx @@ -1,7 +1,6 @@ import * as echarts from 'echarts/core' import { BarSeriesOption } from 'echarts/charts' import { formatByteSize } from '@/util/common' -import { useUpdatedEffect } from '@/util/hooks' import { r_sys_statistics_storage } from '@/services/system' import FlexBox from '@/components/common/FlexBox' import { @@ -25,7 +24,7 @@ const StorageInfo = () => { tooltip: { valueFormatter: (value) => formatByteSize(value as number) } } - useUpdatedEffect(() => { + useEffect(() => { const chartResizeObserver = new ResizeObserver(() => { storageInfoEChartsRef.current.forEach((value) => value.resize()) }) @@ -37,7 +36,7 @@ const StorageInfo = () => { } }, [storageInfoDivRef.current]) - useUpdatedEffect(() => { + useEffect(() => { const intervalId = setInterval(getStorageInfo(), parseInt(refreshInterval) * 1000) return () => { diff --git a/src/pages/System/User.tsx b/src/pages/System/User.tsx index 29591b2..9944054 100644 --- a/src/pages/System/User.tsx +++ b/src/pages/System/User.tsx @@ -11,7 +11,6 @@ import { DATABASE_SELECT_SUCCESS, DATABASE_UPDATE_SUCCESS } from '@/constants/common.constants' -import { useUpdatedEffect } from '@/util/hooks' import { hasPermission } from '@/util/auth' import { utcToLocalTime, isPastTime, localTimeToUtc, dayjsToUtc, getNowUtc } from '@/util/datetime' import { @@ -748,7 +747,7 @@ const User = () => { } }, [formValues]) - useUpdatedEffect(() => { + useEffect(() => { getUser() }, [ JSON.stringify(tableParams.filters), diff --git a/src/pages/UserFramework.tsx b/src/pages/UserFramework.tsx index 90c205c..2cba983 100644 --- a/src/pages/UserFramework.tsx +++ b/src/pages/UserFramework.tsx @@ -5,7 +5,7 @@ import FitFullscreen from '@/components/common/FitFullscreen' import Sidebar from '@/components/common/Sidebar' import FullscreenLoadingMask from '@/components/common/FullscreenLoadingMask' -const ToolsFramework = () => { +const UserFramework = () => { return ( <> @@ -62,4 +62,4 @@ const ToolsFramework = () => { ) } -export default ToolsFramework +export default UserFramework