1.修复了xnPageSelector只能加载前两页的bug

2.将回显查询的结果移动到最前方防止滑动监听出现问题
3.initParams应该包含原始的param参数以适应条件查询需求

snowy-admin-web/src/components/XnPageSelect/index.vue

@@ -14,17 +14,15 @@
 	</a-spin>
 </template>
 
-<script setup name="xnPageSelector">
+<script setup>
-	import { cloneDeep } from 'lodash-es'
+import { watch } from 'vue'
-	import { watch } from 'vue'
 
-	const current = ref(1) // 当前页数
+const total = ref(0) // 数据总数
-	const total = ref(0) // 数据总数
+const initParams = ref({})
-	const initParams = ref({})
+const options = ref([])
-	const options = ref([])
+const spinning = ref(false)
-	const spinning = ref(false)
+const emit = defineEmits({ change: null, 'update:value': null })
-	const emit = defineEmits({ change: null, 'update:value': null })
+const props = defineProps({
-	const props = defineProps({
 	value: {
 		type: String,
 		default: () => undefined
@@ -51,34 +49,33 @@
 		type: Boolean,
 		default: () => false
 	}
-	})
+})
-	const modelValue = ref(props.value)
+const modelValue = ref(props.value)
-	watch(props, (newValue) => {
+watch(props, (newValue) => {
 	modelValue.value = newValue.value
-	})
+})
 
-	// 请求数据
+// 请求数据
-	const onPage = (param = {}) => {
+const onPage = (param = {}) => {
 	if (props.pageFunction) {
-			initParams.value = param
+		initParams.value = { ...initParams.value, ...param, size: props.pageSize };
-			initParams.value.size = props.pageSize
 		// 加载API
-			spinning.value = true
+		spinning.value = true;
-			props
+		props.pageFunction(initParams.value)
-				.pageFunction(initParams.value)
 			.then((data) => {
-					initParams.value.current = data.current
+				// 更新当前页码
+				initParams.value.current = data.current;
 				// 加载完后设置总数
-					total.value = data.total
+				total.value = data.total;
-					options.value = data.records
+				options.value = data.records;
-					queryEcho()
+				queryEcho();
 			})
 			.finally(() => {
-					spinning.value = false
+				spinning.value = false;
-				})
+			});
 	}
-	}
+};
-	const queryEcho = () => {
+const queryEcho = () => {
 	// 如果带有查询的方法，那么我们去给查询回显
 	if (props.echoFunction) {
 		nextTick(() => {
@@ -90,57 +87,59 @@
 					}
 					props.echoFunction(param).then((data) => {
 						if (data[0]){
-								options.value.push(data[0])
+							options.value.unshift(data[0])
 						}
 					})
 				}
 			}
 		})
 	}
-	}
+}
-	// change
+// change
-	const handleChange = (value, array) => {
+const handleChange = (value, array) => {
 	modelValue.value = value
 	// 触发change事件
 	emit('change', value, array)
 	// 更新数据
 	emit('update:value', value)
-	}
+}
-	// 滚动触发
+// 滚动触发
-	const handlePopupScroll = (e) => {
+const handlePopupScroll = (e) => {
 	const { target } = e
 	const { scrollTop, scrollHeight, clientHeight } = target
 	if (scrollTop + 2 + clientHeight >= scrollHeight) {
 		// 已经到达底部，触发分页逻辑
 		handlePagination()
 	}
-	}
+}
-	// 分页加载数据
+// 分页加载数据
-	const handlePagination = () => {
+const handlePagination = () => {
 	// 判断已有数量是否小于总量
 	if (options.value.length < total.value) {
-			const param = cloneDeep(initParams.value)
+		const param = { ...initParams.value, current: initParams.value.current + 1 };
-			param.current = initParams.value.current + 1
+		spinning.value = true;
-			spinning.value = true
+		props.pageFunction(param)
-			props
-				.pageFunction(param)
 			.then((data) => {
 				if (data.records.length > 0) {
-						options.value = [...cloneDeep(options.value), ...data.records].filter((item, index, self) => {
+					// 更新当前页码
-							return (
+					initParams.value.current = data.current;
-								self.findIndex((f) => {
+					// 合并新旧数据
-									return f.id === item.id
+					const newOptions = [...options.value, ...data.records];
-								}) === index
+					// 使用 id 去重
-							)
+					const uniqueOptions = newOptions.reduce((acc, cur) => {
-						})
+						acc[cur.id] = cur;
+						return acc;
+					}, {});
+					options.value = Object.values(uniqueOptions);
 				}
 			})
 			.finally(() => {
-					spinning.value = false
+				spinning.value = false;
-				})
+			});
 	}
-	}
+};
-	defineExpose({
+
+defineExpose({
 	onPage
-	})
+})
 </script>