Unverified 提交 f1db21f6 authored 作者: taojinlong's avatar taojinlong 提交者: GitHub

Merge pull request #1641 from zhangchaochao-fit2cloud/v1.6

fix:fit2cloud-ui国际化zh-TW未引入以及组件国际化
...@@ -1478,7 +1478,10 @@ export default { ...@@ -1478,7 +1478,10 @@ export default {
timeout_refresh: 'Timeout,Will Refresh...', timeout_refresh: 'Timeout,Will Refresh...',
mobile_layout: 'Mobile Layout', mobile_layout: 'Mobile Layout',
component_hidden: 'Component Hidden', component_hidden: 'Component Hidden',
public_link_tips: 'New Is Public Link,The Target Panel Have Not Set Public Link,Can Not Jump' public_link_tips: 'New Is Public Link,The Target Panel Have Not Set Public Link,Can Not Jump',
input_title: 'Input Title',
show_title: 'Show Title',
default_settings: 'Default Settings'
}, },
plugin: { plugin: {
local_install: 'Local installation', local_install: 'Local installation',
......
...@@ -13,6 +13,8 @@ import fuZh from 'fit2cloud-ui/src/locale/lang/zh-CN' // 加载fit2cloud的内 ...@@ -13,6 +13,8 @@ import fuZh from 'fit2cloud-ui/src/locale/lang/zh-CN' // 加载fit2cloud的内
import fuEn from 'fit2cloud-ui/src/locale/lang/en_US' // 加载fit2cloud的内容 import fuEn from 'fit2cloud-ui/src/locale/lang/en_US' // 加载fit2cloud的内容
import fuTW from 'fit2cloud-ui/src/locale/lang/zh-TW' // 加载fit2cloud的内容
Vue.use(VueI18n) Vue.use(VueI18n)
const messages = { const messages = {
...@@ -28,7 +30,8 @@ const messages = { ...@@ -28,7 +30,8 @@ const messages = {
}, },
zh_TW: { zh_TW: {
...twLocale, ...twLocale,
...elementTWLocale ...elementTWLocale,
...fuTW
} }
} }
export function getLanguage() { export function getLanguage() {
......
...@@ -1480,7 +1480,10 @@ export default { ...@@ -1480,7 +1480,10 @@ export default {
timeout_refresh: '請求超時,稍後刷新...', timeout_refresh: '請求超時,稍後刷新...',
mobile_layout: '移動端佈局', mobile_layout: '移動端佈局',
component_hidden: '隱藏的組件', component_hidden: '隱藏的組件',
public_link_tips: '當前是公共鏈接模式,目標儀錶闆未設置公共鏈接,無法跳轉' public_link_tips: '當前是公共鏈接模式,目標儀錶闆未設置公共鏈接,無法跳轉',
input_title: '請輸入標題',
show_title: '顯示標題',
default_settings: '默認值設置'
}, },
plugin: { plugin: {
local_install: '本地安裝', local_install: '本地安裝',
......
...@@ -1489,7 +1489,10 @@ export default { ...@@ -1489,7 +1489,10 @@ export default {
timeout_refresh: '请求超时,稍后刷新...', timeout_refresh: '请求超时,稍后刷新...',
mobile_layout: '移动端布局', mobile_layout: '移动端布局',
component_hidden: '隐藏的组件', component_hidden: '隐藏的组件',
public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转' public_link_tips: '当前是公共链接模式,目标仪表板未设置公共链接,无法跳转',
input_title: '请输入标题',
show_title: '显示标题',
default_settings: '默认值设置'
}, },
plugin: { plugin: {
local_install: '本地安装', local_install: '本地安装',
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
<el-col :span="16"> <el-col :span="16">
<div class="filter-options-right"> <div class="filter-options-right">
<span style="padding-right: 10px;"> <span style="padding-right: 10px;">
<el-checkbox v-model="attrs.showTitle" @change="showTitleChange">显示标题 <el-checkbox v-model="attrs.showTitle" @change="showTitleChange">{{ $t('panel.show_title') }}
</el-checkbox> </el-checkbox>
<el-popover v-model="titlePopovervisible" placement="bottom-end" :disabled="!attrs.showTitle" width="200"> <el-popover v-model="titlePopovervisible" placement="bottom-end" :disabled="!attrs.showTitle" width="200">
<div style="width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;"> <div style="width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;">
<el-input v-model="attrs.title" placeholder="请输入标题" type="textarea" maxlength="15" show-word-limit /> <el-input v-model="attrs.title" :placeholder="$t('panel.input_title')" type="textarea" maxlength="15" show-word-limit />
</div> </div>
<i <i
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
class="box-card" class="box-card"
> >
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<span>默认值设置</span> <span>{{ $t('panel.default_settings') }}</span>
</div> </div>
<div class="custom-component-class"> <div class="custom-component-class">
<component <component
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论