From 3657364146fa434af204fd0ce26be8a0b7e79906 Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Tue, 9 Apr 2024 18:06:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 19 +++++++------ pnpm-lock.yaml | 9 +++++- src/app.ts | 1 + src/index.html | 12 -------- src/layouts/index.tsx | 65 +++++++++++++++++++++++++++++++++++-------- src/main/config.ts | 3 +- src/pages/index.tsx | 4 +-- 7 files changed, 77 insertions(+), 36 deletions(-) create mode 100644 src/app.ts delete mode 100644 src/index.html diff --git a/package.json b/package.json index da5a1eb..9809b06 100644 --- a/package.json +++ b/package.json @@ -22,27 +22,28 @@ "chokidar": "^3.6.0", "clear-module": "^4.1.2", "lodash": "^4.17.21", + "normalize.css": "^8.0.1", "umi": "^4.0.42" }, "devDependencies": { + "@testing-library/jest-dom": "^5", + "@testing-library/react": "^14", "@tsconfig/node21": "^21.0.3", + "@types/jest": "^29", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", + "@types/testing-library__jest-dom": "^5.14.5", "@umijs/plugin-electron": "^0.2.0", + "@umijs/plugins": "^4.1.8", + "cross-env": "^7", "electron": "29.1.6", - "typescript": "^5", + "jest": "^29", + "jest-environment-jsdom": "^29", "prettier": "^2.8.8", "prettier-plugin-organize-imports": "^3.2.2", "prettier-plugin-packagejson": "^2.4.3", - "jest": "^29", - "@types/jest": "^29", "ts-node": "^10", - "cross-env": "^7", - "jest-environment-jsdom": "^29", - "@testing-library/jest-dom": "^5", - "@testing-library/react": "^14", - "@types/testing-library__jest-dom": "^5.14.5", - "@umijs/plugins": "^4.1.8" + "typescript": "^5" }, "publishConfig": { "access": "public", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f19ac7c..9f4d195 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ dependencies: lodash: specifier: ^4.17.21 version: 4.17.21 + normalize.css: + specifier: ^8.0.1 + version: 8.0.1 umi: specifier: ^4.0.42 version: 4.1.8(@babel/core@7.24.4)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(jest@29.7.0)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.4)(webpack@5.91.0) @@ -3422,7 +3425,7 @@ packages: '@types/history': 4.7.11 '@types/react': 18.2.73 '@types/react-router': 5.1.20 - redux: 3.7.2 + redux: 4.2.1 dev: true /@types/react-router@5.1.20: @@ -9081,6 +9084,10 @@ packages: engines: {node: '>=10'} dev: true + /normalize.css@8.0.1: + resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==} + dev: false + /npm-run-path@4.0.1: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} diff --git a/src/app.ts b/src/app.ts new file mode 100644 index 0000000..e0da3ff --- /dev/null +++ b/src/app.ts @@ -0,0 +1 @@ +import 'normalize.css' \ No newline at end of file diff --git a/src/index.html b/src/index.html deleted file mode 100644 index 3b4e80d..0000000 --- a/src/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - 形体结构化视频数据分析系统 - - - -
- - - diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 499c4ab..9b4faf6 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -1,18 +1,61 @@ -import { Link, Outlet } from 'umi'; +import { Outlet, history } from 'umi'; +import { Layout, Menu, theme, Image, Affix } from 'antd' +import avatar from '../assets/avatar.jpg'; import styles from './index.less'; -export default function Layout() { +const { Header, Content, Footer } = Layout; + +const items = [ + { + key: '/', + label: '首页' + }, + { + key: '/docs', + label: '上传页' + } +] + +export default function BaseLayout() { + + const { + token: { colorBgContainer, borderRadiusLG }, + } = theme.useToken(); + return (
- - + + +
+
+ nicecode +
+ history.push(item.key)} + /> +
+ + +
+ +
+ +
+ nicecode ©{new Date().getFullYear()} Created by dev +
+
); } diff --git a/src/main/config.ts b/src/main/config.ts index 635a074..221d371 100644 --- a/src/main/config.ts +++ b/src/main/config.ts @@ -3,10 +3,11 @@ import { BrowserWindowConstructorOptions } from 'electron'; export default { browserWindow: { title: 'nicecode 客户端模板', + titleBarStyle: 'hidden', titleBarOverlay: { color: '#2f3241', symbolColor: '#74b1be', - height: 48 + height: 32 }, maximizable: false, webPreferences: { diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 70280fc..42aafcf 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,4 +1,4 @@ -import { Button } from 'antd'; +import { Button, message } from 'antd'; import avatar from '../assets/avatar.jpg'; export default function HomePage() { @@ -13,7 +13,7 @@ export default function HomePage() {