From 2a2bf7f0365c1392539b3ed793c4803e0de4c04a Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Fri, 6 Nov 2020 16:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E5=8C=96=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9B=B4=E5=8A=A0=E8=A7=84=E8=8C=83=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?css=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/{te => server}/api.go.tpl        |   0
 .../template/{te => server}/model.go.tpl      |   0
 .../template/{te => server}/request.go.tpl    |   0
 .../template/{te => server}/router.go.tpl     |   0
 .../template/{te => server}/service.go.tpl    |   0
 .../resource/template/{fe => web}/api.js.tpl  |   0
 server/resource/template/web/form.vue.tpl     | 125 ++++++++++++++++++
 .../template/{fe => web}/table.vue.tpl        |   2 +
 server/service/sys_auto_code.go               |   2 +-
 web/src/style/main.scss                       |   6 +-
 10 files changed, 132 insertions(+), 3 deletions(-)
 rename server/resource/template/{te => server}/api.go.tpl (100%)
 rename server/resource/template/{te => server}/model.go.tpl (100%)
 rename server/resource/template/{te => server}/request.go.tpl (100%)
 rename server/resource/template/{te => server}/router.go.tpl (100%)
 rename server/resource/template/{te => server}/service.go.tpl (100%)
 rename server/resource/template/{fe => web}/api.js.tpl (100%)
 create mode 100644 server/resource/template/web/form.vue.tpl
 rename server/resource/template/{fe => web}/table.vue.tpl (99%)

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 00000000..811cd8c0
--- /dev/null
+++ b/server/resource/template/web/form.vue.tpl
@@ -0,0 +1,125 @@
+<template>
+<div>
+    <el-form :model="formData" label-position="right" label-width="80px">
+        {{- range .Fields}}
+             <el-form-item label="{{.FieldDesc}}:">
+          {{- if eq .FieldType "bool" }}
+                <el-switch active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" v-model="formData.{{.FieldJson}}" clearable ></el-switch>
+          {{ end -}}
+          {{- if eq .FieldType "string" }}
+                <el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" ></el-input>
+          {{ end -}}
+          {{- if eq .FieldType "int" }}
+          {{- if .DictType}}
+                 <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择" clearable>
+                     <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value"></el-option>
+                 </el-select>
+          {{ else -}}
+                 <el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入"></el-input>
+          {{ end -}}
+          {{ end -}}
+          {{- if eq .FieldType "time.Time" }}
+                  <el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable></el-date-picker>
+           {{ end -}}
+           {{- if eq .FieldType "float64" }}
+                  <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable></el-input-number>
+           {{ end -}}
+              </el-form-item>
+           {{ end -}}
+
+           <el-form-item>
+           <el-button @click="save" type="primary">保存</el-button>
+           <el-button @click="back" type="primary">返回</el-button>
+           </el-form-item>
+    </el-form>
+</div>
+</template>
+
+<script>
+import {
+    create{{.StructName}},
+    update{{.StructName}},
+    find{{.StructName}}
+} from "@/api/{{.PackageName}}";  //  此处请自行替换地址
+import infoList from "@/mixins/infoList";
+export default {
+  name: "{{.StructName}}",
+  mixins: [infoList],
+  data() {
+    return {
+      type: "",
+
+      {{- range .Fields}}
+          {{- if .DictType }}
+      {{ .DictType }}Options:[],
+          {{ end -}}
+      {{end -}}
+
+      formData: {
+            {{range .Fields}}
+            {{- if eq .FieldType "bool" -}}
+               {{.FieldJson}}:false,
+            {{ end -}}
+            {{- if eq .FieldType "string" -}}
+               {{.FieldJson}}:"",
+            {{ end -}}
+            {{- if eq .FieldType "int" -}}
+               {{.FieldJson}}:0,
+            {{ end -}}
+            {{- if eq .FieldType "time.Time" -}}
+               {{.FieldJson}}:new Date(),
+            {{ end -}}
+            {{- if eq .FieldType "float64" -}}
+               {{.FieldJson}}:0,
+            {{ end -}}
+            {{ end }}
+      }
+    };
+  },
+  methods: {
+    async save() {
+      let res;
+      switch (this.type) {
+        case "create":
+          res = await create{{.StructName}}(this.formData);
+          break;
+        case "update":
+          res = await update{{.StructName}}(this.formData);
+          break;
+        default:
+          res = await create{{.StructName}}(this.formData);
+          break;
+      }
+      if (res.code == 0) {
+        this.$message({
+          type:"success",
+          message:"创建/更改成功"
+        })
+      }
+    },
+    back(){
+        this.$router.go(-1)
+    }
+  },
+  async created() {
+   // 建议通过url传参获取目标数据ID 调用 find方法进行查询数据操作 从而决定本页面是create还是update 以下为id作为url参数示例
+    if(this.$route.query.id){
+    const res = await find{{.StructName}}({ ID: this.$route.query.id })
+    if(res.code == 0){
+       this.formData = res.data.re{{.Abbreviation}}
+       this.type == "update"
+     }
+    }else{
+     this.type == "create"
+   }
+  {{ range .Fields -}}
+    {{- if .DictType }}
+    await this.getDict("{{.DictType}}");
+    {{ end -}}
+  {{- end }}
+}
+};
+</script>
+
+<style>
+</style>
\ 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 a184bca3..02018627 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 df158535..41668ba7 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 99803297..f56af3b4 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;