Browse Source
Merge pull request #238 from colinin/4.2
remove invalid filters
pull/252/head
cKey
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
0 additions and
4 deletions
-
vueJs/src/views/localization-management/languages/index.vue
-
vueJs/src/views/localization-management/resources/index.vue
|
|
@ -196,7 +196,6 @@ import { dateFormat, abpPagerFormat } from '@/utils/index' |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
private filter = '' |
|
|
|
|
|
public dataFilter = new GetLanguagesInput() |
|
|
public dataFilter = new GetLanguagesInput() |
|
|
|
|
|
|
|
|
private showEditDialog = false |
|
|
private showEditDialog = false |
|
|
@ -207,7 +206,6 @@ export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
protected processDataFilter() { |
|
|
protected processDataFilter() { |
|
|
this.dataFilter.filter = this.filter |
|
|
|
|
|
this.dataFilter.skipCount = abpPagerFormat(this.currentPage, this.pageSize) |
|
|
this.dataFilter.skipCount = abpPagerFormat(this.currentPage, this.pageSize) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -176,7 +176,6 @@ import { dateFormat, abpPagerFormat } from '@/utils/index' |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
private filter = '' |
|
|
|
|
|
public dataFilter = new GetResourcesInput() |
|
|
public dataFilter = new GetResourcesInput() |
|
|
|
|
|
|
|
|
private showEditDialog = false |
|
|
private showEditDialog = false |
|
|
@ -187,7 +186,6 @@ export default class extends Mixins(DataListMiXin, HttpProxyMiXin) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
protected processDataFilter() { |
|
|
protected processDataFilter() { |
|
|
this.dataFilter.filter = this.filter |
|
|
|
|
|
this.dataFilter.skipCount = abpPagerFormat(this.currentPage, this.pageSize) |
|
|
this.dataFilter.skipCount = abpPagerFormat(this.currentPage, this.pageSize) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
