Merge pull request #409 from WeDataSphere/dev-1.1.2-frontend_xxzhou

Fixed some web bugs in projects、tasks and log
WeBankFinTech · Aug 14, 2023 · f8f7f9d · f8f7f9d
2 parents fd3dcaf + 66e31ea
commit f8f7f9d
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git 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
@@ -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
@@ -39,7 +39,7 @@
                     :label="$t('job.jobDetail.name')"
                     name="jobName"
                 >
-                    <a-input v-model:value="formState.jobName" :maxLength="100" />
+                    <a-textarea v-model:value="formState.jobName" :maxLength="100" showCount  />
                 </a-form-item>
                 <a-form-item :label="$t('job.jobDetail.label')" name="jobLabels">
                     <a-tag

diff --git a/web/src/pages/jobManagement/components/executionLog.vue b/web/src/pages/jobManagement/components/executionLog.vue
@@ -164,6 +164,7 @@ export default defineComponent({
           .catch((err) => {
             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
@@ -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
@@ -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
@@ -10,7 +10,7 @@
           ]">
           <a-input v-model:value="formState.projectName" :maxLength="100" :placeholder="
               $t(`projectManage.editModal.form.fields.projectName.placeholder`)
-            " />
+            " :disabled="mode === 'edit'"/>
         </a-form-item>
         <!--<a-form-item :label="$t(`projectManage.editModal.form.fields.tags.label`)" name="tags">-->
         <!--<a-select mode="multiple" v-model:value="formState.tags" :placeholder="$t(`projectManage.editModal.form.fields.tags.placeholder`)">-->