refactor: 检测目前所有菜单权限

web/src/views/system/role/crud.tsx

@@ -3,7 +3,7 @@ import * as api from './api';
 import { dictionary } from '/@/utils/dictionary';
 import { columnPermission } from '../../../utils/columnPermission';
 import { successMessage } from '../../../utils/message';
-
+import {auth} from '/@/utils/authFunction'
 interface CreateCrudOptionsTypes {
 	output: any;
 	crudOptions: CrudOptions;
@@ -14,12 +14,10 @@ export const createCrudOptions = function ({
 	crudExpose,
 	rolePermission,
 	handleDrawerOpen,
-	hasPermissions,
 }: {
 	crudExpose: CrudExpose;
 	rolePermission: any;
 	handleDrawerOpen: Function;
-	hasPermissions: Function;
 }): CreateCrudOptionsTypes {
 	const pageRequest = async (query: any) => {
 		return await api.GetList(query);
@@ -50,7 +48,7 @@ export const createCrudOptions = function ({
 			actionbar: {
 				buttons: {
 					add: {
-						show: hasPermissions('role:Create')
+						show: auth('role:Create')
 					}
 				}
 			},
@@ -63,31 +61,15 @@ export const createCrudOptions = function ({
 						show: true,
 					},
 					edit: {
-						show: hasPermissions('role:Update'),
+						show: auth('role:Update'),
 					},
 					remove: {
-						show: hasPermissions('role:Delete'),
+						show: auth('role:Delete'),
 					},
-					/* custom: {
+					permission: {
 						type: 'primary',
 						text: '权限配置',
-						show: hasPermissions('role:Update'),
-						tooltip: {
-							placement: 'top',
-							content: '权限配置',
-						},
-						click: (context: any): void => {
-							const { row } = context;
-							// eslint-disable-next-line no-mixed-spaces-and-tabs
-							rolePermission.value.drawer = true;
-							rolePermission.value.editedRoleInfo = row;
-							rolePermission.value.initGet();
-						},
-					}, */
-					customNew: {
-						type: 'primary',
-						text: '权限配置',
-						show: hasPermissions('role:Update'),
+						show: auth('role:Permission'),
 						tooltip: {
 							placement: 'top',
 							content: '权限配置',
@@ -134,9 +116,9 @@ export const createCrudOptions = function ({
 						sortable: 'custom',
 						show: columnPermission('name', 'is_query'),
 					},
-					addForm: {
-						show: columnPermission('name', 'is_create'),
-					},
+					// addForm: {
+					// 	show: columnPermission('name', 'is_create'),
+					// },
 					editForm: {
 						show: columnPermission('name', 'is_update'),
 					},
@@ -177,7 +159,6 @@ export const createCrudOptions = function ({
 					column: {
 						minWidth: 90,
 						sortable: 'custom',
-						show: columnPermission('sort', 'is_query'),
 					},
 					addForm: {
 						show: columnPermission('sort', 'is_create'),

web/src/views/system/role/index.vue

@@ -13,13 +13,14 @@
 </template>
 
 <script lang="ts" setup name="role">
-import { ref, onMounted, inject } from 'vue';
+import {ref, onMounted, inject, onBeforeUpdate} from 'vue';
 import { useColumnPermission } from '/@/stores/columnPermission';
 import { GetPermission } from './api';
 import { useExpose, useCrud } from '@fast-crud/fast-crud';
 import { createCrudOptions } from './crud';
 import PermissionComNew from './components/PermissionComNew/index.vue';
-
+import _ from "lodash-es";
+import {columnPermission} from "/@/utils/columnPermission";
 let drawerVisible = ref(false);
 let roleId = ref(null);
 let roleName = ref(null);
@@ -30,11 +31,11 @@ const crudRef = ref();
 // crud 配置的ref
 const crudBinding = ref();
 
-const hasPermissions: any = inject('$hasPermissions');
 
 const fetchColumnPermission = async () => {
 	const res = await GetPermission();
 	useColumnPermission().setPermissionData(res.data);
+  console.log(3333,res)
 };
 
 const handleDrawerOpen = (row: any) => {
@@ -48,21 +49,51 @@ const handleDrawerClose = () => {
 };
 
 const { crudExpose } = useExpose({ crudRef, crudBinding });
+const handlecolumnPermission = async (crudOptions:any)=>{
+  const res = await GetPermission();
+  const columns = crudOptions.columns;
+  for(let col in columns){
+    for(let i in res.data){
+      if(res.data[i].field_name === col){
+        columns[col].column.show = i['is_query']
+        columns[col].addForm = {
+          show:i['is_create']
+        }
+        columns[col].editForm = {
+          show:i['is_update']
+        }
+        break;
+      }
+    }
+  }
+}
+
+// 你的crud配置
+const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDrawerOpen });
+
+
 
 // 页面打开后获取列表数据
-onMounted(async () => {
-	await fetchColumnPermission();
-
-	// 你的crud配置
-	const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDrawerOpen, hasPermissions });
-
-	// 初始化crud配置
-	const { resetCrudOptions } = useCrud({
-		crudExpose,
-		crudOptions,
-		context: {},
-	});
+onMounted( async () => {
 
+  await handlecolumnPermission(crudOptions)
+  // //合并新的crudOptions
+  // const newOptions = _.merge(crudOptions, {
+  //   columns: {
+  //     text: {
+  //       title: "追加字段",
+  //       type: "text"
+  //     }
+  //   }
+  // });
+  //重置crudBinding
+  // resetCrudOptions(newOptions);
+// 初始化crud配置
+  const { resetCrudOptions } = useCrud({
+    crudExpose,
+    crudOptions,
+    context: {},
+  });
 	crudExpose.doRefresh();
 });