v2.6.5版本更新 (#1757)

* feature:增加资源加载loading

* feature:修正sql无法落盘的问题

* fixed: 修复切换角色出现404的问题。

* 删除selectImage.vue中chooseImg下多余的console.log(url)

---------

Co-authored-by: krank <emosick@qq.com>
Co-authored-by: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>

web/src/components/selectImage/selectImage.vue

@@ -187,7 +187,6 @@ const editFileNameFunc = async(row) => {
     inputValue: row.name
   }).then(async({ value }) => {
     row.name = value
-    // console.log(row)
     const res = await editFileName(row)
     if (res.code === 0) {
       ElMessage({
@@ -216,7 +215,6 @@ const listObj = {
 }
 
 const chooseImg = (url) => {
-  console.log(url)
   if (props.fileType) {
     const typeSuccess = listObj[props.fileType].some(item => {
       if (url.includes(item)) {

web/src/core/config.js

@@ -20,7 +20,7 @@ export const viteLogo = (env) => {
     )
     console.log(
       chalk.green(
-        `> 当前版本:v2.6.4`
+        `> 当前版本:v2.6.5`
       )
     )
     console.log(

web/src/core/gin-vue-admin.js

@@ -10,7 +10,7 @@ export default {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:v2.6.4
+       当前版本:v2.6.5
        加群方式:微信：shouzi_1994 QQ群：622360840
        项目地址：https://github.com/flipped-aurora/gin-vue-admin
        插件市场:https://plugin.gin-vue-admin.com

web/src/main.js

@@ -18,27 +18,14 @@ import App from './App.vue'
 import { initDom } from './utils/positionToCode'
 
 initDom()
-/**
- * @description 导入加载进度条，防止首屏加载时间过长，用户等待
- *
- * */
-import Nprogress from 'nprogress'
-import 'nprogress/nprogress.css'
-Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
-Nprogress.start()
-
-/**
- * 无需在这块结束，会在路由中间件中结束此块内容
- * */
 
 const app = createApp(App)
 app.config.productionTip = false
 
 app
-  .use(run)
-  .use(store)
-  .use(auth)
-  .use(router)
-  .mount('#app')
-
+    .use(run)
+    .use(store)
+    .use(auth)
+    .use(router)
+    .mount('#app')
 export default app

web/src/permission.js

@@ -3,6 +3,8 @@ import { useRouterStore } from '@/pinia/modules/router'
 import getPageTitle from '@/utils/page'
 import router from '@/router'
 import Nprogress from 'nprogress'
+import 'nprogress/nprogress.css'
+Nprogress.configure({ showSpinner: false, ease: 'ease', speed: 500 })
 
 const whiteList = ['Login', 'Init']
 
@@ -75,6 +77,11 @@ router.beforeEach(async(to, from) => {
   } else {
     // 不在白名单中并且已经登录的时候
     if (token) {
+      console.log(sessionStorage.getItem("needCloseAll"))
+      if(sessionStorage.getItem("needToHome") === 'true') {
+        sessionStorage.removeItem("needToHome")
+        return { path: '/'}
+      }
       // 添加flag防止多次获取动态路由和栈溢出
       if (!routerStore.asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
         await getRouter(userStore)
@@ -110,13 +117,23 @@ router.beforeEach(async(to, from) => {
   }
 })
 
+const removeLoading = () => {
+  const element = document.getElementById('gva-loading-box');
+  if (element) {
+    element.remove();
+  }
+}
+
 router.afterEach(() => {
   // 路由加载完成后关闭进度条
   document.getElementsByClassName('main-cont main-right')[0]?.scrollTo(0, 0)
+  removeLoading()
   Nprogress.done()
 })
 
 router.onError(() => {
   // 路由发生错误后销毁进度条
+  removeLoading()
   Nprogress.remove()
 })
+

web/src/view/dashboard/componenst/pluginTable.vue

@@ -5,8 +5,8 @@
 
 <template>
   <div>
-    <el-table :data="tableData" stripe style="width: 100%" @row-click="toPath">
-      <el-table-column prop="ranking" label="排名" width="80" align="center"/>
+    <el-table :data="tableData" stripe style="width: 100%">
+      <el-table-column prop="ranking" label="排名" width="80" align="center" />
       <el-table-column prop="title" label="插件标题" show-overflow-tooltip>
         <template #default="{ row }">
           <a class="text-active" :href="row.link" target="_blank">{{ row.title }}</a>

web/src/view/layout/header/index.vue

@@ -123,6 +123,7 @@ const changeUserAuth = async (id) => {
   });
   if (res.code === 0) {
     window.sessionStorage.setItem("needCloseAll", "true");
+    window.sessionStorage.setItem("needToHome", "true");
     window.location.reload();
   }
 };

web/src/view/systemTools/autoCode/index.vue

@@ -293,18 +293,7 @@
             </template>
             <el-checkbox v-model="form.autoCreateMenuToSql" />
           </el-form-item>
-          <el-form-item>
-            <template #label>
-              <el-tooltip
-                content="注：自动迁移生成的文件到yaml配置的对应位置"
-                placement="bottom"
-                effect="light"
-              >
-                <div> 自动移动文件 <el-icon><QuestionFilled /></el-icon></div>
-              </el-tooltip>
-            </template>
-            <el-checkbox v-model="form.autoMoveFile" />
-          </el-form-item>
+
         </div>
       </el-form>
     </div>
@@ -758,7 +747,6 @@ const form = ref({
   businessDB: '',
   autoCreateApiToSql: true,
   autoCreateMenuToSql: true,
-  autoMoveFile: true,
   gvaModel: true,
   autoCreateResource: false,
   fields: []
@@ -935,38 +923,12 @@ const enterForm = async(isPreview) => {
         if (data.headers?.success === 'false') {
           return
         }
-        if (form.value.autoMoveFile) {
           ElMessage({
             type: 'success',
             message: '自动化代码创建成功，自动移动成功'
           })
-          return
-        }
-        ElMessage({
-          type: 'success',
-          message: '自动化代码创建成功，正在下载'
-        })
-        const blob = new Blob([data])
-        const fileName = 'ginvueadmin.zip'
-        if ('download' in document.createElement('a')) {
-          // 不是IE浏览器
-          const url = window.URL.createObjectURL(blob)
-          const link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', fileName)
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link) // 下载完成移除元素
-          window.URL.revokeObjectURL(url) // 释放掉blob对象
-        } else {
-          // IE 10+
-          window.navigator.msSaveBlob(blob, fileName)
-        }
         clearCatch()
       }
-    } else {
-      return false
     }
   })
 }
@@ -1007,7 +969,6 @@ const getColumnFunc = async() => {
     form.value.abbreviation = tbHump
     form.value.description = tbHump + '表'
     form.value.autoCreateApiToSql = true
-    form.value.autoMoveFile = true
     form.value.fields = []
     res.data.columns &&
           res.data.columns.forEach(item => {
@@ -1120,7 +1081,6 @@ const clearCatch = async () => {
     businessDB: '',
     autoCreateApiToSql: true,
     autoCreateMenuToSql: true,
-    autoMoveFile: true,
     gvaModel: true,
     autoCreateResource: false,
     fields: []