(incubator-streampark) branch dev updated: [Fix]: spark app args data fallback (#4096)

[benjobs]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 542e29d2c [Fix]: spark app args data fallback (#4096)
542e29d2c is described below

commit 542e29d2cbc4d1db46a48a0f9e39d19036c472ea
Author: Kriszu <39726513+wangsizhu0...@users.noreply.github.com>
AuthorDate: Fri Sep 27 14:20:05 2024 +0800

    [Fix]: spark app args data fallback (#4096)
---
 .../src/views/spark/app/components/AppForm.vue                | 11 ++++++++++-
 .../streampark-console-webapp/src/views/spark/app/edit.vue    |  7 ++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppForm.vue
 
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppForm.vue
index e5a47d359..8c0f97dc4 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppForm.vue
+++ 
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/AppForm.vue
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue';
+  import { computed, nextTick, onMounted, ref } from 'vue';
   import { useGo } from '/@/hooks/web/usePage';
   import ProgramArgs from './ProgramArgs.vue';
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
@@ -26,6 +26,7 @@
   import VariableReview from './VariableReview.vue';
   import { useSparkSchema } from '../hooks/useAppFormSchema';
   import { SparkEnv } from '/@/api/spark/home.type';
+  import { decodeByBase64 } from '/@/utils/cipher';
 
   const SparkSqlEditor = createAsyncComponent(() => import('./SparkSql.vue'), {
     loading: true,
@@ -47,6 +48,9 @@
   });
   const go = useGo();
   const sparkSql = ref();
+  const programArgsRef = ref<{
+    setContent: (data: string) => void;
+  }>();
   const submitLoading = ref(false);
 
   const { t } = useI18n();
@@ -72,6 +76,10 @@
     if (props.initFormFn) {
       const fieldsValue = await props.initFormFn();
       await setFieldsValue(fieldsValue);
+      nextTick(() => {
+        if (fieldsValue.sparkSql) 
sparkSql.value?.setContent(decodeByBase64(fieldsValue.sparkSql));
+        if (fieldsValue.appArgs) 
programArgsRef.value?.setContent(fieldsValue.appArgs);
+      });
     }
   }
   /* Submit to create */
@@ -102,6 +110,7 @@
     </template>
     <template #args="{ model }">
       <ProgramArgs
+        ref="programArgsRef"
         v-model:value="model.args"
         :suggestions="suggestions"
         @preview="(value) => openReviewDrawer(true, { value, suggestions })"
diff --git 
a/streampark-console/streampark-console-webapp/src/views/spark/app/edit.vue 
b/streampark-console/streampark-console-webapp/src/views/spark/app/edit.vue
index 7599dff50..c2a1370ea 100644
--- a/streampark-console/streampark-console-webapp/src/views/spark/app/edit.vue
+++ b/streampark-console/streampark-console-webapp/src/views/spark/app/edit.vue
@@ -17,7 +17,7 @@
 <script setup lang="ts">
   import { useGo } from '/@/hooks/web/usePage';
   import AppForm from './components/AppForm.vue';
-  import { nextTick, onMounted, ref } from 'vue';
+  import { onMounted, ref } from 'vue';
   import { PageWrapper } from '/@/components/Page';
 
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -64,9 +64,6 @@
       configOverride,
     });
     sparkApp.value = res;
-    await nextTick(() => {
-      if (res.sparkSql) 
appFormRef.value?.sparkSql?.setContent(decodeByBase64(res.sparkSql));
-    });
     return res;
   }
 
@@ -130,7 +127,7 @@
         const access = await appFormRef?.value?.sparkSql?.handleVerifySql();
         if (!access) {
           createMessage.warning(t('spark.app.addAppTips.sqlCheck'));
-          throw new Error(access);
+          throw new Error(t('spark.app.addAppTips.sqlCheck'));
         }
       }
       await handleSQLMode(formValue);