fork merge

README.md

@@ -12,6 +12,25 @@
 
 [English](./README-en.md) | 简体中文
 
+## ✨一分钟生成前后端基础代码
+
+<table>
+  <tr>
+    <td width="200">
+      <p>📄 创建基础模板</p>
+      <p>🤖 AI生成结构</p>
+      <p>⏰ 生成代码</p>
+      <p>🏷️ 分配权限</p>
+      <p>🎉 基础CURD生成完成</p>   
+    </td>
+    <td>
+      <video src="https://private-user-images.githubusercontent.com/165128580/384700666-4d039215-af29-4f86-bb4f-60dbab38f58e.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzEyNTIxNDYsIm5iZiI6MTczMTI1MTg0NiwicGF0aCI6Ii8xNjUxMjg1ODAvMzg0NzAwNjY2LTRkMDM5MjE1LWFmMjktNGY4Ni1iYjRmLTYwZGJhYjM4ZjU4ZS5tcDQ_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQxMTEwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MTExMFQxNTE3MjZaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT00NjJkMDcwZjJkMjAyMmU1N2I2MzQxY2RhODFlNzgzNGRiMDFhMmY2NTYyM2ZmODdhNDVmMWE1NzlhMDdlOTI5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZJbswpLzF2RHjemcGirKOP0L1fvpl3FUqIiQ_-yjeUo" data-canonical-src="https://private-user-images.githubusercontent.com/165128580/384700666-4d039215-af29-4f86-bb4f-60dbab38f58e.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzEyNTIxNDYsIm5iZiI6MTczMTI1MTg0NiwicGF0aCI6Ii8xNjUxMjg1ODAvMzg0NzAwNjY2LTRkMDM5MjE1LWFmMjktNGY4Ni1iYjRmLTYwZGJhYjM4ZjU4ZS5tcDQ_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQxMTEwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MTExMFQxNTE3MjZaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT00NjJkMDcwZjJkMjAyMmU1N2I2MzQxY2RhODFlNzgzNGRiMDFhMmY2NTYyM2ZmODdhNDVmMWE1NzlhMDdlOTI5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZJbswpLzF2RHjemcGirKOP0L1fvpl3FUqIiQ_-yjeUo" controls="controls" muted="muted" class="d-block rounded-bottom-2 border-top width-fit" style="max-height:640px; min-height: 200px">
+</video>
+    </td>
+  </tr>
+</table>
+
+
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com
 

server/api/v1/system/auto_code_template.go

