This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.5
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.5 by this push:
new d88be6ecf [Improve] create flink-app page style improvements
d88be6ecf is described below
commit d88be6ecf419493d51695a75206bdaab86f817a9
Author: benjobs <[email protected]>
AuthorDate: Thu Sep 26 09:31:05 2024 +0800
[Improve] create flink-app page style improvements
---
.../src/locales/lang/en/flink/app.ts | 17 ++++++++---------
.../src/locales/lang/en/setting/flinkCluster.ts | 4 ++--
.../src/locales/lang/zh-CN/flink/app.ts | 7 +++----
.../views/flink/app/components/AppView/BuildDrawer.vue | 3 ++-
.../src/views/flink/app/data/detail.data.ts | 2 +-
.../src/views/flink/app/hooks/useCreateAndEditSchema.ts | 2 +-
.../src/views/flink/app/hooks/useCreateSchema.ts | 8 +++-----
.../src/views/flink/app/styles/View.less | 6 ++++++
8 files changed, 26 insertions(+), 23 deletions(-)
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 b62c0265d..617f22136 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
@@ -19,7 +19,7 @@ export default {
id: 'ID',
appName: 'Job Name',
searchName: 'Job Name',
- tags: 'Tags',
+ tags: 'Job Tags',
owner: 'Owner',
flinkVersion: 'Flink Version',
duration: 'Duration',
@@ -27,12 +27,11 @@ export default {
runStatus: 'Status',
releaseBuild: 'Release',
jobType: 'Job Type',
- developmentMode: 'Development Mode',
- executionMode: 'Execution Mode',
+ executionMode: 'Deploy Mode',
historyVersion: 'History Version',
dependency: 'Dependency',
- appConf: 'Application Conf',
- resolveOrder: 'resolveOrder',
+ appConf: 'Configures',
+ resolveOrder: 'Resolve Order',
parallelism: 'Parallelism',
restartSize: 'Fault Restart Size',
faultAlertTemplate: 'Fault Alert Template',
@@ -252,10 +251,10 @@ export default {
terminated: 'TERMINATED',
},
addAppTips: {
- developmentModePlaceholder: 'please select job type',
- developmentModeIsRequiredMessage: 'Job Type is required',
- executionModePlaceholder: 'please select execution mode',
- executionModeIsRequiredMessage: 'Execution Mode is required',
+ jobTypePlaceholder: 'please select job type',
+ jobTypeIsRequiredMessage: 'Job Type is required',
+ executionModePlaceholder: 'please select deploy mode',
+ executionModeIsRequiredMessage: 'deploy Mode is required',
hadoopEnvInitMessage:
'Hadoop environment initialization failed, please check the environment
settings',
resourceFromMessage: 'resource from is required',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
index a002c1bb5..baeda5f0b 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
@@ -26,7 +26,7 @@ export default {
clusterName: 'Cluster Name',
address: 'Cluster URL',
internal: 'internal cluster',
- executionMode: 'Execution Mode',
+ executionMode: 'Deploy Mode',
versionId: 'Flink Version',
addExisting: 'existing cluster',
addNew: 'new cluster',
@@ -67,7 +67,7 @@ export default {
},
required: {
address: 'cluster address is required',
- executionMode: 'Execution Mode is required',
+ executionMode: 'Deploy Mode is required',
clusterId: 'Yarn Session Cluster is required',
versionId: 'Flink Version is required',
flinkImage: 'Flink Base Docker Image is required',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
index c7a66e874..9e143ed91 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
@@ -26,8 +26,7 @@ export default {
runStatus: '运行状态',
releaseBuild: '发布状态',
jobType: '作业类型',
- developmentMode: '作业模式',
- executionMode: '运行模式',
+ executionMode: '部署模式',
historyVersion: '历史版本',
dependency: '作业依赖',
appConf: '作业配置',
@@ -247,8 +246,8 @@ export default {
pending: '待重启',
},
addAppTips: {
- developmentModePlaceholder: '请选择开发模式',
- developmentModeIsRequiredMessage: '开发模式必填',
+ jobTypePlaceholder: '请选择开发模式',
+ jobTypeIsRequiredMessage: '作业类型必填',
executionModePlaceholder: '请选择运行模式',
executionModeIsRequiredMessage: '运行模式必填',
hadoopEnvInitMessage: 'hadoop环境检查失败, 请检查配置',
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
index 93d5689ab..f58370ee3 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/BuildDrawer.vue
@@ -88,6 +88,7 @@
@register="registerBuild"
:title="t('flink.app.view.buildTitle')"
width="500"
+ class="build-drawer-detail"
:closable="true"
@close="stop()"
>
@@ -220,12 +221,12 @@
>
<a-button type="primary" @click="openErrorDrawer(true)">
<Icon icon="ant-design:warning-outlined" />
- Error Log
{{ t('flink.app.view.errorLog') }}
</a-button>
</div>
<BasicDrawer
@register="registerErrorLog"
+ class="build-drawer-detail"
:title="t('flink.app.view.errorLog')"
width="800"
:closable="true"
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
b/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
index a88c92495..f98a672e6 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
@@ -51,7 +51,7 @@ export const getDescSchema = (): DescItem[] => {
},
{
field: 'jobType',
- label: t('flink.app.developmentMode'),
+ label: t('flink.app.jobType'),
render: (curVal) =>
h(
'div',
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 a98aa9395..9f640150f 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
@@ -484,7 +484,7 @@ export const useCreateAndEditSchema = (
return [
{
field: 'jobType',
- label: t('flink.app.developmentMode'),
+ label: t('flink.app.jobType'),
component: 'Input',
render: ({ model }) => {
if (model.jobType == JobTypeEnum.JAR) {
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 f12392303..847d9371e 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
@@ -79,11 +79,11 @@ export const useCreateSchema = (dependencyRef: Ref) => {
return [
{
field: 'jobType',
- label: t('flink.app.developmentMode'),
+ label: t('flink.app.jobType'),
component: 'Select',
componentProps: ({ formModel }) => {
return {
- placeholder: t('flink.app.addAppTips.developmentModePlaceholder'),
+ placeholder: t('flink.app.addAppTips.jobTypePlaceholder'),
options: getJobTypeOptions(),
onChange: (value: string) => {
if (value === 'sql') {
@@ -95,9 +95,7 @@ export const useCreateSchema = (dependencyRef: Ref) => {
};
},
defaultValue: 'sql',
- rules: [
- { required: true, message:
t('flink.app.addAppTips.developmentModeIsRequiredMessage') },
- ],
+ rules: [{ required: true, message:
t('flink.app.addAppTips.jobTypeIsRequiredMessage') }],
},
...getExecutionModeSchema.value,
...getFlinkClusterSchemas.value,
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
index 6a9725bf5..3004eaa76 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
@@ -93,6 +93,12 @@
}
}
+.build-drawer-detail {
+ .ant-drawer-body {
+ padding: 20px;
+ }
+}
+
.app_list {
.app_type {
display: inline-block;
