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 2022/11/19 14:18:32 UTC
[incubator-streampark] branch dev updated: [Fix] add project url target and fix alert style error (#2069)
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 5aa70d5fa [Fix] add project url target and fix alert style error (#2069)
5aa70d5fa is described below
commit 5aa70d5fa5c9685072b7bbb7134c7a45751b138a
Author: WSZ <12...@qq.com>
AuthorDate: Sat Nov 19 22:18:26 2022 +0800
[Fix] add project url target and fix alert style error (#2069)
* [Fix] add project url target and fix alert style error
* [improve] text style
---
.../streampark-console-webapp/src/api/flink/setting/alert.ts | 1 -
.../src/components/Form/src/BasicForm.vue | 1 +
.../streampark-console-webapp/src/design/swal2.less | 3 ++-
.../streampark-console-webapp/src/design/theme.less | 10 ++++++++--
.../streampark-console-webapp/src/enums/flinkEnum.ts | 2 +-
.../streampark-console-webapp/src/views/base/login/Login.vue | 6 ++++--
.../src/views/base/login/LoginSlogan.less | 2 +-
.../src/views/flink/app/data/detail.data.ts | 12 ++++++++++--
.../src/views/flink/project/components/ListItem.vue | 4 +++-
.../src/views/flink/setting/View.less | 1 +
.../src/views/flink/setting/components/AlertSetting.vue | 1 +
.../src/views/flink/setting/components/FlinkEnvSetting.vue | 6 +++---
12 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/api/flink/setting/alert.ts b/streampark-console/streampark-console-webapp/src/api/flink/setting/alert.ts
index 5edfc282d..90abdbcb0 100644
--- a/streampark-console/streampark-console-webapp/src/api/flink/setting/alert.ts
+++ b/streampark-console/streampark-console-webapp/src/api/flink/setting/alert.ts
@@ -76,4 +76,3 @@ export function fetchAlertAdd(data: AlertCreate): Promise<AxiosResponse<Result<b
export function fetchAlertUpdate(data: AlertCreate): Promise<AxiosResponse<Result<boolean>>> {
return defHttp.postJson({ url: ALERT_APi.UPDATE, data }, { isReturnNativeResponse: true });
}
-
diff --git a/streampark-console/streampark-console-webapp/src/components/Form/src/BasicForm.vue b/streampark-console/streampark-console-webapp/src/components/Form/src/BasicForm.vue
index 7e8ef420b..617aea45a 100644
--- a/streampark-console/streampark-console-webapp/src/components/Form/src/BasicForm.vue
+++ b/streampark-console/streampark-console-webapp/src/components/Form/src/BasicForm.vue
@@ -327,6 +327,7 @@
.@{prefix-cls} {
.ant-form-item {
margin-bottom: 30px;
+
&-label label::after {
margin: 0 6px 0 2px;
}
diff --git a/streampark-console/streampark-console-webapp/src/design/swal2.less b/streampark-console/streampark-console-webapp/src/design/swal2.less
index 7b6ab9c99..597eb2dbf 100644
--- a/streampark-console/streampark-console-webapp/src/design/swal2.less
+++ b/streampark-console/streampark-console-webapp/src/design/swal2.less
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-.swal2-container {
+.swal2-container {
.api-exception {
font-size: 0.75rem;
text-align: left;
@@ -63,6 +63,7 @@
.swal2-html-container {
color: #e1e1e1;
+
.api-exception {
color: #f1f6fb;
border: 1px solid #282828;
diff --git a/streampark-console/streampark-console-webapp/src/design/theme.less b/streampark-console/streampark-console-webapp/src/design/theme.less
index 8399f7068..3f27839bc 100644
--- a/streampark-console/streampark-console-webapp/src/design/theme.less
+++ b/streampark-console/streampark-console-webapp/src/design/theme.less
@@ -49,12 +49,18 @@ html[data-theme='light'] {
}
.ant-card-grid-hoverable:hover {
- box-shadow: 0 3px 6px -4px rgb(0 0 0 / 48%), 0 6px 16px 0 rgb(0 0 0 / 32%),
+ box-shadow:
+ 0 3px 6px -4px rgb(0 0 0 / 48%),
+ 0 6px 16px 0 rgb(0 0 0 / 32%),
0 9px 28px 8px rgb(0 0 0 / 20%);
}
.ant-card-grid {
- box-shadow: 1px 0 0 0 #434343, 0 1px 0 0 #434343, 1px 1px 0 0 #434343, 1px 0 0 0 #434343 inset,
+ box-shadow:
+ 1px 0 0 0 #434343,
+ 0 1px 0 0 #434343,
+ 1px 1px 0 0 #434343,
+ 1px 0 0 0 #434343 inset,
0 1px 0 0 #434343 inset;
}
diff --git a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
index 6a3ae1af6..b1949498c 100644
--- a/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
+++ b/streampark-console/streampark-console-webapp/src/enums/flinkEnum.ts
@@ -175,7 +175,7 @@ export enum UseStrategyEnum {
export enum SavePointEnum {
CHECK_POINT = 1,
- SAVE_POINT = 2
+ SAVE_POINT = 2,
}
export enum PipelineStepEnum {
diff --git a/streampark-console/streampark-console-webapp/src/views/base/login/Login.vue b/streampark-console/streampark-console-webapp/src/views/base/login/Login.vue
index 5be2b1e7e..94a396cdd 100644
--- a/streampark-console/streampark-console-webapp/src/views/base/login/Login.vue
+++ b/streampark-console/streampark-console-webapp/src/views/base/login/Login.vue
@@ -124,13 +124,15 @@
}
}
}
+
[data-theme='dark']{
.@{prefix-cls}-form{
.ant-form-item-has-error :not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper,
.ant-input-affix-wrapper,
.ant-input {
- color:rgba(0, 0, 0, 0.85);
- background-color:white;
+ color: rgba(0, 0, 0, 0.85);
+ background-color: white;
+
&::placeholder {
color: #bdbdbe !important;
}
diff --git a/streampark-console/streampark-console-webapp/src/views/base/login/LoginSlogan.less b/streampark-console/streampark-console-webapp/src/views/base/login/LoginSlogan.less
index df4c779a4..03f25f30a 100644
--- a/streampark-console/streampark-console-webapp/src/views/base/login/LoginSlogan.less
+++ b/streampark-console/streampark-console-webapp/src/views/base/login/LoginSlogan.less
@@ -177,7 +177,7 @@
font-size: 3.5875rem;
margin-bottom: 15px;
font-weight: bolder;
- line-height: 6.0rem;
+ line-height: 6rem;
}
.system_info h5 {
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
index bfe5407d7..510e2e5b3 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/data/detail.data.ts
@@ -46,8 +46,16 @@ export const getDescSchema = (): DescItem[] => {
),
),
},
- { field: 'module', label: t('flink.app.module'), show: (data) => data.jobType != JobTypeEnum.SQL },
- { field: 'projectName', label: t('flink.app.project'), show: (data) => data.jobType != JobTypeEnum.SQL },
+ {
+ field: 'module',
+ label: t('flink.app.module'),
+ show: (data) => data.jobType != JobTypeEnum.SQL,
+ },
+ {
+ field: 'projectName',
+ label: t('flink.app.project'),
+ show: (data) => data.jobType != JobTypeEnum.SQL,
+ },
{
field: 'appType',
label: t('flink.app.appType'),
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue b/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
index 3dd6c2dba..d4a05b622 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
@@ -24,7 +24,9 @@
</template>
<template #description>
<a-popover arrow-point-at-center trigger="hover" :content="item.url">
- <a-button class="desc-btn">{{ item.description }}</a-button>
+ <a-button class="desc-btn" target="_blank" :href="item.url">
+ {{ item.description }}
+ </a-button>
</a-popover>
</template>
<template #avatar>
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/setting/View.less b/streampark-console/streampark-console-webapp/src/views/flink/setting/View.less
index 9d0ffb837..b74442000 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/setting/View.less
+++ b/streampark-console/streampark-console-webapp/src/views/flink/setting/View.less
@@ -58,6 +58,7 @@
margin-top: 4px;
margin-bottom: 0;
line-height: 15px;
+ word-break: break-all;
}
// .ant-input {
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/setting/components/AlertSetting.vue b/streampark-console/streampark-console-webapp/src/views/flink/setting/components/AlertSetting.vue
index 43a06074e..0475af033 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/setting/components/AlertSetting.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/setting/components/AlertSetting.vue
@@ -298,6 +298,7 @@
padding: 8px 0;
}
}
+
.alert-card-list {
.ant-list-empty-text {
background-color: @component-background;
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/setting/components/FlinkEnvSetting.vue b/streampark-console/streampark-console-webapp/src/views/flink/setting/components/FlinkEnvSetting.vue
index d2aa39b7c..b7f6c9d86 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/setting/components/FlinkEnvSetting.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/setting/components/FlinkEnvSetting.vue
@@ -98,14 +98,14 @@
</template>
</ListItemMeta>
- <div class="list-content" style="width: 40%">
- <div class="list-content-item" style="width: 60%">
+ <div class="list-content flex" style="width: 40%">
+ <div class="list-content-item">
<span>Flink Home</span>
<p style="margin-top: 10px">
{{ item.flinkHome }}
</p>
</div>
- <div class="list-content-item" style="width: 30%">
+ <div class="list-content-item">
<span>Default</span>
<p style="margin-top: 10px">
<Switch