@@ -40,8 +40,8 @@ func (a *AutoCodeTemplateApi) Preview(c *gin.Context) {
 	info.PackageT = utils.FirstUpper(info.Package)
 	autoCode, err := autoCodeTemplateService.Preview(c.Request.Context(), info)
 	if err != nil {
-		global.GVA_LOG.Error("预览失败!", zap.Error(err))
-		response.FailWithMessage("预览失败", c)
+		global.GVA_LOG.Error(err.Error(), zap.Error(err))
+		response.FailWithMessage("预览失败:"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
 	}

server/model/system/request/sys_auto_history.go

@@ -25,6 +25,7 @@ func (r *SysAutoHistoryCreate) Create() model.SysAutoCodeHistory {
 		Request:          r.Request,
 		Table:            r.Table,
 		StructName:       r.StructName,
+		Abbreviation:     r.StructName,
 		BusinessDB:       r.BusinessDB,
 		Description:      r.Description,
 		Injections:       r.Injections,

server/model/system/sys_auto_code_history.go

@@ -16,6 +16,7 @@ type SysAutoCodeHistory struct {
 	Package          string             `json:"package" gorm:"column:package;comment:模块名/插件名"`
 	Request          string             `json:"request" gorm:"type:text;column:request;comment:前端传入的结构化信息"`
 	StructName       string             `json:"structName" gorm:"column:struct_name;comment:结构体名称"`
+	Abbreviation     string             `json:"abbreviation" gorm:"column:abbreviation;comment:结构体名称缩写"`
 	BusinessDB       string             `json:"businessDb" gorm:"column:business_db;comment:业务库"`
 	Description      string             `json:"description" gorm:"column:description;comment:Struct中文名称"`
 	Templates        map[string]string  `json:"template" gorm:"serializer:json;type:text;column:templates;comment:模板信息"`

server/resource/package/web/view/form.vue.tpl

@@ -226,7 +226,7 @@ getDataSourceFunc()
       {{- end }}
       {{- end }}
         <el-form-item>
-          <el-button type="primary" @click="save">保存</el-button>
+          <el-button :loading="btnLoading" type="primary" @click="save">保存</el-button>
           <el-button type="primary" @click="back">返回</el-button>
         </el-form-item>
       </el-form>
@@ -277,6 +277,9 @@ import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
 const route = useRoute()
 const router = useRouter()
 
+// 提交按钮loading
+const btnLoading = ref(false)
+
 const type = ref('')
     {{- range $index, $element := .DictTypes}}
 const {{ $element }}Options = ref([])
@@ -369,8 +372,9 @@ const init = async () => {
 init()
 // 保存按钮
 const save = async() => {
+      btnLoading.value = true
       elFormRef.value?.validate( async (valid) => {
-         if (!valid) return
+         if (!valid) return btnLoading.value = false
             let res
            switch (type.value) {
              case 'create':
@@ -383,6 +387,7 @@ const save = async() => {
                res = await create{{.StructName}}(formData.value)
                break
            }
+           btnLoading.value = false
            if (res.code === 0) {
              ElMessage({
                type: 'success',
@@ -410,4 +415,4 @@ const back = () => {
 <style>
 </style>
 {{- end }}
-{{- end }}
+{{- end }}

server/resource/package/web/view/table.vue.tpl

@@ -74,13 +74,13 @@
         {{- if .CheckDataSource }}
 <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
     <template #default="scope">
-        {{if eq .DataSource.Association 2}}
+        {{- if eq .DataSource.Association 2}}
         <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
              {{ "{{ item }}" }}
         </el-tag>
-        {{ else }}
+        {{- else }}
         <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
-        {{ end }}
+        {{- end }}
     </template>
 </el-table-column>
         {{- else if .DictType}}
@@ -232,7 +232,17 @@
 {{- range .Fields}}
               {{- if .Desc }}
 <el-descriptions-item label="{{ .FieldDesc }}">
-                {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+{{- if .CheckDataSource }}
+    <template #default="scope">
+        {{- if eq .DataSource.Association 2}}
+        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+             {{ "{{ item }}" }}
+        </el-tag>
+        {{- else }}
+        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+        {{- end }}
+    </template>
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
     {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
                 {{- else }}
                     {{- if eq .FieldType "picture" }}
@@ -338,7 +348,7 @@ const {{ $element }}Options = ref([])
 get{{.StructName}}DataSource,
 
 //  获取数据源
-const dataSource = ref([])
+const dataSource = ref({})
 const getDataSourceFunc = async()=>{
   const res = await get{{.StructName}}DataSource()
   if (res.code === 0) {
@@ -537,13 +547,13 @@ getDataSourceFunc()
         {{- if .CheckDataSource }}
         <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
           <template #default="scope">
-                {{if eq .DataSource.Association 2}}
+                {{- if eq .DataSource.Association 2}}
                     <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
                         {{ "{{ item }}" }}
                     </el-tag>
-                {{ else }}
+                {{- else }}
                     <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
-                {{ end }}
+                {{- end }}
          </template>
          </el-table-column>
         {{- else if .DictType}}
@@ -642,7 +652,7 @@ getDataSourceFunc()
               <div class="flex justify-between items-center">
                 <span class="text-lg">{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}</span>
                 <div>
-                  <el-button type="primary" @click="enterDialog">确 定</el-button>
+                  <el-button :loading="btnLoading" type="primary" @click="enterDialog">确 定</el-button>
                   <el-button @click="closeDialog">取 消</el-button>
                 </div>
               </div>
@@ -727,7 +737,17 @@ getDataSourceFunc()
             {{- range .Fields}}
               {{- if .Desc }}
                     <el-descriptions-item label="{{ .FieldDesc }}">
-                {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+                    {{- if .CheckDataSource }}
+                   <template #default="scope">
+                       {{- if eq .DataSource.Association 2}}
+                       <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+                            {{ "{{ item }}" }}
+                       </el-tag>
+                       {{- else }}
+                       <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+                       {{- end }}
+                   </template>
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
                         {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
                 {{- else }}
                     {{- if eq .FieldType "picture" }}
@@ -821,6 +841,9 @@ defineOptions({
     const btnAuth = useBtnAuth()
 {{- end }}
 
+// 提交按钮loading
+const btnLoading = ref(false)
+
 // 控制更多查询条件显示/隐藏状态
 const showAllQuery = ref(false)
 
@@ -987,7 +1010,6 @@ const onSubmit = () => {
   elSearchFormRef.value?.validate(async(valid) => {
     if (!valid) return
     page.value = 1
-    pageSize.value = 10
     {{- range .Fields}}{{- if eq .FieldType "bool" }}
     if (searchInfo.value.{{.FieldJson}} === ""){
         searchInfo.value.{{.FieldJson}}=null
@@ -1171,8 +1193,9 @@ const closeDialog = () => {
 }
 // 弹窗确定
 const enterDialog = async () => {
+     btnLoading.value = true
      elFormRef.value?.validate( async (valid) => {
-             if (!valid) return
+             if (!valid) return btnLoading.value = false
               let res
               switch (type.value) {
                 case 'create':
@@ -1185,6 +1208,7 @@ const enterDialog = async () => {
                   res = await create{{.StructName}}(formData.value)
                   break
               }
+              btnLoading.value = false
               if (res.code === 0) {
                 ElMessage({
                   type: 'success',
@@ -1263,4 +1287,4 @@ defineOptions({
 </style>
 {{- end }}
 
-{{- end }}
+{{- end }}