From a2ac82a1e8111cecc4c31941aaac689c7a41436e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Wed, 1 Feb 2023 01:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8F=9C=E7=9A=84=E8=B7=9F?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/mobile/resource/menuApi.js        |   4 +
 .../mobile/resource/menu/changeModuleForm.vue |  92 +++++++++++
 .../src/views/mobile/resource/menu/form.vue   | 144 +++++++++++-------
 .../src/views/mobile/resource/menu/index.vue  |  40 +++--
 4 files changed, 214 insertions(+), 66 deletions(-)
 create mode 100644 snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue

diff --git a/snowy-admin-web/src/api/mobile/resource/menuApi.js b/snowy-admin-web/src/api/mobile/resource/menuApi.js
index 21fe4bfb..dbe70aa5 100644
--- a/snowy-admin-web/src/api/mobile/resource/menuApi.js
+++ b/snowy-admin-web/src/api/mobile/resource/menuApi.js
@@ -21,6 +21,10 @@ export default {
 	mobileMenuSubmitForm(data, edit = false) {
 		return request(edit ? 'add' : 'edit', data)
 	},
+	// 更改菜单所属模块
+	mobileMenuChangeModule(data) {
+		return request('changeModule', data)
+	},
 	// 删除移动端菜单
 	mobileMenuDelete(data) {
 		return request('delete', data)
diff --git a/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue b/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue
new file mode 100644
index 00000000..0be63dc3
--- /dev/null
+++ b/snowy-admin-web/src/views/mobile/resource/menu/changeModuleForm.vue
@@ -0,0 +1,92 @@
+<template>
+	<a-drawer
+		title="更改模块"
+		:width="500"
+		:visible="visible"
+		:destroy-on-close="true"
+		:body-style="{ paddingBottom: '80px' }"
+		:footer-style="{ textAlign: 'right' }"
+		@close="onClose"
+	>
+		<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+			<a-form-item label="显示名称：" name="title">
+				<span>{{formData.title}}</span>
+			</a-form-item>
+			<a-form-item label="所属目录：" name="module" v-if="formData.parentId === '0'" >
+				<a-radio-group v-model:value="formData.module" button-style="solid">
+					<a-radio-button
+						v-for="module in moduleTypeList"
+						:key="module.id"
+						:value="module.id"
+					>
+						<component :is="module.icon" />
+						{{ module.title }}</a-radio-button
+					>
+				</a-radio-group>
+			</a-form-item>
+
+		</a-form>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+			<a-button type="primary" :loading="submitLoading" @click="onSubmit">保存</a-button>
+		</template>
+	</a-drawer>
+</template>
+
+<script setup>
+	import { required } from '@/utils/formRules'
+	import tool from '@/utils/tool'
+	import mobileMenuApi from '@/api/mobile/resource/menuApi'
+	import { getCurrentInstance } from 'vue'
+	// 默认是关闭状态
+	let visible = $ref(false)
+	const emit = defineEmits({ successful: null })
+	const formRef = ref()
+	// 表单数据，也就是默认给一些数据
+	const formData = ref({})
+	const submitLoading = ref(false)
+	const moduleTypeList = ref([])
+	// 打开抽屉
+	const onOpen = (record) => {
+		visible = true
+		if (record) {
+			formData.value = Object.assign({}, record)
+		}
+		// 获取模块列表
+		mobileMenuApi.mobileMenuModuleSelector().then((data) => {
+			moduleTypeList.value = data
+		})
+	}
+	// 关闭抽屉
+	const onClose = () => {
+		formRef.value.resetFields()
+		visible = false
+	}
+	// 默认要校验的
+	const formRules = {
+		module: [required('请选择所属目录')],
+	}
+
+	// 验证并提交数据
+	const onSubmit = () => {
+		formRef.value
+			.validate()
+			.then(() => {
+				const param = {
+					id: formData.value.id,
+					module: formData.value.module
+				}
+				submitLoading.value = true
+				mobileMenuApi.mobileMenuChangeModule(param).then(() => {
+					submitLoading.value = false
+					emit('successful')
+				}).finally(() => {
+					visible = false
+				})
+			})
+	}
+	// 调用这个函数将子组件的一些数据和方法暴露出去
+	defineExpose({
+		onOpen
+	})
+</script>
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 1924fa82..fefc5ae9 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/form.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/form.vue
@@ -1,68 +1,70 @@
 <template>
     <a-drawer
         :title="formData.id ? '编辑移动端菜单' : '增加移动端菜单'"
-        :width="600"
+        :width="500"
         :visible="visible"
         :destroy-on-close="true"
         :footer-style="{ textAlign: 'right' }"
         @close="onClose"
     >
         <a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
-            <a-row :gutter="16">
-                <a-col :span="12">
-                    <a-form-item label="上级菜单：" name="parentId">
-						<a-tree-select
-							v-model:value="formData.parentId"
-							v-model:treeExpandedKeys="defaultExpandedKeys"
-							style="width: 100%"
-							:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-							placeholder="请选择上级菜单"
-							allow-clear
-							tree-default-expand-all
-							:tree-data="treeData"
-							:field-names="{
+			<a-form-item label="上级菜单：" name="parentId">
+				<a-tree-select
+					v-model:value="formData.parentId"
+					v-model:treeExpandedKeys="defaultExpandedKeys"
+					style="width: 100%"
+					:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+					placeholder="请选择上级菜单"
+					allow-clear
+					tree-default-expand-all
+					:tree-data="treeData"
+					:field-names="{
 								children: 'children',
 								label: 'title',
 								value: 'id'
 							}"
-							selectable="false"
-							tree-line
-							@change="parentChange(formData.parentId)"
-						></a-tree-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="名称：" name="title">
-                        <a-input v-model:value="formData.title" placeholder="请输入名称" allow-clear />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="界面路径：" name="pages">
-                        <a-input v-model:value="formData.pages" placeholder="请输入界面路径" allow-clear />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="图标：" name="icon">
-						<a-input v-model:value="formData.icon" style="width: calc(100% - 70px)" placeholder="请选择图标" allow-clear />
-						<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="颜色：" name="color">
-						<color-picker v-model:value="formData.color" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="是否正规则：" name="regType">
-                        <a-radio-group v-model:value="formData.regType" placeholder="请选择正规则" :options="regTypeOptions" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="可用状态：" name="status">
-                        <a-radio-group v-model:value="formData.status" placeholder="请选择可用状态" :options="statusOptions" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
+					selectable="false"
+					tree-line
+					@change="parentChange(formData.parentId)"
+				></a-tree-select>
+			</a-form-item>
+			<a-form-item label="名称：" name="title">
+				<a-input v-model:value="formData.title" placeholder="请输入名称" allow-clear />
+			</a-form-item>
+			<a-form-item label="菜单类型：" name="menuType">
+				<a-radio-group
+					v-model:value="formData.menuType"
+					button-style="solid"
+					:options="menuTypeOptions"
+					option-type="button"
+				>
+				</a-radio-group>
+			</a-form-item>
+			<a-form-item v-if="formData.menuType !== 'CATALOG'" name="path">
+				<template #label>
+					<a-tooltip>
+						<template #title>
+							类型为内外链条时，输入https开头的链接即可（例：https://xiaonuo.vip）
+						</template>
+						<question-circle-outlined />
+					</a-tooltip>
+					&nbsp {{ formData.menuType === 'MENU' || formData.menuType === 'CATALOG' ? '界面地址' : 'https链接地址' }}：
+				</template>
+				<a-input v-model:value="formData.path" placeholder="请输入" allow-clear />
+			</a-form-item>
+			<a-form-item label="图标：" name="icon">
+				<a-input v-model:value="formData.icon" style="width: calc(100% - 70px)" placeholder="请选择图标" allow-clear />
+				<a-button type="primary" @click="iconSelector.showIconModal(formData.icon)">选择</a-button>
+			</a-form-item>
+			<a-form-item label="颜色：" name="color">
+				<color-picker v-model:value="formData.color" />
+			</a-form-item>
+			<a-form-item label="是否正规则：" name="regType">
+				<a-radio-group v-model:value="formData.regType" placeholder="请选择正规则" :options="regTypeOptions" />
+			</a-form-item>
+			<a-form-item label="可用状态：" name="status">
+				<a-radio-group v-model:value="formData.status" placeholder="请选择可用状态" :options="statusOptions" />
+			</a-form-item>
 			<a-form-item label="排序码：" name="sortCode">
 				<a-slider v-model:value="formData.sortCode" :max="1000" style="width: 100%" />
 			</a-form-item>
@@ -77,6 +79,7 @@
 
 <script setup name="mobileMenuForm">
     import tool from '@/utils/tool'
+	import SnowflakeId from 'snowflake-id'
     import { cloneDeep } from 'lodash-es'
     import { required } from '@/utils/formRules'
     import mobileMenuApi from '@/api/mobile/resource/menuApi'
@@ -96,6 +99,24 @@
     const submitLoading = ref(false)
     const regTypeOptions = ref([])
     const statusOptions = ref([])
+	const menuTypeOptions = [
+		{
+			label: '目录',
+			value: 'CATALOG'
+		},
+		{
+			label: '菜单',
+			value: 'MENU'
+		},
+		{
+			label: '内链',
+			value: 'IFRAME'
+		},
+		{
+			label: '外链',
+			value: 'LINK'
+		}
+	]
 
     // 打开抽屉
     const onOpen = (record, module) => {
@@ -105,7 +126,8 @@
 		formData.value = {
 			regType: 'YES',
 			status: 'ENABLE',
-			category: 'MENU'
+			category: 'MENU',
+			menuType: 'MENU'
 		}
         if (record) {
             let recordData = cloneDeep(record)
@@ -156,7 +178,7 @@
     const formRules = {
         parentId: [required('请选择上级')],
         title: [required('请输入名称')],
-        pages: [required('请输入界面路径')],
+        path: [required('请输入界面路径')],
         icon: [required('请选择图标')],
         color: [required('请选择颜色')],
 		regType: [required('请选择规则类型')],
@@ -168,8 +190,7 @@
             .validate()
             .then(() => {
                 submitLoading.value = true
-                const formDataParam = cloneDeep(formData.value)
-				formDataParam.module = moduleId.value
+                const formDataParam = parameterChanges(cloneDeep(formData.value))
                 mobileMenuApi
                     .mobileMenuSubmitForm(formDataParam, !formDataParam.id)
                     .then(() => {
@@ -181,6 +202,17 @@
                     })
             })
     }
+	// 提交之前转换数据
+	const parameterChanges = (data) => {
+		data.module = moduleId.value
+		if (data.menuType === 'CATALOG') {
+			const snowflake = new SnowflakeId()
+			if (!data.path) {
+				data.path = snowflake.generate()
+			}
+		}
+		return data
+	}
     // 抛出函数
     defineExpose({
         onOpen
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 fd462284..48392df1 100644
--- a/snowy-admin-web/src/views/mobile/resource/menu/index.vue
+++ b/snowy-admin-web/src/views/mobile/resource/menu/index.vue
@@ -42,6 +42,13 @@
                 </a-space>
             </template>
             <template #bodyCell="{ column, record }">
+				<template v-if="column.dataIndex === 'path'">
+					<span v-if="record.menuType === 'CATALOG'">-</span>
+					<span v-else>{{record.path}}</span>
+				</template>
+				<template v-if="column.dataIndex === 'icon'">
+					<component :is="record.icon" />
+				</template>
                 <template v-if="column.dataIndex === 'regType'">
                     {{ $TOOL.dictTypeData('MOBILE_REG_TYPE', record.regType) }}
                 </template>
@@ -55,17 +62,35 @@
                         <a-popconfirm title="确定要删除吗？" @confirm="deleteMobileMenu(record)">
                             <a-button type="link" danger size="small">删除</a-button>
                         </a-popconfirm>
+						<div v-if="record.parentId === '0'">
+							<a-divider type="vertical" />
+							<a-dropdown>
+								<a class="ant-dropdown-link">
+									更多
+									<DownOutlined />
+								</a>
+								<template #overlay>
+									<a-menu>
+										<a-menu-item v-if="record.parentId === '0'">
+											<a @click="changeModuleFormRef.onOpen(record)">更改模块</a>
+										</a-menu-item>
+									</a-menu>
+								</template>
+							</a-dropdown>
+						</div>
                     </a-space>
                 </template>
             </template>
         </s-table>
     </a-card>
     <Form ref="formRef" @successful="table.refresh(true)" />
+	<changeModuleForm ref="changeModuleFormRef" @successful="table.refresh(true)"/>
 </template>
 
 <script setup name="mobileMenuIndex">
     import { message } from 'ant-design-vue'
     import Form from './form.vue'
+	import changeModuleForm from './changeModuleForm.vue'
 	import mobileMenuApi from '@/api/mobile/resource/menuApi'
     let searchFormState = reactive({})
 	let moduleList = ref([])
@@ -73,6 +98,7 @@
     const searchFormRef = ref()
     const table = ref()
     const formRef = ref()
+	const changeModuleFormRef = ref()
     const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
     const columns = [
         {
@@ -81,12 +107,13 @@
         },
         {
             title: '界面路径',
-            dataIndex: 'pages',
+            dataIndex: 'path',
             ellipsis: true
         },
         {
             title: '图标',
-            dataIndex: 'icon'
+            dataIndex: 'icon',
+			width: 80
         },
         {
             title: '正规则',
@@ -105,7 +132,7 @@
 			title: '操作',
 			dataIndex: 'action',
 			align: 'center',
-			width: '150px'
+			width: 200
 		}
     ]
     let selectedRowKeys = ref([])
@@ -144,13 +171,6 @@
 				return []
 			})
 		}
-        /*const searchFormParam = JSON.parse(JSON.stringify(searchFormState))
-        return mobileMenuApi.mobileMenuTree(Object.assign(parameter, searchFormParam)).then((data) => {
-			if (data) {
-				return data
-			}
-			return []
-        })*/
     }
 	// 切换模块标签查询菜单列表
 	const moduleClock = (value) => {