From f88765a34c9d74a108e8fe5305ffc9fd9f03c4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=9E=E5=AE=9D=E5=B1=B1?= <1253070437@qq.com>
Date: Sun, 9 Mar 2025 00:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=9B=BE=E6=A0=87=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B6=E5=8A=A0=E5=85=A5readme=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/Table/columnSetting.vue    |  57 ++--
 .../src/components/Table/index.vue            | 262 ++++++++++++------
 .../src/components/XnIconSelector/README.md   |  46 +++
 .../src/components/XnIconSelector/index.vue   |  37 +--
 4 files changed, 284 insertions(+), 118 deletions(-)
 create mode 100644 snowy-admin-web/src/components/XnIconSelector/README.md

diff --git a/snowy-admin-web/src/components/Table/columnSetting.vue b/snowy-admin-web/src/components/Table/columnSetting.vue
index 3dbd5f07..f70afaf1 100644
--- a/snowy-admin-web/src/components/Table/columnSetting.vue
+++ b/snowy-admin-web/src/components/Table/columnSetting.vue
@@ -24,6 +24,8 @@
 </template>
 <script setup>
 	import Draggable from 'vuedraggable-es'
+	import { ref, watch } from 'vue'
+
 	const emit = defineEmits(['columnChange'])
 	const props = defineProps({
 		columns: {
@@ -35,25 +37,47 @@
 	const indeterminate = ref(false)
 	const checkAll = ref(true)
 	const columnsSetting = ref([])
-	const originColumns = ref()
+	const originColumns = ref([])
 
-	onMounted(() => {
-		columnsSetting.value = props.columns.map((value) => {
-			if (value.checked === undefined) {
-				return {
-					...value,
-					checked: true
-				}
-			} else return value
-		})
+	const emitColumnChange = () => {
+		// 确保发送的数据包含所有必要的列信息，并保持响应性
+		const updatedColumns = columnsSetting.value.map((col) => ({
+			...col,
+			hidden: !col.checked,
+			checked: col.checked,
+			show: col.checked // 添加show属性以确保列的显示状态正确同步
+		}))
+		// 触发列变化事件，确保父组件能够接收到完整的列信息
+		emit('columnChange', updatedColumns)
+	}
 
-		// 这里要用深的拷贝，否则，勾选了字段时会修改了originColumns里的内容
+	// 初始化列设置
+	const initializeColumns = (columns) => {
+		columnsSetting.value = columns.map((value) => ({
+			...value,
+			checked: value.checked !== undefined ? value.checked : !value.hidden
+		}))
+
+		// 深拷贝保存原始列设置
 		originColumns.value = columnsSetting.value.map((value) => ({ ...value }))
 
-		// 处理全选组件
+		// 处理全选状态
 		const notCheckedList = columnsSetting.value.filter((value) => !value.checked)
-		if (notCheckedList.length) checkAll.value = false
-	})
+		checkAll.value = !notCheckedList.length
+		indeterminate.value = notCheckedList.length > 0 && notCheckedList.length < columnsSetting.value.length
+
+		// 触发列变化事件
+		emitColumnChange()
+	}
+
+	// 监听props.columns的变化
+	watch(
+		() => props.columns,
+		(newColumns) => {
+			initializeColumns(newColumns)
+		},
+		{ immediate: true }
+	)
 
 	const reset = () => {
 		columnsSetting.value = originColumns.value.map((value) => ({ ...value }))
@@ -83,11 +107,6 @@
 		}))
 		emitColumnChange()
 	}
