feat(项目管理): 文件管理关于git类型的文件增加文件分支信息展示
--bug=1025259 --user=宋天阳 【文件管理】github#23502，文件管理拉取git文件存在三问题 https://www.tapd.cn/55049933/s/1361146
This commit is contained in:
song-tianyang
f2c-ci-robot[bot]
parent
af838e2af3
commit
642eafeaee
|
|
@ -22,7 +22,10 @@
|
|||
:label="$t('project.project_file.file.path')"
|
||||
prop="repositoryPath"
|
||||
>
|
||||
<el-input v-model="metadataForm.repositoryPath"></el-input>
|
||||
<el-input
|
||||
:placeholder="$t('file.file_path_placeholder')"
|
||||
v-model="metadataForm.repositoryPath"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
|
|
|||
|
|
@ -110,6 +110,15 @@
|
|||
@blur="save"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item
|
||||
v-if="isRepositoryFile()"
|
||||
:label="$t('project.project_file.file.branch')"
|
||||
prop="type"
|
||||
>
|
||||
<span>{{ fileBranch }}</span>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('load_test.file_type')" prop="type">
|
||||
<span>{{ data.type }}</span>
|
||||
</el-form-item>
|
||||
|
|
@ -243,6 +252,7 @@ export default {
|
|||
isPullBtnLoading: false,
|
||||
showPanel: "baseInfo",
|
||||
results: [],
|
||||
fileBranch: "",
|
||||
moduleObj: {
|
||||
id: "id",
|
||||
label: "name",
|
||||
|
|
@ -381,6 +391,12 @@ export default {
|
|||
this.data = data;
|
||||
this.results = this.metadataArray;
|
||||
this.visible = true;
|
||||
if (this.isRepositoryFile() && data.attachInfo) {
|
||||
let attachInfoObj = JSON.parse(data.attachInfo);
|
||||
this.fileBranch = attachInfoObj.branch;
|
||||
} else {
|
||||
this.fileBranch = "";
|
||||
}
|
||||
},
|
||||
isRepositoryFile() {
|
||||
return this.data.storage === "GIT";
|
||||
|
|
|
|||
|
|
@ -1,63 +1,66 @@
|
|||
import el from "element-ui/lib/locale/lang/en";
|
||||
import fu from "fit2cloud-ui/src/locale/lang/en_US"; // 加载fit2cloud的内容
|
||||
import mf from "metersphere-frontend/src/i18n/lang/en-US"
|
||||
import mf from "metersphere-frontend/src/i18n/lang/en-US";
|
||||
|
||||
const message = {
|
||||
pj: {
|
||||
environment_import_repeat_tip: "(Environment configuration with the same name filtered {0})",
|
||||
environment_import_repeat_tip:
|
||||
"(Environment configuration with the same name filtered {0})",
|
||||
check_third_project_success: "inspection passed",
|
||||
api_run_pool_title: 'Interface execution resource pool',
|
||||
api_run_pool_title: "Interface execution resource pool",
|
||||
},
|
||||
file_manage: {
|
||||
my_file: 'My File',
|
||||
update_user: 'Update User',
|
||||
all_file: 'All File',
|
||||
file_download: 'Download',
|
||||
batch_delete: 'Batch Delete',
|
||||
batch_move: 'Batch Move',
|
||||
batch_download: 'Batch Download'
|
||||
my_file: "My File",
|
||||
update_user: "Update User",
|
||||
all_file: "All File",
|
||||
file_download: "Download",
|
||||
batch_delete: "Batch Delete",
|
||||
batch_move: "Batch Move",
|
||||
batch_download: "Batch Download",
|
||||
},
|
||||
pj_custom_field: {
|
||||
copy: "Copy",
|
||||
delete: "Delete"
|
||||
delete: "Delete",
|
||||
},
|
||||
pj_app_manage: {
|
||||
timing_clean_ui_report: "Regularly clean up report",
|
||||
},
|
||||
custom_template: {
|
||||
api_template: "Api Template",
|
||||
base_fields: 'Base fields',
|
||||
template_name: 'Template name',
|
||||
selected_custom_fields: 'Custom fields to be selected',
|
||||
base_fields: "Base fields",
|
||||
template_name: "Template name",
|
||||
selected_custom_fields: "Custom fields to be selected",
|
||||
zentao: "Zentao",
|
||||
zentao_default_name: "Zentao-Default Template",
|
||||
tapd_default_name: "TAPD-Default Template",
|
||||
jira_default_name: "JIRA-Default Template",
|
||||
zentao_default_description: "zentao default template",
|
||||
tapd_default_description: "tapd default template",
|
||||
jira_default_description: "jira default template"
|
||||
jira_default_description: "jira default template",
|
||||
},
|
||||
pj_batch_delete: {
|
||||
error_library: "Confirm batch delete error library"
|
||||
error_library: "Confirm batch delete error library",
|
||||
},
|
||||
project_version: {
|
||||
version_time: 'Version cycle',
|
||||
version_time: "Version cycle",
|
||||
},
|
||||
file: {
|
||||
file_path_placeholder: "Root dir need not file separator: / ",
|
||||
},
|
||||
environment: {
|
||||
export_variable_tip : "Export interface test variables",
|
||||
need_expire_time : "Please enter an expiration time",
|
||||
need_relevance_ui_scenario : "Please associate the login scenario",
|
||||
view_ui_relevane : "View Relevane",
|
||||
cancel_ui_relevane : "Relevant",
|
||||
re_ui_relevane : "Relevane",
|
||||
relevance_ui : "Relevance login scene/command",
|
||||
}
|
||||
}
|
||||
export_variable_tip: "Export interface test variables",
|
||||
need_expire_time: "Please enter an expiration time",
|
||||
need_relevance_ui_scenario: "Please associate the login scenario",
|
||||
view_ui_relevane: "View Relevane",
|
||||
cancel_ui_relevane: "Relevant",
|
||||
re_ui_relevane: "Relevane",
|
||||
relevance_ui: "Relevance login scene/command",
|
||||
},
|
||||
};
|
||||
|
||||
export default {
|
||||
...el,
|
||||
...fu,
|
||||
...mf,
|
||||
...message
|
||||
...message,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,62 +1,65 @@
|
|||
import el from "element-ui/lib/locale/lang/zh-CN"; // 加载element的内容
|
||||
import fu from "fit2cloud-ui/src/locale/lang/zh-CN"; // 加载fit2cloud的内容
|
||||
import mf from "metersphere-frontend/src/i18n/lang/zh-CN"
|
||||
import mf from "metersphere-frontend/src/i18n/lang/zh-CN";
|
||||
|
||||
const message = {
|
||||
pj: {
|
||||
environment_import_repeat_tip: "(已过滤同名称的环境配置 {0})",
|
||||
check_third_project_success: "检查通过",
|
||||
api_run_pool_title: '接口执行资源池',
|
||||
api_run_pool_title: "接口执行资源池",
|
||||
},
|
||||
file_manage: {
|
||||
my_file: '我的文件',
|
||||
update_user: '更新人',
|
||||
all_file: '所有文件',
|
||||
file_download: '下载',
|
||||
batch_delete: '批量删除',
|
||||
batch_move: '批量移动',
|
||||
batch_download: '批量下载'
|
||||
my_file: "我的文件",
|
||||
update_user: "更新人",
|
||||
all_file: "所有文件",
|
||||
file_download: "下载",
|
||||
batch_delete: "批量删除",
|
||||
batch_move: "批量移动",
|
||||
batch_download: "批量下载",
|
||||
},
|
||||
pj_custom_field: {
|
||||
copy: "复制字段",
|
||||
delete: "删除字段"
|
||||
delete: "删除字段",
|
||||
},
|
||||
pj_app_manage: {
|
||||
timing_clean_ui_report: "定时清理UI测试报告",
|
||||
},
|
||||
custom_template: {
|
||||
api_template: "接口模版",
|
||||
base_fields: '基础字段',
|
||||
template_name: '模版名称',
|
||||
selected_custom_fields: '已选自定义字段',
|
||||
base_fields: "基础字段",
|
||||
template_name: "模版名称",
|
||||
selected_custom_fields: "已选自定义字段",
|
||||
zentao: "禅道",
|
||||
zentao_default_name: "禅道-默认模版",
|
||||
tapd_default_name: "TAPD-默认模版",
|
||||
jira_default_name: "JIRA-默认模版",
|
||||
zentao_default_description: "禅道默认模版",
|
||||
tapd_default_description: "TAPD默认模版",
|
||||
jira_default_description: "JIRA默认模版"
|
||||
jira_default_description: "JIRA默认模版",
|
||||
},
|
||||
pj_batch_delete: {
|
||||
error_library: "确定批量删除误报库"
|
||||
error_library: "确定批量删除误报库",
|
||||
},
|
||||
project_version: {
|
||||
version_time: '版本周期',
|
||||
version_time: "版本周期",
|
||||
},
|
||||
file: {
|
||||
file_path_placeholder: "根目录前无需添加文件路径分隔符: / ",
|
||||
},
|
||||
environment: {
|
||||
export_variable_tip : "导出接口测试变量",
|
||||
need_expire_time : "请输入过期时间",
|
||||
need_relevance_ui_scenario : "请关联登录场景",
|
||||
view_ui_relevane : "查看关联",
|
||||
cancel_ui_relevane : "取消关联",
|
||||
re_ui_relevane : "重新关联",
|
||||
relevance_ui : "关联登录场景/指令",
|
||||
}
|
||||
}
|
||||
export_variable_tip: "导出接口测试变量",
|
||||
need_expire_time: "请输入过期时间",
|
||||
need_relevance_ui_scenario: "请关联登录场景",
|
||||
view_ui_relevane: "查看关联",
|
||||
cancel_ui_relevane: "取消关联",
|
||||
re_ui_relevane: "重新关联",
|
||||
relevance_ui: "关联登录场景/指令",
|
||||
},
|
||||
};
|
||||
|
||||
export default {
|
||||
...el,
|
||||
...fu,
|
||||
...mf,
|
||||
...message
|
||||
...message,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,62 +1,65 @@
|
|||
import el from "element-ui/lib/locale/lang/zh-TW";
|
||||
import fu from "fit2cloud-ui/src/locale/lang/zh-TW"; // 加载fit2cloud的内容
|
||||
import mf from "metersphere-frontend/src/i18n/lang/zh-TW"
|
||||
import mf from "metersphere-frontend/src/i18n/lang/zh-TW";
|
||||
|
||||
const message = {
|
||||
pj: {
|
||||
environment_import_repeat_tip: "(已過濾同名稱的環境配置 {0})",
|
||||
check_third_project_success: "檢查通過",
|
||||
api_run_pool_title: '接口執行資源池',
|
||||
api_run_pool_title: "接口執行資源池",
|
||||
},
|
||||
file_manage: {
|
||||
my_file: '我的文件',
|
||||
update_user: '更新人',
|
||||
all_file: '所有文件',
|
||||
file_download: '下載',
|
||||
batch_delete: '批量刪除',
|
||||
batch_move: '批量移动',
|
||||
batch_download: '批量下载'
|
||||
my_file: "我的文件",
|
||||
update_user: "更新人",
|
||||
all_file: "所有文件",
|
||||
file_download: "下載",
|
||||
batch_delete: "批量刪除",
|
||||
batch_move: "批量移动",
|
||||
batch_download: "批量下载",
|
||||
},
|
||||
pj_custom_field: {
|
||||
copy: "複製字段",
|
||||
delete: "刪除字段"
|
||||
delete: "刪除字段",
|
||||
},
|
||||
pj_app_manage: {
|
||||
timing_clean_ui_report: "定時清理UI測試報告",
|
||||
},
|
||||
custom_template: {
|
||||
api_template: "接口模版",
|
||||
base_fields: '基礎字段',
|
||||
template_name: '模版名稱',
|
||||
selected_custom_fields: '已選自定義字段',
|
||||
base_fields: "基礎字段",
|
||||
template_name: "模版名稱",
|
||||
selected_custom_fields: "已選自定義字段",
|
||||
zentao: "禪道",
|
||||
zentao_default_name: "禪道-默認模版",
|
||||
tapd_default_name: "TAPD-默認模版",
|
||||
jira_default_name: "JIRA-默認模版",
|
||||
zentao_default_description: "禪道默認模版",
|
||||
tapd_default_description: "TAPD默認模版",
|
||||
jira_default_description: "JIRA默認模版"
|
||||
jira_default_description: "JIRA默認模版",
|
||||
},
|
||||
pj_batch_delete: {
|
||||
error_library: "確定刪除誤報庫"
|
||||
error_library: "確定刪除誤報庫",
|
||||
},
|
||||
project_version: {
|
||||
version_time: '版本週期',
|
||||
version_time: "版本週期",
|
||||
},
|
||||
file: {
|
||||
file_path_placeholder: "根目錄前無需添加文件路徑分隔符: / ",
|
||||
},
|
||||
environment: {
|
||||
export_variable_tip : "導出接口測試變量",
|
||||
need_expire_time : "請輸入過期時間",
|
||||
need_relevance_ui_scenario : "請關聯登錄場景",
|
||||
view_ui_relevane : "查看關聯",
|
||||
cancel_ui_relevane : "取消關聯",
|
||||
re_ui_relevane : "重新關聯",
|
||||
relevance_ui : "關聯登錄場景/指令",
|
||||
}
|
||||
}
|
||||
export_variable_tip: "導出接口測試變量",
|
||||
need_expire_time: "請輸入過期時間",
|
||||
need_relevance_ui_scenario: "請關聯登錄場景",
|
||||
view_ui_relevane: "查看關聯",
|
||||
cancel_ui_relevane: "取消關聯",
|
||||
re_ui_relevane: "重新關聯",
|
||||
relevance_ui: "關聯登錄場景/指令",
|
||||
},
|
||||
};
|
||||
|
||||
export default {
|
||||
...el,
|
||||
...fu,
|
||||
...mf,
|
||||
...message
|
||||
...message,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue