gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

2.将回显查询的结果移动到最前方防止滑动监听出现问题
3.initParams应该包含原始的param参数以适应条件查询需求
pull/157/head
gao 2023-08-28 11:47:29 +08:00
parent 3f493de7bf
commit 2dcff6f5c5
1 changed files with 122 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
snowy-admin-web/src/components/XnPageSelect/index.vue
View File

@ -14,11 +14,9 @@
</a-spin> </a-spin>
</template> </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([])
@ -60,24 +58,23 @@
// 请求数据 // 请求数据
const onPage = (param = {}) => { const onPage = (param = {}) => {
if (props.pageFunction) { if (props.pageFunction) {
initParams.value = param initParams.value = { ...initParams.value, ...param, size: props.pageSize };
initParams.value.size = props.pageSize
// 加载API // 加载API
spinning.value = true spinning.value = true;
props props.pageFunction(initParams.value)
.pageFunction(initParams.value)
.then((data) => { .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(() => { .finally(() => {
spinning.value = false spinning.value = false;
}) });
}
} }
};
const queryEcho = () => { const queryEcho = () => {
// 如果带有查询的方法，那么我们去给查询回显 // 如果带有查询的方法，那么我们去给查询回显
if (props.echoFunction) { if (props.echoFunction) {
@ -90,7 +87,7 @@
} }
props.echoFunction(param).then((data) => { props.echoFunction(param).then((data) => {
if (data[0]){ if (data[0]){
options.value.push(data[0]) options.value.unshift(data[0])
} }
}) })
} }
@ -119,27 +116,29 @@
const handlePagination = () => { const handlePagination = () => {
// 判断已有数量是否小于总量 // 判断已有数量是否小于总量
if (options.value.length < total.value) { 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) => { .then((data) => {
if (data.records.length > 0) { 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(() => { .finally(() => {
spinning.value = false spinning.value = false;
}) });
}
} }
};
defineExpose({ defineExpose({
onPage onPage
}) })