Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

.env.development

@@ -11,5 +11,3 @@ VITE_PROXY = [["","http://192.168.11.11:7011"]]
 VITE_APP_GLOB_BASE_API = ''
 
 VITE_AUTHORITY = 'http://192.168.11.11:8090'
-VITE_CLIENT_ID = 'tuoheng-pilot-admin'
-VITE_CLIENT_SECRET = 'WB0CZ1c6bZLiYP6jLtDFsA=='

.env.localhost

@@ -13,7 +13,7 @@ VITE_APP_GLOB_BASE_API = '/api-local'
 # mock base api
 VITE_APP_GLOB_BASE_API_MOCK = '/api-mock'
 
-#VITE_AUTHORITY = 'http://192.168.11.11:8090'
-VITE_AUTHORITY = 'https://login-test.t-aaron.com'
+VITE_AUTHORITY = 'http://192.168.11.11:8090'
+#VITE_AUTHORITY = 'https://login-test.t-aaron.com'
 VITE_CLIENT_ID = 'tuoheng-pilot-admin'
 VITE_CLIENT_SECRET = 'WB0CZ1c6bZLiYP6jLtDFsA=='

.env.production

@@ -10,6 +10,4 @@ VITE_PROXY = [["","http://127.0.0.1:8002/api"]]
 # base api
 VITE_APP_GLOB_BASE_API = ''
 
-VITE_AUTHORITY = 'https://oidc.t-aaron.com'
-VITE_CLIENT_ID = 'tuoheng-pilot-admin'
-VITE_CLIENT_SECRET = 'WB0CZ1c6bZLiYP6jLtDFsA=='
+VITE_AUTHORITY = 'https://oidc.t-aaron.com'

.env.test

@@ -10,6 +10,4 @@ VITE_PROXY = [["","http://106.15.120.154:9089"]]
 # base api
 VITE_APP_GLOB_BASE_API = ''
 
-VITE_AUTHORITY = 'https://login-test.t-aaron.com'
-VITE_CLIENT_ID = 'tuoheng-pilot-admin'
-VITE_CLIENT_SECRET = 'WB0CZ1c6bZLiYP6jLtDFsA=='
+VITE_AUTHORITY = 'https://login-test.t-aaron.com'

package.json

@@ -40,7 +40,7 @@
     "eslint-plugin-vue": "^8.5.0",
     "esno": "^0.13.0",
     "fs-extra": "^10.0.1",
-    "naive-ui": "^2.27.0",
+    "naive-ui": "^2.34.3",
     "sass": "^1.49.11",
     "unocss": "^0.16.4",
     "unplugin-vue-components": "^0.18.5",

src/layout/components/Header/index.vue

@@ -66,7 +66,6 @@ export default defineComponent({
     }
 
     const getUserInfo = computed(() => {
-      console.log(userStore, '==============')
       return {
         hasLogin: userStore.hasLogin,
         // avatar: userStore.avatar,

src/router/guard/permission-guard.js

@@ -5,11 +5,11 @@ import { getUserInfo, signinRedirect, signoutRedirect } from '@/utils/oidc/index
 
 export function createPermissionGuard(router) {
   const userStore = useUserStore()
-  // userStore.getUserInfos()
   const permissionStore = usePermissionStore()
   router.beforeEach(async(to, from, next) => {
     const oidcUser = await getUserInfo()
     if (oidcUser) {
+      userStore.getUserInfos()
       const hasRoutes = !!permissionStore.permissionRoutes.length
       if (hasRoutes) {
         next()

src/views/system-manage/role-manage/components/AuthModal.vue

@@ -9,7 +9,7 @@
       <n-tabs type="line" animated>
         <n-tab-pane display-directive="show" name="pc" tab="管理端菜单">
           <n-tree
-            v-show="tabsTreeVisible"
+            v-if="tabsTreeVisible"
             ref="adminTreeRef"
             block-line
             cascade
@@ -24,7 +24,7 @@
         </n-tab-pane>
         <n-tab-pane display-directive="show" name="mp" tab="小程序菜单">
           <n-tree
-            v-show="tabsTreeVisible"
+            v-if="tabsTreeVisible"
             ref="miniTreeRef"
             block-line
             cascade
@@ -92,6 +92,7 @@ export default defineComponent({
     })
 
     function handleConfirm() {
+      console.log(adminTreeRef.value, miniTreeRef.value)
       const adminCheckedData = adminTreeRef.value.getCheckedData()
       const adminIndeterminateData = adminTreeRef.value.getIndeterminateData()
       const miniCheckedData = miniTreeRef.value.getCheckedData()