From f0c72cfafb9b75dd4595451cb5be0d5a7efd4981 Mon Sep 17 00:00:00 2001
From: xiaonuobase <1253070437@qq.com>
Date: Mon, 11 Mar 2024 12:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7vite=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=87=A0=E4=B8=AA=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/package.json                   |  2 +-
 snowy-admin-web/src/components/Table/index.vue |  6 +++---
 snowy-admin-web/src/layout/index.vue           | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/snowy-admin-web/package.json b/snowy-admin-web/package.json
index a6575618..103f6bcd 100644
--- a/snowy-admin-web/package.json
+++ b/snowy-admin-web/package.json
@@ -79,7 +79,7 @@
 		"typescript": "5.3.3",
 		"unplugin-auto-import": "0.17.2",
 		"unplugin-vue-components": "0.26.0",
-		"vite": "5.0.6",
+		"vite": "5.1.4",
 		"vite-plugin-compression": "0.5.1",
 		"vite-plugin-vue-setup-extend": "0.4.0",
 		"vue-eslint-parser": "9.3.2"
diff --git a/snowy-admin-web/src/components/Table/index.vue b/snowy-admin-web/src/components/Table/index.vue
index 1b17eb94..06978f77 100644
--- a/snowy-admin-web/src/components/Table/index.vue
+++ b/snowy-admin-web/src/components/Table/index.vue
@@ -95,6 +95,7 @@
 		<a-table
 			v-bind="{ ...renderTableProps, ...data.localSettings }"
 			@change="loadData"
+			:loading="data.localLoading"
 			:row-key="(record) => record.id"
 			@expand="
 				(expanded, record) => {
@@ -103,7 +104,7 @@
 			"
 		>
 			<template #[item]="scope" v-for="item in renderSlots">
-				<slot :name="item" :scope="scope" v-bind="scope || {}"></slot>
+				<slot v-if="item && renderTableProps.columns.length > 0" :name="item" :scope="scope" v-bind="scope || {}"></slot>
 			</template>
 		</a-table>
 	</div>
@@ -112,8 +113,7 @@
 	import './index.less'
 	import { tableProps } from 'ant-design-vue/es/table/Table.js'
 	import columnSetting from './columnSetting.vue'
-	import './index.less'
-
+	import { get } from 'lodash-es'
 	import { useSlots } from 'vue'
 	import { useRoute } from 'vue-router'
 	const slots = useSlots()
diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue
index ef478ad4..872b6830 100644
--- a/snowy-admin-web/src/layout/index.vue
+++ b/snowy-admin-web/src/layout/index.vue
@@ -197,7 +197,7 @@
 	const selectedKeys = ref([])
 	const openKeys = ref([])
 	const onSelectTag = ref(false)
-	const moduleMenu = ref([])
+	const moduleMenuData = ref([])
 	const moduleMenuShow = ref(true)
 	const doublerowSelectedKey = ref([])
 	const layoutSiderDowbleMenu = ref(true)
@@ -266,8 +266,8 @@
 			}
 			const nextTickMenu = pMenu.value.children
 			if (pidKey) {
-				const modelPidKey = getParentKeys(moduleMenu.value, route.path)
-				moduleMenu.value.forEach((item) => {
+				const modelPidKey = getParentKeys(moduleMenuData.value, route.path)
+				moduleMenuData.value.forEach((item) => {
 					if (modelPidKey.includes(item.path)) {
 						tagSwitchModule(item.id)
 					}
@@ -292,7 +292,7 @@
 	}
 
 	// 执行-start
-	moduleMenu.value = router.getMenu()
+	moduleMenuData.value = router.getMenu()
 	// 获取缓存中的菜单模块是哪个
 	const menuModuleId = tool.data.get('SNOWY_MENU_MODULE_ID')
 	if (menuModuleId) {
@@ -466,9 +466,9 @@
 	}
 	// 切换应用
 	const switchModule = (id) => {
-		if (moduleMenu.value.length > 0) {
+		if (moduleMenuData.value.length > 0) {
 			showThis()
-			const menus = moduleMenu.value.filter((item) => item.id === id)[0].children
+			const menus = moduleMenuData.value.filter((item) => item.id === id)[0].children
 			if (menus.length > 0) {
 				// 正儿八百的菜单
 				menu.value = menus
@@ -494,7 +494,7 @@
 		tool.data.set('SNOWY_MENU_MODULE_ID', id)
 		store.setModule(id)
 		// 正儿八百的菜单
-		menu.value = moduleMenu.value.filter((item) => item.id === id)[0].children
+		menu.value = moduleMenuData.value.filter((item) => item.id === id)[0].children
 	}
 	// 遍历获取子集
 	const traverseChild = (menu) => {