center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: 暂时去掉国际化切换

Browse Source
This commit is contained in:
taojinlong 2021-05-18 12:40:47 +08:00
parent afc6563a32
commit b65835a7b9
7 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/lang/en.js
View File

@ -85,6 +85,7 @@ export default {
tokenError: 'Token error, please login again'
},
commons: {
icon: 'Icon',
all: 'All',
enable: 'Enable',
disable: 'Disable',

1
frontend/src/lang/tw.js
View File

@ -85,6 +85,7 @@ export default {
tokenError: '信息错误，请重新登陸'
},
commons: {
icon: '圖標',
all: '全部',
enable: '啟用',
disable: '停用',

8
frontend/src/lang/zh.js
View File

@ -85,6 +85,7 @@ export default {
tokenError: 'token错误，请重新登录'
},
commons: {
icon: '图标',
all: '全部',
enable: '启用',
disable: '停用',
@ -421,7 +422,12 @@ export default {
apikey_delete_confirm: '这个 API Key 确定要删除吗?',
input_id_placeholder: '请输入ID (不支持中文)',
source: '用户来源',
choose_org: '选择组织'
choose_org: '选择组织',
reset_password: '重置密码',
current_user: '当前用户',
origin_passwd: '原始密码',
new_passwd: '新密码',
confirm_passwd: '确认密码'
},
role: {
menu_authorization: '菜单授权',

16
frontend/src/layout/components/Topbar.vue
View File

@ -35,7 +35,7 @@
<size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> -->
<lang-select class="right-menu-item hover-effect" />
<!-- <lang-select class="right-menu-item hover-effect" />-->
</template>
<el-dropdown class="top-dropdown" style="display: flex;align-items: center;">
@ -45,21 +45,21 @@
<el-dropdown-menu slot="dropdown">
<router-link to="/person-info/index">
<el-dropdown-item>个人信息</el-dropdown-item>
<el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
</router-link>
<router-link to="/person-pwd/index">
<el-dropdown-item>重置密码</el-dropdown-item>
<el-dropdown-item>{{ $t('user.reset_password') }}</el-dropdown-item>
</router-link>
<a href="https://panjiachen.github.io/vue-element-admin-site/#/" target="_blank">
<el-dropdown-item>Docs</el-dropdown-item>
<el-dropdown-item>{{ $t('commons.help_documentation') }} </el-dropdown-item>
</a>
<a href="https://fit2cloud.com/" target="_blank">
<el-dropdown-item>关于</el-dropdown-item>
<el-dropdown-item>{{ $t('commons.about_us') }} </el-dropdown-item>
</a>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
<span style="display:block;">{{ $t('commons.exit_system') }}</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@ -100,7 +100,7 @@ import { isExternal } from '@/utils/validate'
// import Doc from '@/components/Doc'
// import Screenfull from '@/components/Screenfull'
// import SizeSelect from '@/components/SizeSelect'
import LangSelect from '@/components/LangSelect'
// import LangSelect from '@/components/LangSelect'
import { getSysUI } from '@/utils/auth'
export default {
name: 'Topbar',
@ -108,7 +108,7 @@ export default {
AppLink,
// Screenfull,
// SizeSelect,
LangSelect
// LangSelect
// Doc
},
data() {

2
frontend/src/views/system/user/index.vue
View File

@ -287,11 +287,9 @@ export default {
methods: {
select(selection) {
console.log(selection)
},
search(condition) {
console.log(condition) // demo只查看搜索条件，没有搜索的实现
const temp = formatCondition(condition)
const param = temp || {}
const { currentPage, pageSize } = this.paginationConfig

16
frontend/src/views/system/user/personPwd.vue
View File

@ -1,19 +1,19 @@
<template>
<layout-content header="修改密码">
<layout-content :header="$t('member.edit_password')">
<el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="原始密码" prop="oldPwd">
<el-form-item :label="$t('user.origin_passwd')" prop="oldPwd">
<el-input v-model="form.oldPwd" type="password" />
</el-form-item>
<el-form-item label="新密码" prop="newPwd">
<el-form-item :label="$t('user.new_passwd')" prop="newPwd">
<el-input v-model="form.newPwd" type="password" />
</el-form-item>
<el-form-item label="确认密码" prop="repeatPwd">
<el-form-item :label="$t('user.confirm_passwd')" prop="repeatPwd">
<el-input v-model="form.repeatPwd" type="password" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
</el-form-item>
</el-form>
@ -35,12 +35,6 @@ export default {
oldPwd: [
{ required: true, message: this.$t('user.input_password'), trigger: 'blur' }
// {
// required: true,
// pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{6,30}$/,
// message: this.$t('member.password_format_is_incorrect'),
// trigger: 'blur'
// }
],
newPwd: [
{ required: true, message: this.$t('user.input_password'), trigger: 'blur' }

32
frontend/src/views/system/user/privateForm.vue
View File

@ -2,48 +2,42 @@
<layout-content header="个人信息">
<div>
<el-form ref="createUserForm" :disabled="formType !== 'modify'" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
<el-form-item label="用户名" prop="username">
<el-form-item :label="$t('commons.user')" prop="username">
<el-input v-model="form.username" disabled />
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-form-item :label="$t('commons.phone')" prop="phone">
<el-input v-model="form.phone" />
</el-form-item>
<el-form-item label="昵称" prop="nickName">
<el-form-item :label="$t('commons.nick_name')" prop="nickName">
<el-input v-model="form.nickName" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-form-item :label="$t('commons.email')" prop="email">
<el-input v-model="form.email" />
</el-form-item>
<!-- <el-form-item label="性别">
<el-radio-group v-model="form.gender" style="width: 178px">
<el-radio label="男">男</el-radio>
<el-radio label="女">女</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="状态">
<el-form-item :label="$t('commons.status')">
<el-radio-group v-model="form.enabled" disabled style="width: 140px">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
<el-radio :label="1">{{ $t('commons.enable') }}</el-radio>
<el-radio :label="0">{{ $t('commons.disable') }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item disabled label="部门" prop="dept">
<el-form-item disabled :label="$t('commons.organization')" prop="dept">
<treeselect
v-model="form.deptId"
disabled
:options="depts"
:load-options="loadDepts"
:auto-load-root-options="false"
placeholder="选择部门"
:placeholder="$t('user.choose_org')"
/>
</el-form-item>
<el-form-item label="角色" prop="roleIds">
<el-form-item :label="$t('commons.role')" prop="roleIds">
<el-select
v-model="form.roleIds"
disabled
style="width: 100%"
multiple
placeholder="请选择"
:placeholder="$t('commons.please_select')"
@remove-tag="deleteTag"
@change="changeRole"
>
@ -63,8 +57,8 @@
<div slot="footer" style="margin-left: 30px;" class="dialog-footer">
<el-button v-if="formType==='modify'" type="text" @click="reset">{{ $t('commons.cancel') }}</el-button>
<el-button v-if="formType==='modify'" type="primary" @click="save">确认</el-button>
<el-button v-if="formType!=='modify'" type="primary" @click="edit">编辑</el-button>
<el-button v-if="formType==='modify'" type="primary" @click="save">{{ $t('commons.confirm') }}</el-button>
<el-button v-if="formType!=='modify'" type="primary" @click="edit">{{ $t('commons.edit') }}</el-button>
</div>
</div>