+ Merge branch 'i18n' of https://github.com/flipped-aurora/gin-vue-admin

into i18n + Update translations.
flipped-aurora · Dec 23, 2024 · a28d6aa · a28d6aa
2 parents 4b78e52 + 51490a7
commit a28d6aa
Show file tree

Hide file tree

Showing 162 changed files with 17,220 additions and 16,134 deletions.
diff --git a/server/core/server.go b/server/core/server.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize"
 	"github.com/flipped-aurora/gin-vue-admin/server/service/system"

diff --git a/server/go.sum b/server/go.sum
@@ -42,6 +42,7 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=

diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl
@@ -29,7 +29,7 @@ package {{.Package}}
 {{- if not .OnlyTemplate}}
 import (
 	{{- if .GvaModel }}
-	"{{.Module}}/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	{{- end }}
 	{{- if or .HasTimer }}
 	"time"
@@ -82,5 +82,4 @@ func ({{.StructName}}) TableName() string {
 }
 {{ end }}
 
-
-{{ end }}
+{{ end }}
diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
@@ -23,7 +23,7 @@ if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
     db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
 }
     {{- else}}
-if info.{{.FieldName}} != nil {
+if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
     db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
 }
             {{- end }}
@@ -158,7 +158,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
             db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
         }
     {{- else}}
-    if info.{{.FieldName}} != nil {
+    if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
         db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
     }
             {{- end }}

diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl
@@ -1,72 +1,63 @@
+{{- $top := . -}}
 {{- if .IsAdd }}
 // 新增表单中增加如下代码
 {{- range .Fields}}
           {{- if .Form}}
