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/04/05 12:11:16 UTC
[incubator-streampark] branch modal-style created (now c27c01cd5)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a change to branch modal-style
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
at c27c01cd5 [Improve] modal style improvement
This branch includes the following new commits:
new c27c01cd5 [Improve] modal style improvement
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: [Improve] modal style improvement
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch modal-style
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit c27c01cd5256920e21c95ec553f9786dad236baa
Author: benjobs <be...@apache.org>
AuthorDate: Wed Apr 5 20:10:56 2023 +0800
[Improve] modal style improvement
---
.../app/components/AppView/SavepointApplicationModal.vue | 10 ++++++----
.../flink/app/components/AppView/StartApplicationModal.vue | 2 +-
.../flink/app/components/AppView/StopApplicationModal.vue | 6 +++---
.../src/views/flink/app/hooks/useApp.tsx | 2 +-
.../src/views/flink/app/hooks/useAppTableAction.ts | 11 ++++++++---
5 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/SavepointApplicationModal.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/SavepointApplicationModal.vue
index 4b34776f6..6918d369a 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/SavepointApplicationModal.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/AppView/SavepointApplicationModal.vue
@@ -16,6 +16,7 @@
-->
<script lang="ts">
import { reactive, defineComponent } from 'vue';
+ import Icon from '/@/components/Icon';
import { useI18n } from '/@/hooks/web/useI18n';
export default defineComponent({
name: 'SavepointApplicationModal',
@@ -45,7 +46,7 @@
schemas: [
{
field: 'customSavepoint',
- label: 'Custom SavePoint',
+ label: 'Custom Savepoint',
component: 'Input',
componentProps: {
placeholder: 'Optional: Entry the custom savepoint path',
@@ -75,7 +76,7 @@
savePoint: customSavepoint,
});
if (data.data === false) {
- createErrorSwal('custom savePoint path is invalid, ' + data.message);
+ createErrorSwal('custom savepoint path is invalid, ' + data.message);
} else {
await handleSavepointAction(savepointReq);
emit('updateOption', {
@@ -121,8 +122,9 @@
:cancelText="t('common.cancelText')"
>
<template #title>
- {{ t('flink.app.view.savepoint') }}
+ <Icon icon="ant-design:camera-outlined" color="#3c7eff" />
+ {{ t('flink.app.view.savepoint') }}
</template>
- <BasicForm @register="registerForm" class="!pt-20px" />
+ <BasicForm @register="registerForm" class="!pt-30px" height="80px" />
</BasicModal>
</template>
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 cae915ab8..70572c60e 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
@@ -170,7 +170,7 @@
{{ t('flink.app.view.start') }}
</template>
- <BasicForm @register="registerForm">
+ <BasicForm @register="registerForm" class="!pt-40px">
<template #savepoint="{ model, field }">
<template v-if="receiveData.historySavePoint && receiveData.historySavePoint.length > 0">
<Select allow-clear v-model:value="model[field]">
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 59bcb1224..db19b5022 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
@@ -60,7 +60,7 @@
},
{
field: 'customSavepoint',
- label: 'Custom SavePoint',
+ label: 'Custom Savepoint',
component: 'Input',
componentProps: {
placeholder: 'Entry the custom savepoint path',
@@ -117,7 +117,7 @@
savePoint: customSavepoint,
});
if (data.data === false) {
- createErrorSwal('custom savePoint path is invalid, ' + data.message);
+ createErrorSwal('custom savepoint path is invalid, ' + data.message);
} else {
handleStopAction(stopReq);
}
@@ -166,7 +166,7 @@
<SvgIcon name="shutdown" style="color: red" />
{{ t('flink.app.view.stop') }}
</template>
- <BasicForm @register="registerForm" class="!pt-20px">
+ <BasicForm @register="registerForm" class="!pt-30px">
<template #savePointTimeout="{ model, field }">
<InputNumber v-model:value="model[field]" :min="10" :max="7200" step="10" />
</template>
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
index 4c0d3371e..787d2ca59 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useApp.tsx
@@ -226,7 +226,7 @@ export const useFlinkApplication = (openStartModal: Fn) => {
],
content: () => {
return (
- <Form class="!pt-30px">
+ <Form class="!pt-50px">
<Form.Item
label="Application Name"
labelCol={{ lg: { span: 7 }, sm: { span: 7 } }}
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 e32438548..f9b5f2119 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
@@ -24,12 +24,12 @@ import { AppListRecord } from '/@/api/flink/app/app.type';
import { ActionItem, FormProps } from '/@/components/Table';
import { useMessage } from '/@/hooks/web/useMessage';
import {
+ AppStateEnum,
AppTypeEnum,
ExecModeEnum,
- ReleaseStateEnum,
- OptionStateEnum,
- AppStateEnum,
JobTypeEnum,
+ OptionStateEnum,
+ ReleaseStateEnum,
} from '/@/enums/flinkEnum';
import { usePermission } from '/@/hooks/web/usePermission';
import { useI18n } from '/@/hooks/web/useI18n';
@@ -147,6 +147,11 @@ export const useAppTableAction = (
ifShow: [
AppStateEnum.ADDED,
AppStateEnum.FAILED,
+ AppStateEnum.CANCELED,
+ AppStateEnum.KILLED,
+ AppStateEnum.SUCCEEDED,
+ AppStateEnum.TERMINATED,
+ AppStateEnum.POS_TERMINATED,
AppStateEnum.FINISHED,
AppStateEnum.SUSPENDED,
AppStateEnum.LOST,