From c2810a00f2ddd547b5d36a798c4bae10891c4097 Mon Sep 17 00:00:00 2001 From: cles <208023732@qq.com> Date: Fri, 29 Aug 2025 15:23:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=8C=E5=9F=BA=E6=9C=AC=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 +++++++++++++++++++ package-lock.json | 5 ++-- package.json | 1 + src/main/index.js | 4 +-- src/renderer/src/App.jsx | 43 +++++++++++++++++++++----------- src/renderer/src/assets/base.css | 3 ++- src/renderer/src/main.jsx | 12 ++++++--- 7 files changed, 70 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index db3609b..87d9606 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,31 @@ # 有源标靶上位机软件 ## 快速开始 + ### 安装 + 1. 克隆仓库 +```bash +git clone https://gitea.anxinyun.cn/qinjian/FlexometerSetup.git +``` + +2. 安装依赖 + +```bash +cd FlexometerSetup +npm install +``` + +3. 开发 + +```bash +npm run dev +``` + +4. 打包应用 + +```bash +npm run build:目标平台 +# 目标平台可选:win32, linux, mac详见 package.json +``` diff --git a/package-lock.json b/package-lock.json index a633be7..de350f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { - "name": "electron-app", + "name": "FlexometerSetup", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "electron-app", + "name": "FlexometerSetup", "version": "1.0.0", "hasInstallScript": true, "dependencies": { + "@ant-design/icons": "^5.6.1", "@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/utils": "^4.0.0", "antd": "^5.27.1", diff --git a/package.json b/package.json index b9a02ca..7a3eb52 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "build:linux": "npm run build && electron-builder --linux" }, "dependencies": { + "@ant-design/icons": "^5.6.1", "@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/utils": "^4.0.0", "antd": "^5.27.1", diff --git a/src/main/index.js b/src/main/index.js index 61e8bf2..7eb5d25 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -6,8 +6,8 @@ import icon from '../../resources/icon.png?asset' function createWindow() { // Create the browser window. const mainWindow = new BrowserWindow({ - width: 900, - height: 670, + width: 1440, + height: 960, show: false, autoHideMenuBar: true, ...(process.platform === 'linux' ? { icon } : {}), diff --git a/src/renderer/src/App.jsx b/src/renderer/src/App.jsx index d5dbba1..587eb3f 100644 --- a/src/renderer/src/App.jsx +++ b/src/renderer/src/App.jsx @@ -1,17 +1,30 @@ -import { Button } from 'antd' -function App() { - const ipcHandle = () => window.electron.ipcRenderer.send('ping') - - return ( - <> -
-

Hello Electron + antd!

- -
- - ) +import { Layout } from 'antd' +const { Sider, Content } = Layout +const contentStyle = { + textAlign: 'center', + minHeight: 'calc(100vh - 20px)', + color: '#fff', + backgroundColor: '#0958d9' } - +const siderStyle = { + textAlign: 'center', + color: '#fff', + backgroundColor: '#1677ff' +} +const layoutStyle = { + borderRadius: 8, + overflow: 'hidden', + width: 'calc(100% - 8px)', + maxWidth: 'calc(100% - 8px)' +} +const App = () => ( + + + Sider + + + Content + + +) export default App diff --git a/src/renderer/src/assets/base.css b/src/renderer/src/assets/base.css index 782c99a..a2f901c 100644 --- a/src/renderer/src/assets/base.css +++ b/src/renderer/src/assets/base.css @@ -13,8 +13,9 @@ ul { body { min-height: 100vh; color: black; - background: white; + background: #ebe9e9; line-height: 1.6; + padding: 10px; font-family: Inter, -apple-system, diff --git a/src/renderer/src/main.jsx b/src/renderer/src/main.jsx index 58ff91b..9318a70 100644 --- a/src/renderer/src/main.jsx +++ b/src/renderer/src/main.jsx @@ -2,8 +2,14 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' import App from './App' import 'antd/dist/reset.css' +import zhCN from 'antd/locale/zh_CN' +import 'dayjs/locale/zh-cn' +import { ConfigProvider } from 'antd' +import './assets/base.css' createRoot(document.getElementById('root')).render( - - - + + + + + )