From 65f74a05a6e32bc98b7d92c9d00db0ca9ac5db41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 26 Nov 2023 01:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E9=92=88?=
 =?UTF-8?q?=E5=AF=B9=E8=8F=9C=E5=8D=95=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AD=97=E5=85=B8=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/sys/resource/menu/form.vue      | 15 ++----
 .../src/views/sys/resource/menu/index.vue     | 46 ++++++++++++-------
 .../user/service/impl/SysUserServiceImpl.java |  2 +-
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/snowy-admin-web/src/views/sys/resource/menu/form.vue b/snowy-admin-web/src/views/sys/resource/menu/form.vue
index 007c11c5..b15765f0 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/form.vue
@@ -157,12 +157,12 @@
 			formData.value = record
 			// 因为版本升级后该字段无参数，所以默认为可见
 			if (!record.visible) {
-				formData.value.visible = 'true'
+				formData.value.visible = 'TRUE'
 			}
 		} else {
 			formData.value = {
 				menuType: 'MENU',
-				visible: 'true',
+				visible: 'TRUE',
 				sortCode: 99
 			}
 			formData.value = Object.assign(formData.value, record)
@@ -219,16 +219,7 @@
 	}
 
 	const categoryOptions = tool.dictList('MENU_TYPE')
-	const visibleOptions = [
-		{
-			label: '显示',
-			value: 'true'
-		},
-		{
-			label: '隐藏',
-			value: 'false'
-		}
-	]
+	const visibleOptions = tool.dictList('MENU_VISIBLE')
 	// 验证并提交数据
 	const onSubmit = () => {
 		formRef.value
diff --git a/snowy-admin-web/src/views/sys/resource/menu/index.vue b/snowy-admin-web/src/views/sys/resource/menu/index.vue
index 70837e56..70c93c1e 100644
--- a/snowy-admin-web/src/views/sys/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/sys/resource/menu/index.vue
@@ -35,7 +35,7 @@
 		>
 			<template #operator class="table-operator">
 				<a-space>
-					<a-button type="primary" @click="form.onOpen(undefined, moduleType)">
+					<a-button type="primary" @click="formRef.onOpen(undefined, moduleType)">
 						<template #icon><plus-outlined /></template>
 						新增菜单
 					</a-button>
@@ -68,9 +68,22 @@
 						{{ $TOOL.dictTypeData('MENU_TYPE', record.menuType) }}
 					</a-tag>
 				</template>
+				<template v-if="column.dataIndex === 'visible'">
+					<a-tag v-if="record.visible === 'FALSE'">
+						{{ $TOOL.dictTypeData('MENU_VISIBLE', record.visible) }}
+					</a-tag>
+					<a-tag v-else color="green">
+						<span v-if="record.visible === 'TRUE'">
+							{{ $TOOL.dictTypeData('MENU_VISIBLE', record.visible) }}
+						</span>
+						<span v-else>
+							显示
+						</span>
+					</a-tag>
+				</template>
 				<template v-if="column.dataIndex === 'action'">
 					<a-space>
-						<a @click="form.onOpen(record, moduleType)">编辑</a>
+						<a @click="formRef.onOpen(record, moduleType)">编辑</a>
 						<a-divider type="vertical" />
 						<a-popconfirm title="确定要删除此菜单吗？" @confirm="deleteMenu(record)">
 							<a-button type="link" danger size="small">删除</a-button>
@@ -88,7 +101,7 @@
 											<a @click="changeModuleFormRef.onOpen(record)">更改模块</a>
 										</a-menu-item>
 										<a-menu-item v-if="record.menuType === 'MENU'">
-											<a @click="button.onOpen(record)">按钮权限</a>
+											<a @click="buttonRef.onOpen(record)">按钮权限</a>
 										</a-menu-item>
 									</a-menu>
 								</template>
@@ -99,7 +112,7 @@
 			</template>
 		</s-table>
 	</a-card>
-	<Form ref="form" @successful="table.refresh(true)" />
+	<Form ref="formRef" @successful="table.refresh(true)" />
 	<changeModuleForm ref="changeModuleFormRef" @successful="table.refresh(true)" />
 	<Button ref="button" />
 </template>
@@ -107,16 +120,15 @@
 <script setup name="sysMenu">
 	import menuApi from '@/api/sys/resource/menuApi'
 	import Form from './form.vue'
-	import changeModuleForm from './changeModuleForm.vue'
+	import ChangeModuleForm from './changeModuleForm.vue'
 	import Button from '../button/index.vue'
 	let searchFormState = reactive({})
 	const table = ref(null)
-	let form = ref()
-	let changeModuleFormRef = ref()
-	let button = ref()
-	let field = ref()
+	const formRef = ref()
+	const changeModuleFormRef = ref()
+	const buttonRef = ref()
 	const moduleType = ref()
-	let moduleTypeList = ref([])
+	const moduleTypeList = ref([])
 	const toolConfig = { refresh: true, height: true, columnSetting: false, striped: false }
 	const columns = [
 		{
@@ -130,7 +142,8 @@
 		},
 		{
 			title: '类型',
-			dataIndex: 'menuType'
+			dataIndex: 'menuType',
+			width: 100
 		},
 		{
 			title: '路由地址',
@@ -145,14 +158,13 @@
 			width: 150
 		},
 		{
-			title: '排序',
-			dataIndex: 'sortCode',
-			sorter: true
+			title: '是否可见',
+			dataIndex: 'visible',
+			width: 100
 		},
 		{
-			title: '创建时间',
-			dataIndex: 'createTime',
-			ellipsis: true,
+			title: '排序',
+			dataIndex: 'sortCode',
 			sorter: true
 		},
 		{
diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
index 8d22758c..f879079d 100644
--- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
@@ -693,7 +693,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (!sysMenu.getMenuType().equals(SysResourceMenuTypeEnum.CATALOG.getValue())) {
                     metaJsonObject.set("type", sysMenu.getMenuType().toLowerCase());
                     // 如果设置了不可见，那么设置为false，为了兼容已有，所以只是false的为不显示
-                    if (ObjectUtil.isNotEmpty(sysMenu.getVisible()) && sysMenu.getVisible().equals("false")) {
+                    if (ObjectUtil.isNotEmpty(sysMenu.getVisible()) && sysMenu.getVisible().equals("FALSE")) {
                         metaJsonObject.set("hidden", true);
                     }
                 }