Skip to content

Commit 730cd40

Browse files
committed
表格和列设置组件文本内容增加国际化
1 parent 224f1f9 commit 730cd40

3 files changed

Lines changed: 2 additions & 13 deletions

File tree

ui/zhontai.ui.admin.vue3/src/components/my-col-set/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SvgIcon name="ele-Rank" />
3131
</template>
3232
</el-button>
33-
<el-checkbox v-model="item.isShow" class="ml8 mr8" :label="item.attrs.label" />
33+
<el-checkbox v-model="item.isShow" class="ml8 mr8" :label="$t(item.attrs.label)" />
3434
</div>
3535
<div class="my-flex">
3636
<el-button link title="置顶" @click="onMoveToTop(item)">

ui/zhontai.ui.admin.vue3/src/components/my-table/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<el-table ref="tableRef" v-loading="model.loading" :data="paginatedData" class="my-table-box" v-bind="model.attrs">
3-
<el-table-column v-for="(item, index) in columns" :key="item.attrs.prop" v-bind="item.attrs">
3+
<el-table-column v-for="(item, index) in columns" :key="item.attrs.prop" v-bind="item.attrs" :label="$t(item.attrs.label)">
44
<template v-if="item.slot" #default="scope">
55
<slot :name="item.slot" v-bind="scope"></slot>
66
</template>

ui/zhontai.ui.admin.vue3/src/i18n/index.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ function mergeObjects(objects: Record<string, any>[]): Record<string, any> {
3030
// 动态导入国际化文件
3131
// 框架本身的国际化文件(src/i18n/**/*.ts)
3232
const frameworkModules: Record<string, any> = import.meta.glob('./**/*.ts', { eager: true })
33-
// 视图层的国际化文件(src/views/**/**/lang/*.ts)
34-
const viewModules: Record<string, any> = import.meta.glob('./../views/**/**/i18n/*.ts', { eager: true })
3533

3634
// 按语言分类存储所有翻译片段
3735
const messagesByLocale: Record<string, Record<string, any>[]> = {}
@@ -45,15 +43,6 @@ for (const path in frameworkModules) {
4543
messagesByLocale[locale].push(frameworkModules[path].default)
4644
}
4745

48-
// 处理视图模块
49-
for (const path in viewModules) {
50-
const match = path.match(/([^/]+)\.ts$/)
51-
if (!match) continue
52-
const locale = match[1]
53-
if (!messagesByLocale[locale]) messagesByLocale[locale] = []
54-
messagesByLocale[locale].push(viewModules[path].default)
55-
}
56-
5746
// 构建最终的 messages 对象
5847
const messages: Record<string, any> = {}
5948
for (const locale of supportedLocales) {

0 commit comments

Comments
 (0)