Merge branch 'i18n' into i18n-dev-275

Author: pixelmaxQm

server/resource/package/web/view/form.vue.tpl

@@ -92,9 +92,8 @@ import { getDictFunc } from '@/utils/format'
 import { useRoute, useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
 import { ref, reactive } from 'vue'
-import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
-
-const { t } = useI18n() // added by mohamed hassan to support multilanguage
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 {{- if .HasPic }}
 // 图片选择组件
 import SelectImage from '@/components/selectImage/selectImage.vue'

server/resource/package/web/view/table.vue.tpl

@@ -443,10 +443,8 @@ import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
 import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, returnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-
-import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
-const { t } = useI18n() // added by mohamed hassan to support multilanguage
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 {{- if .AutoCreateBtnAuth }}
 // 引入按钮权限标识
@@ -462,11 +460,6 @@ import ImportExcel from '@/components/exportExcel/importExcel.vue'
 import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
 {{- end}}
 
-import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
-const { t } = useI18n() // added by mohamed hassan to support multilanguage
-
-
 defineOptions({
     name: '{{.StructName}}'
 })

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

@@ -90,6 +90,8 @@ import { getDictFunc } from '@/utils/format'
 import { useRoute, useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
 import { ref, reactive } from 'vue'
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 {{- if .HasPic }}
 // 图片选择组件
 import SelectImage from '@/components/selectImage/selectImage.vue'

server/resource/plugin/web/view/view.vue.template

@@ -462,9 +462,8 @@ import ImportExcel from '@/components/exportExcel/importExcel.vue'
 import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
 {{- end}}
 
-import { useI18n } from 'vue-i18n' // added by mohamed hassan to support multilanguage
-const i18n = useI18n() // added by mohamed hassan to support multilanguage
-const { t } = useI18n() // added by mohamed hassan to support multilanguage
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
 
 defineOptions({
     name: '{{.StructName}}'