From 905c1650328d07172a3cb7d48e1e05b88d7a8bed Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Thu, 7 Nov 2024 10:09:38 +0800 Subject: fix: ASW-133 job详情页面日志显示缺少行号 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jobs/log.vue | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/views/jobs/log.vue b/src/views/jobs/log.vue index 0da2713..d382519 100644 --- a/src/views/jobs/log.vue +++ b/src/views/jobs/log.vue @@ -79,7 +79,8 @@
-
{{logContent}}
+
+
@@ -114,7 +115,7 @@ -- cgit v1.2.3 From 720f1aaab501606e8b715fe53760edb345592d2b Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Thu, 7 Nov 2024 11:16:04 +0800 Subject: fix: ASW-135 job创建页面请求environment接口缺少 workspaceId参数 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jobs/detail.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/jobs/detail.vue b/src/views/jobs/detail.vue index fcb609c..2b6c80c 100644 --- a/src/views/jobs/detail.vue +++ b/src/views/jobs/detail.vue @@ -89,7 +89,7 @@ import { ref, reactive, computed, onBeforeMount, nextTick } from 'vue'; import { jobAddApi, packageListApi, - envMgtListApi, + environmentListApi, playbookListApi, } from '@/axios/api'; import { ElMessage } from 'element-plus'; @@ -173,9 +173,10 @@ const getPackageList = async () => { const environmentList = reactive([]); const getEnvironmentList = async () => { const params = { - size: -1 + size: -1, + workspaceId: workspace.value.id }; - const res = await envMgtListApi(params); + const res = await environmentListApi(params); if (res.code == 200) { const records = get(res, 'data.records', []); Object.assign(environmentList, records); -- cgit v1.2.3 From e811f7f269da8e80670a975c790d6700a9f6a7e0 Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Thu, 7 Nov 2024 13:36:35 +0800 Subject: feat: ASW-144 playbook编辑和列表界面增加 type 属性 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.js | 4 ++-- src/i18n/zh.js | 4 ++-- src/views/playbooks/detail.vue | 28 ++++++++++++++++++++++++++-- src/views/playbooks/index.vue | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/i18n/en.js b/src/i18n/en.js index 7a0af05..06b34d4 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -331,10 +331,10 @@ export default { playbook: 'Playbook', new_playbook: 'New Playbook', description: 'Description', - playbook_file: 'Playbook file', + file: 'File', upload_message_drag: 'Drag file here，or ', upload_message_click: 'Click to upload', - upload_tip: 'Only ZIP compressed files are supported, and the extracted files must be scripts with the .air extension.' + upload_tip: 'Compressing the Airtest script folder into a ZIP file.' }, message: { login_success: 'Login success', diff --git a/src/i18n/zh.js b/src/i18n/zh.js index 64eebef..2e7cdfb 100644 --- a/src/i18n/zh.js +++ b/src/i18n/zh.js @@ -331,10 +331,10 @@ export default { playbook: '脚本', new_playbook: '新脚本', description: '描述', - playbook_file: '脚本文件', + file: '文件', upload_message_drag: '将文件拖到此处，或', upload_message_click: '点击上传', - upload_tip: '仅支持ZIP压缩文件，提取的文件必须是扩展名为.air的脚本。' + upload_tip: '将Airtest脚本文件夹压缩为ZIP文件。' }, message: { login_success: '登录成功', diff --git a/src/views/playbooks/detail.vue b/src/views/playbooks/detail.vue index c2155f8..31a7cea 100644 --- a/src/views/playbooks/detail.vue +++ b/src/views/playbooks/detail.vue @@ -25,6 +25,20 @@ :placeholder="t('overall.please_input')" /> + + + + + + @@ -107,10 +121,18 @@ const workspace = computed(() => { const ruleFormRef = ref(null); const ruleForm = reactive({ name: '', + type: 'airtest_script', description: '', file: null, }); +const typeList = reactive([ + { + name: 'Airtest script', + value: 'airtest_script' + } +]); + const uploadFileChange = (rule, value, callback) => { if(uploadFileList.value.length === 0) { return callback(t('message.upload_required_tip')); @@ -120,6 +142,7 @@ const uploadFileChange = (rule, value, callback) => { }; const rules = reactive({ name: [{ required: true, message: t('validator.required'), trigger: 'blur' }], + type: [{ required: true, message: t('validator.required'), trigger: 'blur' }], file: [{ required: true, validator: uploadFileChange, trigger: 'change' }] }); @@ -143,6 +166,7 @@ const save = async () => { if (valid) { let params = new FormData(); params.append('name', ruleForm.name); + params.append('type', ruleForm.type); params.append('description', ruleForm.description ? ruleForm.description : ''); params.append('file', uploadFile.value.raw); let res = await playbookAddApi(workspace.value.id, params); @@ -196,7 +220,7 @@ const jumpBack = () => { } } } - .el-input,.el-textarea { + .el-input,.el-textarea,.el-select { width: 392px; } } diff --git a/src/views/playbooks/index.vue b/src/views/playbooks/index.vue index 9d30170..f842cd2 100644 --- a/src/views/playbooks/index.vue +++ b/src/views/playbooks/index.vue @@ -71,6 +71,14 @@ }} + @@ -154,6 +162,12 @@ const tableTitle = [ label: t('overall.name'), sortable: 'custom', }, + { + width: 150, + prop: 'type', + label: t('overall.type'), + sortable: 'custom', + }, { minWidth: 250, prop: 'description', -- cgit v1.2.3 From d61a71c4dba78544e2818e9b0784f37a6f0f2bc4 Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Fri, 8 Nov 2024 13:38:00 +0800 Subject: feat: 1、面包屑 Jobs 可以点击，返回 job 列表页面;2、当 job 状态为结束状态时，不再请求log 和 详情接口; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/constants.js | 8 ++++++++ src/views/jobs/index.vue | 18 ++++++++-------- src/views/jobs/log.vue | 53 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/utils/constants.js b/src/utils/constants.js index 7da684b..cd5dcbd 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -141,4 +141,12 @@ export const monthDict = { '10': 'Oct', '11': 'Nov', '12': 'Dec', +} +export const jobStatus = { + created: 'created', + pending: 'pending', + running: 'running', + passed: 'passed', + failed: 'failed', + cancel: 'cancel' } \ No newline at end of file diff --git a/src/views/jobs/index.vue b/src/views/jobs/index.vue index be71b33..81575f0 100644 --- a/src/views/jobs/index.vue +++ b/src/views/jobs/index.vue @@ -54,27 +54,27 @@