[incubator-streampark] branch resource updated: upload file resource improvement

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch resource
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/resource by this push:
     new 88f2f917e upload file resource improvement
88f2f917e is described below

commit 88f2f917e273376a8c473996ba2879305ee7e5a4
Author: benjobs <benj...@apache.org>
AuthorDate: Sat Jul 29 18:03:54 2023 +0800

    upload file resource improvement
---
 .../src/views/flink/resource/components/Resource.vue         |  4 +---
 .../src/views/flink/resource/components/ResourceDrawer.vue   | 12 +++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/Resource.vue
 
b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/Resource.vue
index 10b4538d9..561bfcd34 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/Resource.vue
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/Resource.vue
@@ -138,9 +138,8 @@
       loading.value = true;
       const formData = new FormData();
       formData.append('file', data.file);
-      await fetchUpload(formData);
       dependency.jar = {};
-      dependency.jar[data.file.name] = data.file.name;
+      dependency.jar[data.file.name] = await fetchUpload(formData);
       handleUpdateDependency();
     } catch (error) {
       console.error(error);
@@ -159,7 +158,6 @@
     Object.keys(dependency.jar).forEach((v: string) => {
       jars.push(v);
     });
-
     dependencyRecords.value = deps;
     uploadJars.value = jars;
   }
diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue
 
b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue
index dd4282ed6..b200e78d4 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/resource/components/ResourceDrawer.vue
@@ -160,7 +160,6 @@
       if (unref(isUpdate)) {
         resourceId.value = data.record.id;
         await setFieldsValue(data.record);
-
         if (data.record?.resourceType === ResourceTypeEnum.GROUP) {
           await setFieldsValue({ resourceGroup: 
JSON.parse(data.record.resource || '[]') });
         } else {
@@ -175,6 +174,11 @@
     !unref(isUpdate) ? t('flink.resource.addResource') : 
t('flink.resource.modifyResource'),
   );
 
+  async function handleResetFields() {
+    resourceId.value = null;
+    await resetFields();
+  }
+
   // form submit
   async function handleSubmit() {
     try {
@@ -187,10 +191,10 @@
         unref(resourceRef).handleApplyPom();
         const dependencyRecords = unref(resourceRef)?.dependencyRecords;
         const uploadJars = unref(resourceRef)?.uploadJars;
-
         if (unref(dependencyRecords) && unref(dependencyRecords).length > 0) {
           if (unref(dependencyRecords).length > 1) {
             Swal.fire('Failed', t('flink.resource.multiPomTip'), 'error');
+            await handleResetFields();
             return;
           }
           Object.assign(resource, {
@@ -206,11 +210,13 @@
 
         if (resource.pom === undefined && resource.jar === undefined) {
           Swal.fire('Failed', t('flink.resource.addResourceTip'), 'error');
+          await handleResetFields();
           return;
         }
 
         if (resource.pom?.length > 0 && resource.jar?.length > 0) {
           Swal.fire('Failed', t('flink.resource.multiPomTip'), 'error');
+          await handleResetFields();
           return;
         }
 
@@ -267,13 +273,13 @@
                 })
               : fetchAddResource({ resource: resourceJson, connector: 
connector, ...values }));
             unref(resourceRef)?.setDefaultValue({});
-            await resetFields();
             closeDrawer();
             emit('success', isUpdate.value);
             break;
           default:
             break;
         }
+        await handleResetFields();
       }
     } finally {
       setDrawerProps({ confirmLoading: false });