From 71ca7370e214fb56738b3c45f0819bd13d6baa9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E5=AD=90-=E6=9D=8E?= <1537080775@qq.com>
Date: Thu, 4 Jul 2024 14:56:42 +0000
Subject: [PATCH] update web/src/utils/columnPermission.ts.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 木子-李 <1537080775@qq.com>
---
 web/src/utils/columnPermission.ts | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/web/src/utils/columnPermission.ts b/web/src/utils/columnPermission.ts
index 4a9d9f1d7..aff14412b 100644
--- a/web/src/utils/columnPermission.ts
+++ b/web/src/utils/columnPermission.ts
@@ -24,31 +24,17 @@ export const handleColumnPermission = async (func: Function, crudOptions: any,ex
 	const columns = crudOptions.columns;
 	const excludeColumns = ['_index','id', 'create_datetime', 'update_datetime'].concat(excludeColumn)
 	for (let col in columns) {
-		if (excludeColumns.includes(col)) {
-			continue
-		}else{
-			if (columns[col].column) {
-				columns[col].column.show = false
-			} else {
-				columns[col]['column'] = {
-					show: false
-				}
-			}
-			columns[col].addForm = {
-				show: false
-			}
-			columns[col].editForm = {
-				show: false
-			}
-		}
-
 		for (let item of res.data) {
 			if (excludeColumns.includes(item.field_name)) {
 				continue
 			} else if(item.field_name === col) {
 				columns[col].column.show = item['is_query']
 				// 如果列表不可见，则禁止在列设置中选择
-				if(!item['is_query'])columns[col].column.columnSetDisabled = true
+                // 只有列表不可见，才修改列配置，这样才不影响默认的配置
+				if(!item['is_query']){
+                    columns[col].column.show = false
+                    columns[col].column.columnSetDisabled = true
+                }
 				columns[col].addForm = {
 					show: item['is_create']
 				}
-- 
Gitee