Merge branch 'main' of http://git.cc-lotus.info/util/web-template-vue3-js into main

src/lang/package/zh-cn/pages.js

@@ -26,5 +26,8 @@ export default {
     configInfo: '功能列表',
     config_zh: '功能说明',
     config_code: '功能编码'
+  },
+  role: {
+    
   }
 }

src/layout/index.vue

@@ -14,8 +14,9 @@
               <el-col :span="24" class="crumb">
                 <component :is="tagsBar"></component>
               </el-col>
+              {{ pagesLoading }}
               <el-col :span="24" class="container" :style="{ padding: '10px' }">
-                <router-view :style="testInfo"></router-view>
+                <router-view :style="viewStyle"></router-view>
               </el-col>
             </el-row>
           </transition>
@@ -31,7 +32,7 @@
 import cHeader from './parts/Header.vue'
 import cAside from './parts/Sidebar.vue'
 import tagsBar from './parts/Tagsbar.vue'
-const testInfo = ref({
+const viewStyle = ref({
   height: '85vh',
   background: '#ffffff',
   'overflow-x': 'hidden',

src/router/guard.js

@@ -2,10 +2,10 @@ import { AxiosWrapper } from '@/utils/axios-wrapper'
 import { checkResult } from '@/utils/checkResult'
 import { UserStore } from '@/store/user'
 import { cloneDeep, omit } from 'lodash-es'
-import NProgress from "nprogress";
-import "nprogress/nprogress.css";
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
 
-NProgress.configure({ showSpinner: false }); // 进度条
+NProgress.configure({ showSpinner: false }) // 进度条
 // 检查路由是否存在
 const hasNecessaryRoute = (to, router) => {
   // 将默认注册的路由平铺成一维数组
@@ -119,7 +119,7 @@ const resetMenus = (menus) => {
 // 注册前置守卫
 export const registerBeforeRouter = async (router) => {
   router.beforeEach(async (to, from, next) => {
-    NProgress.start(); //开启进度条
+    NProgress.start() //开启进度条
     const token = localStorage.getItem('token')
     if (to.path === '/login') {
       next()
@@ -147,9 +147,11 @@ export const registerBeforeRouter = async (router) => {
 // 注册路由后置守卫
 
 export const registerAfterRouter = async (router) => {
-  router.afterEach((to, form) => {
-    if (to.path === '/login') return
+  router.afterEach(async (to, form) => {
+    if (to.path === '/login') {
+      return
+    }
     // 请求该页面的权限
-    NProgress.done(); //完成进度条
+    NProgress.done() //完成进度条
   })
 }

src/store/modules/app.js

@@ -70,6 +70,7 @@ export const useAppStore = defineStore('app', () => {
   function activeTopMenu(val) {
     activeTopMenuPath.value = val
   }
+
   return {
     device,
     sidebar,

src/views/system/role/index.vue

@@ -2,13 +2,18 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
-        <el-col :span="24" class="one"> 角色 </el-col>
+        <el-col :span="24" class="one">
+          <table></table>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script setup>
+import table from './parts/table.vue'
+const data = ref([])
+
 // 加载中
 const loading = ref(false)
 // 请求
@@ -16,5 +21,8 @@ onMounted(async () => {
   loading.value = true
   loading.value = false
 })
+
+// provide
+provide('data', data)
 </script>
 <style scoped lang="scss"></style>

src/views/system/role/parts/table.vue

@@ -0,0 +1,8 @@
+<template>
+  <el-table :data="data"></el-table>
+</template>
+
+<script setup>
+const data = inject('data')
+</script>
+<style scoped></style>