From 28fb7e4a945f1bf95567b48b21ef64e1e8ed343a Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: Thu, 20 Aug 2020 10:08:11 +0800
Subject: [PATCH] =?UTF-8?q?update=20ruoyi-generator/src/main/resources/vm/?=
 =?UTF-8?q?vue/index.vue.vm.=20=E5=AF=B9=E8=A1=A8=E6=A0=BC=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=8F=AF=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E6=88=96=E5=AF=B9=E6=AF=94=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E3=80=82[=E9=BB=98=E8=AE=A4=E5=8F=AA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E7=AC=AC=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=8E=92=E5=BA=8F=E9=9C=80=E8=A6=81=E5=9C=A8?=
 =?UTF-8?q?=20el-table-column=20=E4=B8=AD=E5=A2=9E=E5=8A=A0=20sortable=3D"?=
 =?UTF-8?q?custom"=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index.vue.vm    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index b5e45f5c5..4833a670e 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -95,10 +95,10 @@
           v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="sortChange">
       <el-table-column type="selection" width="55" align="center" />
 #foreach($column in $columns)
 #set($javaField=$column.javaField)
@@ -109,17 +109,17 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" #if($velocityCount == 1)sortable="custom" #end/>
 #elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180" #if($velocityCount == 1)sortable="custom" #end>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
 #elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" :formatter="${javaField}Format" #if($velocityCount == 1)sortable="custom" #end/>
 #elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
+      <el-table-column label="${comment}" align="center" prop="${javaField}" #if($velocityCount == 1)sortable="custom" #end/>
 #end
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -288,12 +288,23 @@ export default {
         pageNum: 1,
         pageSize: 10,
 #foreach ($column in $columns)
+#if($velocityCount == 1)
+#set($javaField=$column.javaField)
+        orderByColumn: '${javaField}',
+        isAsc: 'asc',
+#end
 #if($column.query)
         $column.javaField: null#if($velocityCount != $columns.size()),#end
 
 #end
 #end
       },
+#foreach ($column in $columns)
+#set($javaField=$column.javaField)
+      // 默认排序
+      defaultSort: { prop: '${javaField}', order: 'descending' },
+#break
+#end
       // 表单参数
       form: {},
       // 表单校验
@@ -306,8 +317,9 @@ export default {
 #else
 #set($comment=$column.columnComment)
 #end
+#set($comment=$column.columnComment)
         $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
+          { required: true, message: "$comment不能为空", trigger: "#if($column.htmlType == "select")"change"#else"blur"#end" }
         ]#if($velocityCount != $columns.size()),#end
 
 #end
@@ -326,6 +338,21 @@ export default {
 #end
   },
   methods: {
+    /** 自定义排序 */
+    sortChange(column, prop, order) {
+      var sortingType = column.order;
+      if (sortingType == 'ascending') {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = 'asc';
+      } else if (sortingType == 'descending') {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = 'desc';
+      } else {
+        this.queryParams.orderByColumn = this.defaultSort.prop;
+        this.queryParams.isAsc = this.defaultSort.order == 'descending'?'desc':'asc';
+      }
+      this.getList();
+    },
     /** 查询${functionName}列表 */
     getList() {
       this.loading = true;
@@ -467,4 +494,4 @@ export default {
     }
   }
 };
-</script>
+</script>
\ No newline at end of file