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/19 04:03:25 UTC
[incubator-streampark] branch dev updated: fix: cluster page & alert list style (#2657)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new c7f1c9daa fix: cluster page & alert list style (#2657)
c7f1c9daa is described below
commit c7f1c9daac8b156a4353d029827122592c9ae3fd
Author: WSZ <12...@qq.com>
AuthorDate: Wed Apr 19 12:03:17 2023 +0800
fix: cluster page & alert list style (#2657)
---
.../src/api/flink/setting/flinkEnv.ts | 24 ++++++++++++++--------
.../setting/Alarm/components/AlertTypeInfo.vue | 5 ++---
.../src/views/setting/Alarm/index.vue | 4 ++--
.../src/views/setting/FlinkCluster/EditCluster.vue | 2 +-
.../views/setting/FlinkHome/components/Modal.vue | 1 +
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts
index 44c56cfe4..7693cc75d 100644
--- a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts
+++ b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkEnv.ts
@@ -69,10 +69,13 @@ export function fetchFlinkInfo(id: string): Promise<FlinkEnv> {
* @returns {Promise<Boolean>}
*/
export function fetchFlinkEnvRemove(id: string): Promise<AxiosResponse<Result<boolean>>> {
- return defHttp.post({
- url: FLINK_API.DELETE,
- data: { id },
- }, { isReturnNativeResponse: true });
+ return defHttp.post(
+ {
+ url: FLINK_API.DELETE,
+ data: { id },
+ },
+ { isReturnNativeResponse: true },
+ );
}
/**
@@ -84,7 +87,7 @@ export function fetchCheckEnv(data: {
id: string | null;
flinkName: string;
flinkHome: string;
-}): Promise<AxiosResponse<Result<boolean>>> {
+}): Promise<AxiosResponse<Result<number>>> {
return defHttp.post({ url: FLINK_API.CHECK, data }, { isReturnNativeResponse: true });
}
@@ -94,10 +97,13 @@ export function fetchCheckEnv(data: {
* @returns {Promise<Boolean>}
*/
export function fetchValidity(id: string): Promise<AxiosResponse<Result<boolean>>> {
- return defHttp.post({
- url: FLINK_API.VALIDITY,
- data: { id },
- }, { isReturnNativeResponse: true });
+ return defHttp.post(
+ {
+ url: FLINK_API.VALIDITY,
+ data: { id },
+ },
+ { isReturnNativeResponse: true },
+ );
}
/**
diff --git a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertTypeInfo.vue b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertTypeInfo.vue
index 159f8a6fe..c76f9cc38 100644
--- a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertTypeInfo.vue
+++ b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/components/AlertTypeInfo.vue
@@ -19,7 +19,6 @@
import { Descriptions, Tag } from 'ant-design-vue';
import { computed, toRefs } from 'vue';
import { SvgIcon } from '/@/components/Icon';
- import { BasicTitle } from '/@/components/Basic';
import { alertTypes } from '../index.data';
import { useI18n } from '/@/hooks/web/useI18n';
@@ -56,14 +55,14 @@
</script>
<template>
- <BasicTitle class="mt-10px border-dot">
+ <div class="mt-10px border-dot text-16px cursor-pointer flex items-center">
<div class="flex items-center">
<SvgIcon :name="alertTypes[alertType].icon" :size="20" class="!align-middle" />
<span class="pl-10px">
{{ alertTypes[alertType].name }}
</span>
</div>
- </BasicTitle>
+ </div>
<Descriptions size="small" :column="1" class="pl-15px mt-10px">
<template v-if="alertType === '1'">
<DescriptionsItem :label="t('setting.alarm.alertEmail')">
diff --git a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/index.vue b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/index.vue
index f6c9e1ffc..34148c512 100644
--- a/streampark-console/streampark-console-webapp/src/views/setting/Alarm/index.vue
+++ b/streampark-console/streampark-console-webapp/src/views/setting/Alarm/index.vue
@@ -169,7 +169,7 @@
<template>
<PageWrapper contentFullHeight>
- <div v-auth="'project:create'" class="bg-white pt-10px px-24px">
+ <div v-auth="'project:create'" class="bg-white py-10px px-24px">
<span class="alarm-title">{{ t('setting.alarm.alertSetting') }}</span>
<a-button
type="dashed"
@@ -182,7 +182,7 @@
</div>
<List
- class="alert-card-list"
+ class="alert-card-list !mt-10px"
:grid="{ gutter: 40, xs: 1, sm: 2, md: 4, lg: 4, xl: 4, xxl: 4 }"
:data-source="alerts"
:pagination="false"
diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/EditCluster.vue b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/EditCluster.vue
index b561fdc74..c3da53cfe 100644
--- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/EditCluster.vue
+++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/EditCluster.vue
@@ -76,7 +76,7 @@
showConfirmButton: false,
timer: 2000,
});
- go('/flink/setting?activeKey=cluster');
+ go('/setting/flinkCluster');
} else {
Swal.fire('Failed', res.msg, 'error');
}
diff --git a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue
index 5cad2ed23..de0ee072d 100644
--- a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue
+++ b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/components/Modal.vue
@@ -113,6 +113,7 @@
'error',
);
}
+ changeOkLoading(false);
return;
}