diff --git a/server/resource/template/te/api.go.tpl b/server/resource/template/server/api.go.tpl similarity index 100% rename from server/resource/template/te/api.go.tpl rename to server/resource/template/server/api.go.tpl diff --git a/server/resource/template/te/model.go.tpl b/server/resource/template/server/model.go.tpl similarity index 100% rename from server/resource/template/te/model.go.tpl rename to server/resource/template/server/model.go.tpl diff --git a/server/resource/template/te/request.go.tpl b/server/resource/template/server/request.go.tpl similarity index 100% rename from server/resource/template/te/request.go.tpl rename to server/resource/template/server/request.go.tpl diff --git a/server/resource/template/te/router.go.tpl b/server/resource/template/server/router.go.tpl similarity index 100% rename from server/resource/template/te/router.go.tpl rename to server/resource/template/server/router.go.tpl diff --git a/server/resource/template/te/service.go.tpl b/server/resource/template/server/service.go.tpl similarity index 100% rename from server/resource/template/te/service.go.tpl rename to server/resource/template/server/service.go.tpl diff --git a/server/resource/template/fe/api.js.tpl b/server/resource/template/web/api.js.tpl similarity index 100% rename from server/resource/template/fe/api.js.tpl rename to server/resource/template/web/api.js.tpl diff --git a/server/resource/template/web/form.vue.tpl b/server/resource/template/web/form.vue.tpl new file mode 100644 index 0000000000000000000000000000000000000000..811cd8c08c89470eb7852b313f703cd98830fc56 --- /dev/null +++ b/server/resource/template/web/form.vue.tpl @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/web/table.vue.tpl similarity index 99% rename from server/resource/template/fe/table.vue.tpl rename to server/resource/template/web/table.vue.tpl index a184bca3055e3144837edbe5087c93979fc461c6..0201862729f8ba104f8c79453abdc0cdb6414dd5 100644 --- a/server/resource/template/fe/table.vue.tpl +++ b/server/resource/template/web/table.vue.tpl @@ -149,11 +149,13 @@ export default { type: "", deleteVisible: false, multipleSelection: [], + {{- range .Fields}} {{- if .DictType }} {{ .DictType }}Options:[], {{ end -}} {{end -}} + formData: { {{range .Fields}} {{- if eq .FieldType "bool" -}} diff --git a/server/service/sys_auto_code.go b/server/service/sys_auto_code.go index df1585357347e22cb13cb83cbb79a7acf0ddc472..41668ba7f1bbf419a5b322243d5c92b77229d9a3 100644 --- a/server/service/sys_auto_code.go +++ b/server/service/sys_auto_code.go @@ -46,7 +46,7 @@ func CreateTemp(autoCode model.AutoCodeStruct) (err error) { } // 生成文件路径,填充 autoCodePath 字段,readme.txt.tpl不符合规则,需要特殊处理 - // resource/template/fe/api.js.tpl -> autoCode/fe/autoCode.PackageName/api/autoCode.PackageName.js + // resource/template/web/api.js.tpl -> autoCode/web/autoCode.PackageName/api/autoCode.PackageName.js // resource/template/readme.txt.tpl -> autoCode/readme.txt autoPath := "autoCode/" for index, value := range dataList { diff --git a/web/src/style/main.scss b/web/src/style/main.scss index 998032974e6556625b6609d912348dc79a0daf76..f56af3b480f7fe98eebbe15a41cf48d1a07bfd36 100644 --- a/web/src/style/main.scss +++ b/web/src/style/main.scss @@ -1066,6 +1066,8 @@ $mainHight: 100vh; .layout-cont { .right-box { + height: $height-header; + line-height: $height-header; text-align: center; vertical-align: middle; margin-right: 40px; @@ -1088,8 +1090,8 @@ $mainHight: 100vh; padding: 0 24px; } .fl-right { - height: $height-header; - line-height: $height-header; + // height: $height-header; + // line-height: $height-header; } &.el-main { overflow: auto;