-
-	const emitColumnChange = () => {
-		// eslint-disable-next-line vue/require-explicit-emits
-		emit('columnChange', columnsSetting.value)
-	}
 </script>
 <style lang="less" scoped>
 	.s-tool-column-item {
diff --git a/snowy-admin-web/src/components/Table/index.vue b/snowy-admin-web/src/components/Table/index.vue
index 7f99e37b..620efcb4 100644
--- a/snowy-admin-web/src/components/Table/index.vue
+++ b/snowy-admin-web/src/components/Table/index.vue
@@ -52,7 +52,6 @@
 				</span>
 			</div>
 		</div>
-
 		<!-- 统计列数据 -->
 		<a-alert showIcon class="s-table-alert mb-4" v-if="props.alert">
 			<template #message>
@@ -65,7 +64,7 @@
 							}}
 						</a>
 					</span>
-					<span className="mr-3" v-for="item in data.needTotalList">
+					<span className="mr-3" v-for="item in data.needTotalList" :key="item">
 						{{ item.title }} 总计{{ ' ' }}
 						<a className="font-6">{{ !item.customRender ? item.total : item.customRender(item.total) }}</a>
 					</span>
@@ -75,13 +74,11 @@
 						"
 						className="ml-6"
 						@click="
-							rowClear(
-								typeof props.alert === 'boolean' && props.alert
-									? clearSelected()
-									: props.alert.clear && typeof props.alert.clear === 'function'
-									  ? props.alert.clear()
-									  : null
-							)
+							typeof props.alert === 'boolean' && props.alert
+								? clearSelected()
+								: props.alert.clear && typeof props.alert.clear === 'function'
+									? props.alert.clear()
+									: null
 						"
 					>
 						{{ ' ' }}
@@ -121,10 +118,11 @@
 	import columnSetting from './columnSetting.vue'
 	import { useSlots } from 'vue'
 	import { useRoute } from 'vue-router'
-	import { get } from 'lodash-es'
+	import { cloneDeep, get } from 'lodash-es'
+
 	const slots = useSlots()
 	const route = useRoute()
-	const emit = defineEmits(['onExpand'])
+	const emit = defineEmits(['onExpand', 'onSelectionChange'])
 	const renderSlots = Object.keys(slots)
 
 	const props = defineProps(
@@ -207,7 +205,17 @@
 		localSettings: {
 			rowClassName: props.rowClassName,
 			rowClassNameSwitch: Boolean(props.rowClassName)
-		}
+		},
+		renderTableProps: {
+			...props,
+			columns: [],
+			dataSource: [],
+			pagination: {},
+			loading: false,
+			size: props.compSize
+		},
+		selectedRows: [],
+		selectedRowKeys: []
 	})
 
 	watch(
@@ -234,15 +242,127 @@
 			})
 		}
 	)
+	// 监听showPagination的变化
+	watch(
+		() => props.rowSelection,
+		(newVal) => {
+			if (!newVal) {
+				// 如果rowSelection被设置为null，清空选中状态
+				data.selectedRows = []
+				data.selectedRowKeys = []
+			}
+			// 更新表格属性
+			getTableProps()
+		},
+		{ deep: true }
+	)
+	watch(
+		() => props.showPagination,
+		(newVal) => {
+			// 更新分页状态
+			data.localPagination = newVal === false ? false : Object.assign({}, data.localPagination)
+			// 重新加载数据和更新表格属性
+			loadData()
+			getTableProps()
+		}
+	)
 	watch(
 		() => props.columns,
 		(newVal) => {
-			data.columnsSetting = newVal
-		}
+			data.columnsSetting = newVal.map((col) => ({
+				...col,
+				checked: col.checked === undefined ? true : col.checked
+			}))
+		},
+		{ deep: true, immediate: true }
 	)
 
 	// 表格props
