From 843dd588d758afc9f337b434dc4cb3bb1f38d260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 27 Sep 2023 14:13:55 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8E=92=E5=BA=8F=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/ConfigurableTableMixin.js | 34 +++++++++++-----------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js
index e67c0fd6..4de3f6fb 100644
--- a/src/mixins/ConfigurableTableMixin.js
+++ b/src/mixins/ConfigurableTableMixin.js
@@ -7,6 +7,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 import store from '@/store'
 import { isHasPermission } from '../utils/hasPermission.js'
 import { FieldType } from '../enums/commonEnums.js'
+import { filterObj } from '../utils/util.js'
 
 let importModalLoading
 
@@ -28,6 +29,11 @@ export const ConfigurableTableMixin = {
         showSizeChanger: true,
         total: 0
       },
+      /* 排序参数 */
+      isorter: {
+        column: 'createTime',
+        order: 'desc'
+      },
       columns: [],
       selectedRowKeys: [],
       selectionRows: [],
@@ -165,17 +171,10 @@ export const ConfigurableTableMixin = {
       return dimension.width + 40
     },
     getQueryParams () {
-      const pageNo = this.ipagination.current
-      const pageSize = this.ipagination.pageSize
-      return {
-        ...this.filters,
-        ...this.searchParams,
-        orderBy: this.orderBy,
-        orderByField: this.orderByField,
-        module: this.flag,
-        pageNo: pageNo,
-        pageSize: pageSize
-      }
+      const param = Object.assign({}, this.queryParam, this.isorter, this.filters)
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
     },
     loadData (arg) {
       if (!this.url.list) {
@@ -205,17 +204,10 @@ export const ConfigurableTableMixin = {
       })
     },
     tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      let sortFieldName
-      if (sorter.columnKey && sorter.columnKey.indexOf('_dictText') !== -1) {
-        sortFieldName = sorter.columnKey.substring(0, sorter.columnKey.indexOf('_dictText'))
-      } else {
-        sortFieldName = sorter.columnKey
+      if (Object.keys(sorter).length > 0) {
+        this.isorter.column = sorter.field
+        this.isorter.order = sorter.order === 'ascend' ? 'asc' : 'desc'
       }
-      if (!sorter.order) {
-        sortFieldName = ''
-      }
-      this.orderByField = sortFieldName
       this.ipagination = pagination
       this.loadData()
     },