This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch fe in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 75034cdc5c38d19b63fd8d0e7472be62d1fc620a Author: benjobs <[email protected]> AuthorDate: Thu Sep 14 08:59:09 2023 +0800 [Improve] FE improvement --- .../src/main/assembly/assembly.xml | 2 +- .../src/assets/icons/app.svg | 1 + .../src/assets/icons/code.svg | 2 +- .../src/assets/icons/flinksql.svg | 1 - .../src/assets/icons/fql.svg | 2 +- .../src/assets/icons/py.svg | 1 + .../src/enums/flinkEnum.ts | 17 +++++- .../default/header/components/notify/index.vue | 2 +- .../src/views/flink/app/Add.vue | 22 ++++---- .../src/views/flink/app/EditFlink.vue | 2 +- .../components/AppView/StopApplicationModal.vue | 10 +++- .../flink/app/hooks/useCreateAndEditSchema.ts | 28 +++++---- .../src/views/flink/app/hooks/useCreateSchema.ts | 66 ++++++++++++++-------- .../views/flink/app/hooks/useEditFlinkSchema.ts | 14 ++--- .../src/views/flink/app/hooks/useSavepoint.tsx | 2 +- .../src/views/setting/FlinkCluster/index.vue | 2 +- .../flink/proxy/ChildFirstClassLoader.scala | 4 +- 17 files changed, 111 insertions(+), 67 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml index 5161835c0..408547f02 100644 --- a/streampark-console/streampark-console-service/src/main/assembly/assembly.xml +++ b/streampark-console/streampark-console-service/src/main/assembly/assembly.xml @@ -21,7 +21,7 @@ <format>tar.gz</format> </formats> <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>apache-streampark_${scala.binary.version}-${project.version}-incubating-bin</baseDirectory> + <baseDirectory>apache-streampark-${project.version}-incubating-bin</baseDirectory> <dependencySets> <dependencySet> 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/code.svg b/streampark-console/streampark-console-webapp/src/assets/icons/code.svg index 79249f718..528815c8a 100644 --- a/streampark-console/streampark-console-webapp/src/assets/icons/code.svg +++ b/streampark-console/streampark-console-webapp/src/assets/icons/code.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="1620569843782" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"; p-id="2413" xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><defs><style type="text/css"></style></defs><path d="M522.126222 105.244444l112.241778 18.659556-132.494222 794.908444-112.241778-18.716444L522.126222 105.187556z m235. [...] +<svg t="1694614994367" class="icon" viewBox="0 0 1279 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"; p-id="41252" width="200" height="200"><path d="M785.433939 2.50773c-33.992813-9.797928-69.38533 9.997886-79.183259 43.990699l-255.945886 895.810603c-9.797928 33.992813 9.997886 69.38533 43.990699 79.183258s69.38533-9.997886 79.183259-43.990699l255.945886-895.810603c9.797928-33.992813-9.997886-69.38533-43.990699-79.183258z m161.165925 240.149226c-24.994715 24.994715-24.994715 65.58 [...] diff --git a/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg b/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg deleted file mode 100644 index b9c2eafc1..000000000 --- a/streampark-console/streampark-console-webapp/src/assets/icons/flinksql.svg +++ /dev/null @@ -1 +0,0 @@ -<?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="1615712071858" class="icon" viewBox="0 0 1059 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"; p-id="4963" xmlns:xlink="http://www.w3.org/1999/xlink"; width="206.8359375" height="200"><defs><style type="text/css"></style></defs><path d="M1024 436.082759h-146.537931V54.731034A54.731034 54.731034 0 0 0 823.908046 0H310.731034a153.6 153.6 0 0 0- [...] 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..fff112457 100644 --- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts +++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts @@ -170,6 +170,12 @@ export enum JobTypeEnum { PYFLINK = 3, } +export enum JobTypeNameEnum { + JAR = 'jar', + SQL = 'sql', + PYFLINK = 'pyflink', +} + export enum ConfigTypeEnum { /** yaml type */ YAML = 1, @@ -191,12 +197,19 @@ export enum CandidateTypeEnum { } export enum ResourceFromEnum { - /** cicd(build from cvs) */ - CICD = 1, + /** resource from cvs */ + CVS = 1, /** upload local jar */ UPLOAD = 2, } +export enum ResourceFromNameEnum { + /** resource from cvs */ + CVS = 'cvs', + /** upload local jar */ + UPLOAD = 'upload', +} + export enum UseStrategyEnum { /** use existing */ USE_EXIST = 1, 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..f313513d8 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 @@ -50,7 +50,9 @@ ClusterStateEnum, ExecModeEnum, JobTypeEnum, + JobTypeNameEnum, ResourceFromEnum, + ResourceFromNameEnum, } from '/@/enums/flinkEnum'; const FlinkSqlEditor = createAsyncComponent(() => import('./components/FlinkSql.vue'), { @@ -174,21 +176,21 @@ }); } const params = { - jobType: values.jobType === 'pyflink' ?JobTypeEnum.PYFLINK : JobTypeEnum.JAR, + jobType: values.jobType === JobTypeNameEnum.PYFLINK ? JobTypeEnum.PYFLINK : JobTypeEnum.JAR, 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 === ResourceFromNameEnum.CVS) { + params['resourceFrom'] = ResourceFromEnum.CVS; //streampark flink if (values.appType == AppTypeEnum.STREAMPARK_FLINK) { const configVal = values.config; @@ -263,7 +265,7 @@ async function handleAppCreate(formValue: Recordable) { try { submitLoading.value = true; - if (formValue.jobType === 'sql') { + if (formValue.jobType === JobTypeNameEnum.SQL) { if (formValue.flinkSql == null || formValue.flinkSql.trim() === '') { createMessage.warning(t('flink.app.editStreamPark.flinkSqlRequired')); } else { @@ -274,10 +276,10 @@ } } } - if (formValue.jobType === 'customcode' || formValue.jobType === 'pyflink') { - handleSubmitCustomJob(formValue); - } else { + if (formValue.jobType === JobTypeNameEnum.SQL) { 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..ba10de5b5 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.CVS) { jars.value = await fetchListJars({ id: app.projectId, module: app.module, 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/useCreateAndEditSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts index d66240c3e..efd420906 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,13 @@ import { fetchFlinkEnv, fetchListFlinkEnv } 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 { AppTypeEnum, ClusterStateEnum, ExecModeEnum, JobTypeEnum } from '/@/enums/flinkEnum'; +import { + AppTypeEnum, + ClusterStateEnum, + ExecModeEnum, + JobTypeEnum, + JobTypeNameEnum, +} from '/@/enums/flinkEnum'; import { isK8sExecMode } from '../utils'; import { useI18n } from '/@/hooks/web/useI18n'; import { fetchCheckHadoop } from '/@/api/flink/setting'; @@ -117,7 +123,7 @@ export const useCreateAndEditSchema = ( if (edit?.appId) { return values?.jobType == JobTypeEnum.SQL; } else { - return values?.jobType == 'sql'; + return values?.jobType == JobTypeNameEnum.SQL; } }, rules: [{ required: true, message: t('flink.app.addAppTips.flinkSqlIsRequiredMessage') }], @@ -131,7 +137,7 @@ export const useCreateAndEditSchema = ( if (edit?.appId) { return values.jobType == JobTypeEnum.SQL; } else { - return values?.jobType == 'sql'; + return values?.jobType == JobTypeNameEnum.SQL; } }, }, @@ -141,11 +147,13 @@ export const useCreateAndEditSchema = ( 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'; - } + if (edit?.appId) { + return values.jobType == JobTypeEnum.SQL || values.jobType == JobTypeEnum.PYFLINK; + } else { + return ( + values?.jobType == JobTypeNameEnum.SQL || values?.jobType == JobTypeNameEnum.PYFLINK + ); + } }, }, { field: 'configOverride', label: '', component: 'Input', show: false }, @@ -157,7 +165,7 @@ export const useCreateAndEditSchema = ( if (edit?.appId) { return values?.jobType == JobTypeEnum.SQL && !isK8sExecMode(values.executionMode); } else { - return values?.jobType == 'sql' && !isK8sExecMode(values.executionMode); + return values?.jobType == JobTypeNameEnum.SQL && !isK8sExecMode(values.executionMode); } }, render({ model, field }) { @@ -508,7 +516,7 @@ export const useCreateAndEditSchema = ( component: 'InputTextArea', defaultValue: '', slot: 'args', - ifShow: ({ values }) => (edit?.mode ? true : values.jobType == 'customcode'), + ifShow: ({ values }) => (edit?.mode ? true : values.jobType !== JobTypeNameEnum.SQL), }, { field: 'description', 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..a660d427f 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, + JobTypeNameEnum, + ResourceFromNameEnum, +} 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: JobTypeNameEnum.JAR, }, { label: h('div', {}, [ h(SvgIcon, { name: 'fql', color: '#108ee9' }, ''), h('span', { class: 'pl-10px' }, 'Flink SQL'), ]), - value: 'sql', + value: JobTypeNameEnum.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: JobTypeNameEnum.PYFLINK, }, ]; }; @@ -102,15 +108,15 @@ export const useCreateSchema = (dependencyRef: Ref) => { placeholder: t('flink.app.addAppTips.developmentModePlaceholder'), options: getJobTypeOptions(), onChange: (value: string) => { - if (value === 'sql') { + if (value === JobTypeNameEnum.SQL) { formModel.tableEnv = 1; } else { - formModel.resourceFrom = 'csv'; + formModel.resourceFrom = ResourceFromNameEnum.CVS; } }, }; }, - defaultValue: 'sql', + defaultValue: JobTypeNameEnum.SQL, rules: [ { required: true, message: t('flink.app.addAppTips.developmentModeIsRequiredMessage') }, ], @@ -124,21 +130,25 @@ 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 === JobTypeNameEnum.JAR, }, { 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 !== JobTypeNameEnum.SQL && + values?.resourceFrom == ResourceFromNameEnum.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 !== JobTypeNameEnum.SQL && + values?.resourceFrom == ResourceFromNameEnum.UPLOAD, rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }], }, { @@ -165,7 +175,9 @@ export const useCreateSchema = (dependencyRef: Ref) => { } }, }, - ifShow: ({ values }) => values?.jobType != 'sql' && values.resourceFrom != 'upload', + ifShow: ({ values }) => + values?.jobType != JobTypeNameEnum.SQL && + values.resourceFrom != ResourceFromNameEnum.UPLOAD, rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }], }, { @@ -188,7 +200,9 @@ export const useCreateSchema = (dependencyRef: Ref) => { }, }; }, - ifShow: ({ values }) => values?.jobType != 'sql' && values?.resourceFrom != 'upload', + ifShow: ({ values }) => + values?.jobType != JobTypeNameEnum.SQL && + values.resourceFrom != ResourceFromNameEnum.UPLOAD, rules: [{ required: true, message: t('flink.app.addAppTips.projectIsRequiredMessage') }], }, { @@ -218,7 +232,9 @@ export const useCreateSchema = (dependencyRef: Ref) => { }, }; }, - ifShow: ({ values }) => values?.jobType !== 'sql' && values?.resourceFrom !== 'upload', + ifShow: ({ values }) => + values?.jobType !== JobTypeNameEnum.SQL && + values?.resourceFrom !== ResourceFromNameEnum.UPLOAD, dynamicRules: () => [ { required: true, message: t('flink.app.addAppTips.appTypeIsRequiredMessage') }, ], @@ -243,8 +259,8 @@ export const useCreateSchema = (dependencyRef: Ref) => { }; }, ifShow: ({ values }) => - values?.jobType != 'sql' && - values?.resourceFrom != 'upload' && + values?.jobType != JobTypeNameEnum.SQL && + values?.resourceFrom != ResourceFromNameEnum.UPLOAD && values.appType == String(AppTypeEnum.APACHE_FLINK), rules: [{ required: true, message: t('flink.app.addAppTips.programJarIsRequiredMessage') }], }, @@ -254,8 +270,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 != JobTypeNameEnum.SQL && + values?.resourceFrom != ResourceFromNameEnum.UPLOAD && values.appType == String(AppTypeEnum.APACHE_FLINK), rules: [{ required: true, message: t('flink.app.addAppTips.mainClassIsRequiredMessage') }], }, @@ -281,8 +297,8 @@ export const useCreateSchema = (dependencyRef: Ref) => { }; }, ifShow: ({ values }) => - values?.jobType != 'sql' && - values?.resourceFrom != 'upload' && + values?.jobType != JobTypeNameEnum.SQL && + values?.resourceFrom != ResourceFromNameEnum.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..289c5e65b 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.CVS) + return getAlertSvgIcon('github', 'build from CVS)'); 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.CVS && 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.CVS && model.module, }, { field: 'jar', @@ -88,7 +88,7 @@ export const useEditFlinkSchema = (jars: Ref) => { }, }; }, - ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.CICD, + ifShow: ({ model }) => model.resourceFrom == ResourceFromEnum.CVS, 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.CVS, }, { field: 'jar', label: 'Program Jar', component: 'Input', dynamicDisabled: true, - ifShow: ({ model }) => model.resourceFrom !== ResourceFromEnum.CICD, + ifShow: ({ model }) => model.resourceFrom !== ResourceFromEnum.CVS, }, { field: 'mainClass', 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; diff --git a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/ChildFirstClassLoader.scala b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/ChildFirstClassLoader.scala index 7db1fbe90..eeb5839ba 100644 --- a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/ChildFirstClassLoader.scala +++ b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/ChildFirstClassLoader.scala @@ -47,9 +47,7 @@ class ChildFirstClassLoader( urls, parent, flinkResourcePattern, - new Consumer[Throwable] { - override def accept(t: Throwable): Unit = {} - }) + (_: Throwable) => {}) } private val FLINK_PATTERN =