-	const renderTableProps = ref([])
+	const renderTableProps = computed(() => {
+		const tableProps = {
+			...props,
+			columns: data.localColumns || props.columns,
+			dataSource: data.localDataSource,
+			pagination: data.localPagination,
+			loading: data.localLoading,
+			size: data.customSize
+		}
+
+		if (props.rowSelection) {
+			tableProps.rowSelection = {
+				...props.rowSelection,
+				selectedRowKeys: data.selectedRowKeys,
+				selectedRows: data.selectedRows,
+				onChange: (selectedRowKeys, selectedRows) => {
+					updateSelect(selectedRowKeys, selectedRows)
+					props.rowSelection.onChange?.(selectedRowKeys, selectedRows)
+				}
+			}
+		}
+
+		if (props.lineSelection && props.rowSelection) {
+			tableProps.customRow = (record, index) => {
+				const customRowProps = typeof props.customRow === 'function' ? props.customRow(record, index) : {}
+				return {
+					...customRowProps,
+					onClick: (event) => {
+						// 执行原有的onClick事件
+						if (customRowProps && typeof customRowProps.onClick === 'function') {
+							customRowProps.onClick(event)
+						}
+
+						// 检查行是否禁用
+						const rowDisabled =
+							typeof props.rowSelection.getCheckboxProps === 'function' &&
+							props.rowSelection.getCheckboxProps(record).disabled
+						if (rowDisabled) return
+
+						// 过滤掉按钮等可交互元素的点击
+						if (
+							event.target?.tagName.toLowerCase() === 'button' ||
+							event.target?.tagName.toLowerCase() === 'a' ||
+							event.target?.closest('button') ||
+							event.target?.closest('a') ||
+							event.target?.closest('.ant-checkbox-wrapper') ||
+							event.target?.closest('.ant-radio-wrapper')
+						) {
+							return
+						}
+
+						// 获取行的key
+						const key = (typeof props.rowKey === 'function' && props.rowKey(record)) || record[props.rowKey] || index
+
+						// 处理选中状态
+						let selectedRowKeys = [...data.selectedRowKeys]
+						let selectedRows = [...data.selectedRows]
+						const rowType = props.rowSelection?.type || 'checkbox'
+
+						if (rowType === 'radio') {
+							// 单选模式下，直接替换选中项
+							selectedRowKeys = [key]
+							selectedRows = [record]
+						} else {
+							// 多选模式下，切换选中状态
+							const existingIndex = selectedRowKeys.indexOf(key)
+							if (existingIndex === -1) {
+								selectedRowKeys.push(key)
+								selectedRows.push(record)
+							} else {
+								selectedRowKeys.splice(existingIndex, 1)
+								selectedRows.splice(existingIndex, 1)
+							}
+						}
+
+						// 更新选中状态并触发事件
+						updateSelect(selectedRowKeys, selectedRows)
+						props.rowSelection.onChange?.(selectedRowKeys, selectedRows)
+					}
+				}
+			}
+		}
+		return tableProps
+	})
+
 	// 右上角工具数组
 	const tool = [
 		{
@@ -291,13 +411,9 @@
 	// 列设置
 	const columnChange = (v) => {
 		data.columnsSetting = v
-		getTableProps()
+		data.localColumns = v.filter((value) => value.checked === undefined || value.checked)
+		getTableProps() // 调用getTableProps以确保表格重新渲染
 	}
-	// 列清空
-	const rowClear = (callback) => {
-		clearSelected()
-	}
-	// 初始化
 	const init = () => {
 		const { current } = route.params
 		const localPageNum = (current && parseInt(current)) || props.pageNum
@@ -305,7 +421,7 @@
 			(['auto', true].includes(props.showPagination) &&
 				Object.assign({}, data.localPagination, {
 					current: localPageNum,
-					pageSize: props.size, //props.compSize, size// 改动
+					pageSize: props.size,
 					showSizeChanger: props.showSizeChanger,
 					defaultPageSize: props.defaultPageSize,
 					pageSizeOptions: props.pageSizeOptions,
@@ -316,6 +432,16 @@
 			false
 		data.needTotalList = initTotalList(props.columns)
 		data.columnsSetting = props.columns
+
+		// 初始化时同步外部的选中状态
+		if (props.rowSelection && props.rowSelection.selectedRowKeys) {
+			data.selectedRowKeys = [...props.rowSelection.selectedRowKeys]
+			// 如果有selectedRows，也同步
+			if (props.rowSelection.selectedRows) {
+				data.selectedRows = cloneDeep(props.rowSelection.selectedRows)
+			}
+		}
+
 		loadData()
 	}
 
@@ -449,87 +575,48 @@
 								updateSelect(selectedRowKeys, selectedRows)
 								typeof props[k].onChange !== 'undefined' && props[k].onChange(selectedRowKeys, selectedRows)
 							}
-					  }
+						}
 					: null
 				return
 			}
-
-			// 设置行属性, 点击行时高亮
-			if (k === 'customRow') {
-				if (props.lineSelection && props.rowSelection) {
-					// 如果需要 整行选择，则重新绑定 customRow 事件
-					renderProps[k] = (record, index) => {
-						return {
-							...(typeof props.customRow !== 'undefined' && props.customRow(record, index)),
-							onClick: (event) => {
-								// 若存在原onClick则执行
-								typeof data[k] !== 'undefined' &&
-									typeof data[k](record, index).onClick !== 'undefined' &&
-									data[k](record, index).onClick(event)
-								// 记录为disabled则直接返回，默认为不可选
-								const rowDisabled =
-									typeof props.rowSelection.getCheckboxProps !== 'undefined' &&
-									props.rowSelection.getCheckboxProps(record).disabled
-								if (rowDisabled) return
-								// 过滤自定义按钮的非空白区域
-								const classList = event.target?.classList
-								if (!classList.contains('ant-table-cell')) return
-								const key = (typeof props.rowKey === 'function' && props.rowKey(record)) || props.rowKey || index
-								let selectedRows = props.rowSelection.selectedRows
-								let selectedRowKeys = props.rowSelection.selectedRowKeys
-								const rowType = props.rowSelection?.type || 'checkbox'
-
-								if (rowType === 'radio' || props.rowSelection.selectedRowKeys === undefined) {
-									selectedRowKeys = [key]
-									selectedRows = [record]
-								} else if (!props.rowSelection.selectedRowKeys?.includes(key)) {
-									selectedRowKeys.push(key)
-									selectedRows.push(record)
-								} else {
-									const index = props.rowSelection.selectedRowKeys?.findIndex((itemKey) => itemKey === key)
-									selectedRows.splice(index, 1)
-									selectedRowKeys.splice(index, 1)
-								}
-								updateSelect(selectedRowKeys, selectedRows)
-							}
-						}
-					}
-					return renderProps[k]
-				}
-			}
 			renderProps[k] = props[k]
 		})
 		renderProps = {
 			...renderProps,
-			size: data.customSize, // 注意这个size是a-table组件需要的，这里不能跟别的地方成为compSize
+			size: data.customSize,
 			columns: data.columnsSetting.filter((value) => value.checked === undefined || value.checked),
 			...data.localSettings
 		}
 		// 将值为 undefined 或者 null 的 table里props属性进行一个过滤
