From 68ff4aa3e2c645756b36d0bc8a9971be0ff94b9b Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Thu, 13 Apr 2023 14:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0@scr=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- src/main.jsx | 20 ++++++++++---------- src/stores/Reservation.js | 4 ++-- src/views/App.jsx | 9 ++++++--- src/views/reservation/Newest.jsx | 2 +- vite.config.js | 5 +++++ 7 files changed, 38 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90646f1..0b96d93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "global.highlights.hub", "version": "0.1.0", "dependencies": { - "antd": "^5.4.0", + "antd": "^5.4.2", "mobx": "^6.9.0", "mobx-react": "^7.6.0", "moment": "^2.29.4", @@ -1069,9 +1069,9 @@ } }, "node_modules/antd": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/antd/-/antd-5.4.0.tgz", - "integrity": "sha512-eWCNFUGMuuHu2wufbq7yzPzwSesO2Our0AnCjCkom646wHw2TOUhfS58FeUSlV/Hhjb+ZLEvdy/mC+vJUb+EXg==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/antd/-/antd-5.4.2.tgz", + "integrity": "sha512-OxXZ7joFf6Um4zeXm07tyJ9WV6eMwUw1KUmewfM/BDceUFVtJVf7YbBTBfX3JTl+jOuSpMSb4naFhOCgVwtyFw==", "dependencies": { "@ant-design/colors": "^7.0.0", "@ant-design/cssinjs": "^1.7.1", @@ -1081,7 +1081,7 @@ "@ctrl/tinycolor": "^3.6.0", "@rc-component/mutate-observer": "^1.0.0", "@rc-component/tour": "~1.8.0", - "@rc-component/trigger": "^1.5.9", + "@rc-component/trigger": "^1.7.0", "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", "dayjs": "^1.11.1", @@ -1101,12 +1101,12 @@ "rc-motion": "^2.6.1", "rc-notification": "~5.0.0", "rc-pagination": "~3.3.1", - "rc-picker": "~3.5.0", + "rc-picker": "~3.6.1", "rc-progress": "~3.4.1", "rc-rate": "~2.10.0", "rc-resize-observer": "^1.2.0", "rc-segmented": "~2.1.2", - "rc-select": "~14.4.0", + "rc-select": "~14.4.3", "rc-slider": "~10.1.0", "rc-steps": "~6.0.0", "rc-switch": "~4.0.0", @@ -1887,9 +1887,9 @@ } }, "node_modules/rc-picker": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-3.5.1.tgz", - "integrity": "sha512-T/rqhB2IVU014k14x713JGzHCUT56YEYsGkUT8vBVOANdoRCe18oN/8zdeWYB/7mQRTTHJ1vCSPnxOowjLyN8Q==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-3.6.2.tgz", + "integrity": "sha512-acLNCi2WTNAuvTtcEzKp72mU15ni0sqrIKVlEcj04KgLZxhlVPMabCS+Sc8VuOCPJbOcW0XeOydbNnJbWTvzxg==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^1.5.0", @@ -1984,9 +1984,9 @@ } }, "node_modules/rc-select": { - "version": "14.4.2", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.4.2.tgz", - "integrity": "sha512-Ykk4bIPwEMd1WDoG8pHrcggRcB7Sji+OhyWj3ADuGKtDQGlgg7PgM79Opf3qtbkLQX+Q9DiQ16UykozAgL5gMw==", + "version": "14.4.3", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.4.3.tgz", + "integrity": "sha512-qoz4gNqm3SN+4dYKSCRiRkxKSEEdbS3jC6gdFYoYwEjDZ9sdQFo5jHlfQbF+hhai01HOoj1Hf8Gq6tpUvU+Gmw==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^1.5.0", diff --git a/package.json b/package.json index 1716ae8..a71b4af 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "dependencies": { - "antd": "^5.4.0", + "antd": "^5.4.2", "mobx": "^6.9.0", "mobx-react": "^7.6.0", "moment": "^2.29.4", diff --git a/src/main.jsx b/src/main.jsx index dc195f2..e6a42ff 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -5,16 +5,16 @@ import { createBrowserRouter, RouterProvider, } from "react-router-dom"; -import RootStore from "./stores/Root"; -import { StoreContext } from './stores/StoreContext'; -import "./assets/global.css"; -import App from "./views/App"; -import Login from "./views/Login"; -import SignOut from "./views/SignOut"; -import Index from "./views/index"; -import ErrorPage from "./views/error-page"; -import ReservationNewest from "./views/reservation/Newest"; -import ReservationDetail from "./views/reservation/Detail"; +import RootStore from "@/stores/Root"; +import { StoreContext } from '@/stores/StoreContext'; +import "@/assets/global.css"; +import App from "@/views/App"; +import Login from "@/views/Login"; +import SignOut from "@/views/SignOut"; +import Index from "@/views/index"; +import ErrorPage from "@/views/error-page"; +import ReservationNewest from "@/views/reservation/Newest"; +import ReservationDetail from "@/views/reservation/Detail"; configure({ useProxies: "ifavailable", diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js index b0c762a..3cdf91d 100644 --- a/src/stores/Reservation.js +++ b/src/stores/Reservation.js @@ -1,6 +1,6 @@ import { makeAutoObservable, runInAction } from "mobx"; -import * as req from '../utils/request'; -import { prepareUrl } from '../utils/commons'; +import * as req from '@/utils/request'; +import { prepareUrl } from '@/utils/commons'; class Reservation { diff --git a/src/views/App.jsx b/src/views/App.jsx index 6594f9e..5b34c81 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -1,11 +1,12 @@ import { Outlet, Link, useHref, useLocation } from "react-router-dom"; import { useEffect } from 'react'; +import { observer } from "mobx-react"; import { Layout, Menu, ConfigProvider, theme, Dropdown, Space, Row, Col } from 'antd'; import { DownOutlined } from '@ant-design/icons'; import 'antd/dist/reset.css'; -import { useStore } from '../stores/StoreContext.js'; +import { useStore } from '@/stores/StoreContext.js'; const { Header, Content, Footer } = Layout; const items = [ @@ -37,7 +38,7 @@ const items = [ key: '3', }, ] -export default function App() { +function App() { const { authStore } = useStore(); @@ -108,4 +109,6 @@ export default function App() { ); -} \ No newline at end of file +} + +export default observer(App); \ No newline at end of file diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx index e529f0b..c07cab9 100644 --- a/src/views/reservation/Newest.jsx +++ b/src/views/reservation/Newest.jsx @@ -3,7 +3,7 @@ import { useEffect } from 'react'; import { observer } from "mobx-react"; import { toJS } from "mobx"; import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio } from 'antd'; -import { useStore } from '../../stores/StoreContext.js'; +import { useStore } from '@/stores/StoreContext.js'; const { Title } = Typography; diff --git a/vite.config.js b/vite.config.js index 5a33944..2f6343f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -4,4 +4,9 @@ import react from '@vitejs/plugin-react' // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], + resolve: { + alias: { + '@': '/src', + }, + }, })