Merge pull request #298 from Fuynkio/dev_shawn

重构:改用Vue Router 和动态导入
ArkMowers · Sep 19, 2023 · dedc9b1 · dedc9b1
2 parents e817e8a + 5f6945f
commit dedc9b1
Show file tree

Hide file tree

Showing 15 changed files with 1,022 additions and 65 deletions.
diff --git a/.github/workflows/pyinstaller-win-shawn.yml b/.github/workflows/pyinstaller-win-shawn.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - dev_shawn
+  workflow_dispatch:
 
 jobs:
   build-win-amd64:
@@ -24,6 +25,8 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 16
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
 
       - name: Install UPX
         uses: crazy-max/ghaction-upx@v2

diff --git a/ui/components.d.ts b/ui/components.d.ts
@@ -9,12 +9,15 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
+    Basementsetting: typeof import('./src/components/Basementsetting.vue')['default']
     Clue: typeof import('./src/components/Clue.vue')['default']
     Email: typeof import('./src/components/Email.vue')['default']
     HelpText: typeof import('./src/components/HelpText.vue')['default']
     MaaBasic: typeof import('./src/components/MaaBasic.vue')['default']
+    Maahugmission: typeof import('./src/components/Maahugmission.vue')['default']
     MaaRogue: typeof import('./src/components/MaaRogue.vue')['default']
     MaaWeekly: typeof import('./src/components/MaaWeekly.vue')['default']
+    Mowersetting: typeof import('./src/components/Mowersetting.vue')['default']
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
@@ -27,6 +30,7 @@ declare module '@vue/runtime-core' {
     NInput: typeof import('naive-ui')['NInput']
     NInputNumber: typeof import('naive-ui')['NInputNumber']
     NLog: typeof import('naive-ui')['NLog']
+    NMenu: typeof import('naive-ui')['NMenu']
     NRadio: typeof import('naive-ui')['NRadio']
     NRadioButton: typeof import('naive-ui')['NRadioButton']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
@@ -40,6 +44,8 @@ declare module '@vue/runtime-core' {
     NTooltip: typeof import('naive-ui')['NTooltip']
     PlanEditor: typeof import('./src/components/PlanEditor.vue')['default']
     Recruit: typeof import('./src/components/Recruit.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
     SKLand: typeof import('./src/components/SKLand.vue')['default']
   }
 }
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -20,9 +20,11 @@
     "moment": "^2.29.4",
     "pinia": "^2.0.32",
     "reconnecting-websocket": "^4.4.0",
+    "router": "^1.3.8",
     "vue": "^3.2.47",
     "vue-axios": "^3.5.2",
-    "vue-chartjs": "^5.0.0"
+    "vue-chartjs": "^5.0.0",
+    "vue-router": "^4.2.4"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.2.0",