diff --git a/src/components/menu/index.js b/src/components/menu/index.js
index 61558db..a04abb1 100644
--- a/src/components/menu/index.js
+++ b/src/components/menu/index.js
@@ -2,6 +2,7 @@ import Menu from 'ant-design-vue/es/menu'
import Icon from 'ant-design-vue/es/icon'
const { Item, SubMenu } = Menu
+// import i18n from '@/common/lang'
export default {
name: 'SMenu',
@@ -40,6 +41,10 @@ export default {
return keys
}
},
+ created () {
+ const langCn = localStorage.language
+ this.showKey = langCn === 'en-us' ? 'titleEn' : 'title'
+ },
mounted () {
this.updateMenu()
},
@@ -150,12 +155,12 @@ export default {
item.meta = Object.assign(item.meta, { hidden: true })
})
}
-
+ // {menu.meta.title && menu.meta.title.includes('t(\'') ? i18n.t(menu.meta.title.replace('t(\'', '').replace('\')', '')) : menu.meta.title}
return (
-
{this.renderIcon(menu.meta.icon)}
- {menu.meta.title}
+ {menu.meta[this.showKey] || menu.meta.title}
)
@@ -169,7 +174,7 @@ export default {
{this.renderIcon(menu.meta.icon)}
- {menu.meta.title}
+ {menu.meta[this.showKey] || menu.meta.title}
{itemArr}
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 0245ae9..b3f5b37 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -199,6 +199,8 @@ export default {
height: @height;
background-color: white;
transition: background 300ms;
+ display: flex;
+ align-items: center;
/* dark 样式 */
@@ -225,5 +227,7 @@ export default {
.breadcrumb {
display: inline-block;
margin: 0;
+ flex: 1;
+ width: 0;
}
diff --git a/src/components/tools/Breadcrumb.vue b/src/components/tools/Breadcrumb.vue
index 044fdd0..0965155 100644
--- a/src/components/tools/Breadcrumb.vue
+++ b/src/components/tools/Breadcrumb.vue
@@ -2,9 +2,9 @@
- {{ item.meta.title }}
+ {{ item.meta[showKey] || item.meta.title }}
- {{ item.meta.title }}
+ {{ item.meta[showKey] || item.meta.title }}
@@ -16,10 +16,12 @@ export default {
data () {
return {
name: '',
- breadList: []
+ breadList: [],
+ showKey: ''
}
},
created () {
+ this.showKey = localStorage.language === 'en-us' ? 'titleEn' : 'title'
this.getBreadcrumb()
},
methods: {
diff --git a/src/utils/util.js b/src/utils/util.js
index 24d0460..dae62d0 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -151,6 +151,7 @@ function generateChildRouters (data) {
hidden: item.hidden,
meta: {
title: item.meta.title,
+ titleEn: item.meta.titleEn,
icon: item.meta.icon,
url: item.meta.url,
permissionList: item.meta.permissionList,
diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue
index c9c3b18..a88c432 100644
--- a/src/views/system/PermissionList.vue
+++ b/src/views/system/PermissionList.vue
@@ -92,8 +92,8 @@ const columns = [
key: 'name'
}, {
title: '菜单英文名称',
- dataIndex: 'englishName',
- key: 'englishName',
+ dataIndex: 'menuEn',
+ key: 'menuEn',
scopedSlots: { customRender: 'text' }
}, {
title: '菜单类型',
diff --git a/src/views/system/modules/PermissionModal.vue b/src/views/system/modules/PermissionModal.vue
index 1d56dad..bbd0e14 100644
--- a/src/views/system/modules/PermissionModal.vue
+++ b/src/views/system/modules/PermissionModal.vue
@@ -31,9 +31,9 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="菜单英文名称"
- prop="englishName"
+ prop="menuEn"
:hasFeedback="true" >
-
+