增加自动化排序功能

server/resource/autocode_template/server/request.go.tpl

@@ -17,4 +17,8 @@ type {{.StructName}}Search struct{
         {{- end }}
        {{- end }}
     request.PageInfo
+    {{- if .NeedSort}}
+    Sort  string `json:"sort" form:"sort"`
+    Order string `json:"order" form:"order"`
+    {{- end}}
 }

server/resource/autocode_template/server/service.go.tpl

@@ -112,6 +112,23 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
 	if err!=nil {
     	return
     }
+    {{- if .NeedSort}}
+        var OrderStr string
+        orderMap := make(map[string]bool)
+       {{- range .Fields}}
+            {{- if .Sort}}
+         	orderMap["{{.FieldJson}}"] = true
+         	{{- end}}
+       {{- end}}
+       if orderMap[info.Sort] {
+          OrderStr = info.Sort
+          if info.Order == "descending" {
+             OrderStr = OrderStr + " desc"
+          }
+          db = db.Order(OrderStr)
+       }
+    {{- end}}
+
 	err = db.Limit(limit).Offset(offset).Find(&{{.Abbreviation}}s).Error
 	return  {{.Abbreviation}}s, total, err
 }

server/resource/autocode_template/web/table.vue.tpl

@@ -86,6 +86,9 @@
         :data="tableData"
         row-key="ID"
         @selection-change="handleSelectionChange"
+        {{- if .NeedSort}}
+        @sort-change="sortChange"
+        {{- end}}
         >
         <el-table-column type="selection" width="55" />
         <el-table-column align="left" label="日期" width="180">
@@ -93,21 +96,21 @@
         </el-table-column>
         {{- range .Fields}}
         {{- if .DictType}}
-        <el-table-column align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
             <template #default="scope">
             {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
             </template>
         </el-table-column>
         {{- else if eq .FieldType "bool" }}
-        <el-table-column align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
             <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
         </el-table-column>
          {{- else if eq .FieldType "time.Time" }}
-         <el-table-column align="left" label="{{.FieldDesc}}" width="180">
+         <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" width="180">
             <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
          </el-table-column>
         {{- else }}
-        <el-table-column align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
         {{- end }}
         {{- end }}
         <el-table-column align="left" label="按钮组">
@@ -240,9 +243,19 @@ const pageSize = ref(10)
 const tableData = ref([])
 const searchInfo = ref({})
 
+{{- if .NeedSort}}
+// 排序
+const sortChange = ({ prop, order }) => {
+  searchInfo.value.sort = prop
+  searchInfo.value.order = order
+  getTableData()
+}
+{{- end}}
+
 // 重置
 const onReset = () => {
   searchInfo.value = {}
+  getTableData()
 }
 
 // 搜索

server/service/system/sys_auto_code.go

@@ -161,6 +161,10 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru
 			autoCode.NeedValid = true
 			break
 		}
+		if autoCode.Fields[i].Sort {
+			autoCode.NeedSort = true
+			break
+		}
 	}
 	dataList, _, needMkdir, err := autoCodeService.getNeedList(&autoCode)
 	if err != nil {
@@ -250,6 +254,10 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc
 			autoCode.NeedValid = true
 			break
 		}
+		if autoCode.Fields[i].Sort {
+			autoCode.NeedSort = true
+			break
+		}
 	}
 	// 增加判断: 重复创建struct
 	if autoCode.AutoMoveFile && AutoCodeHistoryServiceApp.Repeat(autoCode.BusinessDB, autoCode.StructName, autoCode.Package) {