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 9fa1167d8 [Improve] FE page minor improvement (#4021)
9fa1167d8 is described below
commit 9fa1167d838991eec82f5295cabe344298adf371
Author: benjobs <[email protected]>
AuthorDate: Mon Sep 2 17:52:52 2024 +0800
[Improve] FE page minor improvement (#4021)
* [Improve] FE page minor improvement
---
.../console/core/controller/FlinkClusterController.java | 6 ++++++
.../console/core/controller/FlinkEnvController.java | 12 ++++++++++--
.../streampark-console-webapp/src/api/flink/app/app.ts | 1 -
.../src/api/flink/setting/flinkCluster.ts | 12 ++++++++++++
.../src/api/flink/setting/flinkEnv.ts | 13 +++++++++++++
.../src/locales/lang/en/system/member.ts | 2 ++
.../src/locales/lang/en/system/team.ts | 2 +-
.../src/locales/lang/zh-CN/system/member.ts | 2 ++
.../src/views/setting/FlinkCluster/index.vue | 4 ++--
.../src/views/setting/FlinkHome/index.vue | 4 ++--
.../src/views/system/member/Member.vue | 4 ++--
11 files changed, 52 insertions(+), 10 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
index fc1518b25..eca8eccbd 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
@@ -45,6 +45,12 @@ public class FlinkClusterController {
@Autowired private ServiceHelper serviceHelper;
+ @PostMapping("page")
+ public RestResponse findPage(FlinkCluster flinkCluster, RestRequest
restRequest) {
+ IPage<FlinkCluster> flinkClusters =
flinkClusterService.findPage(flinkCluster, restRequest);
+ return RestResponse.success(flinkClusters);
+ }
+
@PostMapping("list")
public RestResponse list(FlinkCluster flinkCluster, RestRequest restRequest)
{
IPage<FlinkCluster> flinkClusters =
flinkClusterService.findPage(flinkCluster, restRequest);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
index dc62c70e0..d7eda1757 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
@@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
@Slf4j
@Validated
@RestController
@@ -39,12 +41,18 @@ public class FlinkEnvController {
@Autowired private FlinkEnvService flinkEnvService;
- @PostMapping("list")
- public RestResponse list(FlinkEnv flinkEnv, RestRequest restRequest) {
+ @PostMapping("page")
+ public RestResponse findPage(FlinkEnv flinkEnv, RestRequest restRequest) {
IPage<FlinkEnv> envs = flinkEnvService.findPage(flinkEnv, restRequest);
return RestResponse.success(envs);
}
+ @PostMapping("list")
+ public RestResponse list() {
+ List<FlinkEnv> envs = flinkEnvService.list();
+ return RestResponse.success(envs);
+ }
+
@PostMapping("check")
public RestResponse check(FlinkEnv version) {
Integer checkResp = flinkEnvService.check(version);
diff --git
a/streampark-console/streampark-console-webapp/src/api/flink/app/app.ts
b/streampark-console/streampark-console-webapp/src/api/flink/app/app.ts
index 348dfc125..0b9259e3c 100644
--- a/streampark-console/streampark-console-webapp/src/api/flink/app/app.ts
+++ b/streampark-console/streampark-console-webapp/src/api/flink/app/app.ts
@@ -26,7 +26,6 @@ enum APP_API {
COPY = '/flink/app/copy',
UPLOAD = '/flink/app/upload',
K8S_START_LOG = '/flink/app/k8sStartLog',
- DEPLOY = '/flink/app/deploy',
MAPPING = '/flink/app/mapping',
YARN = '/flink/app/yarn',
LIST = '/flink/app/list',
diff --git
a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkCluster.ts
b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkCluster.ts
index 1e3341781..0946aa22c 100644
---
a/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkCluster.ts
+++
b/streampark-console/streampark-console-webapp/src/api/flink/setting/flinkCluster.ts
@@ -21,6 +21,7 @@ import { defHttp } from '/@/utils/http/axios';
import { BasicTableParams } from '/@/api/model/baseModel';
enum FLINK_API {
+ PAGE = '/flink/cluster/page',
LIST = '/flink/cluster/list',
REMOTE_URL = '/flink/cluster/remoteUrl',
CREATE = '/flink/cluster/create',
@@ -31,6 +32,17 @@ enum FLINK_API {
SHUTDOWN = '/flink/cluster/shutdown',
DELETE = '/flink/cluster/delete',
}
+
+/**
+ * flink cluster
+ * @returns Promise<FlinkEnv[]>
+ */
+export function pageFlinkCluster(data: BasicTableParams) {
+ return defHttp.post<FlinkCluster[]>({
+ url: FLINK_API.PAGE,
+ data,
+ });
+}
/**
* flink cluster
* @returns Promise<FlinkEnv[]>
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 d7e71e1c6..240a0ba18 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
@@ -21,6 +21,7 @@ import { defHttp } from '/@/utils/http/axios';
import { BasicTableParams } from '/@/api/model/baseModel';
enum FLINK_API {
+ PAGE = '/flink/env/page',
LIST = '/flink/env/list',
CREATE = '/flink/env/create',
DELETE = '/flink/env/delete',
@@ -31,6 +32,18 @@ enum FLINK_API {
DEFAULT = '/flink/env/default',
VALIDITY = '/flink/env/validity',
}
+
+/**
+ * flink environment data
+ * @returns Promise<FlinkEnv[]>
+ */
+export function pageFlinkEnv(data: BasicTableParams) {
+ return defHttp.post<FlinkEnv[]>({
+ url: FLINK_API.PAGE,
+ data,
+ });
+}
+
/**
* flink environment data
* @returns Promise<FlinkEnv[]>
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 14e66edee..c5f8de414 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
@@ -22,6 +22,8 @@ export default {
add: 'Add',
success: 'successful',
fail: 'failed',
+ searchByUser: 'Search by username',
+ searchByRole: 'Search by role',
table: {
title: 'Member List',
userName: 'Search by username',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts
index aaa2dc93d..4fb425f52 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/team.ts
@@ -26,7 +26,7 @@ export default {
searchByTeam: 'Search by team name',
table: {
title: 'Team List',
- teamName: 'Team',
+ teamName: 'Team name',
teamNamePlaceholder: 'please enter Team Name',
description: 'Description',
descriptionMessage: 'exceeds maximum length limit of 100 characters',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts
index f88d6a36e..7a07d27d9 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/member.ts
@@ -22,6 +22,8 @@ export default {
add: '添加',
success: '成功',
fail: '失败',
+ searchByUser: '根据用户名搜索',
+ searchByRole: '根据角色名称搜索',
table: {
title: '成员列表',
userName: '根据用户名搜索',
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
index 5945f53e9..aeb88e492 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkCluster/index.vue
@@ -26,7 +26,7 @@
fetchClusterRemove,
fetchClusterShutdown,
fetchClusterStart,
- fetchFlinkCluster,
+ pageFlinkCluster,
} from '/@/api/flink/setting/flinkCluster';
import { FlinkCluster } from '/@/api/flink/setting/types/flinkCluster.type';
import { useGo } from '/@/hooks/web/usePage';
@@ -55,7 +55,7 @@
const { t } = useI18n();
const { Swal, createMessage } = useMessage();
const [registerTable, { reload, getLoading }] = useTable({
- api: fetchFlinkCluster,
+ api: pageFlinkCluster,
columns: [
{ dataIndex: 'clusterName', title:
t('setting.flinkCluster.form.clusterName') },
{ dataIndex: 'executionMode', title:
t('setting.flinkCluster.form.executionMode') },
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue
index 5457fe904..0638303c2 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/FlinkHome/index.vue
@@ -25,7 +25,7 @@
import {
fetchValidity,
fetchDefaultSet,
- fetchFlinkEnv,
+ pageFlinkEnv,
fetchFlinkEnvRemove,
fetchFlinkInfo,
} from '/@/api/flink/setting/flinkEnv';
@@ -44,7 +44,7 @@
const [registerModal, { openModal: openFlinkModal }] = useModal();
const [registerFlinkDraw, { openDrawer: openEnvDrawer }] = useDrawer();
const [registerTable, { reload, getDataSource }] = useTable({
- api: fetchFlinkEnv,
+ api: pageFlinkEnv,
columns: [
{ dataIndex: 'flinkName', title: t('setting.flinkHome.flinkName') },
{ dataIndex: 'flinkHome', title: t('setting.flinkHome.flinkHome') },
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 84b34299e..3923a85d5 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
@@ -92,7 +92,7 @@
label: '',
component: 'Input',
componentProps: {
- placeholder: t('system.member.table.userName'),
+ placeholder: t('system.member.searchByUser'),
allowClear: true,
},
colProps: { span: 5 },
@@ -102,7 +102,7 @@
label: '',
component: 'Select',
componentProps: {
- placeholder: t('system.member.table.roleName'),
+ placeholder: t('system.member.searchByRole'),
options: unref(roleListOptions),
fieldNames: { label: 'roleName', value: 'roleName' },
allowClear: true,
