Skip to content

Commit 7d5c85a

Browse files
committed
Merge remote-tracking branch 'origin/i18n' into i18n-dev-275
2 parents 92ff427 + 6c3252f commit 7d5c85a

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

web/src/locales/ar.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@
542542
"ipLimitTime": "وقت الحد من IP",
543543
"langFilesPath": "مسار ملفات اللغة",
544544
"language": "اللغة",
545+
"defaultLanguage": "اللغة الإفتراضية",
545546
"level": "المستوى",
546547
"localFileConfig": "تكوين الملف المحلي",
547548
"localFilePath": "مسار الملف المحلي",

web/src/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,7 @@
550550
"ipLimitTime": "IP Limit Time",
551551
"langFilesPath": "Language Files Address",
552552
"language": "Language",
553+
"defaultLanguage" : "Default Language",
553554
"level": "Level",
554555
"localFileConfig": "Local File Configuration",
555556
"localFilePath": "Local File Path",

web/src/locales/zh.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
"enterDBUsername": "",
137137
"initNow": "立即初始化",
138138
"language": "",
139+
"defaultLanguage": "默认语言",
139140
"note": "初始化须知",
140141
"note1": "1.您需有用一定的VUE和GOLANG基础",
141142
"note2-1": "2.请您确认是否已经阅读过",

web/src/view/superAdmin/dictionary/sysDictionary.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<warning-bar :title="t('view.dictionary.sysDictionary.dictNote')" />
44
<div class="flex gap-4 p-2">
5-
<div class="flex-none w-52 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded p-4">
5+
<div class="flex-none w-56 bg-white text-slate-700 dark:text-slate-400 dark:bg-slate-900 rounded p-4">
66
<div class="flex justify-between items-center">
77
<span class="text font-bold">{{ t('view.dictionary.sysDictionary.listOfDictionaries') }}</span>
88
<el-button type="primary" @click="openDrawer">
@@ -34,7 +34,7 @@
3434
</div>
3535
<el-drawer
3636
v-model="drawerFormVisible"
37-
size="30%"
37+
size="34%"
3838
:show-close="false"
3939
:before-close="closeDrawer"
4040
>
@@ -51,12 +51,12 @@
5151
</div>
5252
</div>
5353
</template>
54-
<el-form ref="drawerForm" :model="formData" :rules="rules" label-width="110px">
54+
<el-form ref="drawerForm" :model="formData" :rules="rules" label-width="160px">
5555
<el-form-item :label="t('view.dictionary.sysDictionary.dictName')" prop="name">
5656
<el-input v-model="formData.name" :placeholder="t('view.dictionary.sysDictionary.enterDictName')" clearable :style="{ width: '100%' }" />
5757
</el-form-item>
58-
<el-form-item :label="t('view.dictionary.sysDictionary.dictNameEn')" prop="type">
59-
<el-input v-model="formData.type" :placeholder="t('view.dictionary.sysDictionary.enterDictNameEn')" clearable :style="{ width: '100%' }" />
58+
<el-form-item :label="t('view.dictionary.sysDictionary.dictDataType')" prop="type">
59+
<el-input v-model="formData.type" :placeholder="t('view.dictionary.sysDictionary.enterDictDataType')" clearable :style="{ width: '100%' }" />
6060
</el-form-item>
6161
<el-form-item :label="t('view.dictionary.sysDictionary.status')" prop="status" required>
6262
<el-switch v-model="formData.status" :active-text="t('general.enable')" :inactive-text="t('general.disable')" />

web/src/view/superAdmin/menu/menu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<el-table-column
2626
align="left"
2727
:label="t('view.superAdmin.menu.displayName')"
28-
min-width="120"
28+
min-width="160"
2929
prop="authorityName"
3030
>
3131
<template #default="scope">

web/src/view/systemTools/autoCode/index.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
ref="getTableForm"
4242
:inline="true"
4343
:model="dbform"
44-
label-width="120px"
44+
label-width="140px"
4545
>
4646
<el-row class="w-full">
4747
<el-col :span="6">
@@ -155,7 +155,7 @@
155155
:inline="true"
156156
:model="form"
157157
:rules="rules"
158-
label-width="170px"
158+
label-width="200px"
159159
>
160160
<el-row class="w-full">
161161
<el-col :span="6">
@@ -470,7 +470,7 @@
470470
<el-table-column
471471
align="left"
472472
type="index"
473-
width="60"
473+
width="80"
474474
>
475475
<template #default>
476476
<el-icon class="cursor-grab drag-column">
@@ -482,13 +482,13 @@
482482
align="left"
483483
:label="t('view.systemTools.autoCode.fieldIndex')"
484484
type="index"
485-
width="60"
485+
width="80"
486486
/>
487487
<el-table-column
488488
align="left"
489489
:label="t('view.systemTools.autoCode.primaryKey')"
490490
type="index"
491-
width="60"
491+
width="120"
492492
>
493493
<template #default="{row}">
494494
<el-checkbox v-model="row.primaryKey"/>
@@ -528,6 +528,7 @@
528528
align="left"
529529
:label="t('view.systemTools.autoCode.required')"
530530
prop="require"
531+
width="100"
531532
>
532533
<template #default="{row}">
533534
<el-checkbox v-model="row.require"/>
@@ -574,6 +575,7 @@
574575
align="left"
575576
:label="t('view.systemTools.autoCode.importExport')"
576577
prop="excel"
578+
width="160"
577579
>
578580
<template #default="{row}">
579581
<el-checkbox v-model="row.excel"/>

web/src/view/systemTools/autoPkg/autoPkg.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
ref="pkgForm"
7878
:model="form"
7979
:rules="rules"
80-
label-width="80px"
80+
label-width="120px"
8181
>
8282
<el-form-item
8383
:label="t('view.systemTools.autoPkg.packageName')"

0 commit comments

Comments
 (0)