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 c28f4f3da [Improve] start flink job from savepoint|checkpoint
improvement
c28f4f3da is described below
commit c28f4f3da7147f9e68058b0e8fab102bdda4a041
Author: benjobs <[email protected]>
AuthorDate: Fri Feb 16 12:27:47 2024 +0800
[Improve] start flink job from savepoint|checkpoint improvement
---
.../src/layouts/default/header/index.vue | 4 ++++
.../src/locales/lang/en/flink/app.ts | 5 +++--
.../src/locales/lang/zh-CN/flink/app.ts | 5 +++--
.../flink/app/components/AppView/StartApplicationModal.vue | 12 ++++++++++--
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
index fde2bc0f6..8f3c0a742 100755
---
a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
+++
b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.vue
@@ -39,6 +39,8 @@
</a-button>
<Divider type="vertical" />
+ <Icon icon="ant-design:qrcode-outlined"
:class="`${prefixCls}-action__item`" />
+
<!-- Github info -->
<Github :class="`${prefixCls}-action__item github-item`" />
<!-- Theme Switch -->
@@ -98,10 +100,12 @@
import { useLocale } from '/@/locales/useLocale';
import { version } from '../../../../package.json';
import { useI18n } from '/@/hooks/web/useI18n';
+ import Icon from '/@/components/Icon/src/Icon.vue';
export default defineComponent({
name: 'LayoutHeader',
components: {
+ Icon,
Header: Layout.Header,
AppLogo,
LayoutTrigger,
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 c91427c96..e96868b5e 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
@@ -168,8 +168,9 @@ export default {
savepoint: 'Trigger Savepoint',
fromSavepoint: 'From savepoint',
savepointTip: 'Restore the job from savepoint or latest checkpoint',
- savepointInput:
- 'Specify the savepoint/checkpoint path (Double-click to switch between
"manual input" and "dropdown selection")',
+ savepointInput: 'Specify the savepoint/checkpoint path',
+ savepointSwitch:
+ 'Specify the savepoint/checkpoint path (Double-click to switch between
"input" and "select")',
ignoreRestored: 'Ignore failed',
ignoreRestoredTip:
'ignore savepoint then cannot be restored, Same
as：-allowNonRestoredState(-n)',
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 8e7aba279..cc710b017 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
@@ -160,8 +160,9 @@ export default {
changed: '应用程序已更改。',
fromSavepoint: 'Savepoint 恢复',
savepointTip: '作业从 savepoint 或 checkpoint 恢复状态',
- savepointInput: '指定 savepoint/checkpoint 路径 (双击切换"手动输入"或"下拉框选择")',
- ignoreRestored: '跳过恢复失败',
+ savepointInput: '指定 savepoint/checkpoint 路径',
+ savepointSwitch: '指定 savepoint/checkpoint 路径 (双击切换"下拉框选择"或"手动输入")',
+ ignoreRestored: '忽略失败',
ignoreRestoredTip: '当状态恢复失败时跳过错误，作业继续运行, 同参数：-allowNonRestoredState(-n)',
},
pod: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue
index 6e3a347ca..91a8af01a 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/StartApplicationModal.vue
@@ -55,6 +55,13 @@
}
});
+ function handleSavePointTip(list) {
+ if (list != null && list.length > 0) {
+ return t('flink.app.view.savepointSwitch');
+ }
+ return t('flink.app.view.savepointInput');
+ }
+
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
name: 'startApplicationModal',
labelWidth: 120,
@@ -77,7 +84,8 @@
receiveData.historySavePoint && receiveData.historySavePoint.length
> 0
? 'Select'
: 'Input',
- afterItem: () => h('span', { class: 'conf-switch' },
t('flink.app.view.savepointInput')),
+ afterItem: () =>
+ h('span', { class: 'conf-switch' },
handleSavePointTip(receiveData.historySavePoint)),
slot: 'savepoint',
ifShow: ({ values }) => values.startSavePointed,
required: true,
@@ -227,7 +235,7 @@
v-else
@dblclick="handleSavepoint(model, field, false)"
type="text"
- placeholder="Please enter savepoint manually"
+ :placeholder="$t('flink.app.view.savepointInput')"
v-model:value="model[field]"
/>
</template>
