CN-70 fix:国际化问题、国际化数据录入

This commit is contained in:
晶晶 张
2021-07-22 16:59:24 +08:00
parent 3ae20a4a85
commit 3e044660e7
3 changed files with 17 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
<template> <template>
<div v-click-outside="{object: editObject, func: esc}" class="right-box right-box-user"> <div v-click-outside="{object: editObject, func: esc}" class="right-box right-box-user">
<div class="right-box__header"> <div class="right-box__header">
<div class="header__title">{{editObject.id ? $t('config.user.editUser') : $t('config.user.createUser')}}</div> <div class="header__title">{{editObject.id ? $t('edit I18n') : $t('create I18n')}}</div>
<div class="header__operation"> <div class="header__operation">
<span v-cancel="{object: editObject, func: esc}"><i class="cn-icon cn-icon-close"></i></span> <span v-cancel="{object: editObject, func: esc}"><i class="cn-icon cn-icon-close"></i></span>
</div> </div>
@@ -10,18 +10,18 @@
<div class="container__form"> <div class="container__form">
<el-form ref="i18nForm" :model="editObject" :rules="editObject.id ? rules2 : rules" label-position="top" label-width="120px"> <el-form ref="i18nForm" :model="editObject" :rules="editObject.id ? rules2 : rules" label-position="top" label-width="120px">
<!--name--> <!--name-->
<el-form-item :label="$t('config.I18n.name')" prop="name"> <el-form-item :label="$t('name')" prop="name">
<el-input id="account-input-name" v-model="editObject.name" :disabled="editObject.username==='admin' && editObject.id === 1" <el-input id="account-input-name" v-model="editObject.name" :disabled="editObject.name==='admin' && editObject.id === 1"
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--code--> <!--code-->
<el-form-item :label="$t('config.I18n.code')" prop="code"> <el-form-item :label="$t('code')" prop="code">
<el-input id="account-input-username" v-model="editObject.code" :disabled="editObject.code==='admin' && editObject.id === 1" <el-input id="account-input-code" v-model="editObject.code" :disabled="editObject.code==='admin' && editObject.id === 1"
maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input> maxlength="64" placeholder="" show-word-limit size="small" type="text"></el-input>
</el-form-item> </el-form-item>
<!--lang--> <!--lang-->
<el-form-item :label="$t('config.I18n.lang')" prop="lang"> <el-form-item :label="$t('lang')" prop="lang">
<el-select placeholder="请选择" v-model="editObject.lang" style="width:640px;"> <el-select placeholder="" v-model="editObject.lang" style="width:640px;">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
@@ -34,8 +34,8 @@
show-word-limit size="small" @blur="pinBlur" autocomplete="new-password"></el-input>--> show-word-limit size="small" @blur="pinBlur" autocomplete="new-password"></el-input>-->
</el-form-item> </el-form-item>
<!--value--> <!--value-->
<el-form-item :label="$t('config.I18n.value')" label-width="200px" prop="pinChange"> <el-form-item :label="$t('value')" label-width="200px" prop="value">
<el-input id="account-input-pinChange" v-model="editObject.value" maxlength="64" placeholder="" <el-input id="account-input-value" v-model="editObject.value" maxlength="64" placeholder=""
show-word-limit size="small"></el-input> show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<!--enable--> <!--enable-->
@@ -83,9 +83,6 @@ export default {
options: [{ options: [{
value: 'en', value: 'en',
label: 'en' label: 'en'
}, {
value: 'zh',
label: 'zh'
}, { }, {
value: 'cn', value: 'cn',
label: 'cn' label: 'cn'
@@ -96,19 +93,19 @@ export default {
name: [ name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
username: [ code: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
pin: [ value: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
] ]
}, },
rules2: { // 表单校验规则 rules2: { // 表单校验规则
username: [ code: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
pinChange: [ value: [
{ validator: validatePin, trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
] ]
}, },
roleData: [] roleData: []

View File

@@ -111,12 +111,12 @@ export default {
sortable: 'custom' sortable: 'custom'
}, },
{ {
label: this.$t('config.i18n.lang'), label: this.$t('lang'),
prop: 'lang', prop: 'lang',
show: true, show: true,
sortable: 'custom' sortable: 'custom'
}, { }, {
label: this.$t('config.i18n.value'), label: this.$t('value'),
prop: 'value', prop: 'value',
show: true, show: true,
width: 150 width: 150

View File

@@ -89,6 +89,7 @@ export function put (url, params, headers) {
}).catch(err => { }).catch(err => {
if (err.response) { if (err.response) {
resolve(err.response.data) resolve(err.response.data)
console.log(err)
} else if (err.message) { } else if (err.message) {
resolve(err.message) resolve(err.message)
} }