-		renderTableProps.value = Object.entries(renderProps).reduce((x, [y, z]) => (z == null ? x : ((x[y] = z), x)), {})
+		data.renderTableProps = Object.entries(renderProps).reduce((x, [y, z]) => (z == null ? x : ((x[y] = z), x)), {})
 	}
 
 	// 用于更新已选中的列表数据 total 统计
 	const updateSelect = (selectedRowKeys, selectedRows) => {
 		if (props.rowSelection) {
+			// 更新本地响应式数据
+			data.selectedRows = cloneDeep(selectedRows)
+			data.selectedRowKeys = cloneDeep(selectedRowKeys)
+			// 同步更新rowSelection的选中状态
 			// eslint-disable-next-line vue/no-mutating-props
-			props.rowSelection.selectedRows = selectedRows
+			props.rowSelection.selectedRows = cloneDeep(selectedRows)
 			// eslint-disable-next-line vue/no-mutating-props
-			props.rowSelection.selectedRowKeys = selectedRowKeys
-			props.rowSelection.onChange(selectedRowKeys, selectedRows)
+			props.rowSelection.selectedRowKeys = cloneDeep(selectedRowKeys)
+			// 通知父组件更新
+			emit('onSelectionChange', selectedRowKeys, selectedRows)
+			// 更新表格属性
 			getTableProps()
-		}
-		const list = data.needTotalList
-		data.needTotalList = list.map((item) => {
-			return {
-				...item,
-				total: selectedRows.reduce((sum, val) => {
-					return addNumbers(sum, get(val, item.dataIndex))
+			// 更新统计数据
+			data.needTotalList = initTotalList(props.columns)
+			data.needTotalList.forEach((item) => {
+				item.total = selectedRows.reduce((sum, val) => {
+					const value = get(val, item.dataIndex)
+					return addNumbers(sum, value)
 				}, 0)
-			}
-		})
+			})
+		}
 	}
-	// 如果开启了needTotal计算总和，支持小数点
+	// 数值相加辅助函数
 	const addNumbers = (num1, num2) => {
 		// 将参数转换为数字
 		let num1Value = Number(num1)
@@ -554,10 +641,19 @@
 	// 清空 table 已选中项
 	const clearSelected = () => {
 		if (props.rowSelection) {
+			// 清空选中状态
+			// eslint-disable-next-line vue/no-mutating-props
+			props.rowSelection.selectedRowKeys = []
+			// eslint-disable-next-line vue/no-mutating-props
+			props.rowSelection.selectedRows = []
+			// 触发onChange事件
 			props.rowSelection.onChange([], [])
-			updateSelect([], [])
+			// 更新表格属性
 			getTableProps()
+			// 取消选中的
+			updateSelect([], [])
 		}
+		data.needTotalList = initTotalList(props.columns)
 	}
 	// 刷新并清空已选
 	const clearRefreshSelected = (bool = false) => {
diff --git a/snowy-admin-web/src/components/XnIconSelector/README.md b/snowy-admin-web/src/components/XnIconSelector/README.md
new file mode 100644
index 00000000..60eb8f79
--- /dev/null
+++ b/snowy-admin-web/src/components/XnIconSelector/README.md
@@ -0,0 +1,46 @@
+## 小诺图标选择器
+
+### 说明
+
+改组件为小诺人员选择器，可返回id用逗号隔离的字符串或id数组类型的数据格式
+
+@author yubaoshan
+
+@data 2024年4月13日23:59:23
+
+### props定义
+
+| 序号  | 编码                | 类型            | 说明                  | 默认    |
+|-----|-------------------|---------------|---------------------|-------|
+| 1   | value             | String        | 值，跟v-model绑定        | ''    |
+| 2   | formRef           | -             | 表单dom，为了取消绑定的验证     | -     |
+
+### 示例
+
+```vue
+<template>
+	<a-form ref="formRef" :model="formData" :rules="formRules" layout="vertical">
+		<a-form-item label="图标选择：" name="icon">
+			<xn-icon-selector
+				v-model:value="formData.icon"
+				v-model:formRef="formRef"
+				placeholder="请选择图标"
+				allow-clear
+			/>
+		</a-form-item>
+	</a-form>
+</template>
+<script setup>
+	import { required } from '@/utils/formRules'
+	// 定义表单的dom
+	const formRef = ref()
+	// 表单数据
+	const formData = ref({
+		icon: ''
+	})
+	// 默认要校验的
+	const formRules = {
+		icon: [required('请选择图标')]
+	}
+</script>
+```
diff --git a/snowy-admin-web/src/components/XnIconSelector/index.vue b/snowy-admin-web/src/components/XnIconSelector/index.vue
index 2e379d15..2df2296b 100644
--- a/snowy-admin-web/src/components/XnIconSelector/index.vue
+++ b/snowy-admin-web/src/components/XnIconSelector/index.vue
@@ -5,20 +5,21 @@
 			trigger="click"
 			placement="bottomLeft"
 			:overlayStyle="{ width: '500px' }"
-			@visibleChange="handleVisibleChange"
+			@openChange="handleOpenChange"
 		>
 			<template #content>
 				<div class="icon-selector-content">
 					<a-tabs v-model:activeKey="activeKey" tab-position="left" size="small" @change="handleTabChange">
 						<a-tab-pane v-for="group in iconData" :key="group.key" :tab="group.name">
 							<div v-if="group.iconItem.length > 1" class="icon-category">
-								<a-radio-group v-model:value="currentCategory" @change="handleCategoryChange" size="small">
-									<a-radio-button v-for="item in group.iconItem" :key="item.key" :value="item.key">
-										{{ item.name }}
-									</a-radio-button>
-								</a-radio-group>
+								<a-form-item-rest>
+									<a-radio-group v-model:value="currentCategory" @change="handleCategoryChange" size="small">
+										<a-radio-button v-for="item in group.iconItem" :key="item.key" :value="item.key">
+											{{ item.name }}
+										</a-radio-button>
+									</a-radio-group>
+								</a-form-item-rest>
 							</div>
-
 							<div class="icon-grid">
 								<template v-for="iconGroup in group.iconItem" :key="iconGroup.key">
 									<template v-if="iconGroup.key === currentCategory">
@@ -59,7 +60,7 @@
 </template>
 
 <script setup>
-	import { ref, watch } from 'vue'
+	import { ref } from 'vue'
 	import config from '@/config/iconSelect'
 	import { SearchOutlined, CloseCircleOutlined } from '@ant-design/icons-vue'
 
@@ -85,10 +86,10 @@
 			default: true
 		}
 	})
-
+	const formRef = defineModel('formRef')
 	const emit = defineEmits(['update:value', 'change'])
 
-	const selectedIcon = ref(props.value)
+	const selectedIcon = ref()
 	const iconData = ref(config.icons)
 	const visible = ref(false)
 	const activeKey = ref(iconData.value[0]?.key || '')
@@ -101,9 +102,9 @@
 		}
 	)
 
-	const handleVisibleChange = (isVisible) => {
+	const handleOpenChange = (isOpen) => {
 		if (!props.disabled) {
-			visible.value = isVisible
+			visible.value = isOpen
 		}
 	}
 
@@ -112,16 +113,15 @@
 	}
 
 	const handleIconSelect = (icon) => {
-		selectedIcon.value = icon
 		emit('update:value', icon)
-		emit('change', icon)
+		formRef.value?.validateFields('icon')
 		visible.value = false
 	}
 
 	const handleClear = () => {
-		selectedIcon.value = ''
 		emit('update:value', '')
-		emit('change', '')
+		selectedIcon.value = ''
+		formRef.value?.validateFields('icon')
 	}
 
 	const handleTabChange = (key) => {
@@ -144,6 +144,7 @@
 			color: rgba(0, 0, 0, 0.25);
 			transition: color 0.3s;
 			font-size: 12px;
+
 			&:hover {
 				color: rgba(0, 0, 0, 0.45);
 			}
@@ -210,6 +211,7 @@
 			background-color: rgba(0, 0, 0, 0.2);
 			border-radius: 4px;
 		}
+
 		&::-webkit-scrollbar-track {
 			background-color: transparent;
 		}
@@ -240,12 +242,15 @@
 			font-size: 14px;
 		}
 	}
+
 	:deep(.ant-tabs-tab) {
 		padding: 8px !important;
 	}
+
 	:deep(.ant-tabs-nav) {
 		width: 60px !important;
 	}
+
 	:deep(.ant-tabs-tabpane) {
 		padding-left: 0 !important;
 	}