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 7d2f1a286 [Improve]: project modal & flink cluster modal (#4067)
7d2f1a286 is described below
commit 7d2f1a28609a9362eb373812fc98c9774c26001d
Author: Kriszu <[email protected]>
AuthorDate: Sun Sep 15 15:55:09 2024 +0800
[Improve]: project modal & flink cluster modal (#4067)
---
.../src/api/flink/project/index.ts | 2 +-
.../src/views/flink/project/View.vue | 100 +++++++++++----------
.../src/views/setting/FlinkCluster/index.vue | 22 +++--
3 files changed, 68 insertions(+), 56 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/api/flink/project/index.ts
b/streampark-console/streampark-console-webapp/src/api/flink/project/index.ts
index e2d27b412..fe4704903 100644
---
a/streampark-console/streampark-console-webapp/src/api/flink/project/index.ts
+++
b/streampark-console/streampark-console-webapp/src/api/flink/project/index.ts
@@ -105,7 +105,7 @@ export function closeBuild(data: Recordable) {
}
export function deleteProject(data: Recordable):
Promise<AxiosResponse<Result<boolean>>> {
- return defHttp.post({ url: Api.DELETE, data }, { isReturnNativeResponse:
true });
+ return defHttp.post({ url: Api.DELETE, data }, { isTransformResponse: false
});
}
export function modules(data: Recordable) {
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
index 94c564cc4..498742e50 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
@@ -106,11 +106,7 @@
icon: 'ant-design:thunderbolt-outlined',
auth: 'project:build',
ifShow: record.buildState !== BuildStateEnum.BUILDING,
- popConfirm: {
- title: t('flink.project.operationTips.buildProjectMessage'),
- placement: 'left',
- confirm: handleBuild.bind(null, record),
- },
+ onClick: handleBuild.bind(null, record),
},
{
icon: 'clarity:note-edit-line',
@@ -125,11 +121,7 @@
tooltip: t('common.delText'),
ifShow: record.buildState !== BuildStateEnum.BUILDING,
auth: 'project:delete',
- popConfirm: {
- title: t('flink.project.operationTips.deleteProjectMessage'),
- placement: 'left',
- confirm: handleDelete.bind(null, record),
- },
+ onClick: handleDelete.bind(null, record),
},
]"
/>
@@ -182,7 +174,7 @@
const userStore = useUserStoreWithOut();
const { t } = useI18n();
const router = useRouter();
- const { Swal, createMessage } = useMessage();
+ const { Swal, createConfirm, createMessage } = useMessage();
const [registerLogModal, { openModal: openLogModal }] = useModal();
const buttonList = reactive(statusList);
const loading = ref(false);
@@ -242,45 +234,61 @@
});
}
async function handleBuild(record: ProjectRecord) {
- try {
- await buildProject({
- id: record.id,
- socketId: buildUUID(),
- });
- Swal.fire({
- icon: 'success',
- title: t('flink.project.operationTips.projectIsbuildingMessage'),
- showConfirmButton: false,
- timer: 2000,
- });
- } catch (e) {
-
createMessage.error(t('flink.project.operationTips.projectIsbuildFailedMessage'));
- }
+ createConfirm({
+ iconType: 'warning',
+ title: t('flink.project.operationTips.buildProject'),
+ centered: true,
+ content: t('flink.project.operationTips.buildProjectMessage'),
+ onOk: async () => {
+ try {
+ await buildProject({
+ id: record.id,
+ socketId: buildUUID(),
+ });
+ Swal.fire({
+ icon: 'success',
+ title:
t('flink.project.operationTips.projectIsbuildingMessage'),
+ showConfirmButton: false,
+ timer: 2000,
+ });
+ } catch (e) {
+
createMessage.error(t('flink.project.operationTips.projectIsbuildFailedMessage'));
+ }
+ },
+ });
}
const handleEdit = function (record: ProjectRecord) {
router.push({ path: '/flink/project/edit', query: { id: record.id } });
};
async function handleDelete(record: ProjectRecord) {
- try {
- const { data } = await deleteProject({ id: record.id });
- if (data.data) {
- Swal.fire({
- icon: 'success',
- title:
t('flink.project.operationTips.deleteProjectSuccessMessage'),
- showConfirmButton: false,
- timer: 2000,
- });
- reload();
- } else {
- Swal.fire(
- 'Failed',
-
t('flink.project.operationTips.deleteProjectFailedDetailMessage'),
- 'error',
- );
- }
- } catch (e) {
-
createMessage.error(t('flink.project.operationTips.deleteProjectFailedMessage'));
- }
+ createConfirm({
+ iconType: 'warning',
+ title: t('flink.project.operationTips.deleteProject'),
+ content: t('flink.project.operationTips.deleteProjectMessage'),
+ centered: true,
+ onOk: async () => {
+ try {
+ const res = await deleteProject({ id: record.id });
+ if (res.data) {
+ Swal.fire({
+ icon: 'success',
+ title:
t('flink.project.operationTips.deleteProjectSuccessMessage'),
+ showConfirmButton: false,
+ timer: 2000,
+ });
+ reload();
+ } else {
+ Swal.fire(
+ 'Failed',
+
t('flink.project.operationTips.deleteProjectFailedDetailMessage'),
+ 'error',
+ );
+ }
+ } catch (e) {
+
createMessage.error(t('flink.project.operationTips.deleteProjectFailedMessage'));
+ }
+ },
+ });
}
const handleQuery = function (val: string | undefined) {
@@ -294,7 +302,7 @@
handlePageDataReload(true);
}
start();
- }, 5000);
+ }, 2000);
/* View log */
function handleViewLog(value: Recordable) {
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 bcc51184f..291c60bab 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
@@ -53,7 +53,7 @@
const go = useGo();
const { t } = useI18n();
- const { Swal, createMessage } = useMessage();
+ const { Swal, createMessage, createConfirm } = useMessage();
const [registerTable, { reload, getLoading }] = useTable({
api: pageFlinkCluster,
columns: [
@@ -123,9 +123,17 @@
}
/* delete */
async function handleDelete(item: FlinkCluster) {
- await fetchClusterRemove(item.id);
- reload();
- createMessage.success('The current cluster is remove');
+ createConfirm({
+ iconType: 'warning',
+ title: t('common.delText'),
+ centered: true,
+ content: t('setting.flinkCluster.delete'),
+ onOk: async () => {
+ await fetchClusterRemove(item.id);
+ reload();
+ createMessage.success('The current cluster is remove');
+ },
+ });
}
/* shutdown */
async function handleShutdownCluster(item: FlinkCluster) {
@@ -232,11 +240,7 @@
icon: 'ant-design:delete-outlined',
color: 'error',
tooltip: t('common.delText'),
- popConfirm: {
- title: t('setting.flinkCluster.delete'),
- placement: 'left',
- confirm: handleDelete.bind(null, record),
- },
+ onClick: handleDelete.bind(null, record),
},
]"
/>
