fix: 冲突

This commit is contained in:
taojinlong 2021-02-22 15:40:38 +08:00
parent 593042f1b4
commit 112460af5a
2 changed files with 23 additions and 3 deletions

View File

@ -15,6 +15,7 @@
"@fortawesome/free-regular-svg-icons": "^5.12.0",
"@fortawesome/free-solid-svg-icons": "^5.12.0",
"@fortawesome/vue-fontawesome": "^0.1.9",
"@riophae/vue-treeselect": "0.4.0",
"axios": "^0.21.1",
"core-js": "^3.4.3",
"diffable-html": "^4.0.0",
@ -46,8 +47,7 @@
"vuedraggable": "^2.24.3",
"vuex": "^3.1.2",
"xml-js": "^1.6.11",
"yan-progress": "^1.0.3",
"@riophae/vue-treeselect": "0.4.0"
"yan-progress": "^1.0.3"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.1.0",

View File

@ -61,7 +61,7 @@ export default {
test_resource_pool: '测试资源池',
system_setting: '系统设置',
api: '视图',
performance: '数据',
dataset: '数据',
functional: '功能测试',
input_content: '请输入内容',
create: '新建',
@ -1523,6 +1523,26 @@ export default {
title: '认证设置',
auth_name_valid: '名称不支持特殊字符',
},
dataset:{
datalist:'数据列表',
add_group:'添加分组',
add_scene:'添加场景',
group:'分组',
scene:'场景',
delete:'删除',
move_to:'移动到',
rename:'重命名',
tips:'提示',
confirm_delete:'确认删除',
delete_success:'删除成功',
confirm:'确认',
cancel:'取消',
search:'搜索',
back:'返回',
add_table:'添加表',
process:'进度',
update:'更新'
},
datasource: {
create: '新建数据连接',
type: '类型',