Merge pull request #2 from sdmu-gaoqi/dev

Dev

.gitignore

@@ -15,6 +15,7 @@ dist-ssr
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
+!.vscode/settings.json
 .idea
 .DS_Store
 *.suo

.vscode/extensions.json

@@ -1,3 +1,8 @@
 {
-  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+  "recommendations": [
+    "Vue.volar",
+    "Vue.vscode-typescript-vue-plugin",
+    "wa.wa-language-tip",
+    "wa.wa-menus"
+  ]
 }

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": false,
+    "source.fixAll.stylelint": false
+  },
+  "editor.formatOnSave": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

README.md

@@ -19,6 +19,7 @@
 │   ├── menu.ts // 菜单配置
 │   ├── route.ts // route配置
 │   ├── utils // 工具函数集合
+│   ├── mock // mock接口
 │   └── logo.svg
 ├── index.html
 ├── package.json
@@ -39,6 +40,7 @@ export type WARoute = RouteRecordRaw & {
   meta: {
     permission?: string[] // 权限标识
     key: string // 唯一标识
+    notNeedLogin?: boolean // 是否需要登录(route跳转不需要判断是否登录参数)
   }
 
 /**
@@ -62,7 +64,7 @@ const initPerms = async () => {
 
 路由的定义遵从的规则
 
-1. 需要关联权限的需要吧权限点写在permission中
+1. 需要关联权限的需要把权限点写在permission中
 2. 如果菜单与路由需要根据接口过滤权限 逻辑写在 initPerms
    (其中 authRouter表示需要有权限点的菜单)
 3. 路由与菜单的配置是两份 没有做一份呼转的逻辑
@@ -103,6 +105,17 @@ export type WAMenu = (ItemType & {
 
 ## 关于环境
 
-不同环境配置再 env目录下
+不同环境配置在 env目录下
 注意 暴露给页面使用的需要加VITE前缀
 package里有不同环境的打包方式
+
+## 关于mock
+
+mock预设为 test 与 prod(根据import.meta.env.MODE 决定 prod模式时 使用的是prod文件下的mock 其他的都是用的test下的mock)
+需要增加更多环境支持可以在 mock/index.ts修改
+
+## 关于插件
+
+内设了几款插件
+wa-menu 右键 src/locales/lang.xlsx可以 执行xlsx自动转ts的脚本
+wa-language-tip 丰富i18n 在编写时的提示能力

env/.env.development

@@ -1,2 +1,2 @@
 NODE_ENV: development
-VITE_BASE_REQUEST: https: //store-operations-admin-dev.yuque.com
+VITE_BASE_REQUEST: /

env/.env.production

@@ -1,2 +1,2 @@
 NODE_ENV: production
-VITE_BASE_REQUEST: https: //store-operations-admin.yuque.com
+VITE_BASE_REQUEST: https://store-operations-admin.yuque.com

env/.env.staging

@@ -1,2 +1,2 @@
 NODE_ENV: production
-VITE_BASE_REQUEST: https: //store-operations-admin-staging.yuque.com
+VITE_BASE_REQUEST: https://store-operations-admin-staging.yuque.com

env/.env.test

@@ -1,2 +1,2 @@
 NODE_ENV: production
-VITE_BASE_REQUEST: https: //store-operations-admin-test.yuque.com
+VITE_BASE_REQUEST: https://store-operations-admin-test.yuque.com

mock/test/index.ts

@@ -0,0 +1,43 @@
+import { MockMethod } from 'vite-plugin-mock'
+
+// @ts-ignore
+const testMock: MockMethod = [
+  {
+    url: '/api/login',
+    method: 'post',
+    timeout: 1000,
+    response: ({ data }: any) => {
+      console.log('登录请求数据 =>', data)
+      return {
+        code: 0,
+        data: {
+          token: 'thisIsToken'
+        }
+      }
+    }
+  },
+  {
+    url: '/api/perm',
+    method: 'get',
+    timeout: 1000,
+    response: ({ data }: any) => {
+      console.log('登录请求数据 =>', data)
+      return {
+        code: 0,
+        data: ['perm-1']
+      }
+    }
+  },
+  {
+    url: '/api/logout',
+    method: 'get',
+    timeout: 1000,
+    response: () => {
+      return {
+        code: 0
+      }
+    }
+  }
+]
+
+export default testMock

package.json

@@ -8,7 +8,7 @@
     "build:test": "vue-tsc && vite build --mode test",
     "build:pre": "vue-tsc && vite build --mode staging",
     "build:dev": "vue-tsc && vite build --mode development",
-    "dev": "vite",
+    "dev": "pnpm vite",
     "preview": "vite preview",
     "prepare": "husky install",
     "prettier": "prettier -c --write **/*",
@@ -42,16 +42,23 @@
   "config": {
     "commitizen": {
       "path": "node_modules/cz-git"
+    },
+    "wa-menus": {
+      "xlsxDefaultLan": "zh-CN",
+      "xlsxTransformPath": "src/locales",
+      "xlsxTransformType": "ts"
     }
   },
   "dependencies": {
     "@types/vue": "^2.0.0",
     "add": "^2.0.6",
     "ant-design-vue": "^4.0.0",
+    "axios": "^1.6.5",
     "babel-eslint": "^10.1.0",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
     "eslint-plugin-import": "^2.25.2",
+    "mockjs": "^1.1.0",
     "path": "^0.12.7",
     "postcss": "^8.0.0",
     "prettier": "^3.0.0",
@@ -61,6 +68,7 @@
     "vite-plugin-mkcert": "^1.16.0",
     "vue": "^3.3.4",
     "vue-hooks-plus": "^1.8.6",
+    "vue-i18n": "^9.9.0",
     "vue-router": "^4.2.4",
     "vuex": "^4.1.0",
     "wa-utils": "^0.2.6"
@@ -81,13 +89,15 @@
     "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-vue": "^9.17.0",
+    "glob": "^10.3.10",
     "husky": "^8.0.3",
     "lint-staged": "^13.0.3",
     "stylelint": "^15.10.2",
     "stylelint-config-standard-scss": "^10.0.0",
     "tailwindcss": "^3.3.3",
     "typescript": "*",
     "vite": "^4.4.7",
+    "vite-plugin-mock": "^2.9.6",
     "vite-svg-loader": "^4.0.0",
     "vue-tsc": "^1.8.5",
     "wa-postcss-pxtorem": "^0.0.1"