fix🛠️: 进入页面请求两次的bug;部署脚本
This commit is contained in:
parent
293df6e0a1
commit
d2edaa57e9
|
@ -5,7 +5,8 @@
|
|||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build && pwsh scripts/build.ps1",
|
||||
"build": "tsc && vite build",
|
||||
"deploy": "tsc && vite build && pwsh scripts/build.ps1",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
$server_path='fadinglight:/root/docker/caddy/site/www'
|
||||
|
||||
ssh fadinglight "rm ${server_path}/* -r"
|
||||
|
||||
scp -r dist/* $server_path
|
20
src/App.tsx
20
src/App.tsx
|
@ -1,31 +1,23 @@
|
|||
import Layout from './components/layout'
|
||||
import {Routes, Route} from 'react-router-dom'
|
||||
import {useEffect} from "react";
|
||||
import { Routes, Route } from 'react-router-dom'
|
||||
import Home from './pages/Home/Home'
|
||||
import NotFound from './pages/NotFound'
|
||||
import {Bill, BillContext} from "./store";
|
||||
import { Bill, BillContext } from "./store";
|
||||
import './App.css'
|
||||
import Record from "./pages/Record/Record";
|
||||
|
||||
function App() {
|
||||
const billStore = new Bill()
|
||||
const now = new Date()
|
||||
|
||||
useEffect(() => {
|
||||
billStore.fetch(now.getFullYear(), now.getMonth() + 1)
|
||||
.then()
|
||||
.catch(console.dir)
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<div className="App">
|
||||
<BillContext.Provider value={billStore}>
|
||||
<Layout home>
|
||||
<Routes>
|
||||
<Route path={"/"} element={<Home/>}/>
|
||||
<Route path={"/home"} element={<Home/>}/>
|
||||
<Route path={"/record"} element={<Record/>}/>
|
||||
<Route path={"/*"} element={<NotFound/>}/>
|
||||
<Route path={"/"} element={<Home />} />
|
||||
<Route path={"/home"} element={<Home />} />
|
||||
<Route path={"/record"} element={<Record />} />
|
||||
<Route path={"/*"} element={<NotFound />} />
|
||||
</Routes>
|
||||
</Layout>
|
||||
</BillContext.Provider>
|
||||
|
|
|
@ -6,13 +6,7 @@ import { useContext, useEffect, useState } from "react";
|
|||
import { BillContext } from "../../store";
|
||||
import { observer } from "mobx-react-lite";
|
||||
import Pie from "../../components/charts/pie";
|
||||
import {
|
||||
Card,
|
||||
Modal,
|
||||
DatePicker,
|
||||
Radio,
|
||||
Space,
|
||||
} from "antd";
|
||||
import { Card, Modal, DatePicker, Radio, Space } from "antd";
|
||||
import moment from 'moment';
|
||||
import 'moment/locale/zh-cn';
|
||||
import dayjs from 'dayjs'
|
||||
|
|
|
@ -28,6 +28,9 @@ function Record() {
|
|||
if (!!clsRef.current) clsRef.current.focus()
|
||||
}, [clsRef])
|
||||
|
||||
useEffect(() => {
|
||||
billStore.fetchLabels().then()
|
||||
}, [])
|
||||
|
||||
// table
|
||||
const columns = [
|
||||
|
@ -117,7 +120,7 @@ function Record() {
|
|||
const [uploadLoading, setUploadLoading] = useState(false)
|
||||
const upload = async () => {
|
||||
setUploadLoading(true)
|
||||
datasource.forEach( it => Reflect.deleteProperty(it, "key"))
|
||||
datasource.forEach(it => Reflect.deleteProperty(it, "key"))
|
||||
try {
|
||||
await postBills(datasource)
|
||||
setDataSource([])
|
||||
|
|
|
@ -16,7 +16,6 @@ export class Bill {
|
|||
|
||||
constructor() {
|
||||
makeAutoObservable(this)
|
||||
this.fetchLabels().then()
|
||||
}
|
||||
|
||||
get bills() {
|
||||
|
|
|
@ -7,7 +7,7 @@ export default defineConfig({
|
|||
server: {
|
||||
proxy: {
|
||||
"/api/": {
|
||||
target: "https://www.fadinglight.cn/api/",
|
||||
target: "https://bill.fadinglight.cn/api/",
|
||||
changeOrigin: true,
|
||||
rewrite: (path) => path.replace(/^\/api/, ""),
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user