diff --git a/web/package.json b/web/package.json
index 744f9ac66..41f210b83 100644
--- a/web/package.json
+++ b/web/package.json
@@ -55,14 +55,14 @@
"@fesjs/plugin-model": "^2.0.0",
"@fesjs/plugin-request": "^2.0.2",
"@form-create/ant-design-vue": "^3.0.0-alpha.2",
- "@vue/compiler-sfc": "3.2.20",
+ "@vue/compiler-sfc": "3.1.4",
"ant-design-vue": "^2.2.7",
"echarts": "^5.2.1",
"lodash-es": "4.17.21",
"moment": "^2.29.4",
"monaco-editor": "^0.34.0",
"monaco-editor-webpack-plugin": "^7.0.1",
- "vue": "^3.1.0",
+ "vue": "3.1.4",
"vue-request": "^1.2.0"
},
"private": true
diff --git a/web/src/pages/jobManagement/components/configDrawer.vue b/web/src/pages/jobManagement/components/configDrawer.vue
index 8859dfde0..64ade8453 100644
--- a/web/src/pages/jobManagement/components/configDrawer.vue
+++ b/web/src/pages/jobManagement/components/configDrawer.vue
@@ -212,6 +212,9 @@ export default {
const list = res?.result || [];
if (!formState['proxyUser']) {
formState['proxyUser'] = list[0] || '';
+ if (formState['proxyUser']) {
+ context.emit('finish', cloneDeep(formState), 'init');
+ }
}
proxyUsers.value = list;
})
diff --git a/web/src/pages/jobManagement/components/createJob.vue b/web/src/pages/jobManagement/components/createJob.vue
index 00116ddd3..6293b712e 100644
--- a/web/src/pages/jobManagement/components/createJob.vue
+++ b/web/src/pages/jobManagement/components/createJob.vue
@@ -39,7 +39,7 @@
:label="$t('job.jobDetail.name')"
name="jobName"
>
-
+
{
console.log(err)
//message.error("获取日志失败")
+ pauseFetchingLog(true);
})
} else {
getTaskExecLog({
@@ -180,6 +181,7 @@ export default defineComponent({
.catch((err) => {
console.log(err)
message.error("获取日志失败")
+ pauseFetchingLog(true);
})
}
}
diff --git a/web/src/pages/jobManagement/components/index.vue b/web/src/pages/jobManagement/components/index.vue
index cf28787cb..5b4daa07f 100644
--- a/web/src/pages/jobManagement/components/index.vue
+++ b/web/src/pages/jobManagement/components/index.vue
@@ -676,7 +676,7 @@ export default {
}
},
// 更新保存任务配置
- handleModalFinish(config) {
+ handleModalFinish(config, type = 'config') {
const _this = this;
const { id } = this.curTab;
const _config = Object.assign(
@@ -694,11 +694,11 @@ export default {
_config.projectId = _this.$route.query.id
updateTaskConfiguration(id, _config)
.then((res) => {
- message.success('更新/保存成功');
+ if(type !== 'init') message.success('更新/保存成功');
_this.jobData.proxyUser = _config.proxyUser;
})
.catch((err) => {
- message.error('更新/保存失败');
+ if(type !== 'init') message.error('更新/保存失败');
console.log('updateTaskConfiguration error', err);
});
},
diff --git a/web/src/pages/jobManagement/components/jobDetail.vue b/web/src/pages/jobManagement/components/jobDetail.vue
index 2e1a1b294..b65b6e260 100644
--- a/web/src/pages/jobManagement/components/jobDetail.vue
+++ b/web/src/pages/jobManagement/components/jobDetail.vue
@@ -693,7 +693,7 @@ export default {
}
},
// 更新保存任务配置
- handleModalFinish(config) {
+ handleModalFinish(config, type = 'config') {
const _this = this;
const { id } = this.curTab;
const _config = Object.assign(
@@ -711,11 +711,11 @@ export default {
_config.projectId = _this.$route.query.id
updateTaskConfiguration(id, _config)
.then((res) => {
- message.success('更新/保存成功');
+ if(type !== 'init') message.success('更新/保存成功');
_this.jobData.proxyUser = _config.proxyUser;
})
.catch((err) => {
- message.error('更新/保存失败');
+ if(type !== 'init') message.error('更新/保存失败');
console.log('updateTaskConfiguration error', err);
});
},
diff --git a/web/src/pages/projectManage/components/editModal.vue b/web/src/pages/projectManage/components/editModal.vue
index 4751e7f1e..9a5aea9e8 100644
--- a/web/src/pages/projectManage/components/editModal.vue
+++ b/web/src/pages/projectManage/components/editModal.vue
@@ -10,7 +10,7 @@
]">
+ " :disabled="mode === 'edit'"/>