feat: update to vite5.x

jzfai · Dec 13, 2023 · b2441b0 · b2441b0
1 parent 05c2623
commit b2441b0
Show file tree

Hide file tree

Showing 39 changed files with 1,800 additions and 720 deletions.
diff --git a/.env.serve-local b/.env.serve-local
@@ -0,0 +1,8 @@
+#The defined variable must start with VITE_APP_
+VITE_APP_ENV = 'test'
+VITE_APP_BASE_URL = 'http://localhost:12050'
+  #image or oss address
+VITE_APP_IMAGE_URL = 'https://github.jzfai.top/minio'
+
+#VITE_APP_BASE_URL = '/api'
+#VITE_APP_PROXY_URL = 'https://github.jzfai.top/micro-service-api'
diff --git a/eslintrc/.eslintrc-auto-import.json b/eslintrc/.eslintrc-auto-import.json
@@ -18,6 +18,7 @@
     "defineAsyncComponent": true,
     "defineComponent": true,
     "deleteArrObjByKey": true,
+    "dict": true,
     "dillParameters": true,
     "dillParameters3": true,
     "dillRequestBody": true,
@@ -39,9 +40,9 @@
     "elMessage": true,
     "elNotify": true,
     "filterAsyncRouter": true,
-    "filterAsyncRouterByReq": true,
     "findArrObjByKey": true,
     "freshRouter": true,
+    "generatorRouter": true,
     "getCurrentInstance": true,
     "getCurrentScope": true,
     "getCurrentTime": true,
@@ -50,6 +51,7 @@
     "getQueryParam": true,
     "getWeek": true,
     "h": true,
+    "handleTree": true,
     "inject": true,
     "isExternal": true,
     "isProxy": true,
@@ -63,8 +65,6 @@
     "nextTick": true,
     "onActivated": true,
     "onBeforeMount": true,
-    "onBeforeRouteLeave": true,
-    "onBeforeRouteUpdate": true,
     "onBeforeUnmount": true,
     "onBeforeUpdate": true,
     "onDeactivated": true,
@@ -87,7 +87,6 @@
     "resetState": true,
     "resizeHandler": true,
     "resolveComponent": true,
-    "resolveDirective": true,
     "rolesPermission": true,
     "routeInfo": true,
     "routerBack": true,
@@ -113,7 +112,6 @@
     "useElement": true,
     "useErrorLog": true,
     "useForm": true,
-    "useLink": true,
     "useLowCodeStore": true,
     "useRoute": true,
     "useRouter": true,

diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
     "name": "low-code-platform",
-    "version": "2.0.5",
+    "version": "2.2.0",
     "license": "MIT",
     "author": "kuanghua([email protected])",
     "packageManager": "[email protected]",
     "scripts": {
         "dev": "vite --mode serve-dev",
+        "local": "vite --mode serve-local",
         "debug": "vite --mode serve-dev --debug",
         "test": "vite --mode serve-test",
         "build:test": "vite build --mode  build-test",
@@ -90,7 +91,7 @@
         "unplugin-auto-import": "^0.11.2",
         "unplugin-vue-components": "^0.22.8",
         "unplugin-vue-define-options": "^0.6.1",
-        "vite": "^4.0.0",
+        "vite": "^5.0.4",
         "vite-plugin-html": "^3.2.0",
         "vite-plugin-mkcert": "^1.7.2",
         "vite-plugin-mock": "^2.9.6",
@@ -129,7 +130,7 @@
         "not op_mini all"
     ],
     "engines": {
-        "node": ">= 16 <18",
-        "pnpm": ">= 6 <8"
+        "node": ">= 16 <20",
+        "pnpm": ">= 6 <9"
     }
 }
diff --git a/src/api/brand.ts b/src/api/brand.ts
diff --git a/src/api/system.ts b/src/api/system.ts
@@ -3,7 +3,7 @@ import axiosReq from 'axios'
 // export const userInfoReq = (): Promise<any> => {
 //   return new Promise((resolve) => {
 //     const reqConfig = {
-//       url: '/basis-func/user/getUserInfo',
+//       url: '/generator/user/getUserInfo',
 //       params: { plateFormId: 2 },
 //       method: 'post'
 //     }

