From 1484a308cf3497b19481c5d16c855605b6ae0308 Mon Sep 17 00:00:00 2001 From: pycook Date: Sun, 16 Feb 2020 14:50:17 +0800 Subject: [PATCH 1/2] modeling i18n --- cmdb-ui/src/locales/lang/en-US.js | 37 ++++++++++++- cmdb-ui/src/locales/lang/zh-CN.js | 39 +++++++++++++- .../cmdb/modeling/ci_type/attributesTable.vue | 45 ++++++++-------- .../cmdb/modeling/ci_type/checkTable.vue | 22 ++++---- .../modeling/ci_type/defaultShowTable.vue | 23 ++++---- .../views/cmdb/modeling/ci_type/detail.vue | 10 ++-- .../src/views/cmdb/modeling/ci_type/group.vue | 54 +++++++++---------- .../src/views/cmdb/modeling/ci_type/list.vue | 25 +++++---- .../cmdb/modeling/ci_type/relationTable.vue | 30 +++++------ .../modeling/preference_relation/index.vue | 10 ++-- .../modules/RelationViewForm.vue | 10 ++-- .../cmdb/modeling/relation_type/index.vue | 24 ++++----- .../modules/relationTypeForm.vue | 12 ++--- 13 files changed, 199 insertions(+), 142 deletions(-) diff --git a/cmdb-ui/src/locales/lang/en-US.js b/cmdb-ui/src/locales/lang/en-US.js index 686bc05..c1bbd47 100644 --- a/cmdb-ui/src/locales/lang/en-US.js +++ b/cmdb-ui/src/locales/lang/en-US.js @@ -25,6 +25,7 @@ export default { add: 'Add', new: 'New', update: 'Edit', + save: 'Save', delete: 'Delete', yes: 'Yes', no: 'No', @@ -33,6 +34,7 @@ export default { downloadTemplate: 'Download', upload: 'Upload', download: 'Download', + batchUpdate: 'Batch update', displayFields: 'Display Fields' }, tip: { @@ -53,6 +55,7 @@ export default { noData: 'No Data', addSuccess: 'Add successfully', updateSuccess: 'Update successfully', + saveSuccess: 'Save successfully', deleteSuccess: 'Delete successfully', cancelSuccess: 'Cancel successfully', downloading: 'Downloading ...', @@ -66,7 +69,7 @@ export default { ci: { batchOperate: 'Batch Operation', confirmBatchUpdate: 'Confirm batch modification?', - batchUpdate: 'Batch update ...', + batchUpdate: 'Batch update', batchUpdateSuccess: 'Batch update successfully', confirmDelete: 'Confirm deleting ?', attribute: 'Attributes', @@ -105,6 +108,9 @@ export default { ciType: { add: 'Add', addAttribute: 'Add Attribute', + addAttribute1: 'Add Attribute', + moreAttribute: 'More Attributes', + bindAttribute: 'Bind Attribute', editModel: 'Edit Model', modelName: 'Model Name', name: 'Name', @@ -116,6 +122,7 @@ export default { link: 'Link', password: 'Password', list: 'List', + required: 'Required', integer: 'Integer', float: 'Float', text: 'Text', @@ -124,6 +131,34 @@ export default { isIt: 'Is it ', predefinedValue: 'Predefined values', predefinedValueTip: 'Multiple values are separated by line breaks', + defaultShow: 'Default show', + typeAttribute: 'Attribute', + typeRelation: 'Relation', + requiredCheck: 'Required check', + defaultShowAttribute: 'Default display attributes', + attributeGroup: 'Attribute grouping & sorting', + addGroup: 'Add Group', + deleteGroup: 'Delete Group', + up: 'Up', + down: 'Down', + moveSuccess: 'Move successfully', + moveFailed: 'Move Failed', + groupNameExisted: 'The group name already exists', + moreAttributeCannotSort: 'More attributes cannot be sorted. If you need to sort, add them to other groups!', + newCIType: 'New CI Type', + editCIType: 'Edit CI Type', + newRelation: 'New Relation', + sourceCIType: 'Source CI Type', + targetCIType: 'Target CI Type', + relationType: 'Relation Type', + relationViewDefinePanel: 'Relationship view definition panel', + relationViewDefinePanelTip1: 'Method 1. Right-click tree node (recommended)', + relationViewDefinePanelTip2: 'Method 2. Open the switch in the upper right corner and select the node of the tree', + newRealtionView: 'New relational view', + RealtionViewName: 'Relational view name', + RealtionViewNameRequired: 'Please enter a relational view name', + newRelationType: 'New Relation Type', + relationTypeNameRequired: 'Please enter a type name', uniqueFlag: 'unique flag' } } diff --git a/cmdb-ui/src/locales/lang/zh-CN.js b/cmdb-ui/src/locales/lang/zh-CN.js index ee743ef..4349475 100644 --- a/cmdb-ui/src/locales/lang/zh-CN.js +++ b/cmdb-ui/src/locales/lang/zh-CN.js @@ -25,6 +25,7 @@ export default { add: '新增', new: '新建', update: '修改', + save: '保存', delete: '删除', yes: '是', no: '否', @@ -33,6 +34,7 @@ export default { downloadTemplate: '下载模板', upload: '上传', download: '下载', + batchUpdate: '批量修改', displayFields: '显示字段' }, tip: { @@ -48,11 +50,12 @@ export default { create: '创建', clear: '清空', modify: '修改', - unselectedAttribute: '未选属性', - selectedAttribute: '已选属性', + unselectedAttribute: '当前项', + selectedAttribute: '已选项', noData: '没数据', addSuccess: '新增成功', updateSuccess: '修改成功', + saveSuccess: '保存成功', deleteSuccess: '删除成功', cancelSuccess: '取消成功', downloading: '正在下载 ...', @@ -105,6 +108,9 @@ export default { ciType: { add: '新增', addAttribute: '新增属性', + bindAttribute: '绑定属性', + addAttribute1: '添加属性', + moreAttribute: '更多属性', editModel: '编辑模型', modelName: '模型名(英文)', name: '名称', @@ -116,6 +122,7 @@ export default { link: '链接', password: '密码', list: '列表', + required: '必须', integer: '整数', float: '浮点数', text: '文本', @@ -124,6 +131,34 @@ export default { isIt: '是否', predefinedValue: '预定义值', predefinedValueTip: '多个值使用换行分隔', + defaultShow: '默认显示', + typeAttribute: '模型属性', + typeRelation: '模型关联', + requiredCheck: '必须校验', + defaultShowAttribute: '默认显示属性', + attributeGroup: '属性分组 & 排序', + addGroup: '添加分组', + deleteGroup: '删除分组', + up: '上移', + down: '下移', + moveSuccess: '移动成功', + moveFailed: '移动出错', + groupNameExisted: '分组名称已存在', + moreAttributeCannotSort: '更多属性不能进行排序, 如需排序需添加入其他分组中！', + newCIType: '新增模型', + editCIType: '编辑模型', + newRelation: '新增关系', + sourceCIType: '源模型', + targetCIType: '目标模型', + relationType: '关联关系', + relationViewDefinePanel: '关系视图定义面板', + relationViewDefinePanelTip1: '方法1. 右键选择树节点(推荐)', + relationViewDefinePanelTip2: '方法2. 先打开右上角的开关，再选择树的节点', + newRealtionView: '新增关系视图', + RealtionViewName: '关系视图名', + RealtionViewNameRequired: '请输入 关系视图名', + newRelationType: '新增关系类型', + relationTypeNameRequired: '请输入类型名', uniqueFlag: '唯一标识' } } 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 5609f4e..11298be 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/attributesTable.vue @@ -72,10 +72,10 @@ {{ $t('tip.delete') }} @@ -100,7 +100,7 @@ :render="item=>item.title" :selectedKeys="transferSelectedKeys" :targetKeys="transferTargetKeys" - :titles="['当前项', '已选项']" + :titles="[$t('tip.unselectedAttribute'), $t('tip.selectedAttribute')]" :listStyle="{ height: '600px', width: '40%', @@ -163,8 +163,8 @@ export default { drawerVisible: false }, batchBindAttrAction: { - btnName: '绑定属性', - drawerTitle: '绑定属性', + btnName: this.$t('ciType.bindAttribute'), + drawerTitle: this.$t('ciType.bindAttribute'), drawerVisible: false }, @@ -191,7 +191,7 @@ export default { }, columns: [ { - title: '名称', + title: this.$t('ciType.alias'), dataIndex: 'alias', sorter: false, width: 200, @@ -210,7 +210,7 @@ export default { } }, { - title: '英文名', + title: this.$t('ciType.name'), dataIndex: 'name', sorter: false, width: 200, @@ -229,7 +229,7 @@ export default { } }, { - title: '类型', + title: this.$t('ciType.type'), dataIndex: 'value_type', sorter: false, width: 100, @@ -238,7 +238,7 @@ export default { }, { - title: '唯一', + title: this.$t('ciType.unique'), dataIndex: 'is_unique', width: 50, sorter: false, @@ -246,7 +246,7 @@ export default { }, { - title: '索引', + title: this.$t('ciType.index'), dataIndex: 'is_index', sorter: false, width: 50, @@ -254,7 +254,7 @@ export default { }, { - title: '排序', + title: this.$t('ciType.sort'), dataIndex: 'is_sortable', sorter: false, width: 50, @@ -262,7 +262,7 @@ export default { }, { - title: '链接', + title: this.$t('ciType.link'), dataIndex: 'is_link', sorter: false, width: 50, @@ -270,7 +270,7 @@ export default { }, { - title: '密码', + title: this.$t('ciType.password'), dataIndex: 'is_password', sorter: false, width: 50, @@ -278,7 +278,7 @@ export default { }, { - title: '列表', + title: this.$t('ciType.list'), dataIndex: 'is_list', sorter: false, width: 50, @@ -286,7 +286,7 @@ export default { }, { - title: '必须', + title: this.$t('ciType.required'), dataIndex: 'is_required', sorter: false, width: 50, @@ -294,14 +294,14 @@ export default { }, { - title: '默认显示', + title: this.$t('ciType.defaultShow'), dataIndex: 'default_show', sorter: false, scopedSlots: { customRender: 'is_check' } }, { - title: '操作', + title: this.$t('tip.operate'), dataIndex: 'action', width: 100, fixed: 'right', @@ -323,11 +323,8 @@ export default { }, mdl: {}, - // 高级搜索 展开/关闭 advanced: false, - // 查询参数 queryParam: {}, - // 表头 selectedRowKeys: [], selectedRows: [], @@ -448,7 +445,7 @@ export default { handleDelete (record) { this.unbindAttribute([record.id]) .then(res => { - this.$message.success(`删除成功`) + this.$message.success(this.$t('tip.deleteSuccess')) this.handleOk() }).catch(err => this.requestFailed(err)) }, @@ -486,7 +483,7 @@ export default { const that = this Promise.all(p).then(function (values) { console.log(values) - that.$message.success(`修改成功`) + that.$message.success(that.$t('tip.updateSuccess')) that.handleOk() that.onBatchBindAttrActionClose() }).catch(err => that.requestFailed(err)) @@ -500,7 +497,7 @@ export default { }, requestFailed (err) { - const msg = ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试' + const msg = ((err.response || {}).data || {}).message || this.$t('tip.requestFailed') this.$message.error(`${msg}`) } 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 bba7b58..9dcc012 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/checkTable.vue @@ -1,6 +1,6 @@ @@ -121,34 +121,34 @@
@@ -182,14 +182,14 @@
  • 添加属性
    • + style="">{{ $t('ciType.addAttribute1') }}
    x.originName).includes(CITypeGroup.name)) { - this.$message.error('分组名称已存在') + this.$message.error(this.$t('ciType.groupNameExisted')) } else { updateCITypeGroupById(CITypeGroup.id, { name: CITypeGroup.name, attributes: CITypeGroup.attributes.map(x => x.id), order: CITypeGroup.order }) .then(res => { CITypeGroup.editable = false this.$set(this.CITypeGroups, index, CITypeGroup) - this.$message.success('修改成功') + this.$message.success(this.$t('tip.updateSuccess')) }) .catch(err => this.requestFailed(err)) } @@ -389,14 +389,14 @@ export default { const fromGroupId = this.CITypeGroups[beforeIndex].id const toGroupId = this.CITypeGroups[afterIndex].id transferCITypeGroupIndex(this.CITypeId, { from: fromGroupId, to: toGroupId }).then(res => { - this.$message.success('操作成功') + this.$message.success(this.$t('ciType.moveSuccess')) const beforeGroup = this.CITypeGroups[beforeIndex] this.CITypeGroups[beforeIndex] = this.CITypeGroups[afterIndex] this.$set(this.CITypeGroups, beforeIndex, this.CITypeGroups[afterIndex]) this.$set(this.CITypeGroups, afterIndex, beforeGroup) }).catch(err => { - this.$httpError(err, '移动出错') + this.$httpError(err, this.$t('ciType.moveFailed')) }) }, handleAddExistGroupAttr (index) { @@ -463,13 +463,13 @@ export default { handleChange (e, group) { if (e.hasOwnProperty('moved') && e.moved.oldIndex !== e.moved.newIndex) { if (group === -1) { - this.$message.error('更多属性不能进行排序, 如需排序需添加入其他分组中！') + this.$message.error(this.$t('ciType.moreAttributeCannotSort')) } else { transferCITypeAttrIndex(this.CITypeId, { from: { attr_id: e.moved.element.id, group_id: group > -1 ? group : null }, to: { order: e.moved.newIndex, group_id: group > -1 ? group : null } - }).then(res => this.$message.success('保存成功')).catch(err => { + }).then(res => this.$message.success(this.$t('tip.saveSuccess'))).catch(err => { this.$httpError(err) this.abortDraggable() }) @@ -486,7 +486,7 @@ export default { { from: { attr_id: e.removed.element.id, group_id: group > -1 ? group : null }, to: { group_id: this.addRemoveGroupFlag.to.group_id, order: this.addRemoveGroupFlag.to.order } - }).then(res => this.$message.success('保存成功')).catch(err => { + }).then(res => this.$message.success(this.$t('tip.saveSuccess'))).catch(err => { this.$httpError(err) this.abortDraggable() }).finally(() => { @@ -501,9 +501,9 @@ export default { }) }, updatePropertyIndex () { - const attributes = [] // 全部属性 - let attributeOrder = 0 // 属性组 - let groupOrder = 0 // 组排序 + const attributes = [] // all attributes + let attributeOrder = 0 // attribute group + let groupOrder = 0 // sort by group const promises = [ ] @@ -548,14 +548,14 @@ export default { const that = this Promise.all(promises) .then(values => { - that.$message.success(`修改成功`) + that.$message.success(this.$t('tip.updateSuccess')) that.getCITypeGroupData() that.modalVisible = false }) .catch(err => that.requestFailed(err)) }, requestFailed (err) { - const msg = ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试' + const msg = ((err.response || {}).data || {}).message || this.$t('tip.requestFailed') this.$message.error(`${msg}`) } }, 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 da7fe22..f9ae9f3 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/list.vue @@ -13,7 +13,7 @@ @@ -66,18 +66,17 @@ { @@ -228,7 +227,7 @@ export default { handleDelete (record) { deleteCIType(record.id) .then(res => { - this.$message.success(`删除成功`) + this.$message.success(this.$t('tip.deleteSuccess')) this.getCITypes() }) .catch(err => this.requestFailed(err)) @@ -252,7 +251,7 @@ export default { createCIType (data) { createCIType(data) .then(res => { - this.$message.success(`添加成功`) + this.$message.success(this.$t('tip.addSuccess')) this.drawerVisible = false this.getCITypes() }) @@ -262,14 +261,14 @@ export default { updateCIType (CITypeId, data) { updateCIType(CITypeId, data) .then(res => { - this.$message.success(`修改成功`) + this.$message.success(this.$t('tip.updateSuccess')) this.drawerVisible = false this.getCITypes() }) .catch(err => this.requestFailed(err)) }, requestFailed (err) { - const msg = ((err.response || {}).data || {}).message || '请求出现错误，请稍后再试' + const msg = ((err.response || {}).data || {}).message || this.$t('tip.requestFailed') this.$message.error(`${msg}`) } 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 5c076f5..e64dc00 100644 --- a/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue +++ b/cmdb-ui/src/views/cmdb/modeling/ci_type/relationTable.vue @@ -1,6 +1,6 @@