diff --git a/package.json b/package.json index 1346457..a875971 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tank-front", - "version": "3.1.6", + "version": "4.0.3", "private": true, "dependencies": { "@ant-design/icons": "4.7.0", diff --git a/src/common/model/base/Pager.ts b/src/common/model/base/Pager.ts index bc5f7ac..32922a8 100644 --- a/src/common/model/base/Pager.ts +++ b/src/common/model/base/Pager.ts @@ -175,20 +175,6 @@ export default class Pager extends HttpBase { } } - //根据key来删除某个Filter - removeFilter(key: string) { - if (!this.filters || !this.filters.length) { - return; - } - for (let i = 0; i < this.filters.length; i++) { - let filter = this.filters[i]; - if (filter.key === key) { - this.filters.splice(i, 1); - break; - } - } - } - //隐藏某个Filter,实际上我们可以根据这个filter来筛选,只不过不出现在NbFilter中而已。 showFilter(key: string, visible = true) { if (!this.filters || !this.filters.length) { diff --git a/src/pages/matter/List.tsx b/src/pages/matter/List.tsx index 6b11fcd..bbcfcee 100644 --- a/src/pages/matter/List.tsx +++ b/src/pages/matter/List.tsx @@ -475,12 +475,14 @@ export default class List extends TankComponent { } searchFile(value?: string) { + console.log('search', value); this.pager.setFilterValue('name', value); this.pager.setFilterValue('page', 0); this.refresh(); } changeSearch(e: any) { + console.log('change', e.currentTarget.value); if (!e.currentTarget.value) this.searchFile(); } @@ -547,8 +549,10 @@ export default class List extends TankComponent { goToDirectory(id: string) { this.searchText = null; - this.pager.setFilterValue('puuid', id); - this.pager.removeFilter('name'); + this.pager.setFilterValues({ + puuid: id, + name: undefined, + }); this.pager.page = 0; const query = this.pager.getParams(); Sun.navigateQueryTo({ path: this.getMatterListPath(), query });