From bc8a3be3bc8f0b96a5646734e93d6d8bca25235d Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Wed, 25 Jun 2025 21:52:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=95=E5=9B=BE=E4=B8=8A=E4=BC=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=EF=BC=8C=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A0?=
 =?UTF-8?q?orderBy=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2sql=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/app/common/model/common.go        | 8 ++++----
 internal/consts/version.go                 | 2 +-
 resource/template/vm/vue/edit-vue.template | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/app/common/model/common.go b/internal/app/common/model/common.go
index 9f3b9d8..611bcc1 100644
--- a/internal/app/common/model/common.go
+++ b/internal/app/common/model/common.go
@@ -9,10 +9,10 @@ package model
 
 // PageReq 公共请求参数
 type PageReq struct {
-	DateRange []string `p:"dateRange"` //日期范围
-	PageNum   int      `p:"pageNum"`   //当前页码
-	PageSize  int      `p:"pageSize"`  //每页数
-	OrderBy   string   //排序方式
+	DateRange []string `p:"dateRange"`                                                                                                                                                       //日期范围
+	PageNum   int      `p:"pageNum"`                                                                                                                                                         //当前页码
+	PageSize  int      `p:"pageSize"`                                                                                                                                                        //每页数
+	OrderBy   string   `p:"orderBy" v:"regex:^[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC)(?:\\s*,\\s*[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)?\\s+(asc|desc|ASC|DESC))*$#排序参数不合法"` // 排序方式
 }
 
 // ListRes 列表公共返回
diff --git a/internal/consts/version.go b/internal/consts/version.go
index a9fb653..b1d378c 100644
--- a/internal/consts/version.go
+++ b/internal/consts/version.go
@@ -9,5 +9,5 @@ package consts
 
 const (
 	Logo    = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg`
-	Version = "3.3.5"
+	Version = "3.3.6"
 )
diff --git a/resource/template/vm/vue/edit-vue.template b/resource/template/vm/vue/edit-vue.template
index 2021adb..de61590 100644
--- a/resource/template/vm/vue/edit-vue.template
+++ b/resource/template/vm/vue/edit-vue.template
@@ -187,7 +187,7 @@
             class="avatar-uploader"
             name="file"
           >
-            <div v-if="!proxy.isEmpty(imageUrlThumb)">
+            <div v-if="!proxy.isEmpty(imageUrl{{$column.GoField}})">
               <el-link type="danger" style="position: absolute; right: 5px; top: 6px;font-size: 18px;" :underline="false" @click.stop="deleteImageUrl{{$column.GoField}}" title="删除">
                 <el-icon><ele-DeleteFilled /></el-icon>
               </el-link>