Merge branch 'dev'

This commit is contained in:
zhangwenjian committed 2021-06-13 23:07:37 +08:00
commit 372248c819
219 files changed
+9367 -8029

No files matched your search

+4 -3
View File
@@ -6,7 +6,7 @@
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
{{range .Columns}}
{{- $x := .IsQuery -}}
{{- if ($x) -}}
{{- if (eq $x "1") -}}
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
{{- if ne .FkTableName "" -}}
<el-select v-model="queryParams.{{.JsonField}}"
@@ -294,7 +294,8 @@
// 表单校验
rules: {
{{- range .Columns -}}
{{- if eq .IsRequired "1" -}}
{{- $x := .IsQuery -}}
{{- if (eq $x "1") -}}
{{.JsonField}}:
[
{required: true, message: '{{.ColumnComment}}不能为空', trigger: 'blur'}
@@ -341,7 +342,7 @@
this.form = {
{{ range .Columns}}
{{- $x := .IsInsert -}}
{{- if ($x) -}}
{{- if (eq $x "1") -}}
{{- if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}}