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 1226884b6 [Improve] FE style minor improvement
1226884b6 is described below
commit 1226884b6d746ff6cf3ff866f546d14f69b1a83f
Author: benjobs <[email protected]>
AuthorDate: Tue Sep 10 18:40:23 2024 +0800
[Improve] FE style minor improvement
---
.../src/locales/lang/en/flink/project.ts | 2 +-
.../src/locales/lang/en/system/member.ts | 4 +-
.../src/locales/lang/en/system/role.ts | 2 +-
.../src/views/flink/app/Detail.vue | 66 +++++++++++-----------
.../src/views/flink/app/styles/Detail.less | 7 +++
.../src/views/setting/FlinkCluster/AddCluster.vue | 9 ++-
.../src/views/setting/FlinkCluster/Cluster.less | 4 ++
.../src/views/setting/FlinkCluster/EditCluster.vue | 9 ++-
8 files changed, 63 insertions(+), 40 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
index a14e19f58..6b118ae6a 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/project.ts
@@ -50,7 +50,7 @@ export default {
'By default,lookup pom.xml in root path,You can manually specify the
module to compile pom.xml',
buildArgs: 'Build Argument',
buildArgsPlaceholder: 'Build Argument, e.g: -Pprod',
- description: 'description',
+ description: 'Description',
descriptionPlaceholder: 'Description for this project',
lastBuild: 'Last Build',
buildState: 'Build State',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts
index f8679a744..a3a45cde7 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/member.ts
@@ -26,8 +26,8 @@ export default {
searchByRole: 'Search by role',
table: {
title: 'Member List',
- userName: 'user Name',
- roleName: 'role Name',
+ userName: 'Username',
+ roleName: 'Role name',
createTime: 'Create Time',
modifyTime: 'Modify Time',
},
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts
index 0f9928d78..db0bc8f6f 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/role.ts
@@ -18,7 +18,7 @@ export default {
deleteTip: 'Are you sure delete this Role',
assignment: 'menu assignment',
form: {
- roleName: 'Role Name',
+ roleName: 'Role name',
menuId: 'permission',
menuIdRequired: 'Please select the permission.',
create: 'Add Role',
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue
index 5da14917e..bd95c760c 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/Detail.vue
@@ -186,39 +186,41 @@
});
</script>
<template>
- <PageWrapper content-full-height content-background contentClass="p-24px">
- <div class="mb-15px">
- <span class="app-bar">{{ t('flink.app.detail.detailTitle') }}</span>
- <Space class="-mt-8px">
- <div v-for="link in externalLinks" :key="link.id">
- <ExternalLinkBadge
- :label="link.badgeLabel"
- :redirect="link.renderedLinkUrl"
- :color="link.badgeColor"
- :message="link.badgeName"
- :disabled="appNotRunning"
- />
- </div>
- </Space>
- <a-button type="primary" shape="circle" @click="router.back()"
class="float-right -mt-8px">
- <Icon icon="ant-design:arrow-left-outlined" />
- </a-button>
- <a-button
- type="primary"
- @click="handleFlinkView"
- :disabled="appNotRunning"
- class="float-right -mt-8px mr-20px"
- >
- <Icon icon="ant-design:cloud-outlined" />
- {{ t('flink.app.detail.flinkWebUi') }}
- </a-button>
+ <PageWrapper content-full-height content-background>
+ <div class="detail-pad">
+ <div class="mb-15px">
+ <span class="app-bar">{{ t('flink.app.detail.detailTitle') }}</span>
+ <Space class="-mt-8px">
+ <div v-for="link in externalLinks" :key="link.id">
+ <ExternalLinkBadge
+ :label="link.badgeLabel"
+ :redirect="link.renderedLinkUrl"
+ :color="link.badgeColor"
+ :message="link.badgeName"
+ :disabled="appNotRunning"
+ />
+ </div>
+ </Space>
+ <a-button type="primary" shape="circle" @click="router.back()"
class="float-right -mt-8px">
+ <Icon icon="ant-design:arrow-left-outlined" />
+ </a-button>
+ <a-button
+ type="primary"
+ @click="handleFlinkView"
+ :disabled="appNotRunning"
+ class="float-right -mt-8px mr-20px"
+ >
+ <Icon icon="ant-design:cloud-outlined" />
+ {{ t('flink.app.detail.flinkWebUi') }}
+ </a-button>
+ </div>
+ <Description @register="registerDescription" />
+ <Divider class="mt-20px -mb-17px" />
+ <DetailTab :app="app" :tabConf="detailTabs" />
+
+ <Mergely @register="registerConfDrawer" :readOnly="true" />
+ <RequestModal @register="registerOpenApi" />
</div>
- <Description @register="registerDescription" />
- <Divider class="mt-20px -mb-17px" />
- <DetailTab :app="app" :tabConf="detailTabs" />
-
- <Mergely @register="registerConfDrawer" :readOnly="true" />
- <RequestModal @register="registerOpenApi" />
</PageWrapper>
</template>
<style lang="less">
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/Detail.less
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/Detail.less
index 0e3646538..a78675241 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/Detail.less
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/Detail.less
@@ -48,3 +48,10 @@
.pointer {
cursor: pointer;
}
+
+.detail-pad {
+ margin: 16px 16px 0 16px;
+ .ant-table-wrapper {
+ padding: 0;
+ }
+}
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/AddCluster.vue
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/AddCluster.vue
index 2ce5a85fa..1dadb9a27 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/AddCluster.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/AddCluster.vue
@@ -82,8 +82,13 @@
}
</script>
<template>
- <PageWrapper content-background content-class="py-30px">
- <BasicForm @register="registerForm" @submit="handleSubmitCluster"
:schemas="getClusterSchema">
+ <PageWrapper content-full-height fixed-height content-class="flex flex-col
bg-white">
+ <BasicForm
+ @register="registerForm"
+ @submit="handleSubmitCluster"
+ :schemas="getClusterSchema"
+ class="mt-30px"
+ >
<template #formFooter>
<div class="flex items-center w-full justify-center">
<a-button @click="go('/setting/flinkCluster')">
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/Cluster.less
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/Cluster.less
index 4a42554b7..47d61abae 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/Cluster.less
+++
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/Cluster.less
@@ -28,3 +28,7 @@
border-radius: 4px;
margin-top: 14px;
}
+
+.mt-30px {
+ margin-top: 30px;
+}
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 340b21ac3..07b1df679 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
@@ -121,8 +121,13 @@
});
</script>
<template>
- <PageWrapper content-background content-class="py-30px">
- <BasicForm @register="registerForm" @submit="handleSubmitCluster"
:schemas="getClusterSchema">
+ <PageWrapper content-full-height fixed-height content-class="flex flex-col
bg-white">
+ <BasicForm
+ @register="registerForm"
+ @submit="handleSubmitCluster"
+ :schemas="getClusterSchema"
+ class="mt-30px"
+ >
<template #formFooter>
<div class="flex items-center w-full justify-center">
<a-button @click="go('/setting/flinkCluster')">
