diff --git a/eladmin-web/src/components/Crud/crud.js b/eladmin-web/src/components/Crud/crud.js index 4473120..637c55e 100644 --- a/eladmin-web/src/components/Crud/crud.js +++ b/eladmin-web/src/components/Crud/crud.js @@ -31,8 +31,6 @@ function CRUD(options) { form: {}, // 重置表单 defaultForm: () => {}, - // 排序规则,默认 id 降序, 支持多字段排序 ['id,desc', 'createTime,asc'] - sort: ['id,desc'], // 等待时间 time: 50, // CRUD Method @@ -350,7 +348,6 @@ function CRUD(options) { return { current: crud.page.page, size: crud.page.size, - sort: crud.sort, ...crud.query, ...crud.params } diff --git a/eladmin-web/src/mixins/crud.js b/eladmin-web/src/mixins/crud.js index 99fda07..e0394ff 100644 --- a/eladmin-web/src/mixins/crud.js +++ b/eladmin-web/src/mixins/crud.js @@ -12,8 +12,6 @@ export default { return { // 表格数据 data: [], - // 排序规则,默认 id 降序, 支持多字段排序 ['id,desc', 'createTime,asc'] - sort: ['id,desc'], // 页码 page: 1, // 每页数据条数 @@ -85,7 +83,6 @@ export default { return { current: this.page, size: this.size, - sort: this.sort, ...this.query, ...this.params } diff --git a/eladmin-web/src/views/mnt/deploy/sysRestore.vue b/eladmin-web/src/views/mnt/deploy/sysRestore.vue index e44aed6..3736772 100644 --- a/eladmin-web/src/views/mnt/deploy/sysRestore.vue +++ b/eladmin-web/src/views/mnt/deploy/sysRestore.vue @@ -70,7 +70,6 @@ export default { if (this.deployId === '') { return false } - this.sort = 'deployDate,desc' this.params['deployId'] = this.deployId return true }, diff --git a/eladmin-web/src/views/system/dict/dictDetail.vue b/eladmin-web/src/views/system/dict/dictDetail.vue index 32756da..a9c3f9e 100644 --- a/eladmin-web/src/views/system/dict/dictDetail.vue +++ b/eladmin-web/src/views/system/dict/dictDetail.vue @@ -66,7 +66,7 @@ export default { components: { pagination, rrOperation, udOperation }, cruds() { return [ - CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'], + CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, crudMethod: { ...crudDictDetail }, optShow: { add: true, diff --git a/eladmin-web/src/views/system/job/index.vue b/eladmin-web/src/views/system/job/index.vue index e17ea75..e0ef54e 100644 --- a/eladmin-web/src/views/system/job/index.vue +++ b/eladmin-web/src/views/system/job/index.vue @@ -63,7 +63,6 @@ export default { return CRUD({ title: '岗位', url: 'api/job', - sort: ['jobSort,asc', 'id,desc'], crudMethod: { ...crudJob } }) }, diff --git a/eladmin-web/src/views/system/role/index.vue b/eladmin-web/src/views/system/role/index.vue index 27d0bf4..186e366 100644 --- a/eladmin-web/src/views/system/role/index.vue +++ b/eladmin-web/src/views/system/role/index.vue @@ -135,7 +135,7 @@ export default { name: 'Role', components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '角色', url: 'api/roles', sort: 'level,asc', crudMethod: { ...crudRoles }}) + return CRUD({ title: '角色', url: 'api/roles', crudMethod: { ...crudRoles }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/eladmin-web/src/views/system/user/index.vue b/eladmin-web/src/views/system/user/index.vue index f64ba19..dc53d2d 100644 --- a/eladmin-web/src/views/system/user/index.vue +++ b/eladmin-web/src/views/system/user/index.vue @@ -59,13 +59,13 @@ 重置密码 @@ -376,8 +376,7 @@ export default { }, // 获取左侧部门数据 getDeptDatas(node, resolve) { - const sort = 'id,desc' - const params = { sort: sort } + const params = {} if (typeof node !== 'object') { if (node) { params['name'] = node