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 d84a2daa2 [Improve] page minor improvement
d84a2daa2 is described below
commit d84a2daa254a50b6535291dd10bbd94f0a39e0a1
Author: benjobs <[email protected]>
AuthorDate: Sun Sep 1 22:25:11 2024 +0800
[Improve] page minor improvement
---
.../src/views/flink/app/View.vue | 27 +++++++++++-----------
.../src/views/flink/variable/DependApps.vue | 2 +-
.../src/views/flink/variable/View.vue | 2 +-
.../src/views/setting/YarnQueue/index.vue | 2 +-
.../src/views/system/member/Member.vue | 2 +-
.../src/views/system/menu/Menu.vue | 2 +-
.../src/views/system/role/Role.vue | 2 +-
.../src/views/system/team/Team.vue | 2 +-
.../src/views/system/token/Token.vue | 2 +-
.../src/views/system/user/User.vue | 2 +-
10 files changed, 23 insertions(+), 22 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
index c0862bdfe..e407b6942 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/View.vue
@@ -104,7 +104,8 @@
delete params.state;
}
currentTablePage.value = params.pageNum;
- // sessionStorage.setItem('appPageNo', params.pageNum);
+ Object.assign(params, searchRef.value);
+ sessionStorage.setItem('appPageNo', params.pageNum);
return params;
},
afterFetch: (dataSource) => {
@@ -191,7 +192,7 @@
immediate: true,
canResize: false,
showIndexColumn: false,
- showTableSetting: true,
+ showTableSetting: false,
useSearchForm: false,
tableSetting: { fullScreen: true, redo: false },
actionColumn: {
@@ -272,12 +273,12 @@
@resize-column="onTableColumnResize"
class="app_list !px-0 table-searchbar flex-1 pt-20px !px-0 flex flex-col"
>
- <template #tableTitle>
- <div class="flex justify-between" style="width: calc(100% - 130px)">
+ <template #tableTitle>
+ <div class="flex justify-between" style="width: 100%">
<Form name="appTableForm" :model="searchRef" layout="inline"
class="flex-1">
- <Row :gutter="10" class="w-full">
- <Col :span="5">
- <Form.Item :label="t('flink.app.tags')">
+ <Row :gutter="5" class="w-full">
+ <Col :span="4">
+ <Form.Item>
<Select
:placeholder="t('flink.app.tags')"
show-search
@@ -287,8 +288,8 @@
/>
</Form.Item>
</Col>
- <Col :span="5">
- <Form.Item :label="t('flink.app.owner')">
+ <Col :span="4">
+ <Form.Item>
<Select
:placeholder="t('flink.app.owner')"
show-search
@@ -303,8 +304,8 @@
/>
</Form.Item>
</Col>
- <Col :span="5">
- <Form.Item :label="t('flink.app.jobType')">
+ <Col :span="4">
+ <Form.Item>
<Select
:placeholder="t('flink.app.jobType')"
show-search
@@ -317,8 +318,8 @@
/>
</Form.Item>
</Col>
- <Col :span="7">
- <Form.Item :label="t('flink.app.searchName')">
+ <Col :span="6">
+ <Form.Item>
<Input
:placeholder="t('flink.app.searchName')"
v-model:value="searchRef.jobName"
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/variable/DependApps.vue
b/streampark-console/streampark-console-webapp/src/views/flink/variable/DependApps.vue
index 145950579..53fbf841b 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/variable/DependApps.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/variable/DependApps.vue
@@ -34,7 +34,7 @@
api: fetchDependApps,
canResize: false,
showIndexColumn: false,
- showTableSetting: true,
+ showTableSetting: false,
tableSetting: { setting: true },
beforeFetch(params: Recordable) {
Object.assign(params, {
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/variable/View.vue
b/streampark-console/streampark-console-webapp/src/views/flink/variable/View.vue
index cfa3b0d36..2a2522a62 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/variable/View.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/variable/View.vue
@@ -109,7 +109,7 @@
rowKey: 'id',
pagination: true,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
showIndexColumn: false,
canResize: false,
actionColumn: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.vue
b/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.vue
index 0a2b123b7..4737aaa8b 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.vue
@@ -87,7 +87,7 @@
rowKey: 'id',
pagination: true,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
showIndexColumn: false,
canResize: false,
actionColumn: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/member/Member.vue
b/streampark-console/streampark-console-webapp/src/views/system/member/Member.vue
index 7503498c7..33429c954 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/member/Member.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/member/Member.vue
@@ -124,7 +124,7 @@
rowKey: 'id',
pagination: true,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
showIndexColumn: false,
canResize: false,
actionColumn: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/menu/Menu.vue
b/streampark-console/streampark-console-webapp/src/views/system/menu/Menu.vue
index 1eb138d16..ea583a3b5 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/menu/Menu.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/menu/Menu.vue
@@ -68,7 +68,7 @@
pagination: false,
striped: false,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
bordered: true,
showIndexColumn: false,
canResize: false,
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/Role.vue
b/streampark-console/streampark-console-webapp/src/views/system/role/Role.vue
index ad1fbbd08..6d490aff0 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/Role.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/Role.vue
@@ -103,7 +103,7 @@
schemas: searchFormSchema,
fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
},
- showTableSetting: true,
+ showTableSetting: false,
useSearchForm: true,
showIndexColumn: false,
canResize: false,
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/team/Team.vue
b/streampark-console/streampark-console-webapp/src/views/system/team/Team.vue
index 3afb94853..06a30d723 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/team/Team.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/team/Team.vue
@@ -82,7 +82,7 @@
rowKey: 'id',
pagination: true,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
showIndexColumn: false,
canResize: false,
actionColumn: {
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 0da2360f7..dc12403e6 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
@@ -88,7 +88,7 @@
schemas: searchFormSchema,
},
useSearchForm: false,
- showTableSetting: true,
+ showTableSetting: false,
rowKey: 'tokenId',
showIndexColumn: false,
canResize: false,
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/user/User.vue
b/streampark-console/streampark-console-webapp/src/views/system/user/User.vue
index 763b04d64..7a6dfc789 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/user/User.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/user/User.vue
@@ -78,7 +78,7 @@
pagination: true,
striped: false,
useSearchForm: true,
- showTableSetting: true,
+ showTableSetting: false,
bordered: false,
showIndexColumn: false,
canResize: false,
