From 95b14e5a4260c0ac6c95a7d1a634eef7c94a9356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 3 Dec 2023 22:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=201.?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E6=9D=83=E9=99=90;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/role/index.vue | 44 ++++-------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index 658a7b6..98d7261 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -14,13 +14,13 @@
 
 <script lang="ts" setup name="role">
 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";
+import {handleColumnPermission} from "/@/utils/columnPermission";
 let drawerVisible = ref(false);
 let roleId = ref(null);
 let roleName = ref(null);
@@ -32,12 +32,6 @@ const crudRef = ref();
 const crudBinding = ref();
 
 
-const fetchColumnPermission = async () => {
-	const res = await GetPermission();
-	useColumnPermission().setPermissionData(res.data);
-  console.log(3333,res)
-};
-
 const handleDrawerOpen = (row: any) => {
 	roleId.value = row.id;
 	roleName.value = row.name;
@@ -49,24 +43,6 @@ 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 });
@@ -76,24 +52,16 @@ const { crudOptions } = createCrudOptions({ crudExpose, rolePermission, handleDr
 // 页面打开后获取列表数据
 onMounted( async () => {
 
-  await handlecolumnPermission(crudOptions)
-  // //合并新的crudOptions
-  // const newOptions = _.merge(crudOptions, {
-  //   columns: {
-  //     text: {
-  //       title: "追加字段",
-  //       type: "text"
-  //     }
-  //   }
-  // });
-  //重置crudBinding
-  // resetCrudOptions(newOptions);
+  const newOptions = await handleColumnPermission(GetPermission,crudOptions)
+
 // 初始化crud配置
   const { resetCrudOptions } = useCrud({
     crudExpose,
     crudOptions,
     context: {},
   });
+  //重置crudBinding
+  resetCrudOptions(newOptions);
 	crudExpose.doRefresh();
 });