diff --git a/src/api/user.ts b/src/api/user.ts
@@ -5,11 +5,12 @@ import settings from '@/settings'
 export const userInfoReq = () => {
   return new Promise((resolve) => {
     const reqConfig = {
-      url: '/getInfo',
+      url: 'getInfo',
+      data:{platformId: settings.platformId},
       method: 'get'
     }
-    request(reqConfig).then(({ data }) => {
-      resolve(data)
+    request(reqConfig).then((res) => {
+      resolve(res?.data)
     })
   })
 }
@@ -18,8 +19,8 @@ export const userInfoReq = () => {
 export const getRouterReq = () => {
   return new Promise((resolve) => {
     const reqConfig = {
-      url: '/getRouters',
-      params:{platformId: settings.platformId},
+      url: 'getMenu',
+      params: { platformId: settings.platformId },
       reqLoading: false,
       method: 'get'
     }
@@ -32,8 +33,8 @@ export const getRouterReq = () => {
 //登录
 export const loginReq = (subForm) => {
   return request({
-    url: '/login',
-    data: Object.assign(subForm, { platformId: settings.platformId }),
+    url: 'login',
+    data: subForm,
     method: 'post',
     isNotTipErrorMsg: true
   })
@@ -42,7 +43,7 @@ export const loginReq = (subForm) => {
 // 注册方法
 export const register = (data) => {
   return request({
-    url: '/register',
+    url: 'rbac/register',
     method: 'post',
     data
   })
@@ -51,19 +52,22 @@ export const register = (data) => {
 //退出登录
 export const loginOutReq = () => {
   return request({
-    url: '/logout',
+    url: 'rbac/logout',
     method: 'post'
   })
 }
 
-
 //获取验证码
 export const getCodeImg = () => {
   return request({
     url: '/captchaImage',
     headers: {
       isToken: false
     },
+    data:{
+      width:100,
+      height:50
+    },
     method: 'get'
   })
 }
@@ -80,13 +84,12 @@ export function changeUserStatus(userId, status) {
     data
   })
 }
-
+//查询列表
 export const listReq = (query) => {
-  //查询列表
   return request({
     url: '/system/user/list',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 
@@ -165,14 +168,6 @@ export const getUserInfo = () => {
     method: 'get'
   })
 }
-//归属部门
-export const deptIdReq = (data) => {
-  return request({
-    url: `/system/user/deptTree`,
-    data,
-    method: 'get'
-  })
-}
 
 // 保存授权角色
 export function updateAuthRole(data) {

diff --git a/src/components/CustomJsonInput.vue b/src/components/CustomJsonInput.vue
@@ -34,14 +34,15 @@ import {ElMessageBox} from 'element-plus'
 //2.定义修改的json字段的值,
 const couldView = ref(["tree", "code", "form", "view"])
 
-const jsonData = ref({name: "test"})
+const jsonData = ref()
 const updateModelValue = (val) => {
   jsonData.value = val
 }
 
 const dialogVisible = ref(false)
 const handleClose = () => {
   ElMessageBox.confirm('退出将清空您配置的数据').then(() => {
+    resetData()
     dialogVisible.value = false
   })
 }
@@ -74,14 +75,15 @@ const saveFileName = ref('')
 const emits = defineEmits(["reloadPage"])
 const saveTmp = async () => {
   const reqConfig = {
-    url: '/basis-func/configSave/insert',
+    url: '/generator/configSave',
     method: 'post',
     data: {
       name: `${saveFileName.value}-custom`,
       generatorConfig: JSON.stringify(jsonData.value)
     }
   }
   axiosReq(reqConfig).then(() => {
+    resetData()
     elMessage('配置保存成功')
     emits("reloadPage")
   })
@@ -90,7 +92,7 @@ const saveTmp = async () => {
 //更新模板
 const updateTmp = async () => {
   const reqConfig = {
-    url: '/basis-func/configSave/updateById',
+    url: '/generator/configSave',
     method: 'put',
     data: {
       id: saveFileId,
@@ -100,10 +102,15 @@ const updateTmp = async () => {
   }
   axiosReq(reqConfig).then(() => {
     elMessage('更新成功')
+    resetData()
     emits("reloadPage")
   })
 }
 
+const resetData=()=>{
+  saveFileName.value = ""
+  jsonData.value = {}
+}
 defineExpose({showModal})
 </script>
 

diff --git a/src/components/TemplateConfig.vue b/src/components/TemplateConfig.vue
@@ -18,7 +18,7 @@ const chooseTmpFile = ref('')
 const templateFileData = ref([])
 const templateFileReq = () => {
   const reqConfig = {
-    url: '/basis-func/templateFile/selectPage',
+    url: '/generator/templateFile/listPage',
     method: 'get',
     data: { pageSize: 500, pageNum: 1 }
   }

diff --git a/src/hooks/use-error-log.ts b/src/hooks/use-error-log.ts
@@ -5,7 +5,7 @@ import pack from '../../package.json'
 import settings from '@/settings'
 import bus from '@/utils/bus'
 //此处不要使用utils下的axios
-const reqUrl = '/integration-front/errorCollection/insert'
+const reqUrl = '/integration-front/errorCollection'
 let repeatErrorLogJudge = ''
 const errorLogReq = (errLog: string) => {
   axiosReq({

diff --git a/src/hooks/use-form.ts b/src/hooks/use-form.ts
@@ -116,7 +116,7 @@ export const useForm = (subForm) => {
       const formData = new FormData()
       formData.append('file', refSettingFile.files[0])
       axiosReq({
-        url: '/basis-func/upload/file',
+        url: '/generator/upload/file',
         timeout: 30000,
         data: formData,
         method: 'post',