-<el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
-          {{- if .CheckDataSource}}
-    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
-        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
-    </el-select>
-          {{- else }}
-          {{- if eq .FieldType "bool" }}
-    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
-          {{- end }}
-          {{- if eq .FieldType "string" }}
-          {{- if .DictType}}
-    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.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="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
-          {{- end }}
-          {{- end }}
-          {{- if eq .FieldType "richtext" }}
-    <RichEdit v-model="formData.{{.FieldJson}}"/>
-          {{- end }}
-          {{- if eq .FieldType "json" }}
-    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
-    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
-          {{- end }}
-           {{- if eq .FieldType "array" }}
-    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
-           {{- end }}
-          {{- if eq .FieldType "int" }}
-    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
-          {{- end }}
-          {{- if eq .FieldType "time.Time" }}
-    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}"  />
-          {{- end }}
-          {{- if eq .FieldType "float64" }}
-    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
-          {{- end }}
-          {{- if eq .FieldType "enum" }}
-    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
-       <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
-    </el-select>
-          {{- end }}
-          {{- if eq .FieldType "picture" }}
-    <SelectImage
-     v-model="formData.{{ .FieldJson }}"
-     file-type="image"
-    />
-          {{- end }}
-          {{- if eq .FieldType "pictures" }}
-    <SelectImage
-     multiple
-     v-model="formData.{{ .FieldJson }}"
-     file-type="image"
-     />
-          {{- end }}
-          {{- if eq .FieldType "video" }}
-    <SelectImage
-    v-model="formData.{{ .FieldJson }}"
-    file-type="video"
-    />
-           {{- end }}
-          {{- if eq .FieldType "file" }}
-    <SelectFile v-model="formData.{{ .FieldJson }}" />
-          {{- end }}
-          {{- end }}
+<el-form-item :label="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')"  prop="{{.FieldJson}}" >
+       {{- if .CheckDataSource}}
+        <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.Clearable}}" >
+          <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+        </el-select>
+       {{- else }}
+      {{- if eq .FieldType "bool" }}
+          <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" :active-text="t('base.yes')" :inactive-text="t('base.no')" clearable ></el-switch>
+      {{- end }}
+      {{- if eq .FieldType "string" }}
+      {{- if .DictType}}
+           <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" style="width:100%" :clearable="{{.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="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  :placeholder="t('{{$top.Package}}.{{$top.StructName}}.{{.FieldName}}')" />
+      {{- end }}
+      {{- end }}
+      {{- if eq .FieldType "richtext" }}
+          <RichEdit v-model="formData.{{.FieldJson}}"/>
+      {{- end }}
+      {{- if eq .FieldType "int" }}
+          <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" :placeholder="t('general.pleaseEnter')" />
+      {{- end }}
+      {{- if eq .FieldType "time.Time" }}
+          <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" :placeholder="t('general.selectDate')" :clearable="{{.Clearable}}"></el-date-picker>
+      {{- end }}
+      {{- if eq .FieldType "float64" }}
+          <el-input-number v-model="formData.{{ .FieldJson }}" :precision="2" :clearable="{{.Clearable}}"></el-input-number>
+      {{- end }}
+      {{- if eq .FieldType "enum" }}
+        <el-select v-model="formData.{{ .FieldJson }}" :placeholder="t('base.pleaseSelect')" style="width:100%" :clearable="{{.Clearable}}">
+          <el-option v-for="item in [{{ .DataTypeLong }}]" :key="item" :label="item" :value="item" />
+        </el-select>
+      {{- end }}
+       {{- if eq .FieldType "picture" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "video" }}
+          <SelectImage v-model="formData.{{ .FieldJson }}" file-type="video"/>
+       {{- end }}
+       {{- if eq .FieldType "pictures" }}
+           <SelectImage v-model="formData.{{ .FieldJson }}" multiple file-type="image"/>
+       {{- end }}
+       {{- if eq .FieldType "file" }}
+          <SelectFile v-model="formData.{{ .FieldJson }}" />
+       {{- end }}
+       {{- if eq .FieldType "json" }}
+          // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+          {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+       {{- end }}
+       {{- if eq .FieldType "array" }}
+          <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+       {{- end }}
+       {{- end }}
 </el-form-item>
           {{- end }}
           {{- end }}
@@ -125,22 +116,22 @@ const {{ $element }}Options = ref([])
         {{- end }}
 // 验证规则中增加如下字段
 
-{{- range .Fields }}
+   {{- range .Fields }}
         {{- if .Form }}
             {{- if eq .Require true }}
-{{.FieldJson }} : [{
-    required: true,
-    message: '{{ .ErrorText }}',
-    trigger: ['input','blur'],
-},
+               {{.FieldJson }} : [{
+                   required: true,
+                   message: '{{ .ErrorText }}',
+                   trigger: ['input','blur'],
+               },
                {{- if eq .FieldType "string" }}
-{
-    whitespace: true,
-    message: '不能只输入空格',
-    trigger: ['input', 'blur'],
-}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
               {{- end }}
-],
+              ],
             {{- end }}
         {{- end }}
     {{- end }}
@@ -160,6 +151,10 @@ const getDataSourceFunc = async()=>{
 getDataSourceFunc()
 {{- end }}
 {{- else }}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 51490a7e2c2d02f1a32e81180eb7a48ada0956a2
 {{- if not .OnlyTemplate }}
 <template>
   <div>
@@ -325,16 +320,27 @@ const formData = ref({
           {{- end }}
         {{- end }}
         })
+
 // 验证规则
 const rule = reactive({
     {{- range .Fields }}
+        {{- if .Form }}
             {{- if eq .Require true }}
                {{.FieldJson }} : [{
                    required: true,
                    message: '{{ .ErrorText }}',
                    trigger: ['input','blur'],
-               }],
+               },
+               {{- if eq .FieldType "string" }}
+               {
+                   whitespace: true,
+                   message: t('general.noOnlySpace'),
+                   trigger: ['input', 'blur'],
+              }
+              {{- end }}
+              ],
             {{- end }}
+        {{- end }}
     {{- end }}
 })
 
@@ -412,4 +418,4 @@ const back = () => {
 <style>
 </style>
 {{- end }}
-{{- end }}
+{{- end }}