From d8bb0e96fbbb763c623255629d623e7308ef5dee Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期三, 22 五月 2024 16:15:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/tool/value-table.vue | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index 20b9a47..0387ae4 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -564,14 +564,17 @@ }, sizeChange(val) { this.page.size = val - this.selectList() + this.selectList('page') }, currentChange(val) { this.page.current = val - this.selectList() + this.selectList('page') }, - selectList() { + selectList(val) { this.loading = true + if(val===undefined){ + this.page.current = 1; + } if (this.data.isPage != undefined && this.data.isPage != true) { this.page = { current: -1, @@ -593,6 +596,7 @@ this.total = res.data.body.total this.tableHead = res.data.head this.tableData = res.data.body.records + // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData)) for (var a in this.data.selectField) { if (this.data.selectField[a].choose == true) { this.tableData.map(b => { -- Gitblit v1.9.3