From d690c9d1099c51368bd812f12930bd90822619ce Mon Sep 17 00:00:00 2001 From: snowlyg Date: Tue, 25 May 2021 19:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=20gorm=20=E6=9C=AC=E8=BA=AB?= =?UTF-8?q?=20sort=20=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/view/model/model.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/data/view/model/model.go b/data/view/model/model.go index 0ce5822..9a3d628 100755 --- a/data/view/model/model.go +++ b/data/view/model/model.go @@ -134,11 +134,15 @@ func (m *_Model) genTableElement(cols []ColumnsInfo) (el []genstruct.GenElement) case ColumnsKeyUnique: // unique key.唯一索引 tmp.AddTag(_tagGorm, "unique") case ColumnsKeyIndex: // index key.复合索引 - if v1.KeyType == "FULLTEXT" { - tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName)+",class:FULLTEXT") - } else { - tmp.AddTag(_tagGorm, getUninStr("index", ":", v1.KeyName)) + uninStr := getUninStr("index", ":", v1.KeyName) + // 兼容 gorm 本身 sort 标签 + if v1.KeyName == "sort" { + uninStr = "index" } + if v1.KeyType == "FULLTEXT" { + uninStr += ",class:FULLTEXT" + } + tmp.AddTag(_tagGorm, uninStr) case ColumnsKeyUniqueIndex: // unique index key.唯一复合索引 tmp.AddTag(_tagGorm, getUninStr("uniqueIndex", ":", v1.KeyName)) }