Merge branch 'develop' of github.com:flipped-aurora/gin-vue-admin into gva_gormv2_dev

server/resource/template/web/api.js.tpl

@@ -94,4 +94,4 @@ export const get{{.StructName}}List = (params) => {
     method: 'get',
     params
   })
-}
+}

server/resource/template/web/form.vue.tpl

@@ -3,35 +3,35 @@
     <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="请输入" />
-    {{ 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="请输入"/>
-    {{ 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 -}}
+    {{- 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="请输入" />
+    {{- 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-select>
+    {{- else }}
+        <el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" />
+    {{- 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 -}}
+    {{- end }}
       <el-form-item>
         <el-button size="mini" type="primary" @click="save">保存</el-button>
         <el-button size="mini" type="primary" @click="back">返回</el-button>
       </el-form-item>
     </el-form>
-</div>
+  </div>
 </template>
 
 <script>
@@ -47,29 +47,29 @@ export default {
   data() {
     return {
       type: '',
-      {{range .Fields}}
+      {{- range .Fields}}
           {{- if .DictType }}
       {{ .DictType }}Options: [],
-          {{ end -}}
-      {{end -}}
+          {{- 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 }}
+        {{- 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 }}
       }
     }
   },
@@ -84,10 +84,10 @@ export default {
     } else {
       this.type = 'create'
     }
-    {{ range .Fields -}}
+    {{- range .Fields }}
       {{- if .DictType }}
-    await this.getDict("{{.DictType}}")
-      {{ end -}}
+    await this.getDict('{{.DictType}}')
+      {{- end }}
     {{- end }}
   },
   methods: {
@@ -119,4 +119,4 @@ export default {
 </script>
 
 <style>
-</style>
+</style>

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

@@ -19,8 +19,8 @@
             </el-form-item>
                   {{- else }}
         <el-form-item label="{{.FieldDesc}}">
-          <el-input placeholder="搜索条件" v-model="searchInfo.{{.FieldJson}}" />
-        </el-form-item> {{ end }} {{ end }}  {{ end }}
+          <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
+        </el-form-item>{{ end }}{{ end }}{{ end }}
         <el-form-item>
           <el-button size="mini" type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <el-button size="mini" type="primary" icon="el-icon-plus" @click="openDialog">新增</el-button>
@@ -52,15 +52,16 @@
       {{- if .DictType}}
       <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
         <template slot-scope="scope">
-          {{"{{"}}filterDict(scope.row.{{.FieldJson}},"{{.DictType}}"){{"}}"}}
+          {{"{{"}} filterDict(scope.row.{{.FieldJson}},"{{.DictType}}") {{"}}"}}
         </template>
       </el-table-column>
       {{- else if eq .FieldType "bool" }}
       <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
         <template slot-scope="scope">{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}</template>
       </el-table-column> {{- else }}
-      <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" /> {{ end -}}
-      {{ end -}}
+      <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+      {{- end }}
+      {{- end }}
       <el-table-column label="按钮组">
         <template slot-scope="scope">
           <el-button size="small" type="primary" icon="el-icon-edit" class="table-button" @click="update{{.StructName}}(scope.row)">变更</el-button>
@@ -82,30 +83,30 @@
       <el-form :model="formData" label-position="right" label-width="80px">
     {{- range .Fields}}
         <el-form-item label="{{.FieldDesc}}:">
-      {{ if eq .FieldType "bool" }}
+      {{- 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" }}
+      {{- end }}
+      {{- if eq .FieldType "string" }}
           <el-input v-model="formData.{{.FieldJson}}" clearable placeholder="请输入" />
-      {{ end -}}
-      {{ if eq .FieldType "int" }}
+      {{- 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-select>
-      {{ else }}
+      {{- else }}
           <el-input v-model.number="formData.{{ .FieldJson }}" clearable placeholder="请输入" />
-      {{ end -}}
-      {{ end -}}
-      {{ if eq .FieldType "time.Time" }}
+      {{- end }}
+      {{- end }}
+      {{- if eq .FieldType "time.Time" }}
           <el-date-picker type="date" placeholder="选择日期" v-model="formData.{{ .FieldJson }}" clearable />
-       {{ end -}}
-       {{- if eq .FieldType "float64" }}
+      {{- end }}
+      {{- if eq .FieldType "float64" }}
           <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" clearable />
-       {{ end -}}
-            </el-form-item>
-       {{- end }}
-     </el-form>
+      {{- end }}
+        </el-form-item>
+      {{- end }}
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="enterDialog">确 定</el-button>
@@ -127,6 +128,23 @@ import { formatTimeToStr } from '@/utils/date'
 import infoList from '@/mixins/infoList'
 export default {
   name: '{{.StructName}}',
+  filters: {
+    formatDate: function(time) {
+      if (time !== null && time !== '') {
+        var date = new Date(time)
+        return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss')
+      } else {
+        return ''
+      }
+    },
+    formatBoolean: function(bool) {
+      if (bool != null) {
+        return bool ? '是' : '否'
+      } else {
+        return ''
+      }
+    }
+  },
   mixins: [infoList],
   data() {
     return {
@@ -135,66 +153,49 @@ export default {
       type: '',
       deleteVisible: false,
       multipleSelection: [],
-      {{ range .Fields}}
+      {{- range .Fields}}
           {{- if .DictType }}
       {{ .DictType }}Options: [],
-          {{ end -}}
-      {{ end }}
+          {{- end }}
+      {{- end }}
       formData: {
-        {{range .Fields}}
-          {{- if eq .FieldType "bool" -}}
+    {{- range .Fields}}
+      {{- if eq .FieldType "bool" }}
         {{.FieldJson}}: false,
-          {{ end -}}
-          {{- if eq .FieldType "string" -}}
+      {{- end }}
+      {{- if eq .FieldType "string" }}
         {{.FieldJson}}: '',
-          {{ end -}}
-          {{- if eq .FieldType "int" -}}
+      {{- end }}
+      {{- if eq .FieldType "int" }}
         {{.FieldJson}}: 0,
-          {{ end -}}
-          {{- if eq .FieldType "time.Time" -}}
+      {{- end }}
+      {{- if eq .FieldType "time.Time" }}
         {{.FieldJson}}: new Date(),
-          {{ end -}}
-          {{- if eq .FieldType "float64" -}}
+      {{- end }}
+      {{- if eq .FieldType "float64" }}
         {{.FieldJson}}: 0,
-          {{ end -}}
-        {{ end }}
-      }
-    }
-  },
-  filters: {
-    formatDate: function(time) {
-      if (time !== null && time !== '') {
-        var date = new Date(time);
-        return formatTimeToStr(date, 'yyyy-MM-dd hh:mm:ss');
-      } else {
-        return ''
-      }
-    },
-    formatBoolean: function(bool) {
-      if (bool != null) {
-        return bool ? '是' : '否'
-      } else {
-        return ''
+      {{- end }}
+    {{- end }}
       }
     }
   },
   async created() {
     await this.getTableData()
-    {{ range .Fields -}}
-      {{- if .DictType }}
+{{- range .Fields }}
+  {{- if .DictType }}
     await this.getDict('{{.DictType}}')
-      {{ end -}}
-    {{- end }}
+  {{- end }}
+{{- end }}
   },
   methods: {
   // 条件搜索前端看此方法
     onSubmit() {
       this.page = 1
       this.pageSize = 10
-      {{- range .Fields}} {{- if eq .FieldType "bool" }}
+      {{- range .Fields}}{{- if eq .FieldType "bool" }}
       if (this.searchInfo.{{.FieldJson}} === ""){
         this.searchInfo.{{.FieldJson}}=null
-      } {{ end }} {{ end }}
+      }{{ end }}{{ end }}
       this.getTableData()
     },
     handleSelectionChange(val) {
@@ -246,23 +247,23 @@ export default {
     closeDialog() {
       this.dialogFormVisible = false
       this.formData = {
-        {{range .Fields}}
-          {{- if eq .FieldType "bool" -}}
+      {{- range .Fields}}
+        {{- if eq .FieldType "bool" }}
         {{.FieldJson}}: false,
-          {{ end -}}
-          {{- if eq .FieldType "string" -}}
+        {{- end }}
+        {{- if eq .FieldType "string" }}
         {{.FieldJson}}: '',
-          {{ end -}}
-          {{- if eq .FieldType "int" -}}
+        {{- end }}
+        {{- if eq .FieldType "int" }}
         {{.FieldJson}}: 0,
-          {{ end -}}
-          {{- if eq .FieldType "time.Time" -}}
+        {{- end }}
+        {{- if eq .FieldType "time.Time" }}
         {{.FieldJson}}: new Date(),
-          {{ end -}}
-          {{- if eq .FieldType "float64" -}}
+        {{- end }}
+        {{- if eq .FieldType "float64" }}
         {{.FieldJson}}: 0,
-          {{ end -}}
-        {{ end }}
+        {{- end }}
+      {{- end }}
       }
     },
     async delete{{.StructName}}(row) {
@@ -272,7 +273,7 @@ export default {
           type: 'success',
           message: '删除成功'
         })
-        if (this.tableData.length === 1 && this.page > 1 ) {
+        if (this.tableData.length === 1 && this.page > 1) {
           this.page--
         }
         this.getTableData()
@@ -281,10 +282,10 @@ export default {
     async enterDialog() {
       let res
       switch (this.type) {
-        case "create":
+        case 'create':
           res = await create{{.StructName}}(this.formData)
           break
-        case "update":
+        case 'update':
           res = await update{{.StructName}}(this.formData)
           break
         default:

server/utils/validator.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"errors"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 )
@@ -37,6 +38,15 @@ func NotEmpty() string {
 	return "notEmpty"
 }
 
+//@author: [zooqkl](https://github.com/zooqkl)
+//@function: RegexpMatch
+//@description: 正则校验 校验输入项是否满足正则表达式
+//@param:  rule string
+//@return: string
+func RegexpMatch(rule string) string {
+	return "regexp=" + rule
+}
+
 //@author: [piexlmax](https://github.com/piexlmax)
 //@function: Lt
 //@description: 小于入参(<) 如果为string array Slice则为长度比较 如果是 int uint float 则为数值比较
@@ -133,6 +143,10 @@ func Verify(st interface{}, roleMap Rules) (err error) {
 					if isBlank(val) {
 						return errors.New(tagVal.Name + "值不能为空")
 					}
+				case strings.Split(v, "=")[0] == "regexp":
+					if !regexpMatch(strings.Split(v, "=")[1], val.String()) {
+						return errors.New(tagVal.Name + "格式校验不通过")
+					}
 				case compareMap[strings.Split(v, "=")[0]]:
 					if !compareVerify(val, v) {
 						return errors.New(tagVal.Name + "长度或值不在合法范围," + v)
@@ -266,3 +280,7 @@ func compare(value interface{}, VerifyStr string) bool {
 		return false
 	}
 }
+
+func regexpMatch(rule, matchStr string) bool {
+	return regexp.MustCompile(rule).MatchString(matchStr)
+}

web/.eslintrc.js

@@ -52,7 +52,7 @@ module.exports = {
         properties: 'always'
       }
     ],
-    'comma-dangle': [2, 'never'],
+    'comma-dangle': [2, 'only-multiline'],
     'comma-spacing': [
       2,
       {