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/17 02:32:23 UTC
[incubator-streampark] branch dev updated: [improve]: fix header and dependency style (#2034)
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 3a91b20bc [improve]: fix header and dependency style (#2034)
3a91b20bc is described below
commit 3a91b20bcd5fb4cad913106699edaa3fe0299682
Author: WSZ <wa...@outlook.com>
AuthorDate: Thu Nov 17 10:32:17 2022 +0800
[improve]: fix header and dependency style (#2034)
---
.../src/layouts/default/header/components/Slogan.vue | 2 +-
.../src/layouts/default/header/index.less | 1 +
.../src/views/flink/app/components/Dependency.vue | 10 ++++++----
.../src/views/system/token/Token.vue | 17 ++++++++++++-----
.../src/views/system/token/token.data.ts | 2 +-
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/Slogan.vue b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/Slogan.vue
index a3623fb2e..6cbc4a178 100755
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/components/Slogan.vue
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/components/Slogan.vue
@@ -67,7 +67,7 @@
}
}
- @media screen and (max-width: 1585px) {
+ @media screen and (max-width: 1626px) {
.@{prefix-cls}:not(.collapse-slogo) {
display: none;
}
diff --git a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.less b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.less
index 0f3abd900..16c10d74f 100755
--- a/streampark-console/streampark-console-webapp/src/layouts/default/header/index.less
+++ b/streampark-console/streampark-console-webapp/src/layouts/default/header/index.less
@@ -185,6 +185,7 @@
background-color: @header-dark-bg-color !important;
// border-bottom: 1px solid @border-color-base;
border-left: 1px solid @border-color-base;
+ border-bottom: 1px solid @border-color-base;
.@{header-prefix-cls}-logo {
&:hover {
background-color: @header-dark-bg-hover-color;
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue b/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue
index b45af62fb..9f91911fb 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/components/Dependency.vue
@@ -262,10 +262,12 @@
<template>
<Tabs type="card" v-model:activeKey="activeTab" class="pom-card">
<TabPane key="pom" tab="Maven pom">
- <div ref="pomBox" class="pom-box syntax-true" style="height: 300px"></div>
- <a-button type="primary" class="apply-pom" @click="handleApplyPom()">
- {{ t('common.apply') }}
- </a-button>
+ <div class="relative">
+ <div ref="pomBox" class="pom-box syntax-true" style="height: 300px"></div>
+ <a-button type="primary" class="apply-pom" @click="handleApplyPom()">
+ {{ t('common.apply') }}
+ </a-button>
+ </div>
</TabPane>
<TabPane key="jar" tab="Upload Jar">
<template v-if="isK8sExecMode(formModel?.executionMode)">
diff --git a/streampark-console/streampark-console-webapp/src/views/system/token/Token.vue b/streampark-console/streampark-console-webapp/src/views/system/token/Token.vue
index 7421c6c67..0e2b93f78 100644
--- a/streampark-console/streampark-console-webapp/src/views/system/token/Token.vue
+++ b/streampark-console/streampark-console-webapp/src/views/system/token/Token.vue
@@ -15,7 +15,7 @@
limitations under the License.
-->
<template>
- <div>
+ <PageWrapper>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate" v-auth="'token:add'">
@@ -49,7 +49,7 @@
</template>
</BasicTable>
<TokenDrawer @register="registerDrawer" @success="handleSuccess" />
- </div>
+ </PageWrapper>
</template>
<script lang="ts">
import { defineComponent, unref } from 'vue';
@@ -63,10 +63,10 @@
import { useMessage } from '/@/hooks/web/useMessage';
import { useI18n } from '/@/hooks/web/useI18n';
import Icon from '/@/components/Icon';
-
+ import { PageWrapper } from '/@/components/Page';
export default defineComponent({
name: 'UserToken',
- components: { BasicTable, TokenDrawer, TableAction, Icon },
+ components: { BasicTable, TokenDrawer, TableAction, Icon, PageWrapper },
setup() {
const { t } = useI18n();
const { createMessage } = useMessage();
@@ -75,12 +75,19 @@
const [registerTable, { reload, updateTableDataRecord }] = useTable({
title: t('system.token.table.title'),
api: fetTokenList,
+ // beforeFetch: (params) => {
+ // if (params.user) {
+ // params.username = params.user;
+ // delete params.user;
+ // }
+ // return params;
+ // },
columns,
formConfig: {
baseColProps: { style: { paddingRight: '30px' } },
schemas: searchFormSchema,
},
- useSearchForm: true,
+ useSearchForm: false,
showTableSetting: true,
rowKey: 'tokenId',
showIndexColumn: false,
diff --git a/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts b/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
index 2b426e562..4928f132c 100644
--- a/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
+++ b/streampark-console/streampark-console-webapp/src/views/system/token/token.data.ts
@@ -90,7 +90,7 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
- field: 'userName',
+ field: 'user',
label: t('system.token.table.userName'),
component: 'Input',
colProps: { span: 8 },