[fix]代码生成器

resource/template/go/api.template

@@ -7,11 +7,11 @@ package api
 import (
     "pandax/kit/model"
     "pandax/kit/restfulx"
+	"strings"
 
 	"pandax/apps/{{.PackageName}}/entity"
 	"pandax/apps/{{.PackageName}}/services"
 	"pandax/kit/biz"
-	"pandax/kit/utils"
 )
 
 type {{.ClassName}}Api struct {
@@ -61,7 +61,7 @@ func (p *{{.ClassName}}Api) Insert{{.ClassName}}(rc *restfulx.ReqCtx) {
 	var data entity.{{.ClassName}}
 	restfulx.BindQuery(rc, &data)
 
-	err := p.{{.ClassName}}App.Insert(data)
+	_,err := p.{{.ClassName}}App.Insert(data)
 	biz.ErrIsNil(err, "添加{{.TableComment}}失败")
 }
 
@@ -84,4 +84,4 @@ func (p *{{.ClassName}}Api) Delete{{.ClassName}}(rc *restfulx.ReqCtx) {
     {{.PkJsonField}}s := utils.IdsStrToIdsIntGroup({{.PkJsonField}})
     {{- end }}
     biz.ErrIsNil(p.{{.ClassName}}App.Delete({{.PkJsonField}}s), "删除{{.TableComment}}失败")
-}
+}

resource/template/go/service.template

@@ -17,7 +17,7 @@ type (
 		FindOne({{.PkJsonField}} {{.PkGoType}}) (*entity.{{.ClassName}},error)
 		FindListPage(page, pageSize int, data entity.{{.ClassName}}) (*[]entity.{{.ClassName}}, int64, error)
 		FindList(data entity.{{ .ClassName }}) (*[]entity.{{.ClassName}},error)
-		Update(data entity.{{.ClassName}}) (*entity.{{.ClassName}},error)
+		Update(data entity.{{.ClassName}}) error
 		Delete({{.PkJsonField}}s []{{.PkGoType}}) error
 	}
 
@@ -119,7 +119,7 @@ func (m *{{.BusinessName}}ModelImpl) FindListPage(page, pageSize int, data entit
 	if err != nil {
         return &list, total, err
     }
-	err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
+	err = db.Limit(pageSize).Offset(offset).Find(&list).Error
 	return &list, total, err
 }
 
@@ -188,15 +188,14 @@ func (m *{{.BusinessName}}ModelImpl) FindList(data entity.{{$model}}) (*[]entity
     db.Preload("{{$column.LinkTableClass}}")
     {{- end -}}
     {{- end}}
-	err := db.Order("create_time").Find(&list).Error
+	err := db.Find(&list).Error
 	return &list, err
 }
 
-func (m *{{.BusinessName}}ModelImpl) Update(data entity.{{$model}}) (*entity.{{$model}}, error) {
-	err := global.Db.Table(m.table).Updates(&data).Error
-	return &data, err
+func (m *{{.BusinessName}}ModelImpl) Update(data entity.{{$model}}) error {
+	return global.Db.Table(m.table).Updates(&data).Error
 }
 
 func (m *{{.BusinessName}}ModelImpl) Delete({{.PkJsonField}}s []{{.PkGoType}}) error {
 	return global.Db.Table(m.table).Delete(&entity.{{$model}}{}, "{{.PkColumn}} in (?)", {{.PkJsonField}}s).Error
-}
+}

resource/template/js/api.template

@@ -10,7 +10,7 @@ export function list{{.FunctionName}}(query:any) {
 }
 
 // 查询{{.FunctionName}}详细
-export function get{{.FunctionName}}({{.PkJsonField}}:number) {
+export function get{{.FunctionName}}({{.PkJsonField}}:{{.PkGoType}}) {
 	return request({
 		url: '/{{.PackageName}}/{{.BusinessName}}/' + {{.PkJsonField}},
 		method: 'get'
@@ -36,7 +36,7 @@ export function update{{.FunctionName}}(data:any) {
 }
 
 // 删除{{.FunctionName}}
-export function del{{.FunctionName}}({{.PkJsonField}}: string) {
+export function del{{.FunctionName}}({{.PkJsonField}}: {{.PkGoType}}) {
 	return request({
 		url: '/{{.PackageName}}/{{.BusinessName}}/' + {{.PkJsonField}},
 		method: 'delete'

resource/template/vue/edit-vue.template

@@ -162,14 +162,18 @@ const onSubmit = () => {
       state.loading = true;
       if (state.ruleForm.{{.PkJsonField}} != undefined && state.ruleForm.{{.PkJsonField}} != 0) {
         update{{.FunctionName}}(state.ruleForm).then((response) => {
-          ElMessage.success("修改成功");
+          if (response.code == 200){
+            ElMessage.success("修改成功");
+            closeDialog(state.ruleForm); // 关闭弹窗
+          }
           state.loading = false;
-          closeDialog(state.ruleForm); // 关闭弹窗
         });
       } else {
         add{{.FunctionName}}(state.ruleForm).then((response) => {
-          ElMessage.success("新增成功");
-          closeDialog(state.ruleForm); // 关闭弹窗
+          if (response.code == 200){
+            ElMessage.success("新增成功");
+            closeDialog(state.ruleForm); // 关闭弹窗
+          }
         });
       }
     }
@@ -179,4 +183,4 @@ const onSubmit = () => {
 defineExpose({
   openDialog,
 });
-</script>
+</script>