fix some already know issue

Author: jzfai

README.md

@@ -27,7 +27,6 @@ The framework is available in js,ts, plus and electron versions
 - js version：[vue3-admin-template](https://github.com/jzfai/vue3-admin-template.git) -- basic version
 - ts version：[vue3-element-ts](https://github.com/jzfai/vue3-admin-ts.git)
 - ts version for plus：[vue3-element-plus](https://github.com/jzfai/vue3-admin-plus.git)
-- java Micro-service background data：[micro-service-plus](https://github.com/jzfai/micro-service-plus)
 
 
 ## Build Setup

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-admin-electron",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "license": "ISC",
   "author": "kuanghua(869653722@qq.com)",
   "scripts": {

src/hooks/use-error-log.ts

@@ -3,11 +3,13 @@ import { jsErrorCollection } from 'js-error-collection'
 import pack from '../../package.json'
 import settings from '@/settings'
 import bus from '@/utils/bus'
-import axiosReq from '@/utils/axios-req'
+//此处不要使用utils下的axios
+import axiosReq from 'axios'
 const reqUrl = '/integration-front/errorCollection/insert'
+let repeatErrorLogJudge = ''
 const errorLogReq = (errLog: string) => {
   axiosReq({
-    url: reqUrl,
+    url: import.meta.env.VITE_APP_BASE_URL+reqUrl,
     data: {
       pageUrl: window.location.href,
       errorLog: errLog,
@@ -25,8 +27,11 @@ export const useErrorLog = () => {
   //判断该环境是否需要收集错误日志,由settings配置决定
   if (settings.errorLog?.includes(import.meta.env.VITE_APP_ENV)) {
     jsErrorCollection({ runtimeError: true, rejectError: true, consoleError: true }, (errLog) => {
-      //判断是否是reqUrl错误，避免死循环
-      if (!errLog.includes(reqUrl)) errorLogReq(errLog)
+      if (!repeatErrorLogJudge || !errLog.includes(repeatErrorLogJudge)) {
+        errorLogReq(errLog)
+        //移除重复日志，fix重复提交错误日志，避免造成死循环
+        repeatErrorLogJudge = errLog.slice(0, 20)
+      }
     })
   }
 }

src/hooks/use-permission.ts

@@ -16,7 +16,7 @@ import router, { asyncRoutes, constantRoutes, roleCodeRoutes } from '@/router'
 import 'nprogress/nprogress.css'
 import { useBasicStore } from '@/store/basic'
 
-const buttonCodes: Array<number> = [] //按钮权限
+const buttonCodes: Array<Number> = [] //按钮权限
 interface menuRow {
   category: number
   code: number

src/layout/app-main/TagsView.vue

@@ -219,7 +219,7 @@ const { visible, top, left, selectedTag } = toRefs(state)
   height: var(--tag-view-height);
   width: 100%;
   background: var(--tags-view-background);
-  border-bottom: 1px solid var(--tags-view-border-bottom-color);
+  border-bottom: 1px solid var(--tags-view-border-bottom);
   box-shadow: var(--tags-view-box-shadow);
   .tags-view-wrapper {
     .tags-view-item {

src/layout/app-main/index.vue

@@ -31,16 +31,35 @@ const key = computed(() => route.path)
 // leaveRmCachePage: is true, keep-alive remote when page leave
 let oldRoute: rawConfig = {}
 let deepOldRouter: RouteLocationMatched | null = null
+let cacheGroup: any = []
 const basicStore = useBasicStore()
 const removeDeepChildren = (deepOldRouter) => {
   deepOldRouter.children?.forEach((fItem) => {
-    basicStore.setCacheViewDeep(fItem.name)
+    basicStore.delCacheViewDeep(fItem.name)
   })
 }
 watch(
   () => route.name,
   () => {
     const routerLevel = route.matched.length
+
+    //缓存组处理
+    //first judge cacheGroup and then  remove
+    if (cacheGroup.length) {
+      if (!cacheGroup.includes(route.name)) {
+        cacheGroup.forEach((item) => {
+          basicStore.delCachedView(item)
+        })
+      }
+    }
+    //and then cache the current router config page
+    if (route.meta?.cacheGroup) {
+      cacheGroup = route.meta?.cacheGroup || []
+      cacheGroup.forEach((fItem) => {
+        basicStore.addCachedView(fItem)
+      })
+    }
+
     //二级路由处理
     if (routerLevel === 2) {
       if (deepOldRouter?.name) {
@@ -81,7 +100,7 @@ watch(
         //否则走正常两级路由处理流程
         if (oldRoute?.name) {
           if (oldRoute.meta?.leaveRmCachePage && oldRoute.meta?.cachePage) {
-            basicStore.setCacheViewDeep(oldRoute.name)
+            basicStore.delCacheViewDeep(oldRoute.name)
           }
         }
       }

src/layout/sidebar/index.vue

@@ -25,8 +25,9 @@ import Logo from './Logo.vue'
 import SidebarItem from './SidebarItem.vue'
 import { useBasicStore } from '@/store/basic'
 const { settings, allRoutes, sidebar } = storeToRefs(useBasicStore())
-const { meta, path } = useRoute()
+const routeInstance = useRoute()
 const activeMenu = computed(() => {
+  const { meta, path } = routeInstance
   // if set path, the sidebar will highlight the path you set
   if (meta.activeMenu) {
     return meta.activeMenu
@@ -39,4 +40,7 @@ const activeMenu = computed(() => {
 .el-menu-vertical {
   width: var(--side-bar-width);
 }
+.reset-menu-style{
+  border-right: 1px solid var(--side-bar-border-right-color);
+}
 </style>

src/permission.ts

@@ -3,6 +3,7 @@ import { filterAsyncRouter, progressClose, progressStart } from '@/hooks/use-per
 import { useBasicStore } from '@/store/basic'
 import { userInfoReq } from '@/api/user'
 import { langTitle } from '@/hooks/use-common'
+import settings from "@/settings";
 
 //路由进入前拦截
 //to:将要进入的页面 vue-router4.0 不推荐使用next()
@@ -11,6 +12,11 @@ router.beforeEach(async (to) => {
   progressStart()
   document.title = langTitle(to.meta?.title) // i18 page title
   const basicStore = useBasicStore()
+  //not login
+  if (!settings.isNeedLogin) {
+    basicStore.setFilterAsyncRoutes([])
+    return true
+  }
   //1.判断token
   if (basicStore.token) {
     if (to.path === '/login') {

src/router/index.ts

@@ -56,7 +56,7 @@ export const constantRoutes: RouterTypes = [
     component: Layout,
     children: [
       {
-        path: 'https://github.jzfai.top/low-code-platform/#/permission-center/user-table-query',
+        path: 'https://github.jzfai.top/low-code-plateform',
         meta: { title: 'RBAC', icon: 'skill' }
       }
     ]

src/store/basic.ts

@@ -102,7 +102,7 @@ export const useBasicStore = defineStore('basic', {
         state.cachedViewsDeep.push(view)
       })
     },
-    setCacheViewDeep(view) {
+    delCacheViewDeep(view) {
       this.$patch((state) => {
         const index = state.cachedViewsDeep.indexOf(view)
         index > -1 && state.cachedViewsDeep.splice(index, 1)