From 010f76a39dac4090969d8b3d4182c3d7115a0b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Tue, 20 Sep 2022 11:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=80=82=E9=85=8D=E5=A4=9A?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8BOSS=E9=A1=B5=E9=9D=A2=EF=BC=88=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=9C=80=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=90=A6=E5=88=99=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A1=BA=E5=BA=8F=E4=BE=9D=E6=AC=A1=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=BD=8D=E7=BD=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=91=E7=94=9F=E6=94=B9=E5=8F=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/oss/index.vue | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index d304451e0..bb0193135 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -118,7 +118,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"
+              :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="对象存储主键" align="center" prop="ossId" v-if="false"/>
       <el-table-column label="文件名" align="center" prop="fileName" />
@@ -135,13 +136,15 @@
                 v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180"
+                       sortable="custom" :sort-orders="['descending', 'ascending']">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createBy" />
-      <el-table-column label="服务商" align="center" prop="service" sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="服务商" align="center" prop="service"
+                       sortable="custom" :sort-orders="['descending', 'ascending']"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -293,6 +296,7 @@ export default {
     resetQuery() {
       this.daterangeCreateTime = [];
       this.resetForm("queryForm");
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
       this.handleQuery();
     },
     // 多选框选中数据
@@ -302,9 +306,21 @@ export default {
       this.multiple = !selection.length
     },
     /** 排序触发事件 */
-    handleSortChange(column, prop, order) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
+    handleSortChange({column, prop, order}) {
+      let orderByArr = this.queryParams.orderByColumn ? this.queryParams.orderByColumn.split(",") : [];
+      let isAscArr = this.queryParams.isAsc ? this.queryParams.isAsc.split(",") : [];
+      let propIndex = orderByArr.indexOf(prop)
+      if (propIndex !== -1) {
+        //排序里已存在 只修改排序
+        isAscArr[propIndex] = order;
+      } else {
+        //排序里不存在则新增排序
+        orderByArr.push(prop);
+        isAscArr.push(order);
+      }
+      //合并排序
+      this.queryParams.orderByColumn = orderByArr.join(",");
+      this.queryParams.isAsc = isAscArr.join(",");
       this.getList();
     },
     /** 任务日志列表查询 */