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 1/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=A4=9A=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8BOSS=E9=A1=B5=E9=9D=A2=EF=BC=88=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=8E=92=E5=BA=8F=E9=9C=80=E7=82=B9=E5=87=BB=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=8C=E5=90=A6=E5=88=99=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E7=82=B9=E5=87=BB=E9=A1=BA=E5=BA=8F=E4=BE=9D=E6=AC=A1?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=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();
     },
     /** 任务日志列表查询 */

From ce77e6b8a44eced285ac338e405faec201ce228b 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 16:35:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=9A=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A1=88=E4=BE=8BOSS=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=88=E5=AE=8C=E5=96=84=E6=8E=92=E5=BA=8F=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=E5=92=8C=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=8C=E6=94=AF=E6=8C=81=E6=AD=A3=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=80=92=E5=BA=8F=EF=BC=8C=E5=8F=96=E6=B6=88=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=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 | 49 +++++++++++++++++++++----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index bb0193135..9f8557ca6 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -119,7 +119,9 @@
     </el-row>
 
     <el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange"
-              :default-sort="defaultSort" @sort-change="handleSortChange">
+              :header-cell-class-name="handleHeaderClass"
+              @header-click="handleHeaderCLick"
+              v-if="showTable">
       <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" />
@@ -137,14 +139,14 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180"
-                       sortable="custom" :sort-orders="['descending', 'ascending']">
+                       sortable="custom">
         <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']"/>
+                       sortable="custom"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -196,6 +198,7 @@ export default {
   name: "Oss",
   data() {
     return {
+      showTable: true,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -267,6 +270,7 @@ export default {
         this.ossList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.showTable = true;
       });
     },
     checkFileSuffix(fileSuffix) {
@@ -294,9 +298,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.showTable = false;
       this.daterangeCreateTime = [];
       this.resetForm("queryForm");
-      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.queryParams.orderByColumn = this.defaultSort.prop;
+      this.queryParams.isAsc = this.defaultSort.order;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -305,14 +311,41 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 排序触发事件 */
-    handleSortChange({column, prop, order}) {
+    // 设置列的排序为我们自定义的排序
+    handleHeaderClass({column}) {
+      column.order = column.multiOrder
+    },
+    // 点击表头进行排序
+    handleHeaderCLick(column) {
+      if (column.sortable !== 'custom') {
+        return
+      }
+      switch (column.multiOrder) {
+        case 'descending':
+          column.multiOrder = 'ascending';
+          break;
+        case 'ascending':
+          column.multiOrder = '';
+          break;
+        default:
+          column.multiOrder = 'descending';
+          break;
+      }
+      this.handleOrderChange(column.property, column.multiOrder)
+    },
+    handleOrderChange(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;
+        if (order) {
+          //排序里已存在 只修改排序
+          isAscArr[propIndex] = order;
+        } else {
+          //如果order为null 则删除排序字段和属性
+          isAscArr.splice(propIndex, 1);//删除排序
+          orderByArr.splice(propIndex, 1);//删除属性
+        }
       } else {
         //排序里不存在则新增排序
         orderByArr.push(prop);