You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/09/14 15:08:55 UTC
[incubator-streampark] branch fe-enums created (now 7aa11696a)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a change to branch fe-enums
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
at 7aa11696a [Improvement] FE enums improvements
This branch includes the following new commits:
new 7aa11696a [Improvement] FE enums improvements
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-streampark] 01/01: [Improvement] FE enums improvements
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch fe-enums
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 7aa11696aa7617e8665e55a9546950b163b0dbf6
Author: benjobs <be...@apache.org>
AuthorDate: Thu Sep 14 23:08:40 2023 +0800
[Improvement] FE enums improvements
---
.../src/assets/icons/app.svg | 1 +
.../src/assets/icons/fql.svg | 2 +-
.../src/assets/icons/py.svg | 1 +
.../src/enums/flinkEnum.ts | 4 +-
.../default/header/components/notify/index.vue | 2 +-
.../src/views/flink/app/Add.vue | 20 +++----
.../src/views/flink/app/EditFlink.vue | 2 +-
.../src/views/flink/app/EditStreamPark.vue | 24 ++++----
.../src/views/flink/app/View.vue | 8 +--
.../components/AppView/StopApplicationModal.vue | 10 +++-
.../src/views/flink/app/hooks/useAppTableAction.ts | 1 +
.../flink/app/hooks/useCreateAndEditSchema.ts | 40 ++++---------
.../src/views/flink/app/hooks/useCreateSchema.ts | 65 ++++++++++++----------
.../views/flink/app/hooks/useEditFlinkSchema.ts | 14 ++---
.../src/views/flink/app/hooks/useFlinkRender.tsx | 10 ++--
.../src/views/flink/app/hooks/useSavepoint.tsx | 2 +-
.../src/views/setting/FlinkCluster/index.vue | 2 +-
17 files changed, 101 insertions(+), 107 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/app.svg b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg
new file mode 100644
index 000000000..d663174fa
--- /dev/null
+++ b/streampark-console/streampark-console-webapp/src/assets/icons/app.svg
@@ -0,0 +1 @@
+<svg t="1694652889725" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15332" width="200" height="200"><path d="M284.804 360.254L462.757 255.48a7.676 7.676 0 0 0 0-13.241L283.589 137.334a7.484 7.484 0 0 0-7.548 0L98.153 242.238a7.676 7.676 0 0 0 0 13.24l179.103 104.84a7.484 7.484 0 0 0 7.548 0z m464.39 0L927.148 255.48a7.676 7.676 0 0 0 0-13.241L748.043 137.334a7.484 7.484 0 0 0-7.612 0L562.543 242.238a7.676 7.676 0 0 0 0 13.24l179.104 104.84a7 [...]
diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg b/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg
index 91f562223..961e9e176 100644
--- a/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg
+++ b/streampark-console/streampark-console-webapp/src/assets/icons/fql.svg
@@ -1 +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="1615699816468" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2736" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M134.144 95.914667L184.32 30.378667h488.106667l229.376 212.992v671.744l-108.885334 90.794666-650.24-25.941333-13.99 [...]
+<svg t="1694614881698" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="39038" width="200" height="200"><path d="M176 64A112 112 0 0 0 64 176v672c0 61.824 50.176 112 112 112h672A112 112 0 0 0 960 848V176A112 112 0 0 0 848 64H176zM160 176a16 16 0 0 1 16-16h672a16 16 0 0 1 16 16v672a16 16 0 0 1-16 16H176a16 16 0 0 1-16-16V176z m60.8 150.528h243.52v81.024h-159.36v55.68h147.072v80.256H304.96v129.792H220.8V326.528z m426.048 353.28c-48.448 0-88.896-15 [...]
diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/py.svg b/streampark-console/streampark-console-webapp/src/assets/icons/py.svg
new file mode 100644
index 000000000..fd26fd959
--- /dev/null
+++ b/streampark-console/streampark-console-webapp/src/assets/icons/py.svg
@@ -0,0 +1 @@
+<svg t="1694615129517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="51736" width="200" height="200"><path d="M170.666667 170.666667v682.666666h682.666666V170.666667H170.666667zM85.333333 170.666667A85.333333 85.333333 0 0 1 170.666667 85.333333h682.666666A85.333333 85.333333 0 0 1 938.666667 170.666667v682.666666a85.333333 85.333333 0 0 1-85.333334 85.333334H170.666667A85.333333 85.333333 0 0 1 85.333333 853.333333V170.666667z m356.010667 10 [...]
diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index 5e02fdb61..6301878d8 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -191,8 +191,8 @@ export enum CandidateTypeEnum {
}
export enum ResourceFromEnum {
- /** cicd(build from cvs) */
- CICD = 1,
+ /** from PROJECT */
+ PROJECT = 1,
/** upload local jar */
UPLOAD = 2,
}
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
index f6c1c054b..534c73b31 100644
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/notify/index.vue
@@ -137,7 +137,7 @@
listData.value[1].list = [...data];
}
}
-
+
const wbSocketUrl = `${window.location.origin}${
import.meta.env.VITE_GLOB_API_URL + (import.meta.env.VITE_GLOB_API_URL_PREFIX || '')
}/websocket/${userStore.getUserInfo.userId}`;
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 64e17fe6a..6d4fc80c9 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
@@ -174,21 +174,21 @@
});
}
const params = {
- jobType: values.jobType === 'pyflink' ?JobTypeEnum.PYFLINK : JobTypeEnum.JAR,
+ jobType: values.jobType,
projectId: values.project || null,
module: values.module || null,
dependency:
- dependency.pom === undefined && dependency.jar === undefined
- ? null
- : JSON.stringify(dependency),
+ dependency.pom === undefined && dependency.jar === undefined
+ ? null
+ : JSON.stringify(dependency),
appType: values.appType,
};
handleSubmitParams(params, values, k8sTemplate);
// common params...
const resourceFrom = values.resourceFrom;
if (resourceFrom) {
- if (resourceFrom === 'csv') {
- params['resourceFrom'] = ResourceFromEnum.CICD;
+ if (resourceFrom == ResourceFromEnum.PROJECT) {
+ params['resourceFrom'] = ResourceFromEnum.PROJECT;
//streampark flink
if (values.appType == AppTypeEnum.STREAMPARK_FLINK) {
const configVal = values.config;
@@ -263,7 +263,7 @@
async function handleAppCreate(formValue: Recordable) {
try {
submitLoading.value = true;
- if (formValue.jobType === 'sql') {
+ if (formValue.jobType == JobTypeEnum.SQL) {
if (formValue.flinkSql == null || formValue.flinkSql.trim() === '') {
createMessage.warning(t('flink.app.editStreamPark.flinkSqlRequired'));
} else {
@@ -273,11 +273,9 @@
throw new Error(access);
}
}
- }
- if (formValue.jobType === 'customcode' || formValue.jobType === 'pyflink') {
- handleSubmitCustomJob(formValue);
- } else {
handleSubmitSQL(formValue);
+ } else {
+ handleSubmitCustomJob(formValue);
}
} catch (error) {
submitLoading.value = false;
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
index 021354020..88691cc99 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/EditFlink.vue
@@ -174,7 +174,7 @@
}
const value = await handleGetApplication();
setFieldsValue(value);
- if (app.resourceFrom == ResourceFromEnum.CICD) {
+ if (app.resourceFrom == ResourceFromEnum.PROJECT) {
jars.value = await fetchListJars({
id: app.projectId,
module: app.module,
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 e559a8d37..2225c38c6 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
@@ -156,21 +156,19 @@
async function handleAppUpdate(values) {
try {
submitLoading.value = true;
- if (app.jobType == JobTypeEnum.JAR) {
- handleSubmitCustomJob(values);
- } else {
- if (app.jobType == JobTypeEnum.SQL) {
- if (values.flinkSql == null || values.flinkSql.trim() === '') {
- createMessage.warning(t('flink.app.editStreamPark.flinkSqlRequired'));
- } else {
- const access = await flinkSql?.value?.handleVerifySql();
- if (!access) {
- createMessage.warning(t('flink.app.editStreamPark.sqlCheck'));
- throw new Error(access);
- }
- handleSubmitSQL(values);
+ if (app.jobType == JobTypeEnum.SQL) {
+ if (values.flinkSql == null || values.flinkSql.trim() === '') {
+ createMessage.warning(t('flink.app.editStreamPark.flinkSqlRequired'));
+ } else {
+ const access = await flinkSql?.value?.handleVerifySql();
+ if (!access) {
+ createMessage.warning(t('flink.app.editStreamPark.sqlCheck'));
+ throw new Error(access);
}
+ handleSubmitSQL(values);
}
+ } else {
+ handleSubmitCustomJob(values);
}
} catch (error) {
console.error(error);
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
index ca229a23e..05c8cc5b7 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
@@ -199,9 +199,9 @@
<BasicTable @register="registerTable" class="app_list !px-0 pt-20px" :formConfig="formConfig">
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'jobName'">
- <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_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.PYFLINK"> PyFlink </span>
<span
class="link"
:class="{
@@ -214,7 +214,7 @@
<Tooltip :title="record.description"> {{ record.jobName }} </Tooltip>
</span>
- <template v-if="record['jobType'] === JobTypeEnum.JAR">
+ <template v-if="record['jobType'] == JobTypeEnum.JAR">
<Badge
v-if="record.release === ReleaseStateEnum.NEED_CHECK"
class="build-badge"
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue
index 7f47a2304..bdecd2b4e 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StopApplicationModal.vue
@@ -76,7 +76,12 @@
unCheckedChildren: 'OFF',
},
defaultValue: false,
- afterItem: () => h('span', { class: 'conf-switch' }, 'Note: native format savepoint is supported since flink 1.15'),
+ afterItem: () =>
+ h(
+ 'span',
+ { class: 'conf-switch' },
+ 'Note: native format savepoint is supported since flink 1.15',
+ ),
ifShow: ({ values }) => !!values.stopSavePointed,
},
{
@@ -101,7 +106,8 @@
/* submit */
async function handleSubmit() {
try {
- const { stopSavePointed, customSavepoint, drain, nativeFormat } = (await validate()) as Recordable;
+ const { stopSavePointed, customSavepoint, drain, nativeFormat } =
+ (await validate()) as Recordable;
const stopReq = {
id: app.id,
savePointed: stopSavePointed,
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
index 909ffce1e..2ea02530a 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useAppTableAction.ts
@@ -306,6 +306,7 @@ export const useAppTableAction = (
options: [
{ label: 'JAR', value: JobTypeEnum.JAR },
{ label: 'SQL', value: JobTypeEnum.SQL },
+ { label: 'PYFLINK', value: JobTypeEnum.PYFLINK },
],
onChange: handlePageDataReload.bind(null, false),
},
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 d66240c3e..3b724fcc2 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
@@ -56,6 +56,7 @@ import { useI18n } from '/@/hooks/web/useI18n';
import { fetchCheckHadoop } from '/@/api/flink/setting';
import { fetchTeamResource } from '/@/api/flink/resource';
const { t } = useI18n();
+
export interface HistoryRecord {
k8sNamespace: Array<string>;
k8sSessionClusterId: Array<string>;
@@ -113,13 +114,7 @@ export const useCreateAndEditSchema = (
label: 'Flink SQL',
component: 'Input',
slot: 'flinkSql',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values?.jobType == JobTypeEnum.SQL;
- } else {
- return values?.jobType == 'sql';
- }
- },
+ ifShow: ({ values }) => values?.jobType == JobTypeEnum.SQL,
rules: [{ required: true, message: t('flink.app.addAppTips.flinkSqlIsRequiredMessage') }],
},
{
@@ -127,39 +122,22 @@ export const useCreateAndEditSchema = (
label: t('flink.app.resource'),
component: 'Select',
render: ({ model }) => renderStreamParkResource({ model, resources: unref(teamResource) }),
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values.jobType == JobTypeEnum.SQL;
- } else {
- return values?.jobType == 'sql';
- }
- },
+ ifShow: ({ values }) => values.jobType == JobTypeEnum.SQL,
},
{
field: 'dependency',
label: t('flink.app.dependency'),
component: 'Input',
slot: 'dependency',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values.jobType == JobTypeEnum.SQL || values.jobType == JobTypeEnum.PYFLINK;
- } else {
- return values?.jobType == 'sql' || values?.jobType == 'pyflink';
- }
- },
+ ifShow: ({ values }) => values.jobType != JobTypeEnum.JAR,
},
{ field: 'configOverride', label: '', component: 'Input', show: false },
{
field: 'isSetConfig',
label: t('flink.app.appConf'),
component: 'Switch',
- ifShow: ({ values }) => {
- if (edit?.appId) {
- return values?.jobType == JobTypeEnum.SQL && !isK8sExecMode(values.executionMode);
- } else {
- return values?.jobType == 'sql' && !isK8sExecMode(values.executionMode);
- }
- },
+ ifShow: ({ values }) =>
+ values?.jobType == JobTypeEnum.SQL && !isK8sExecMode(values.executionMode),
render({ model, field }) {
return renderIsSetConfig(model, field, registerConfDrawer, openConfDrawer);
},
@@ -508,7 +486,7 @@ export const useCreateAndEditSchema = (
component: 'InputTextArea',
defaultValue: '',
slot: 'args',
- ifShow: ({ values }) => (edit?.mode ? true : values.jobType == 'customcode'),
+ ifShow: ({ values }) => (edit?.mode ? true : values.jobType != JobTypeEnum.SQL),
},
{
field: 'description',
@@ -540,8 +518,10 @@ export const useCreateAndEditSchema = (
],
},
);
- } else {
+ } else if (model.jobType == JobTypeEnum.SQL) {
return getAlertSvgIcon('fql', 'Flink SQL');
+ } else if (model.jobType == JobTypeEnum.PYFLINK) {
+ return getAlertSvgIcon('py', 'Py Flink');
}
},
},
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
index 65f5ba5f3..ffb99b2ec 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateSchema.ts
@@ -16,9 +16,15 @@
*/
import { FormSchema } from '/@/components/Table';
import { computed, h, Ref, ref, unref } from 'vue';
-import { AppTypeEnum, ConfigTypeEnum, ExecModeEnum } from '/@/enums/flinkEnum';
+import {
+ AppTypeEnum,
+ ConfigTypeEnum,
+ ExecModeEnum,
+ JobTypeEnum,
+ ResourceFromEnum,
+} from '/@/enums/flinkEnum';
-import Icon, { SvgIcon } from '/@/components/Icon';
+import { SvgIcon } from '/@/components/Icon';
import { useCreateAndEditSchema } from './useCreateAndEditSchema';
import { fetchMain, fetchName } from '/@/api/flink/app/app';
import { modules, fetchListConf, fetchListJars } from '/@/api/flink/project';
@@ -33,24 +39,24 @@ const getJobTypeOptions = () => {
return [
{
label: h('div', {}, [
- h(Icon, { icon: 'ant-design:code-outlined', color: '#108ee9' }, ''),
+ h(SvgIcon, { name: 'code', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Custom Code'),
]),
- value: 'customcode',
+ value: String(JobTypeEnum.JAR),
},
{
label: h('div', {}, [
h(SvgIcon, { name: 'fql', color: '#108ee9' }, ''),
h('span', { class: 'pl-10px' }, 'Flink SQL'),
]),
- value: 'sql',
+ value: String(JobTypeEnum.SQL),
},
{
- label: h('div', {}, [
- h(SvgIcon, { name: 'pyflink', color: '#108ee9' }, ''),
- h('span', { class: 'pl-10px' }, 'Python Flink'),
- ]),
- value: 'pyflink',
+ label: h('div', {}, [
+ h(SvgIcon, { name: 'py', color: '#108ee9' }, ''),
+ h('span', { class: 'pl-10px' }, 'Python Flink'),
+ ]),
+ value: String(JobTypeEnum.PYFLINK),
},
];
};
@@ -101,16 +107,14 @@ export const useCreateSchema = (dependencyRef: Ref) => {
return {
placeholder: t('flink.app.addAppTips.developmentModePlaceholder'),
options: getJobTypeOptions(),
- onChange: (value: string) => {
- if (value === 'sql') {
- formModel.tableEnv = 1;
- } else {
- formModel.resourceFrom = 'csv';
+ onChange: (value) => {
+ if (value != JobTypeEnum.SQL) {
+ formModel.resourceFrom = String(ResourceFromEnum.PROJECT);
}
},
};
},
- defaultValue: 'sql',
+ defaultValue: String(JobTypeEnum.SQL),
rules: [
{ required: true, message: t('flink.app.addAppTips.developmentModeIsRequiredMessage') },
],
@@ -124,21 +128,23 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Select',
render: ({ model }) => renderResourceFrom(model),
rules: [{ required: true, message: t('flink.app.addAppTips.resourceFromMessage') }],
- show: ({ values }) => values?.jobType != 'sql',
+ show: ({ values }) => values?.jobType != JobTypeEnum.SQL,
},
{
field: 'uploadJobJar',
label: t('flink.app.selectJobJar'),
component: 'Select',
render: ({ model }) => renderStreamParkJarApp({ model, resources: unref(teamResource) }),
- ifShow: ({ values }) => values?.jobType !== 'sql' && values?.resourceFrom == 'upload',
+ ifShow: ({ values }) =>
+ values?.jobType != JobTypeEnum.SQL && values?.resourceFrom == ResourceFromEnum.UPLOAD,
},
{
field: 'mainClass',
label: t('flink.app.mainClass'),
component: 'Input',
componentProps: { placeholder: t('flink.app.addAppTips.mainClassPlaceholder') },
- ifShow: ({ values }) => values?.jobType !== 'sql' && values?.resourceFrom == 'upload',
+ ifShow: ({ values }) =>
+ values?.jobType != JobTypeEnum.SQL && values?.resourceFrom == ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }],
},
{
@@ -165,7 +171,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
}
},
},
- ifShow: ({ values }) => values?.jobType != 'sql' && values.resourceFrom != 'upload',
+ ifShow: ({ values }) =>
+ values?.jobType != JobTypeEnum.SQL && values.resourceFrom != ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }],
},
{
@@ -188,7 +195,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
},
};
},
- ifShow: ({ values }) => values?.jobType != 'sql' && values?.resourceFrom != 'upload',
+ ifShow: ({ values }) =>
+ values?.jobType != JobTypeEnum.SQL && values?.resourceFrom != ResourceFromEnum.UPLOAD,
rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }],
},
{
@@ -218,7 +226,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
},
};
},
- ifShow: ({ values }) => values?.jobType !== 'sql' && values?.resourceFrom !== 'upload',
+ ifShow: ({ values }) =>
+ values?.jobType != JobTypeEnum.SQL && values?.resourceFrom != ResourceFromEnum.UPLOAD,
dynamicRules: () => [
{ required: true, message: t('flink.app.addAppTips.appTypeIsRequiredMessage') },
],
@@ -243,8 +252,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType != 'sql' &&
- values?.resourceFrom != 'upload' &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.APACHE_FLINK),
rules: [{ required: true, message: t('flink.app.addAppTips.programJarIsRequiredMessage') }],
},
@@ -254,8 +263,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
component: 'Input',
componentProps: { placeholder: t('flink.app.addAppTips.mainClassPlaceholder') },
ifShow: ({ values }) =>
- values?.jobType != 'sql' &&
- values?.resourceFrom != 'upload' &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.APACHE_FLINK),
rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }],
},
@@ -281,8 +290,8 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
ifShow: ({ values }) =>
- values?.jobType != 'sql' &&
- values?.resourceFrom != 'upload' &&
+ values?.jobType != JobTypeEnum.SQL &&
+ values?.resourceFrom != ResourceFromEnum.UPLOAD &&
values.appType == String(AppTypeEnum.STREAMPARK_FLINK),
dynamicRules: () => [{ required: true, validator: handleCheckConfig }],
},
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditFlinkSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditFlinkSchema.ts
index aef6f6f81..f77da71f6 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditFlinkSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useEditFlinkSchema.ts
@@ -47,8 +47,8 @@ export const useEditFlinkSchema = (jars: Ref) => {
label: 'Resource From',
component: 'Input',
render: ({ model }) => {
- if (model.resourceFrom == ResourceFromEnum.CICD)
- return getAlertSvgIcon('github', 'CICD (build from CSV)');
+ if (model.resourceFrom == ResourceFromEnum.PROJECT)
+ return getAlertSvgIcon('github', 'Project (build from CSV)');
else if (model.resourceFrom == ResourceFromEnum.UPLOAD)
return getAlertSvgIcon('upload', 'Upload (upload local job)');
else return '';
@@ -60,14 +60,14 @@ export const useEditFlinkSchema = (jars: Ref) => {
label: 'Project',
component: 'Input',
render: ({ model }) => h(Alert, { message: model.projectName, type: 'info' }),
- ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.CICD && model.projectName,
+ ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.PROJECT && model.projectName,
},
{
field: 'module',
label: 'Module',
component: 'Input',
render: ({ model }) => h(Alert, { message: model.module, type: 'info' }),
- ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.CICD && model.module,
+ ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.PROJECT && model.module,
},
{
field: 'jar',
@@ -88,7 +88,7 @@ export const useEditFlinkSchema = (jars: Ref) => {
},
};
},
- ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.CICD,
+ ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.PROJECT,
rules: [{ required: true, message: 'Please select jar' }],
},
{
@@ -96,14 +96,14 @@ export const useEditFlinkSchema = (jars: Ref) => {
label: 'Upload Job Jar',
component: 'Select',
slot: 'uploadJobJar',
- ifShow: ({ model }) => model.resourceFrom != ResourceFromEnum.CICD,
+ ifShow: ({ model }) => model.resourceFrom != ResourceFromEnum.PROJECT,
},
{
field: 'jar',
label: 'Program Jar',
component: 'Input',
dynamicDisabled: true,
- ifShow: ({ model }) => model.resourceFrom !== ResourceFromEnum.CICD,
+ ifShow: ({ model }) => model.resourceFrom != ResourceFromEnum.PROJECT,
},
{
field: 'mainClass',
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
index d5b461822..f96d80f4e 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkRender.tsx
@@ -515,15 +515,15 @@ export const renderResourceFrom = (model: Recordable) => {
value={model.resourceFrom}
placeholder="Please select resource from"
>
- <Select.Option value="csv">
+ <Select.Option value="1">
<SvgIcon name="github" />
- <span class="pl-10px">CICD</span>
- <span class="gray">(build from CVS)</span>
+ <span class="pl-10px">Project</span>
+ <span class="gray"> (build from Project)</span>
</Select.Option>
- <Select.Option value="upload">
+ <Select.Option value="2">
<SvgIcon name="upload" />
<span class="pl-10px">Upload</span>
- <span class="gray">(upload local job)</span>
+ <span class="gray"> (upload local job)</span>
</Select.Option>
</Select>
);
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx
index a7ffb3994..63dce93f2 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useSavepoint.tsx
@@ -17,7 +17,7 @@
import Icon from '/@/components/Icon';
import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n';
-import { Form, Input, Switch} from 'ant-design-vue';
+import { Form, Input, Switch } from 'ant-design-vue';
import { fetchCheckSavepointPath } from '/@/api/flink/app/app';
import { trigger } from '/@/api/flink/app/savepoint';
import { ref, unref } from 'vue';
diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
index 73345d065..1442219ea 100644
--- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
+++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
@@ -48,7 +48,7 @@
import { useI18n } from '/@/hooks/web/useI18n';
import { PageWrapper } from '/@/components/Page';
import { BasicTitle } from '/@/components/Basic';
- import State from './State.tsx'
+ import State from './State.tsx';
const ListItem = List.Item;
const ListItemMeta = ListItem.Meta;