This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 2e05df0f8 [Improve] FE i18m improvement
2e05df0f8 is described below
commit 2e05df0f8701e7639029ee53e95d66829d53a7b6
Author: benjobs <[email protected]>
AuthorDate: Thu Feb 15 15:06:59 2024 +0800
[Improve] FE i18m improvement
---
.../src/locales/lang/en/flink/app.ts | 6 +++++
.../src/locales/lang/zh-CN/flink/app.ts | 6 +++++
.../components/AppView/StopApplicationModal.vue | 28 +++++++++++-----------
3 files changed, 26 insertions(+), 14 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 aa6b306fb..755533a2b 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
@@ -213,6 +213,12 @@ export default {
copy: 'Copy Application',
remapping: 'Remapping Application',
deleteTip: 'Are you sure delete this job ?',
+ triggerSavePoint: 'Trigger savepoint',
+ enableSavePoint: 'Trigger savepoint before flink job cancel',
+ customSavepoint: 'Specify savepoint path to cancel the job ',
+ enableDrain: 'Send MAX_WATERMARK before taking the savepoint and stopping
the pipeline',
+ invalidSavePoint: 'Custom savepoint path invalid: ',
+ canceling: 'The current job is canceling',
},
dashboard: {
availableTaskSlots: 'Available Task Slots',
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 633cfe682..ce3096ad9 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
@@ -202,6 +202,12 @@ export default {
copy: '复制作业',
remapping: '重新映射作业',
deleteTip: '你确定要删除这个作业?',
+ triggerSavePoint: '触发 savepoint',
+ enableSavePoint: '在 Flink 作业取消之前触发 savepoint',
+ customSavepoint: '指定 savepoint 保存路径',
+ enableDrain: '在触发 savepoint 和停止作业之前发送 MAX_WATERMARK',
+ invalidSavePoint: 'savepoint 路径无效: ',
+ canceling: '当前作业正在停止中',
},
dashboard: {
availableTaskSlots: '可用的任务槽数',
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 8e2fbde87..06d7f73b3 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
@@ -47,7 +47,7 @@
schemas: [
{
field: 'stopSavePointed',
- label: 'Savepoint',
+ label: t('flink.app.operation.triggerSavePoint'),
component: 'Switch',
componentProps: {
checkedChildren: 'ON',
@@ -55,17 +55,16 @@
},
defaultValue: true,
afterItem: () =>
- h('span', { class: 'conf-switch' }, 'trigger savePoint before taking
cancel'),
+ h('span', { class: 'conf-switch' },
t('flink.app.operation.enableSavePoint')),
},
{
field: 'customSavepoint',
- label: 'Custom Savepoint',
+ label: 'Savepoint path',
component: 'Input',
componentProps: {
- placeholder: 'Entry the custom savepoint path',
+ placeholder: t('flink.app.operation.customSavepoint'),
allowClear: true,
},
- afterItem: () => h('span', { class: 'conf-switch' }, 'cancel job with
savepoint path'),
ifShow: ({ values }) => !!values.stopSavePointed,
},
{
@@ -77,14 +76,15 @@
unCheckedChildren: 'OFF',
},
defaultValue: false,
- afterItem: () => h('span', { class: 'conf-switch' }, 'Send max
watermark before stopped'),
+ ifShow: ({ values }) => !!values.stopSavePointed,
+ afterItem: () => h('span', { class: 'conf-switch' },
t('flink.app.operation.enableDrain')),
},
],
colon: true,
showActionButtonGroup: false,
labelCol: { lg: { span: 7, offset: 0 }, sm: { span: 7, offset: 0 } },
wrapperCol: { lg: { span: 16, offset: 0 }, sm: { span: 4, offset: 0 } },
- baseColProps: { span: 24 },
+ baseColProps: { span: 23 },
});
/* submit */
@@ -104,22 +104,22 @@
savePoint: customSavepoint,
});
if (data.data === false) {
- createErrorSwal('custom savepoint path is invalid, ' +
data.message);
+ await createErrorSwal(t('flink.app.operation.invalidSavePoint') +
data.message);
} else {
- handleStopAction(stopReq);
+ await handleStopAction(stopReq);
}
} else {
const { data } = await fetchCheckSavepointPath({
id: app.id,
});
if (data.data) {
- handleStopAction(stopReq);
+ await handleStopAction(stopReq);
} else {
- createErrorSwal(data.message);
+ await createErrorSwal(data.message);
}
}
} else {
- handleStopAction(stopReq);
+ await handleStopAction(stopReq);
}
emit('updateOption', {
type: 'stopping',
@@ -135,7 +135,7 @@
await fetchCancel(stopReq);
Swal.fire({
icon: 'success',
- title: 'The current job is canceling',
+ title: t('flink.app.operation.canceling'),
showConfirmButton: false,
timer: 2000,
});
@@ -153,6 +153,6 @@
<SvgIcon name="shutdown" style="color: red" />
{{ t('flink.app.view.stop') }}
</template>
- <BasicForm @register="registerForm" class="!pt-30px" />
+ <BasicForm @register="registerForm" class="!pt-40px" />
</BasicModal>
</template>
