From a901e2a4ff67123d4d959467df73a4cd7be7969d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Sun, 5 Feb 2023 03:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=88=E6=9D=83=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=97=A0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AD=89=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mobile/resource/button/form.vue |  4 --
 .../src/views/mobile/resource/menu/form.vue   |  9 +++--
 .../src/views/mobile/resource/menu/index.vue  | 39 +++++++++----------
 .../src/views/mobile/resource/module/form.vue |  4 +-
 .../views/mobile/resource/module/index.vue    |  6 +++
 .../service/impl/MobileMenuServiceImpl.java   |  5 +--
 6 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/snowy-admin-web/src/views/mobile/resource/button/form.vue b/snowy-admin-web/src/views/mobile/resource/button/form.vue
index dd2d07b0..cfb1ebfe 100644
--- a/snowy-admin-web/src/views/mobile/resource/button/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/button/form.vue
@@ -48,13 +48,11 @@
 		formRef.value.resetFields()
 		visible = false
 	}
-
 	// 默认要校验的
 	const formRules = {
 		title: [required('请输入按钮名称')],
 		code: [required('请输入按钮编码')]
 	}
-
 	// 验证并提交数据
 	const onSubmit = () => {
 		formRef.value
@@ -62,7 +60,6 @@
 			.then(() => {
 				const defParam = {
 					category: 'BUTTON',
-					// module: recordData.value.module,
 					parentId: recordData.value.id
 				}
 				const param = Object.assign(defParam, formData.value)
@@ -72,7 +69,6 @@
 				})
 			})
 	}
