[incubator-streampark] branch dev updated: [BUG] Fix wrong app type (#2777)

[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 bb80f668f [BUG] Fix wrong app type (#2777)
bb80f668f is described below

commit bb80f668ff59957d5eba99aaec306253714c84f7
Author: zhoulii <zhouli....@foxmail.com>
AuthorDate: Mon May 29 22:23:16 2023 +0800

    [BUG] Fix wrong app type (#2777)
    
    Co-authored-by: zhoulii <zhoul...@hikvision.com.cn>
---
 .../src/views/flink/app/EditStreamPark.vue                 |  1 +
 .../src/views/flink/app/hooks/useCreateAndEditSchema.ts    | 14 ++++++++++++--
 .../src/views/flink/app/hooks/useEdit.ts                   |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
 
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
index 523bd87b4..c7e8c1824 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/app/EditStreamPark.vue
@@ -301,6 +301,7 @@
 
     setFieldsValue({
       jobType: res.jobType,
+      appType: res.appType,
       executionMode: res.executionMode,
       flinkSql: res.flinkSql ? decodeByBase64(res.flinkSql) : '',
       dependency: '',
diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
index 132fc7235..19d8c57d5 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
@@ -50,7 +50,7 @@ import { fetchFlinkEnv } from '/@/api/flink/setting/flinkEnv';
 import { FlinkEnv } from '/@/api/flink/setting/types/flinkEnv.type';
 import { AlertSetting } from '/@/api/flink/setting/types/alert.type';
 import { FlinkCluster } from '/@/api/flink/setting/types/flinkCluster.type';
-import { ClusterStateEnum, ExecModeEnum, JobTypeEnum } from 
'/@/enums/flinkEnum';
+import { AppTypeEnum, ClusterStateEnum, ExecModeEnum, JobTypeEnum } from 
'/@/enums/flinkEnum';
 import { isK8sExecMode } from '../utils';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { fetchCheckHadoop } from '/@/api/flink/setting';
@@ -550,7 +550,17 @@ export const useCreateAndEditSchema = (
         field: 'appType',
         label: t('flink.app.appType'),
         component: 'Input',
-        render: () => getAlertSvgIcon('flink', 'StreamPark Flink'),
+        render: ({ model }) => {
+          if (model.appType == AppTypeEnum.APACHE_FLINK) {
+            return getAlertSvgIcon('flink', 'Apache Flink');
+          } else if (model.appType == AppTypeEnum.STREAMPARK_FLINK) {
+            return getAlertSvgIcon('flink', 'StreamPark Flink');
+          } else if (model.appType == AppTypeEnum.APACHE_SPARK) {
+            return getAlertSvgIcon('spark', 'Apache Spark');
+          } else if (model.appType == AppTypeEnum.STREAMPARK_SPARK) {
+            return getAlertSvgIcon('spark', 'StreamPark Spark');
+          }
+        },
       },
     ];
   });
diff --git 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEdit.ts
 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEdit.ts
index 06898e123..49d425720 100644
--- 
a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEdit.ts
+++ 
b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEdit.ts
@@ -44,6 +44,7 @@ export const useEdit = () => {
     Object.assign(defaultOptions, JSON.parse(app.options || '{}'));
     Object.assign(returnData, {
       jobType: res.jobType,
+      appType: res.appType,
       versionId: res.versionId,
       executionMode: res.executionMode,
       resourceFrom: res.resourceFrom,