From bd82a0e27c043ea2abd33ee773a63ebef8c87ef0 Mon Sep 17 00:00:00 2001 From: shaohaojiecoder <445923944@qq.com> Date: Sat, 8 Feb 2020 22:27:56 +0800 Subject: [PATCH] add some --- cmdb-ui/src/config/router.config.js | 18 +++++----- cmdb-ui/src/locales/lang/en-US.js | 33 ++++++++++++++++++- cmdb-ui/src/locales/lang/zh-CN.js | 33 ++++++++++++++++++- .../views/account/settings/AvatarModal.vue | 2 +- .../views/acl/module/addRoleRelationForm.vue | 2 +- .../src/views/acl/module/permissionForm.vue | 4 +-- cmdb-ui/src/views/acl/module/resourceForm.vue | 4 +-- .../acl/module/resourcePermManageForm.vue | 2 +- .../src/views/acl/module/resourceTypeForm.vue | 4 +-- cmdb-ui/src/views/acl/module/roleForm.vue | 4 +-- cmdb-ui/src/views/acl/module/userForm.vue | 4 +-- cmdb-ui/src/views/acl/permissions.vue | 6 ++-- cmdb-ui/src/views/acl/resource_types.vue | 6 ++-- cmdb-ui/src/views/acl/resources.vue | 4 +-- cmdb-ui/src/views/acl/roles.vue | 4 +-- cmdb-ui/src/views/acl/users.vue | 6 ++-- cmdb-ui/src/views/cmdb/batch/index.vue | 2 +- .../views/cmdb/batch/modules/CiTypeChoice.vue | 2 +- cmdb-ui/src/views/cmdb/ci/index.vue | 10 +++--- .../src/views/cmdb/ci/modules/SearchForm.vue | 6 ++-- .../views/cmdb/modeling/attributes/index.vue | 6 ++-- .../attributes/module/attributeForm.vue | 4 +-- .../cmdb/modeling/ci_type/attributesTable.vue | 8 ++--- .../cmdb/modeling/ci_type/checkTable.vue | 6 ++-- .../modeling/ci_type/defaultShowTable.vue | 6 ++-- .../src/views/cmdb/modeling/ci_type/group.vue | 4 +-- .../src/views/cmdb/modeling/ci_type/list.vue | 4 +-- .../cmdb/modeling/ci_type/relationTable.vue | 6 ++-- .../modules/RelationViewForm.vue | 4 +-- .../cmdb/modeling/relation_type/index.vue | 6 ++-- .../modules/relationTypeForm.vue | 4 +-- cmdb-ui/src/views/cmdb/preference/index.vue | 16 ++++----- cmdb-ui/src/views/user/Login.vue | 2 +- 33 files changed, 147 insertions(+), 85 deletions(-) diff --git a/cmdb-ui/src/config/router.config.js b/cmdb-ui/src/config/router.config.js index 63a70ce..ee9efad 100644 --- a/cmdb-ui/src/config/router.config.js +++ b/cmdb-ui/src/config/router.config.js @@ -63,14 +63,14 @@ const cmdbRouter = [ name: 'ci_type', hideChildrenInMenu: true, component: () => import('@/views/cmdb/modeling/ci_type/list'), - meta: { title: '模型管理', keepAlive: true } + meta: { title: 'menu.ciModelManager', keepAlive: true } }, { path: '/config/ci_types/:CITypeName/detail/:CITypeId', name: 'ci_type_detail', hideChildrenInMenu: true, component: () => import('@/views/cmdb/modeling/ci_type/detail'), - meta: { title: '模型管理', keepAlive: true, hidden: true }, + meta: { title: 'menu.ciModelManager', keepAlive: true, hidden: true }, hidden: true }, { @@ -78,21 +78,21 @@ const cmdbRouter = [ name: 'attributes', hideChildrenInMenu: true, component: () => import('@/views/cmdb/modeling/attributes/index'), - meta: { title: '属性库', keepAlive: true } + meta: { title: 'menu.ciPropertyRep', keepAlive: true } }, { path: '/config/relation_type', name: 'relation_type', hideChildrenInMenu: true, component: () => import('@/views/cmdb/modeling/relation_type/index'), - meta: { title: '关系类型', keepAlive: true } + meta: { title: 'menu.ciRelationType', keepAlive: true } }, { path: '/config/preference_relation', name: 'preference_relation', hideChildrenInMenu: true, component: () => import('@/views/cmdb/modeling/preference_relation/index'), - meta: { title: '关系视图定义', keepAlive: true } + meta: { title: 'menu.ciRelationViewDefine', keepAlive: true } } ] }, @@ -108,28 +108,28 @@ const cmdbRouter = [ name: 'cmdb_acl_users', hideChildrenInMenu: true, component: () => import('@/views/acl/users'), - meta: { title: '用户管理', keepAlive: true } + meta: { title: 'menu.aclUsersManager', keepAlive: true } }, { path: '/acl/roles', name: 'cmdb_acl_roles', hideChildrenInMenu: true, component: () => import('@/views/acl/roles'), - meta: { title: '角色管理', keepAlive: true } + meta: { title: 'menu.aclRolesManager', keepAlive: true } }, { path: '/acl/resources', name: 'cmdb_acl_resources', hideChildrenInMenu: true, component: () => import('@/views/acl/resources'), - meta: { title: '资源管理', keepAlive: true } + meta: { title: 'menu.aclResourceManager', keepAlive: true } }, { path: '/acl/resource_types', name: 'cmdb_acl_resource_types', hideChildrenInMenu: true, component: () => import('@/views/acl/resource_types'), - meta: { title: '资源类型', keepAlive: true } + meta: { title: 'menu.aclResourceType', keepAlive: true } } ] } diff --git a/cmdb-ui/src/locales/lang/en-US.js b/cmdb-ui/src/locales/lang/en-US.js index 8d59f7e..93bb5ae 100644 --- a/cmdb-ui/src/locales/lang/en-US.js +++ b/cmdb-ui/src/locales/lang/en-US.js @@ -8,6 +8,37 @@ export default { treeViews: 'Treeviews', batch: 'Batch', ciType: 'CiType', - acl: 'ACL' + acl: 'ACL', + ciModelManager: 'Model', + ciPropertyRep: 'Propertys', + ciRelationType: 'RelationType', + ciRelationViewDefine: 'RelationViewDefine', + aclUsersManager: 'Users', + aclRolesManager: 'Roles', + aclResourceManager: 'Resources', + aclResourceType: 'ResourceType' + }, + button: { + cancel: 'Cancel', + submit: 'Submit', + query: 'Query', + add: 'Add', + delete: 'Delete', + yes: 'Yes', + no: 'No', + reset: 'Reset', + subscribe: 'Subscribe', + download: 'Download', + upload: 'Upload' + }, + tip: { + subscribed: 'Subscribedu', + unsubscribed: 'Unsubscribed', + unfold: 'Unfold', + fold: 'Fold', + detail: 'Detail', + delete: 'Delete', + edit: 'Edit', + operate: 'Operate' } } diff --git a/cmdb-ui/src/locales/lang/zh-CN.js b/cmdb-ui/src/locales/lang/zh-CN.js index 5086c17..5ce5be2 100644 --- a/cmdb-ui/src/locales/lang/zh-CN.js +++ b/cmdb-ui/src/locales/lang/zh-CN.js @@ -7,6 +7,37 @@ export default { treeViews: '树状视图', batch: '批量导入', ciType: '模型配置', - acl: '权限管理' + acl: '权限管理', + ciModelManager: '模型管理', + ciPropertyRep: '属性库', + ciRelationType: '关系类型', + ciRelationViewDefine: '关系视图定义', + aclUsersManager: '用户管理', + aclRolesManager: '角色管理', + aclResourceManager: '资源管理', + aclResourceType: '资源类型' + }, + button: { + cancel: '取消', + submit: '提交', + query: '查询', + add: '新增', + delete: '删除', + yes: '是', + no: '否', + reset: '重置', + subscribe: '订阅', + download: '下载模板', + upload: '上传' + }, + tip: { + subscribed: '已订阅', + unsubscribed: '未订阅', + unfold: '展开', + fold: '收起', + detail: '详情', + delete: '删除', + edit: '编辑', + operate: '操作' } } diff --git a/cmdb-ui/src/views/account/settings/AvatarModal.vue b/cmdb-ui/src/views/account/settings/AvatarModal.vue index 0ad9c41..7d72791 100644 --- a/cmdb-ui/src/views/account/settings/AvatarModal.vue +++ b/cmdb-ui/src/views/account/settings/AvatarModal.vue @@ -28,7 +28,7 @@ diff --git a/cmdb-ui/src/views/acl/module/addRoleRelationForm.vue b/cmdb-ui/src/views/acl/module/addRoleRelationForm.vue index 879e4c0..b107a8d 100644 --- a/cmdb-ui/src/views/acl/module/addRoleRelationForm.vue +++ b/cmdb-ui/src/views/acl/module/addRoleRelationForm.vue @@ -44,7 +44,7 @@ > 关联父角色 关联子角色 - 取消 + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/module/permissionForm.vue b/cmdb-ui/src/views/acl/module/permissionForm.vue index b473175..437c1bb 100644 --- a/cmdb-ui/src/views/acl/module/permissionForm.vue +++ b/cmdb-ui/src/views/acl/module/permissionForm.vue @@ -65,8 +65,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/module/resourceForm.vue b/cmdb-ui/src/views/acl/module/resourceForm.vue index 9f92fd5..cf1991a 100644 --- a/cmdb-ui/src/views/acl/module/resourceForm.vue +++ b/cmdb-ui/src/views/acl/module/resourceForm.vue @@ -52,8 +52,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/module/resourcePermManageForm.vue b/cmdb-ui/src/views/acl/module/resourcePermManageForm.vue index dc6c907..f398380 100644 --- a/cmdb-ui/src/views/acl/module/resourcePermManageForm.vue +++ b/cmdb-ui/src/views/acl/module/resourcePermManageForm.vue @@ -30,7 +30,7 @@
添加 - 取消 + {{ $t('button.cancel') }}
diff --git a/cmdb-ui/src/views/acl/module/resourceTypeForm.vue b/cmdb-ui/src/views/acl/module/resourceTypeForm.vue index e2b2c8d..e9a4017 100644 --- a/cmdb-ui/src/views/acl/module/resourceTypeForm.vue +++ b/cmdb-ui/src/views/acl/module/resourceTypeForm.vue @@ -60,8 +60,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/module/roleForm.vue b/cmdb-ui/src/views/acl/module/roleForm.vue index ce92473..57460ef 100644 --- a/cmdb-ui/src/views/acl/module/roleForm.vue +++ b/cmdb-ui/src/views/acl/module/roleForm.vue @@ -66,8 +66,8 @@ background: '#fff', }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/module/userForm.vue b/cmdb-ui/src/views/acl/module/userForm.vue index 2612fc5..de2bef5 100644 --- a/cmdb-ui/src/views/acl/module/userForm.vue +++ b/cmdb-ui/src/views/acl/module/userForm.vue @@ -133,8 +133,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/acl/permissions.vue b/cmdb-ui/src/views/acl/permissions.vue index f55affe..bbc6cdf 100644 --- a/cmdb-ui/src/views/acl/permissions.vue +++ b/cmdb-ui/src/views/acl/permissions.vue @@ -39,7 +39,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -61,7 +61,7 @@ diff --git a/cmdb-ui/src/views/acl/resource_types.vue b/cmdb-ui/src/views/acl/resource_types.vue index d663e74..cd42424 100644 --- a/cmdb-ui/src/views/acl/resource_types.vue +++ b/cmdb-ui/src/views/acl/resource_types.vue @@ -39,7 +39,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -61,7 +61,7 @@ diff --git a/cmdb-ui/src/views/acl/resources.vue b/cmdb-ui/src/views/acl/resources.vue index effc9e5..8fe9e07 100644 --- a/cmdb-ui/src/views/acl/resources.vue +++ b/cmdb-ui/src/views/acl/resources.vue @@ -55,7 +55,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -81,7 +81,7 @@ okText="是" cancelText="否" > - 删除 + {{ $t('tip.delete') }} diff --git a/cmdb-ui/src/views/acl/roles.vue b/cmdb-ui/src/views/acl/roles.vue index 00a4602..2d4fc6c 100644 --- a/cmdb-ui/src/views/acl/roles.vue +++ b/cmdb-ui/src/views/acl/roles.vue @@ -37,7 +37,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -70,7 +70,7 @@ okText="是" cancelText="否" > - 删除 + {{ $t('tip.delete') }} diff --git a/cmdb-ui/src/views/acl/users.vue b/cmdb-ui/src/views/acl/users.vue index 255654d..640a907 100644 --- a/cmdb-ui/src/views/acl/users.vue +++ b/cmdb-ui/src/views/acl/users.vue @@ -38,7 +38,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -71,7 +71,7 @@ diff --git a/cmdb-ui/src/views/cmdb/batch/index.vue b/cmdb-ui/src/views/cmdb/batch/index.vue index af44731..58d6e8f 100644 --- a/cmdb-ui/src/views/cmdb/batch/index.vue +++ b/cmdb-ui/src/views/cmdb/batch/index.vue @@ -7,7 +7,7 @@ - 上传 + {{ $t('button.upload') }} diff --git a/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue b/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue index 7af6c7b..14af6ae 100644 --- a/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue +++ b/cmdb-ui/src/views/cmdb/batch/modules/CiTypeChoice.vue @@ -19,7 +19,7 @@ style="margin-left: 20px" :disabled="downLoadButtonDis" @click="downLoadExcel" - >下载模板 + >{{ $t('button.download') }} diff --git a/cmdb-ui/src/views/cmdb/ci/index.vue b/cmdb-ui/src/views/cmdb/ci/index.vue index 82aa7e1..5577dc7 100644 --- a/cmdb-ui/src/views/cmdb/ci/index.vue +++ b/cmdb-ui/src/views/cmdb/ci/index.vue @@ -10,7 +10,7 @@ type="primary" icon="plus" @click="$refs.create.visible = true; $refs.create.action='create'" - >新建 + >{{ $t('button.add') }} -  下载 +  {{ $t('tip.download') }} - 删除 + {{ $t('tip.delete') }} @@ -62,10 +62,10 @@ diff --git a/cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue b/cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue index 392f7fe..0531553 100644 --- a/cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue +++ b/cmdb-ui/src/views/cmdb/ci/modules/SearchForm.vue @@ -73,14 +73,14 @@ class="table-page-search-submitButtons" :style="advanced && { float: 'right', overflow: 'hidden' } || {} " > - 查询 - 重置 + {{ $t('button.query') }} + {{ $t('button.reset') }} - {{ advanced ? '收起' : '展开' }} + {{ advanced ? $t('tip.fold') : $t('tip.unfold') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/attributes/index.vue b/cmdb-ui/src/views/cmdb/modeling/attributes/index.vue index a3fa4b7..6bce69b 100644 --- a/cmdb-ui/src/views/cmdb/modeling/attributes/index.vue +++ b/cmdb-ui/src/views/cmdb/modeling/attributes/index.vue @@ -39,7 +39,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -69,7 +69,7 @@ diff --git a/cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue b/cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue index 9c26691..8c8b2db 100644 --- a/cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue +++ b/cmdb-ui/src/views/cmdb/modeling/attributes/module/attributeForm.vue @@ -148,8 +148,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue index 8284105..b77a4c4 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue @@ -68,7 +68,7 @@ @@ -124,8 +124,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue index cf201b9..bba7b58 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue @@ -21,7 +21,7 @@ @@ -65,8 +65,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue index ac24abf..a86f2ba 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/defaultShowTable.vue @@ -20,7 +20,7 @@ @@ -64,8 +64,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue index 663e64a..1329763 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/group.vue @@ -12,7 +12,7 @@ ref="addGroupInput" v-model.trim="newGroupName" /> 保存 - 取消 + {{ $t('button.cancel') }} @@ -37,7 +37,7 @@ ref="editGroupInput" v-model.trim="CITypeGroup.name" /> 保存 - 取消 + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue index 9b5339b..da7fe22 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue @@ -125,8 +125,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue b/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue index 451593f..5c076f5 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue @@ -20,7 +20,7 @@ @@ -91,8 +91,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue b/cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue index 8afc488..7607b97 100644 --- a/cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue +++ b/cmdb-ui/src/views/cmdb/modeling/preference_relation/modules/RelationViewForm.vue @@ -42,8 +42,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue b/cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue index 3b66b7e..570ed1d 100644 --- a/cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue +++ b/cmdb-ui/src/views/cmdb/modeling/relation_type/index.vue @@ -39,7 +39,7 @@ @click="() => handleReset(clearFilters, column)" size="small" style="width: 90px" - >重置 + >{{ $t('button.reset') }} @@ -57,7 +57,7 @@ diff --git a/cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue b/cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue index dc8ff59..03021c5 100644 --- a/cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue +++ b/cmdb-ui/src/views/cmdb/modeling/relation_type/modules/relationTypeForm.vue @@ -42,8 +42,8 @@ }" > - 确定 - 取消 + {{ $t('button.submit') }} + {{ $t('button.cancel') }} diff --git a/cmdb-ui/src/views/cmdb/preference/index.vue b/cmdb-ui/src/views/cmdb/preference/index.vue index fa9bd77..6d00e23 100644 --- a/cmdb-ui/src/views/cmdb/preference/index.vue +++ b/cmdb-ui/src/views/cmdb/preference/index.vue @@ -17,11 +17,11 @@ {{ item.is_subscribed ? "已订阅" : "未订阅" }} + >{{ item.is_subscribed ? $t('tip.subscribed') : $t('tip.unsubscribed') }} @@ -43,8 +43,8 @@ 已订阅 - 未订阅 + >{{ $t('tip.subscribed') }} + {{ $t('tip.unsubscribed') }} 订阅 + >{{ $t('button.subscribe') }}

@@ -101,8 +101,8 @@ textAlign: 'right', }" > - 取消 - 订阅 + {{ $t('button.cancel') }} + {{ $t('button.subscribe') }} diff --git a/cmdb-ui/src/views/user/Login.vue b/cmdb-ui/src/views/user/Login.vue index c9545c2..ed02c44 100644 --- a/cmdb-ui/src/views/user/Login.vue +++ b/cmdb-ui/src/views/user/Login.vue @@ -56,7 +56,7 @@ class="login-button" :loading="state.loginBtn" :disabled="state.loginBtn" - >确定 + >{{ $t('button.submit') }}