-
 	// 调用这个函数将子组件的一些数据和方法暴露出去
 	defineExpose({
 		onOpen
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/form.vue b/snowy-admin-web/src/views/mobile/resource/menu/form.vue
index 0f9e0003..a68b4537 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/form.vue
@@ -1,7 +1,7 @@
 <template>
     <a-drawer
         :title="formData.id ? '编辑移动端菜单' : '增加移动端菜单'"
-        :width="500"
+        :width="600"
         :visible="visible"
         :destroy-on-close="true"
         :footer-style="{ textAlign: 'right' }"
@@ -73,19 +73,18 @@
             <a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
             <a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
         </template>
-<!--		<Icon-selector ref="iconSelector" @iconCallBack="iconCallBack" />-->
 		<icon-mobile-selector ref="iconSelector" @iconCallBack="iconCallBack" />
     </a-drawer>
 </template>
 
 <script setup name="mobileMenuForm">
     import tool from '@/utils/tool'
+	import { message } from 'ant-design-vue'
 	import SnowflakeId from 'snowflake-id'
     import { cloneDeep } from 'lodash-es'
     import { required } from '@/utils/formRules'
     import mobileMenuApi from '@/api/mobile/resource/menuApi'
 	import ColorPicker from '@/components/ColorPicker/index.vue'
-	// import IconSelector from '@/components/Selector/iconSelector.vue'
 	import IconMobileSelector from '@/components/Selector/iconMobileSelector.vue'
     // 抽屉状态
     const visible = ref(false)
@@ -122,6 +121,10 @@
 
     // 打开抽屉
     const onOpen = (record, module) => {
+		if (!module) {
+			message.warning('请先添加菜单所属模块')
+			return
+		}
 		moduleId.value = module
         visible.value = true
 		// 设置默认的
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/index.vue b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
index 1b428917..baffbfa7 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
@@ -1,6 +1,7 @@
 <template>
-    <a-card :bordered="false">
-		<a-space class="mb-3">
+	<a-card :bordered="false" :body-style="{ 'padding-bottom': '0px' }" class="mb-2">
+		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
+			<a-space style="align-items: normal">
 			<a-radio-group v-model:value="module" button-style="solid">
 				<a-radio-button
 					v-for="module in moduleList"
@@ -12,15 +13,17 @@
 					{{ module.title }}</a-radio-button
 				>
 			</a-radio-group>
-
-			<a-input-search
-				v-model:value="searchFormState.searchKey"
-				placeholder="请输入菜单名称关键词"
-				enter-button
-				allowClear
-				@search="onSearch"
-			/>
-		</a-space>
+			<a-form-item name="searchKey">
+				<a-space>
+					<a-input v-model:value="searchFormState.searchKey" placeholder="请输入模块名称关键词"></a-input>
+					<a-button type="primary" @click="table.refresh(true)">查询</a-button>
+					<a-button style="margin: 0 8px" @click="() => searchFormRef.resetFields()">重置</a-button>
+				</a-space>
+			</a-form-item>
+			</a-space>
+		</a-form>
+	</a-card>
+    <a-card :bordered="false">
 		<s-table
             ref="table"
             :columns="columns"
@@ -47,8 +50,9 @@
 					<span v-else>{{record.path}}</span>
 				</template>
 				<template v-if="column.dataIndex === 'icon'">
-<!--					<component :is="record.icon" />-->
-					<span class="snowy xn-icons" :class="record.icon" ></span>
+					<a-tag :color="record.color">
+						<span class="snowy xn-icons" :class="record.icon" ></span>
+					</a-tag>
 				</template>
                 <template v-if="column.dataIndex === 'regType'">
                     {{ $TOOL.dictTypeData('MOBILE_REG_TYPE', record.regType) }}
@@ -101,9 +105,9 @@
     let searchFormState = reactive({})
 	let moduleList = ref([])
 	const module = ref()
-    const searchFormRef = ref()
     const table = ref()
     const formRef = ref()
+	const searchFormRef = ref()
 	const changeModuleFormRef = ref()
 	const button = ref()
     const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
@@ -184,13 +188,6 @@
 		searchFormState.module = value
 		table.value.refresh(true)
 	}
-
-	// 查询
-	const onSearch = () => {
-		if (searchFormState.searchKey) {
-			table.value.refresh(true)
-		}
-	}
     // 删除
     const deleteMobileMenu = (record) => {
         let params = [
diff --git a/snowy-admin-web/src/views/mobile/resource/module/form.vue b/snowy-admin-web/src/views/mobile/resource/module/form.vue
index e18947b7..46fc8072 100644
--- a/snowy-admin-web/src/views/mobile/resource/module/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/module/form.vue
@@ -27,7 +27,7 @@
 			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
 			<a-button type="primary" @click="onSubmit">保存</a-button>
 		</template>
-		<Icon-selector ref="iconSelector" @iconCallBack="iconCallBack" />
+		<icon-mobile-selector ref="iconSelector" @iconCallBack="iconCallBack" />
 	</a-drawer>
 </template>
 
@@ -35,7 +35,7 @@
 	import ColorPicker from '@/components/ColorPicker/index.vue'
 	import { required } from '@/utils/formRules'
 	import moduleApi from '@/api/mobile/resource/moduleApi'
-	import IconSelector from '@/components/Selector/iconSelector.vue'
+	import IconMobileSelector from '@/components/Selector/iconMobileSelector.vue'
 	// 默认是关闭状态
 	let visible = $ref(false)
 	const emit = defineEmits({ successful: null })
diff --git a/snowy-admin-web/src/views/mobile/resource/module/index.vue b/snowy-admin-web/src/views/mobile/resource/module/index.vue
index 6c822557..e8fec158 100644
--- a/snowy-admin-web/src/views/mobile/resource/module/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/module/index.vue
@@ -110,6 +110,12 @@
 			return res
 		})
 	}
+	// 查询
+	const onSearch = () => {
+		if (searchFormState.searchKey) {
+			table.value.refresh(true)
+		}
+	}
 	// 删除
 	const deleteModule = (record) => {
 		let params = [
diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
index 1fbd871d..cfb7ea3a 100644
--- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
+++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java
@@ -206,7 +206,6 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
     @Override
     public List<JSONObject> mobileMenuTreeSelector() {
         LambdaQueryWrapper<MobileMenu> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.in(MobileMenu::getCategory, MobileResourceCategoryEnum.MODULE.getValue(), MobileResourceCategoryEnum.MENU.getValue());
         List<MobileMenu> allModuleAndMenuList = this.list(lambdaQueryWrapper);
         List<MobileMenu> mobileModuleList = CollectionUtil.newArrayList();
         List<MobileMenu> mobileMenuList = CollectionUtil.newArrayList();
@@ -218,7 +217,7 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
         allModuleAndMenuList.forEach(mobileMenu -> {
             if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MODULE.getValue())) mobileModuleList.add(mobileMenu);
             if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.MENU.getValue())) mobileMenuList.add(mobileMenu);
-            if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.BUTTON.getValue())) mobileMenuList.add(mobileMenu);
+            if (mobileMenu.getCategory().equals(MobileResourceCategoryEnum.BUTTON.getValue())) mobileButtonList.add(mobileMenu);
         });
         List<JSONObject> leafMenuList = CollectionUtil.newArrayList();
         List<TreeNode<String>> treeNodeList = mobileMenuList.stream().map(mobileMenu ->
@@ -404,7 +403,7 @@ public class MobileMenuServiceImpl extends ServiceImpl<MobileMenuMapper, MobileM
             }
         }
     }
-    
+
     @Override
     public List<MobileMenu> getChildListById(List<MobileMenu> originDataList, String id, boolean includeSelf) {
         List<MobileMenu> resultList = CollectionUtil.newArrayList();