提交 e99d869d 编写于 作者: Mosher's avatar Mosher

Revert "修复表格分页问题"

This reverts commit c66cb44a.
上级 c66cb44a
...@@ -634,10 +634,8 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -634,10 +634,8 @@ import { FormItemModel } from '@/model/form-detail';
const arg: any = {...opt}; const arg: any = {...opt};
const page: any = {}; const page: any = {};
if (this.isEnablePagingBar) { if (this.isEnablePagingBar) {
if(!pageReset) {
Object.assign(page, { page: this.curPage-1, size: this.limit }); Object.assign(page, { page: this.curPage-1, size: this.limit });
} }
}
// 设置排序 // 设置排序
if (!this.isNoSort && !Object.is(this.minorSortDir, '') && !Object.is(this.minorSortPSDEF, '')) { if (!this.isNoSort && !Object.is(this.minorSortDir, '') && !Object.is(this.minorSortPSDEF, '')) {
const sort: string = this.minorSortPSDEF+","+this.minorSortDir; const sort: string = this.minorSortPSDEF+","+this.minorSortDir;
...@@ -659,7 +657,7 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -659,7 +657,7 @@ import { FormItemModel } from '@/model/form-detail';
return; return;
} }
const data: any = response.data; const data: any = response.data;
this.totalrow = pageReset ? response.data.length : this.totalrow; this.totalrow = response.data.length;
this.items = JSON.parse(JSON.stringify(data)); this.items = JSON.parse(JSON.stringify(data));
// 清空selections,gridItemsModel // 清空selections,gridItemsModel
this.selections = []; this.selections = [];
...@@ -1144,7 +1142,7 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -1144,7 +1142,7 @@ import { FormItemModel } from '@/model/form-detail';
return; return;
} }
if (Object.is('load', action)) { if (Object.is('load', action)) {
this.load(data, true); this.load(data);
} }
if (Object.is('remove', action)) { if (Object.is('remove', action)) {
this.remove(data); this.remove(data);
...@@ -1344,7 +1342,7 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -1344,7 +1342,7 @@ import { FormItemModel } from '@/model/form-detail';
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public pageRefresh(): void { public pageRefresh(): void {
this.load({}, true); this.load({});
} }
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册