test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(环境组): i18n

This commit is contained in:
shiziyuan9527 2021-12-03 15:29:19 +08:00 committed by shiziyuan9527
parent 5d0a81453a
commit 57d4144676
13 changed files with 128 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/business/components/api/automation/scenario/EnvGroup.vue
View File

@ -1,16 +1,16 @@
<template>
<div>
<div style="margin-left: 20px;">
<el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
<el-select v-model="envGroupId" :placeholder="$t('workspace.env_group.select')" style="margin-top: 8px;width: 200px;" size="small">
<el-option v-for="(group, index) in groups" :key="index"
:label="group.name"
:value="group.id"/>
</el-select>
<span style="margin-left: 8px;">环境组</span>
<span style="margin-left: 8px;">{{$t('workspace.env_group.name')}}</span>
<i class="el-icon-view icon-view-btn" @click="viewGroup"></i>
</div>
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
<el-dialog :visible="visble" append-to-body :title="'环境组'" @close="visble = false" style="height: 800px;">
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
<el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false" style="height: 800px;">
<template>
<environment-group style="overflow-y: auto;"
:screen-height="'350px'"
@ -74,21 +74,21 @@ export default {
checkEnv() {
return new Promise((resolve) => {
if (!this.envGroupId) {
this.$warning("请选择环境组！");
this.$warning(this.$t('workspace.env_group.select'));
resolve(false);
return false;
}
this.$get("/environment/group/project/map/" + this.envGroupId, res => {
let data = res.data;
if (!data) {
this.$warning("环境组缺少环境！");
this.$warning(this.$t('workspace.env_group.lack_env'));
resolve(false);
return;
}
let map = new Map(Object.entries(data));
for (let id of this.projectIds) {
if (!map.get(id)) {
this.$warning("此环境组缺少必要的项目环境！");
this.$warning(this.$t('workspace.env_group.lack_necessary_environment'));
resolve(false);
return;
}

18
frontend/src/business/components/api/automation/scenario/EnvGroupWithOption.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div style="margin-left: 20px;">
<el-select v-model="envGroupId" placeholder="请选择用户组" style="margin-top: 8px;width: 200px;" size="small">
<el-select v-model="envGroupId" :placeholder="$t('workspace.env_group.select')" style="margin-top: 8px;width: 200px;" size="small">
<el-option-group
v-for="group in groups"
:key="group.label"
@ -15,11 +15,11 @@
</el-option>
</el-option-group>
</el-select>
<span style="margin-left: 8px;">环境组</span>
<span style="margin-left: 8px;">{{$t('workspace.env_group.name')}}</span>
<i class="el-icon-view icon-view-btn" @click="viewGroup"></i>
</div>
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
<el-dialog :visible="visble" append-to-body :title="'环境组'" @close="visble = false" style="height: 800px;">
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
<el-dialog :visible="visble" append-to-body :title="$t('workspace.env_group.name')" @close="visble = false" style="height: 800px;">
<template>
<environment-group style="overflow-y: auto;"
:screen-height="'350px'"
@ -73,11 +73,11 @@ export default {
this.disabledGroups = groups.filter(group => group.disabled === true);
this.notDisabledGroups = groups.filter(group => group.disabled === false);
this.$set(this.groups, 0, {
label: '可用环境组',
label: this.$t('workspace.env_group.available_group'),
options: this.notDisabledGroups
});
this.$set(this.groups, 1, {
label: '不可用环境组(缺少项目环境)',
label: this.$t('workspace.env_group.not_available_group'),
options: this.disabledGroups
});
})
@ -95,21 +95,21 @@ export default {
checkEnv() {
return new Promise((resolve) => {
if (!this.envGroupId) {
this.$warning("请选择环境组！");
this.$warning(this.$t('workspace.env_group.select'));
resolve(false);
return false;
}
this.$get("/environment/group/project/map/" + this.envGroupId, res => {
let data = res.data;
if (!data) {
this.$warning("环境组缺少环境！");
this.$warning(this.$t('workspace.env_group.lack_env'));
resolve(false);
return;
}
let map = new Map(Object.entries(data));
for (let id of this.projectIds) {
if (!map.get(id)) {
this.$warning("此环境组缺少必要的项目环境！");
this.$warning(this.$t('workspace.env_group.lack_necessary_environment'));
resolve(false);
return;
}

6
frontend/src/business/components/api/automation/scenario/EnvPopover.vue
View File

@ -7,8 +7,8 @@
@show="showPopover"
trigger="click">
<el-radio-group v-model="radio" style="margin-left: 20px;" @change="radioChange">
<el-radio :label="ENV_TYPE.JSON">环境列表</el-radio>
<el-radio :label="ENV_TYPE.GROUP">环境组</el-radio>
<el-radio :label="ENV_TYPE.JSON">{{$t('workspace.env_group.env_list')}}</el-radio>
<el-radio :label="ENV_TYPE.GROUP">{{$t('workspace.env_group.name')}}</el-radio>
</el-radio-group>
<env-select :project-ids="projectIds"
:result="result"
@ -140,7 +140,7 @@ export default {
resolve(true);
} else {
if (!this.environmentType) {
this.$warning("请选择环境！");
this.$warning(this.$t('workspace.env_group.please_select_env'));
resolve(false);
} else if (this.environmentType === ENV_TYPE.JSON) {
let res = this.$refs.envSelect.checkEnv(data);

8
frontend/src/business/components/api/automation/scenario/EnvSelect.vue
View File

@ -1,7 +1,7 @@
<template>
<div v-loading="result.loading">
<div v-for="pe in data" :key="pe.id" style="margin-left: 20px;">
<el-select v-model="pe['selectEnv']" placeholder="请选择环境" style="margin-top: 8px;width: 200px;" size="small">
<el-select v-model="pe['selectEnv']" :placeholder="$t('workspace.env_group.please_select_env')" style="margin-top: 8px;width: 200px;" size="small">
<el-option v-for="(environment, index) in pe.envs" :key="index"
:label="environment.name"
:value="environment.id"/>
@ -23,7 +23,7 @@
</span>
</div>
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">确 定</el-button>
<el-button type="primary" @click="handleConfirm" size="small" class="env-confirm">{{$t('workspace.env_group.confirm')}}</el-button>
<!-- 环境配置 -->
<api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
@ -153,7 +153,7 @@ export default {
map.set(dt.id, dt.selectEnv);
})
if (!sign) {
this.$warning("请为当前场景选择一个运行环境！");
this.$warning(this.$t('workspace.env_group.please_select_env_for_current_scenario'));
return;
}
this.$emit('setProjectEnvMap', map);
@ -301,7 +301,7 @@ export default {
}
if (!sign) {
this.$warning("请为当前场景选择一个运行环境！");
this.$warning(this.$t('workspace.env_group.please_select_env_for_current_scenario'));
return false;
}
return true;

4
frontend/src/business/components/settings/workspace/environment/EditEnvironmentGroup.vue
View File

@ -37,7 +37,7 @@ export default {
},
data() {
return {
title: '创建环境组',
title: this.$t('workspace.env_group.create'),
form: {},
createVisible: false,
rules: {
@ -61,7 +61,7 @@ export default {
if (valid) {
let sign = this.$refs.environmentGroupRow.valid();
if (!sign) {
this.$warning("项目与环境对应关系不完整！");
this.$warning(this.$t('workspace.env_group.not_intact'));
return false;
}
let envGroupProject = this.$refs.environmentGroupRow.envGroupProject;

12
frontend/src/business/components/settings/workspace/environment/EnvGroupCascader.vue
View File

@ -4,21 +4,21 @@
<el-form :model="ruleForm" :rules="rules" ref="ruleForm">
<el-form-item prop="project" label-width="0px">
<el-alert
title="若环境组中已经包含此次将要加入的项目，则该项目环境将被覆盖" style="height: 33px;"
:title="$t('workspace.env_group.cascader_tip')" style="height: 33px;"
type="info" :closable="false" show-icon></el-alert>
<el-row type="flex" justify="space-between" :gutter="10">
<el-col :span="10" class="search">
<el-input v-model="searchName" prefix-icon="el-icon-search"
placeholder="请输入名称搜索环境组" size="mini" style="width: 100%;"></el-input>
:placeholder="$t('workspace.env_group.search_tip')" size="mini" style="width: 100%;"></el-input>
</el-col>
<el-col :span="10" class="search">
<el-input v-model="groupName" placeholder="请输入环境组名称快速创建"
<el-input v-model="groupName" :placeholder="$t('workspace.env_group.fast_create_tip')"
prefix-icon="el-icon-plus"
size="mini">
</el-input>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="save" size="mini" style="width: 100%;">快速添加</el-button>
<el-button type="primary" @click="save" size="mini" style="width: 100%;">{{ $t('workspace.env_group.quickly_add') }}</el-button>
</el-col>
</el-row>
<el-cascader-panel :props="props" v-loading="result.loading"
@ -115,7 +115,7 @@ export default {
selectValueArr.push(node.value);
}
if (selectValueArr.length < 1) {
this.$warning("请选择环境组");
this.$warning(this.$t('workspace.env_group.select'));
return false;
}
this.$emit('confirm', selectValueArr);
@ -135,7 +135,7 @@ export default {
},
save() {
if (!this.groupName) {
this.$warning("环境组名不能为空！");
this.$warning(this.$t('workspace.env_group.name_not_null'));
return false;
}
this.$post("/environment/group/add", {name: this.groupName}, () => {

4
frontend/src/business/components/settings/workspace/environment/EnvironmentGroupList.vue
View File

@ -57,7 +57,7 @@
</el-card>
<edit-environment-group ref="editEnvironmentGroup" @refresh="init"/>
<ms-delete-confirm :title="'删除环境组'" @delete="_handleDelete" ref="deleteConfirm"/>
<ms-delete-confirm :title="$t('workspace.env_group.delete')" @delete="_handleDelete" ref="deleteConfirm"/>
</div>
</template>
@ -98,7 +98,7 @@ export default {
},
data() {
return {
btnTips: '创建环境组',
btnTips: this.$t('workspace.env_group.create'),
envGroupId: '',
condition: {},
environmentGroupList: [],

18
frontend/src/business/components/settings/workspace/environment/EnvironmentGroupRow.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div class="btn-div">
<el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">保存</el-button>
<el-button size="mini" type="primary" class="save-btn" v-if="!rowReadOnly && !showSaveBtn" @click="update">{{$t('commons.save')}}</el-button>
</div>
<div v-loading="result.loading" class="group-row">
<el-form class="row-form">
@ -10,7 +10,7 @@
<el-col :span="6">
<el-select v-model="item.projectId" filterable clearable style="width: 100%" @change="projectChange(item)"
:size="itemSize"
placeholder="请选择项目" :disabled="rowReadOnly">
:placeholder="$t('workspace.env_group.please_select_project')" :disabled="rowReadOnly">
<el-option v-for="(project, projectIndex) in projectList" :key="projectIndex" :label="project.name"
:disabled="project.disabled"
:value="project.id"></el-option>
@ -20,7 +20,7 @@
<el-col :span="6">
<el-select v-model="item.environmentId" filterable clearable style="width: 100%"
@change="environmentChange(item)" :size="itemSize"
placeholder="请选择环境" :disabled="rowReadOnly">
:placeholder="$t('workspace.env_group.please_select_env')" :disabled="rowReadOnly">
<el-option v-for="(environment, envIndex) in item.environments" :key="envIndex"
:label="environment.name"
:value="environment.id"></el-option>
@ -29,13 +29,13 @@
<el-col :span="4">
<el-button :size="itemSize" icon="el-icon-s-data" style="width: 100%;"
@click="showDomainInfo(item)" v-if="item.moreDomain">查看域名详情
@click="showDomainInfo(item)" v-if="item.moreDomain">{{ $t('workspace.env_group.view_details') }}
</el-button>
<el-input v-else v-model="item.domainName" :disabled="true" :size="itemSize"/>
</el-col>
<el-col :span="5">
<el-input prop="description" show-overflow-tooltip placeholder="描述" maxlength="100"
<el-input prop="description" show-overflow-tooltip :placeholder="$t('commons.description')" maxlength="100"
v-model="item.domainDescription"
show-word-limit :size="itemSize" :disabled="true"/>
</el-col>
@ -49,14 +49,14 @@
</el-row>
</el-form-item>
</el-form>
<el-dialog title="域名列表" :visible.sync="domainVisible" append-to-body>
<el-dialog :title="$t('workspace.env_group.domain_list')" :visible.sync="domainVisible" append-to-body>
<el-table :data="conditions">
<el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
<template v-slot:default="{row}">
{{ row.conditionType ? row.server : getUrl(row) }}
</template>
</el-table-column>
<el-table-column :label="'类型'" show-overflow-tooltip
<el-table-column :label="$t('commons.type')" show-overflow-tooltip
min-width="100px">
<template v-slot:default="{row}">
<el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
@ -73,7 +73,7 @@
{{ row.conditionType ? "-" : getDetails(row) }}
</template>
</el-table-column>
<el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
<el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
<template v-slot:default="{row}">
<span>{{ row.description ? row.description : "-" }}</span>
</template>
@ -372,7 +372,7 @@ export default {
update() {
let sign = this.valid();
if (!sign) {
this.$warning("项目与环境对应关系不完整！");
this.$warning(this.$t('workspace.env_group.not_intact'));
return false;
}
let param = {

14
frontend/src/business/components/settings/workspace/environment/EnvironmentList.vue
View File

@ -38,7 +38,7 @@
<el-table-column :label="$t('api_test.environment.socket')" show-overflow-tooltip>
<template v-slot="scope">
<span v-if="parseDomainName(scope.row)!='SHOW_INFO'">{{ parseDomainName(scope.row) }}</span>
<el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>查看域名详情</el-button>
<el-button size="mini" icon="el-icon-s-data" @click="showInfo(scope.row)" v-else>{{ $t('workspace.env_group.view_details') }}</el-button>
</template>
</el-table-column>
<el-table-column :label="$t('commons.operating')">
@ -76,14 +76,14 @@
</el-dialog>
<environment-import :project-list="projectList" @refresh="refresh" ref="envImport"></environment-import>
<el-dialog title="域名列表" :visible.sync="domainVisible">
<el-dialog :title="$t('workspace.env_group.domain_list')" :visible.sync="domainVisible">
<el-table :data="conditions">
<el-table-column prop="socket" :label="$t('load_test.domain')" show-overflow-tooltip width="180">
<template v-slot:default="{row}">
{{ row.conditionType ? row.server : getUrl(row) }}
</template>
</el-table-column>
<el-table-column :label="'类型'" show-overflow-tooltip
<el-table-column :label="$t('commons.type')" show-overflow-tooltip
min-width="100px">
<template v-slot:default="{row}">
<el-tag type="info" size="mini">{{ row.conditionType ? row.conditionType : "HTTP" }}</el-tag>
@ -100,7 +100,7 @@
{{ row.conditionType ? "-" : getDetails(row) }}
</template>
</el-table-column>
<el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="'描述'">
<el-table-column prop="description" show-overflow-tooltip min-width="120px" :label="$t('commons.description')">
<template v-slot:default="{row}">
<span>{{ row.description ? row.description : "-" }}</span>
</template>
@ -117,7 +117,7 @@
<el-button type="primary" @click="domainVisible = false" size="mini">{{ $t('commons.confirm') }}</el-button>
</span>
</el-dialog>
<env-group-cascader :title="'批量添加到环境组'" ref="cascader" @confirm="_batchAddToGroup"/>
<env-group-cascader :title="$t('workspace.env_group.batch_add_to_ws')" ref="cascader" @confirm="_batchAddToGroup"/>
</div>
</template>
@ -187,7 +187,7 @@ export default {
selectDataCounts: 0,
buttons: [
{
name: '批量添加到环境组', handleClick: this.batchAddToGroup
name: this.$t('workspace.env_group.batch_add_to_ws'), handleClick: this.batchAddToGroup
},
]
};
@ -463,7 +463,7 @@ export default {
}
})
if (str) {
this.$warning(str + "环境选择冲突，一个项目选择一个对应环境！");
this.$warning(str + this.$t('workspace.env_group.choice_conflict'));
return false;
}
return true;

2
frontend/src/business/components/settings/workspace/environment/EnvironmentManage.vue
View File

@ -5,7 +5,7 @@
<el-tab-pane :label="$t('api_test.environment.environment_list')" name="list">
<environment-list v-if="activeName === 'list'"/>
</el-tab-pane>
<el-tab-pane :label="'环境组'" name="group">
<el-tab-pane :label="$t('workspace.env_group.name')" name="group">
<environment-group-list v-if="activeName === 'group'"/>
</el-tab-pane>
</el-tabs>

26
frontend/src/i18n/en-US.js
View File

@ -193,6 +193,7 @@ export default {
follow_success:"Follow Success",
cancel_follow_success: "Cancel Follow Success",
generate_test_data: "Generate test data",
type: "Type",
relationship: {
name: 'Dependencies',
pre_case: 'Prepositional Case',
@ -482,6 +483,31 @@ export default {
int: 'Int',
float: 'Float',
multipleInput: 'MultipleInput'
},
env_group: {
name: "Environment Group",
create: "Create Group",
not_intact: "the project and the environment is incomplete!",
cascader_tip: "The existing environment will be overwritten",
search_tip: "Please enter a name to search",
fast_create_tip: "Please enter the name to quickly create",
quickly_add: "Quickly add",
select: "Please select an environment group",
name_not_null: "Environment group name cannot be empty",
delete: "Delete environment group",
please_select_project: "Please select an item",
please_select_env: "Please select environment",
view_details: "View details",
domain_list: "Domain list",
batch_add_to_ws: "Add to environment group in bulk",
choice_conflict: "one project chooses a corresponding environment!",
env_list: "Environment List",
confirm: "Confirm",
please_select_env_for_current_scenario: "please select env for current scenario",
lack_env: "Environment group is missing environment！",
lack_necessary_environment: "This environment group lacks the necessary project environment！",
available_group: 'available',
not_available_group: "unavailable"
}
},
organization: {

26
frontend/src/i18n/zh-CN.js
View File

@ -193,6 +193,7 @@ export default {
run_fail: "执行失败",
follow_success:"关注成功",
cancel_follow_success:"取消关注成功",
type: "类型",
relationship: {
name: '依赖关系',
pre_case: '前置用例',
@ -483,6 +484,31 @@ export default {
int: '整型',
float: '浮点型',
multipleInput: '多值输入框'
},
env_group: {
name: "环境组",
create: "创建环境组",
not_intact: "项目与环境对应关系不完整！",
cascader_tip: "若环境组中已经包含此次将要加入的项目，则该项目环境将被覆盖",
search_tip: "请输入名称搜索环境组",
fast_create_tip: "请输入环境组名称快速创建",
quickly_add: "快速添加",
select: "请选择环境组",
name_not_null: "环境组名不能为空",
delete: "删除环境组",
please_select_project: "请选择项目",
please_select_env: "请选择环境",
view_details: "查看域名详情",
domain_list: "域名列表",
batch_add_to_ws: "批量添加到环境组",
choice_conflict: "环境选择冲突，一个项目选择一个对应环境！",
env_list: "环境列表",
confirm: "确 定",
please_select_env_for_current_scenario: "请为当前场景选择一个运行环境！",
lack_env: "环境组缺少环境！",
lack_necessary_environment: "此环境组缺少必要的项目环境！",
available_group: '可用环境组',
not_available_group: "不可用环境组(缺少项目环境)"
}
},
organization: {

26
frontend/src/i18n/zh-TW.js
View File

@ -193,6 +193,7 @@ export default {
run_fail: "執行失敗",
follow_success:"關注成功",
cancel_follow_success: "取消關注成功",
type: "類型",
relationship: {
name: '依賴關系',
pre_case: '前置用例',
@ -483,6 +484,31 @@ export default {
int: '整型',
float: '浮點型',
multipleInput: '多值輸入框'
},
env_group: {
name: "環境組",
create: "創建環境組",
not_intact: "項目與環境對應關係不完整！",
cascader_tip: "若環境組中已經包含此次將要加入的項目，則該項目環境將被覆蓋",
search_tip: "請輸入名稱搜索環境組",
fast_create_tip: "請輸入名稱搜索環境組",
quickly_add: "快速添加",
select: "請選擇環境組",
name_not_null: "環境組名不能為空",
delete: "刪除環境組",
please_select_project: "請選擇項目",
please_select_env: "請選擇環境",
view_details: "請選擇環境",
domain_list: "域名列表",
batch_add_to_ws: "批量添加到環境組",
choice_conflict: "環境選擇衝突，一個項目選擇一個對應環境！",
env_list: "環境列表",
confirm: "確 定",
please_select_env_for_current_scenario: "請為當前場景選擇一個運行環境！",
lack_env: "環境組缺少環境！",
lack_necessary_environment: "此環境組缺少必要的項目環境！",
available_group: '可用環境組',
not_available_group: "不可用環境組(缺少項目環境)"
}
},
organization: {