update

src/packages/pc/router/index.ts

@@ -45,8 +45,12 @@ const routes: Array<RouteRecordRaw> = [
             title: '初始化',
             keepAlive: false
         },
-    },
-    {
+    }
+]
+
+// 开发环境
+if (process.env.NODE_ENV === 'development') {
+    routes.push({
         path: '/router',
         name: 'router',
         component: () => import('../components/layouts/page/index.vue'),
@@ -65,8 +69,8 @@ const routes: Array<RouteRecordRaw> = [
                 }
             }
         ]
-    }
-]
+    })
+}
 
 const router = historyRouter.create({
     history: createWebHashHistory(),

src/packages/pc/views/member/institution/role/components/details/index.vue

@@ -24,6 +24,7 @@ import { ref, PropType } from 'vue'
 import { ElMessage } from 'element-plus'
 import { handleNoneValue } from '@/filters'
 import { useRequest } from '@/hooks/request'
+import { useEnum } from '@/hooks/enum'
 import { queryDetail } from '@/services/api/admin'
 import { getAllMenus } from '@/services/api/user'
 import { i18n } from '@/stores'
@@ -38,6 +39,8 @@ const props = defineProps({
     }
 })
 
+const roleTypeEnum = useEnum('roleType') // 角色名称
+
 const { global: { t } } = i18n
 const filteredRoutes = ref<Model.MenusRsp[]>([])
 const show = ref(true)
@@ -97,7 +100,7 @@ const { data, loading } = useRequest(queryDetail, {
 })
 
 const detailProps: CellProp[] = [
-    { prop: 'rolename', label: 'admin.role.edit.rolename' },
+    { prop: 'autoid', label: 'admin.role.edit.rolename', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
     { prop: 'sensitivefields', label: 'admin.role.edit.sensitivefields' },
     { prop: 'menuids', label: 'admin.role.edit.menuids' },
 ]

src/packages/pc/views/member/institution/role/index.vue

@@ -53,7 +53,7 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryR
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'autoid', label: 'member.institution.role.rolename' , formatValue: (val) => roleTypeEnum.getEnumTypeName(val)},
+    { field: 'autoid', label: 'member.institution.role.rolename', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
     { field: 'modifiername', label: 'member.institution.role.modifiername' },
     { field: 'modifytime', label: 'member.institution.role.modifytime' },
     { field: 'rolestatus', label: 'member.institution.role.rolestatus', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },

src/packages/pc/views/system/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-view>
-        <app-table ref="tableRef" :data="routerStore.userRoutes" v-model:columns="columns" row-key="resourceCode">
+        <app-table ref="tableRef" :data="dataList" v-model:columns="columns" row-key="resourceCode">
             <template #headerLeft>
                 <div>
                     <el-button icon="Plus" @click="showComponent('edit')">新增</el-button>
@@ -15,15 +15,16 @@
                 <el-button size="small" icon="Delete" circle @click="showComponent('delete', row)" />
             </template>
         </app-table>
-        <component ref="componentRef" v-bind="{ record }" :is="componentMap.get(componentId)"
-            @closed="closeComponent" v-if="componentId" />
+        <component ref="componentRef" v-bind="{ record }" :is="componentMap.get(componentId)" @closed="closeComponent"
+            v-if="componentId" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
-import { useRouterStore } from '@/stores'
+import { useRequest } from '@/hooks/request'
+import { getAllMenus } from '@/services/api/user'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -31,14 +32,13 @@ const componentMap = new Map<string, unknown>([
     ['delete', defineAsyncComponent(() => import('./components/delete/index.vue'))], // 删除
 ])
 
-const routerStore = useRouterStore()
 const record = shallowRef<Model.MenusRsp>()
 const tableRef = shallowRef()
 const isRowExpansion = shallowRef(false)
 
-const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
-    routerStore.getUserRoutes()
-})
+const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run())
+
+const { dataList, run } = useRequest(getAllMenus)
 
 const columns = shallowRef([
     { field: 'title', label: '菜单', align: 'left' },
@@ -67,6 +67,6 @@ const tableExpandAll = () => {
         })
     }
 
-    toggleRowExpansionAll(routerStore.userRoutes)
+    toggleRowExpansionAll(dataList.value)
 }
 </script>