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 c5c0f7177 [Improve] Spark-app create-page improvements (#4089)
c5c0f7177 is described below
commit c5c0f7177c65863e7a5b4025175c108574a024fa
Author: benjobs <[email protected]>
AuthorDate: Wed Sep 25 22:40:19 2024 +0800
[Improve] Spark-app create-page improvements (#4089)
* [Improve] create spark-job minor improvements
* [Improve] spark-app create-page improvements
---
.../streampark-console-webapp/src/assets/icons/pyspark.svg | 1 +
.../streampark-console-webapp/src/assets/icons/sparksql.svg | 1 +
.../src/locales/lang/en/flink/app.ts | 7 +++----
.../src/locales/lang/en/spark/app.ts | 5 ++---
.../src/locales/lang/zh-CN/spark/app.ts | 6 +++---
.../streampark-console-webapp/src/views/flink/app/Add.vue | 10 +++++-----
.../src/views/spark/app/components/AppForm.vue | 2 +-
.../src/views/spark/app/components/SparkSql.vue | 4 ++--
.../streampark-console-webapp/src/views/spark/app/create.vue | 12 ++++++------
.../src/views/spark/app/hooks/useAppFormSchema.tsx | 4 ++--
.../src/views/spark/app/hooks/useSparkRender.tsx | 6 +++---
.../streampark-console-webapp/src/views/spark/app/index.vue | 8 ++------
12 files changed, 31 insertions(+), 35 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/assets/icons/pyspark.svg
b/streampark-console/streampark-console-webapp/src/assets/icons/pyspark.svg
new file mode 100644
index 000000000..019172625
--- /dev/null
+++ b/streampark-console/streampark-console-webapp/src/assets/icons/pyspark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG
1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";><svg
t="1727239211717" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="15065"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M459.52 64l201.792 218.688 299.2-41.472-150.976 258.56 129.664
266.88-286.144-57.152 30.656-67.52 124.992 24.96-82.112-169.152
95.68-163.968-189.696 26.368-12 [...]
\ No newline at end of file
diff --git
a/streampark-console/streampark-console-webapp/src/assets/icons/sparksql.svg
b/streampark-console/streampark-console-webapp/src/assets/icons/sparksql.svg
new file mode 100644
index 000000000..f7fcef4cc
--- /dev/null
+++ b/streampark-console/streampark-console-webapp/src/assets/icons/sparksql.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG
1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";><svg
t="1727239261909" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="16408"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M459.52 64l201.792 218.688 299.2-41.472-150.976 258.56 129.664
266.88-286.144-57.152 30.656-67.52 124.992 24.96-82.112-169.152
95.68-163.968-189.696 26.368-12 [...]
\ No newline at end of file
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
index 20e479d26..8b657e1fc 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
@@ -17,8 +17,8 @@
export default {
id: 'ID',
appName: 'Job Name',
- searchName: 'Name',
- tags: 'Tags',
+ searchName: 'search by JobName',
+ tags: 'Job Tags',
owner: 'Owner',
flinkVersion: 'Flink Version',
duration: 'Duration',
@@ -34,7 +34,7 @@ export default {
selectAppPlaceHolder: 'choose app jar',
dependency: 'Dependency',
appConf: 'Configurations',
- resolveOrder: 'resolveOrder',
+ resolveOrder: 'Resolve Order',
parallelism: 'Parallelism',
restartSize: 'Fault Restart Size',
faultAlertTemplate: 'Fault Alert Template',
@@ -57,7 +57,6 @@ export default {
mainClass: 'Program Main',
project: 'Project',
module: 'Module',
- appType: 'Application Type',
programArgs: 'Program Args',
programJar: 'Program Jar',
dynamicProperties: 'Dynamic Properties',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
index 306e67d56..50046c029 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/spark/app.ts
@@ -51,8 +51,8 @@ export default {
},
id: 'Applications ID',
appName: 'Job Name',
- searchName: 'Job Name',
- tags: 'Tags',
+ searchName: 'search by JobName',
+ tags: 'Job Tags',
owner: 'Creator',
sparkVersion: 'Spark Version',
duration: 'Runtime',
@@ -60,7 +60,6 @@ export default {
runStatus: 'Run Status',
releaseBuild: 'Release Status',
jobType: 'Job Type',
- appType: 'Application Type',
executionMode: 'Deploy Mode',
historyVersion: 'History Version',
resource: 'Spark App',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
index a00276e3b..ab1b1d554 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/spark/app.ts
@@ -50,9 +50,9 @@ export default {
pending: '待重启',
},
id: '应用ID',
- appName: '应用名称',
- searchName: '应用名称',
- tags: '应用标签',
+ appName: '作业名称',
+ searchName: '根据作业名搜索',
+ tags: '作业标签',
owner: '创建者',
sparkVersion: 'Spark版本',
duration: '运行时长',
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
index 8fb4fb2c6..016b60eb7 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/Add.vue
@@ -237,7 +237,7 @@
}
let config = values.configOverride;
- if (config != null && config !== undefined && config.trim() != '') {
+ if (config != null && config.trim() != '') {
config = encryptByBase64(config);
} else {
config = null;
@@ -257,7 +257,7 @@
: JSON.stringify(dependency),
};
handleSubmitParams(params, values, k8sTemplate);
- handleCreateApp(params);
+ await handleCreateApp(params);
}
/* Submit to create */
async function handleAppCreate(formValue: Recordable) {
@@ -273,9 +273,9 @@
throw new Error(access);
}
}
- handleSubmitSQL(formValue);
+ await handleSubmitSQL(formValue);
} else {
- handleSubmitCustomJob(formValue);
+ await handleSubmitCustomJob(formValue);
}
} catch (error) {
submitLoading.value = false;
@@ -286,7 +286,7 @@
const param = {};
for (const k in params) {
const v = params[k];
- if (v != null && v !== undefined) {
+ if (v != null) {
param[k] = v;
}
}
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 23be7f979..e5a47d359 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
@@ -102,7 +102,7 @@
</template>
<template #args="{ model }">
<ProgramArgs
- v-model:value="model[args]"
+ 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/components/SparkSql.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/SparkSql.vue
index c2e5b6f96..eeaa0c203 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/components/SparkSql.vue
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/components/SparkSql.vue
@@ -79,7 +79,7 @@
if (success) {
verifyRes.verified = true;
verifyRes.errorMsg = '';
- syntaxError();
+ await syntaxError();
return true;
} else {
verifyRes.errorStart = parseInt(res.start);
@@ -95,7 +95,7 @@
verifyRes.errorMsg = res.message;
break;
}
- syntaxError();
+ await syntaxError();
return false;
}
} catch (error) {
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/create.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/create.vue
index 684556f62..9ead57315 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/create.vue
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/create.vue
@@ -75,11 +75,11 @@
hadoopUser: values.hadoopUser,
description: values.description,
};
- handleCreateAction(params);
+ await handleCreateAction(params);
}
/* spark sql mode */
async function handleSQLMode(values: Recordable) {
- handleCreateAction({
+ await handleCreateAction({
jobType: JobTypeEnum.SQL,
executionMode: values.executionMode,
appType: AppTypeEnum.APACHE_SPARK,
@@ -101,7 +101,7 @@
/* Submit to create */
async function handleAppSubmit(formValue: Recordable) {
let { configOverride } = formValue;
- if (configOverride != null && configOverride !== undefined &&
configOverride.trim() != '') {
+ if (configOverride != null && configOverride.trim() != '') {
formValue.config = encryptByBase64(configOverride);
} else {
formValue.config = null;
@@ -116,9 +116,9 @@
throw new Error(access);
}
}
- handleSQLMode(formValue);
+ await handleSQLMode(formValue);
} else {
- handleCustomJobMode(formValue);
+ await handleCustomJobMode(formValue);
}
}
/* send create request */
@@ -126,7 +126,7 @@
const param: SparkApplication = {};
for (const k in params) {
const v = params[k];
- if (v != null && v !== undefined) {
+ if (v != null) {
param[k] = v;
}
}
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useAppFormSchema.tsx
b/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useAppFormSchema.tsx
index 17960169a..35f5db033 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useAppFormSchema.tsx
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useAppFormSchema.tsx
@@ -73,7 +73,7 @@ export function useSparkSchema(sparkEnvs: Ref<SparkEnv[]>) {
{
field: 'jobType',
label: t('spark.app.jobType'),
- component: 'Input',
+ component: 'InputNumber',
render: ({ model }) => {
const jobOptions = getJobTypeOptions();
return (
@@ -202,7 +202,7 @@ export function useSparkSchema(sparkEnvs: Ref<SparkEnv[]>) {
component: 'InputTextArea',
defaultValue: '',
slot: 'args',
- ifShow: ({ values }) => [JobTypeEnum.JAR,
JobTypeEnum.PYSPARK].includes(values?.jobType),
+ ifShow: ({ model }) => [JobTypeEnum.JAR,
JobTypeEnum.PYSPARK].includes(model?.jobType),
},
{
field: 'appProperties',
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useSparkRender.tsx
b/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useSparkRender.tsx
index 30191fa70..63cb315bb 100644
---
a/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useSparkRender.tsx
+++
b/streampark-console/streampark-console-webapp/src/views/spark/app/hooks/useSparkRender.tsx
@@ -298,21 +298,21 @@ export const renderStreamParkJarApp = ({ model, resources
}) => {
export const sparkJobTypeMap = {
[JobTypeEnum.JAR]: {
label: h('div', {}, [
- h(SvgIcon, { name: 'code', color: '#108ee9' }, ''),
+ h(SvgIcon, { name: 'spark', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Spark Jar'),
]),
value: JobTypeEnum.JAR,
},
[JobTypeEnum.SQL]: {
label: h('div', {}, [
- h(SvgIcon, { name: 'fql', color: '#108ee9' }, ''),
+ h(SvgIcon, { name: 'sparksql', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Spark SQL'),
]),
value: JobTypeEnum.SQL,
},
[JobTypeEnum.PYSPARK]: {
label: h('div', {}, [
- h(SvgIcon, { name: 'py', color: '#108ee9' }, ''),
+ h(SvgIcon, { name: 'pyspark', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'PySpark'),
]),
value: JobTypeEnum.PYSPARK,
diff --git
a/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
b/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
index 1837326d9..8e59d562c 100644
--- a/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
+++ b/streampark-console/streampark-console-webapp/src/views/spark/app/index.vue
@@ -335,12 +335,8 @@
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'appName'">
- <span class="app_type app_jar" v-if="record['jobType'] ==
JobTypeEnum.JAR">
- Spark JAR
- </span>
- <span class="app_type app_sql" v-if="record['jobType'] ==
JobTypeEnum.SQL">
- Spark SQL
- </span>
+ <span class="app_type app_jar" v-if="record['jobType'] ==
JobTypeEnum.JAR"> JAR </span>
+ <span class="app_type app_sql" v-if="record['jobType'] ==
JobTypeEnum.SQL"> SQL </span>
<span class="app_type app_py" v-if="record['jobType'] ==
JobTypeEnum.PYSPARK">
PySpark
</span>
