From 5d1e503cf9aedd181b20933a8762b875e4230a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 6 Dec 2022 12:23:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AVue3=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/v3/TreeVue.txt    | 23 +++++++++++++------
 .../wwwroot/CodeGenTemplate/v3/Vue.txt        | 23 +++++++++++++------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
index 43950e56..803e58bf 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
@@ -553,14 +553,23 @@ function handleSelectionChange(selection) {
 
 // 自定义排序
 function sortChange(column) {
-  if (column.prop == null || column.order == null) {
-    queryParams.sort = undefined
-    queryParams.sortType = undefined
-  } else {
-    queryParams.sort = column.prop
-    queryParams.sortType = column.order
-  }
+  var sort = undefined
+  var sortType = undefined
 
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+
+$foreach(item in genTable.Columns)
+$if(item.IsSort && item.CsharpField.ToLower() != item.ColumnName.ToLower())
+    if (column.prop == '${item.CsharpFieldFl}') {
+      sort = '${item.ColumnName}'
+    }
+$end
+${end}
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
   handleQuery()
 }
 
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 97c928c4..9465a14e 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -420,14 +420,23 @@ function handleSelectionChange(selection) {
 
 // 自定义排序
 function sortChange(column) {
-  if (column.prop == null || column.order == null) {
-    queryParams.sort = undefined
-    queryParams.sortType = undefined
-  } else {
-    queryParams.sort = column.prop
-    queryParams.sortType = column.order
-  }
+  var sort = undefined
+  var sortType = undefined
 
+  if (column.prop != null && column.order != null) {
+    sort = column.prop
+    sortType = column.order
+
+$foreach(item in genTable.Columns)
+$if(item.IsSort && item.CsharpField.ToLower() != item.ColumnName.ToLower())
+    if (column.prop == '${item.CsharpFieldFl}') {
+      sort = '${item.ColumnName}'
+    }
+$end
+${end}
+  }
+  queryParams.sort = sort
+  queryParams.sortType = sortType
   handleQuery()
 }