diff --git a/index.html b/index.html index fca2209..ec00ac0 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,16 @@ - - - - Center - - - -
- - - + + + + + Center + + + + +
+ + + + \ No newline at end of file diff --git a/package.json b/package.json index 8ad08c1..df272e2 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vite", "build": "vite build", + "build:sky": "cross-env CENTER_ENV=sky vite build", "dev:kv": "cross-env VITE_USE_KV=true vite", "lint": "eslint .", "preview": "vite preview", diff --git a/packages/resources/src/pages/upload/v2/upload.ts b/packages/resources/src/pages/upload/v2/upload.ts index 3954256..c74cdda 100644 --- a/packages/resources/src/pages/upload/v2/upload.ts +++ b/packages/resources/src/pages/upload/v2/upload.ts @@ -3,7 +3,7 @@ import 'nprogress/nprogress.css'; import { Id, toast } from 'react-toastify'; import { nanoid } from 'nanoid'; import { toastLogin } from '@kevisual/resources/pages/message/ToastLogin'; -import { uploadFiles, UploadProgress } from '@kevisual/query-upload/query-upload'; +import { uploadFiles, UploadProgress } from '@kevisual/query-upload/query-upload.js'; export type ConvertOpts = { appKey?: string; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b26f883..4ac82c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -355,12 +355,18 @@ importers: '@mui/material': specifier: ^7.0.1 version: 7.0.1(@emotion/react@11.14.0(@types/react@19.1.0)(react@19.1.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.1.0)(react@19.1.0))(@types/react@19.1.0)(react@19.1.0))(@types/react@19.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + re-resizable: + specifier: ^6.11.2 + version: 6.11.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0) react: specifier: 19.1.0 version: 19.1.0 react-dom: specifier: 19.1.0 version: 19.1.0(react@19.1.0) + react-draggable: + specifier: ^4.4.6 + version: 4.4.6(react-dom@19.1.0(react@19.1.0))(react@19.1.0) react-hook-form: specifier: ^7.55.0 version: 7.55.0(react@19.1.0) @@ -4381,6 +4387,12 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + re-resizable@6.11.2: + resolution: {integrity: sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==} + peerDependencies: + react: ^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 + react-datepicker@8.2.1: resolution: {integrity: sha512-1pyALWM9mTZ7DG7tfcApwBy2kkld9Kz/EI++LhPnoXJAASbvuq6fdsDfkoB3q1JrxF7vhghVmQ759H/rOwUNNw==} peerDependencies: @@ -9220,6 +9232,11 @@ snapshots: react: 19.1.0 react-dom: 19.1.0(react@19.1.0) + re-resizable@6.11.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + dependencies: + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + react-datepicker@8.2.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@floating-ui/react': 0.27.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) diff --git a/src/assets/fonts/font.css b/src/assets/fonts/font.css index c170944..6e98688 100644 --- a/src/assets/fonts/font.css +++ b/src/assets/fonts/font.css @@ -1,3 +1,45 @@ -@import "./D-DIN/font.css"; -@import "./Montserrat/font.css"; -@import "./Orbitron/font.css"; +@import 'tailwindcss'; + +@import './D-DIN/font.css'; +@import './Montserrat/font.css'; +@import './Orbitron/font.css'; + +/* D-DIN */ +@utility font-d-din { + font-family: 'D-DIN', sans-serif; +} +@utility font-d-din-bold { + font-family: 'D-DIN-Bold', sans-serif; +} +@utility font-d-din-italic { + font-family: 'D-DIN-Italic', sans-serif; +} +@utility font-d-din-condensed { + font-family: 'D-DIN Condensed', sans-serif; +} +@utility font-d-din-condensed-bold { + font-family: 'D-DIN Condensed-Bold', sans-serif; +} +@utility font-d-din-exp { + font-family: 'D-DIN Exp', sans-serif; +} +@utility font-d-din-exp-italic { + font-family: 'D-DIN Exp-Italic', sans-serif; +} +@utility font-d-din-exp-bold { + font-family: 'D-DIN Exp-Bold', sans-serif; +} + +/* Montserrat */ +@utility font-montserrat { + font-family: 'Montserrat', sans-serif; +} + +@utility font-montserrat-italic { + font-family: 'Montserrat-Italic', sans-serif; +} + +/* Orbitron */ +@utility font-orbitron { + font-family: 'Orbitron', sans-serif; +} diff --git a/src/modules/basename.ts b/src/modules/basename.ts index 6da2da4..bb46c18 100644 --- a/src/modules/basename.ts +++ b/src/modules/basename.ts @@ -1 +1,4 @@ export const basename = DEV_SERVER ? '' : '/root/center'; + +// @ts-ignore +export const isSky = CENTER_ENV === 'sky'; diff --git a/src/modules/layout/index.tsx b/src/modules/layout/index.tsx index c52e5ff..6c9c3d4 100644 --- a/src/modules/layout/index.tsx +++ b/src/modules/layout/index.tsx @@ -18,6 +18,7 @@ import { Languages, QrCode } from 'lucide-react'; import { useTranslation } from 'react-i18next'; import { toast } from 'react-toastify'; import { useTheme } from '@kevisual/components/theme/index.tsx'; +import { isSky } from '../basename'; type LayoutMainProps = { title?: React.ReactNode; @@ -112,15 +113,18 @@ export const LayoutMain = (props: LayoutMainProps) => {
-
- - - -
- QR Code -
逸闻设计
+ {!isSky && ( +
+ + + + +
+ QR Code +
逸闻设计
+
-
+ )}
diff --git a/src/pages/user/module/FileUpload.tsx b/src/pages/user/module/FileUpload.tsx index e50cae4..ad8001d 100644 --- a/src/pages/user/module/FileUpload.tsx +++ b/src/pages/user/module/FileUpload.tsx @@ -39,8 +39,8 @@ export const FileUpload = forwardRef((props, ref) => { })) as any; console.log('res', res); if (res?.code === 200) { - const resource = res.data?.resource; - props?.onChange?.(resource); + const [resource] = res.data?.upload || {}; + props?.onChange?.(resource?.path || ''); } else { message.error(res.message || 'Request failed'); } diff --git a/vite.config.ts b/vite.config.ts index 3a0a175..c49dfba 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -4,6 +4,7 @@ import path from 'path'; import tailwindcss from '@tailwindcss/vite'; import basicSsl from '@vitejs/plugin-basic-ssl'; const isDev = process.env.NODE_ENV === 'development'; +const centerEnv = process.env.CENTER_ENV; const plugins: any[] = [basicSsl()]; plugins.push(tailwindcss()); const devBackend = 'https://kevisual.silkyai.cn'; @@ -48,6 +49,7 @@ export default defineConfig({ }, define: { DEV_SERVER: JSON.stringify(process.env.NODE_ENV === 'development'), + CENTER_ENV: JSON.stringify(centerEnv), }, base: isDev ? '/' : '/root/center/', build: {