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 636db8768 [Improve] FE style minor improvement (#4020)
636db8768 is described below
commit 636db87680c3ed04c6ceab51bccd98028eb8cc31
Author: benjobs <[email protected]>
AuthorDate: Mon Sep 2 16:20:06 2024 +0800
[Improve] FE style minor improvement (#4020)
* [Improve] FE style improvement
---
.../core/controller/FlinkClusterController.java | 8 ++---
.../core/controller/FlinkEnvController.java | 10 +++---
.../console/core/mapper/FlinkClusterMapper.java | 5 +++
.../console/core/mapper/FlinkEnvMapper.java | 5 +++
.../console/core/service/FlinkClusterService.java | 4 +++
.../console/core/service/FlinkEnvService.java | 4 +++
.../core/service/impl/FlinkClusterServiceImpl.java | 10 ++++++
.../core/service/impl/FlinkEnvServiceImpl.java | 11 ++++++
.../resources/mapper/core/FlinkClusterMapper.xml | 36 +++++++------------
.../main/resources/mapper/core/FlinkEnvMapper.xml | 25 ++++++++------
.../src/api/flink/setting/flinkCluster.ts | 4 ++-
.../src/api/flink/setting/flinkEnv.ts | 4 ++-
.../src/components/Table/src/BasicTable.vue | 7 ++--
.../src/locales/lang/en/flink/variable.ts | 2 ++
.../src/locales/lang/en/setting/flinkCluster.ts | 1 +
.../src/locales/lang/en/setting/flinkHome.ts | 1 +
.../src/locales/lang/en/system/member.ts | 4 +--
.../src/locales/lang/en/system/role.ts | 1 +
.../src/locales/lang/en/system/team.ts | 1 +
.../src/locales/lang/en/system/user.ts | 1 +
.../src/locales/lang/zh-CN/flink/variable.ts | 2 ++
.../src/locales/lang/zh-CN/setting/flinkCluster.ts | 1 +
.../src/locales/lang/zh-CN/setting/flinkHome.ts | 1 +
.../src/locales/lang/zh-CN/system/member.ts | 4 +--
.../src/locales/lang/zh-CN/system/role.ts | 1 +
.../src/locales/lang/zh-CN/system/team.ts | 4 +--
.../src/locales/lang/zh-CN/system/user.ts | 1 +
.../src/views/flink/app/View.vue | 2 +-
.../src/views/flink/app/styles/View.less | 14 ++++++++
.../src/views/flink/project/View.vue | 35 +++++++++++++------
.../src/views/flink/variable/variable.data.ts | 4 +--
.../src/views/setting/FlinkCluster/index.vue | 40 ++++++++++++++++------
.../src/views/setting/FlinkHome/index.vue | 40 ++++++++++++++++------
.../src/views/setting/YarnQueue/index.data.ts | 9 -----
.../src/views/setting/YarnQueue/index.vue | 3 +-
.../src/views/system/member/Member.vue | 14 ++------
.../src/views/system/role/Role.vue | 3 +-
.../src/views/system/role/role.data.ts | 13 ++-----
.../src/views/system/team/Team.vue | 3 +-
.../src/views/system/team/team.data.ts | 15 ++------
.../src/views/system/token/Token.vue | 29 ++++++++++------
.../src/views/system/token/token.data.ts | 10 ++++--
.../src/views/system/user/User.vue | 4 +--
.../src/views/system/user/user.data.ts | 13 ++-----
44 files changed, 240 insertions(+), 169 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 99b92b6ae..fc1518b25 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
@@ -17,6 +17,7 @@
package org.apache.streampark.console.core.controller;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.InternalException;
import org.apache.streampark.console.core.bean.ResponseResult;
@@ -26,6 +27,7 @@ import
org.apache.streampark.console.core.service.ServiceHelper;
import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -33,8 +35,6 @@ 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
@@ -46,8 +46,8 @@ public class FlinkClusterController {
@Autowired private ServiceHelper serviceHelper;
@PostMapping("list")
- public RestResponse list() {
- List<FlinkCluster> flinkClusters = flinkClusterService.listCluster();
+ public RestResponse list(FlinkCluster flinkCluster, RestRequest restRequest)
{
+ IPage<FlinkCluster> flinkClusters =
flinkClusterService.findPage(flinkCluster, restRequest);
return RestResponse.success(flinkClusters);
}
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 8b72070ac..dc62c70e0 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
@@ -17,11 +17,13 @@
package org.apache.streampark.console.core.controller;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiDetailException;
import org.apache.streampark.console.core.entity.FlinkEnv;
import org.apache.streampark.console.core.service.FlinkEnvService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -29,8 +31,6 @@ 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
@@ -40,9 +40,9 @@ public class FlinkEnvController {
@Autowired private FlinkEnvService flinkEnvService;
@PostMapping("list")
- public RestResponse list() {
- List<FlinkEnv> list = flinkEnvService.list();
- return RestResponse.success(list);
+ public RestResponse list(FlinkEnv flinkEnv, RestRequest restRequest) {
+ IPage<FlinkEnv> envs = flinkEnvService.findPage(flinkEnv, restRequest);
+ return RestResponse.success(envs);
}
@PostMapping("check")
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java
index 1e59183da..1cfe5fcb2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkClusterMapper.java
@@ -22,10 +22,15 @@ import
org.apache.streampark.console.core.entity.FlinkCluster;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface FlinkClusterMapper extends BaseMapper<FlinkCluster> {
Boolean existsByClusterId(@Param("clusterId") String clusterId, @Param("id")
Long id);
Boolean existsByClusterName(@Param("clusterName") String clusterName,
@Param("id") Long id);
+
+ IPage<FlinkCluster> findPage(
+ Page<FlinkCluster> page, @Param("cluster") FlinkCluster flinkCluster);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java
index ee123c3c6..ee9b9b77f 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkEnvMapper.java
@@ -18,14 +18,19 @@
package org.apache.streampark.console.core.mapper;
import org.apache.streampark.console.core.entity.FlinkEnv;
+import org.apache.streampark.console.core.entity.Project;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
public interface FlinkEnvMapper extends BaseMapper<FlinkEnv> {
FlinkEnv getByAppId(@Param("appId") Long appId);
void setDefault(@Param("id") Long id);
+
+ IPage<FlinkEnv> findPage(Page<Project> page, @Param("flinkEnv") FlinkEnv
flinkEnv);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java
index a96cd4e16..40caad1b2 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkClusterService.java
@@ -18,9 +18,11 @@
package org.apache.streampark.console.core.service;
import org.apache.streampark.common.enums.ExecutionMode;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.core.bean.ResponseResult;
import org.apache.streampark.console.core.entity.FlinkCluster;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Collection;
@@ -49,4 +51,6 @@ public interface FlinkClusterService extends
IService<FlinkCluster> {
List<FlinkCluster> getByExecutionModes(Collection<ExecutionMode>
executionModes);
List<FlinkCluster> listCluster();
+
+ IPage<FlinkCluster> findPage(FlinkCluster flinkCluster, RestRequest
restRequest);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
index c00f934b9..bbcbe8af8 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/FlinkEnvService.java
@@ -17,8 +17,10 @@
package org.apache.streampark.console.core.service;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.core.entity.FlinkEnv;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.IOException;
@@ -93,4 +95,6 @@ public interface FlinkEnvService extends IService<FlinkEnv> {
void syncConf(Long id) throws IOException;
void validity(Long id);
+
+ IPage<FlinkEnv> findPage(FlinkEnv flinkEnv, RestRequest restRequest);
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
index 9c1c54b45..ea9ac083b 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkClusterServiceImpl.java
@@ -22,8 +22,10 @@ import org.apache.streampark.common.enums.ExecutionMode;
import org.apache.streampark.common.util.ThreadUtils;
import org.apache.streampark.common.util.Utils;
import org.apache.streampark.common.util.YarnUtils;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.exception.ApiDetailException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.bean.ResponseResult;
import org.apache.streampark.console.core.entity.FlinkCluster;
import org.apache.streampark.console.core.entity.FlinkEnv;
@@ -45,6 +47,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.annotations.VisibleForTesting;
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -379,6 +383,12 @@ public class FlinkClusterServiceImpl extends
ServiceImpl<FlinkClusterMapper, Fli
return clusters;
}
+ @Override
+ public IPage<FlinkCluster> findPage(FlinkCluster flinkCluster, RestRequest
restRequest) {
+ Page<FlinkCluster> page = MybatisPager.getPage(restRequest);
+ return this.baseMapper.findPage(page, flinkCluster);
+ }
+
@Override
public void delete(Long id) {
FlinkCluster flinkCluster = getById(id);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
index 5a53e587e..9a71f896c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkEnvServiceImpl.java
@@ -17,14 +17,19 @@
package org.apache.streampark.console.core.service.impl;
+import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.core.entity.FlinkEnv;
+import org.apache.streampark.console.core.entity.Project;
import org.apache.streampark.console.core.mapper.FlinkEnvMapper;
import org.apache.streampark.console.core.service.ApplicationService;
import org.apache.streampark.console.core.service.FlinkClusterService;
import org.apache.streampark.console.core.service.FlinkEnvService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -153,6 +158,12 @@ public class FlinkEnvServiceImpl extends
ServiceImpl<FlinkEnvMapper, FlinkEnv>
checkOrElseAlert(flinkEnv);
}
+ @Override
+ public IPage<FlinkEnv> findPage(FlinkEnv flinkEnv, RestRequest restRequest) {
+ Page<Project> page = MybatisPager.getPage(restRequest);
+ return this.baseMapper.findPage(page, flinkEnv);
+ }
+
private void checkOrElseAlert(FlinkEnv flinkEnv) {
// 1.check exists
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
index b869326dd..ade85d8cf 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkClusterMapper.xml
@@ -17,29 +17,19 @@
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper
namespace="org.apache.streampark.console.core.mapper.FlinkClusterMapper">
- <resultMap id="BaseResultMap"
type="org.apache.streampark.console.core.entity.FlinkCluster">
- <id column="id" jdbcType="BIGINT" property="id"/>
- <result column="address" jdbcType="VARCHAR" property="address"/>
- <result column="cluster_id" jdbcType="VARCHAR" property="clusterId"/>
- <result column="cluster_name" jdbcType="VARCHAR"
property="clusterName"/>
- <result column="options" jdbcType="LONGVARCHAR" property="options"/>
- <result column="yarn_queue" jdbcType="VARCHAR" property="yarnQueue"/>
- <result column="execution_mode" jdbcType="TINYINT"
property="executionMode"/>
- <result column="version_id" jdbcType="BIGINT" property="versionId"/>
- <result column="k8s_namespace" jdbcType="VARCHAR"
property="k8sNamespace"/>
- <result column="service_account" jdbcType="VARCHAR"
property="serviceAccount"/>
- <result column="description" jdbcType="VARCHAR"
property="description"/>
- <result column="user_id" jdbcType="BIGINT" property="userId"/>
- <result column="flink_image" jdbcType="VARCHAR" property="flinkImage"/>
- <result column="dynamic_properties" jdbcType="LONGVARCHAR"
property="dynamicProperties"/>
- <result column="k8s_rest_exposed_type" jdbcType="TINYINT"
property="k8sRestExposedType"/>
- <result column="k8s_hadoop_integration" jdbcType="BOOLEAN"
property="k8sHadoopIntegration"/>
- <result column="k8s_conf" jdbcType="VARCHAR" property="k8sConf"/>
- <result column="resolve_order" jdbcType="INTEGER"
property="resolveOrder"/>
- <result column="exception" jdbcType="LONGVARCHAR"
property="exception"/>
- <result column="cluster_state" jdbcType="TINYINT"
property="clusterState"/>
- <result column="create_time" jdbcType="DATE" property="createTime"/>
- </resultMap>
+ <select id="findPage"
resultType="org.apache.streampark.console.core.entity.FlinkCluster">
+ select * from t_flink_cluster
+ <where>
+ <if test="cluster.clusterName != null and cluster.clusterName !=
''">
+ <if test="_databaseId == 'mysql'">
+ and cluster_name like concat('%',
#{cluster.clusterName},'%')
+ </if>
+ <if test="_databaseId == 'pgsql'">
+ and cluster_name like '%' || #{cluster.clusterName} || '%'
+ </if>
+ </if>
+ </where>
+ </select>
<select id="existsByClusterId" resultType="java.lang.Boolean"
parameterType="java.lang.String">
select
diff --git
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml
index 160c9d97b..451a2cfdc 100644
---
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/FlinkEnvMapper.xml
@@ -17,17 +17,20 @@
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
<mapper namespace="org.apache.streampark.console.core.mapper.FlinkEnvMapper">
- <resultMap id="BaseResultMap"
type="org.apache.streampark.console.core.entity.FlinkEnv">
- <id column="id" jdbcType="BIGINT" property="id"/>
- <result column="flink_name" jdbcType="VARCHAR" property="flinkName"/>
- <result column="flink_home" jdbcType="VARCHAR" property="flinkHome"/>
- <result column="flink_conf" jdbcType="VARCHAR" property="flinkConf"/>
- <result column="description" jdbcType="VARCHAR"
property="description"/>
- <result column="version" jdbcType="VARCHAR" property="version"/>
- <result column="scala_version" jdbcType="VARCHAR"
property="scalaVersion"/>
- <result column="is_default" jdbcType="BOOLEAN" property="isDefault"/>
- <result column="create_time" jdbcType="DATE" property="createTime"/>
- </resultMap>
+
+ <select id="findPage"
resultType="org.apache.streampark.console.core.entity.FlinkEnv">
+ select * from t_flink_env
+ <where>
+ <if test="flinkEnv.flinkName != null and flinkEnv.flinkName != ''">
+ <if test="_databaseId == 'mysql'">
+ and flink_name like concat('%', #{flinkEnv.flinkName},'%')
+ </if>
+ <if test="_databaseId == 'pgsql'">
+ and flink_name like '%' || #{flinkEnv.flinkName} || '%'
+ </if>
+ </if>
+ </where>
+ </select>
<select id="getByAppId"
resultType="org.apache.streampark.console.core.entity.FlinkEnv"
parameterType="java.lang.Long">
select v.*
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 8bd9c8c4b..1e3341781 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
@@ -18,6 +18,7 @@ import { AxiosResponse } from 'axios';
import { FlinkCluster } from './types/flinkCluster.type';
import { Result } from '/#/axios';
import { defHttp } from '/@/utils/http/axios';
+import { BasicTableParams } from '/@/api/model/baseModel';
enum FLINK_API {
LIST = '/flink/cluster/list',
@@ -34,9 +35,10 @@ enum FLINK_API {
* flink cluster
* @returns Promise<FlinkEnv[]>
*/
-export function fetchFlinkCluster() {
+export function fetchFlinkCluster(data: BasicTableParams) {
return defHttp.post<FlinkCluster[]>({
url: FLINK_API.LIST,
+ data,
});
}
/**
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 7693cc75d..d7e71e1c6 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
@@ -18,6 +18,7 @@ import { AxiosResponse } from 'axios';
import { FlinkCreate, FlinkEnv } from './types/flinkEnv.type';
import { Result } from '/#/axios';
import { defHttp } from '/@/utils/http/axios';
+import { BasicTableParams } from '/@/api/model/baseModel';
enum FLINK_API {
LIST = '/flink/env/list',
@@ -34,9 +35,10 @@ enum FLINK_API {
* flink environment data
* @returns Promise<FlinkEnv[]>
*/
-export function fetchFlinkEnv() {
+export function fetchFlinkEnv(data: BasicTableParams) {
return defHttp.post<FlinkEnv[]>({
url: FLINK_API.LIST,
+ data,
});
}
diff --git
a/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue
b/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue
index 482fed44d..874143db2 100644
---
a/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue
+++
b/streampark-console/streampark-console-webapp/src/components/Table/src/BasicTable.vue
@@ -397,14 +397,11 @@
}
&-form-container {
- // padding: 16px;
-
.ant-form {
- padding: 12px 10px 6px;
- margin-bottom: 16px;
+ padding: 20px 10px 0;
+ margin-bottom: 0;
background-color: @component-background;
border: none;
- border-radius: 4px;
}
}
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/variable.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/variable.ts
index 10f865bbd..7b7c7467f 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/variable.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/variable.ts
@@ -23,6 +23,8 @@ export default {
add: 'Add',
success: ' successful',
fail: ' failed',
+ searchByCode: 'Search by var code',
+ searchByDesc: 'Search by description',
table: {
title: 'Variable List',
variableCode: 'Variable Code',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
index 5b3557fcc..377a5fbf3 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkCluster.ts
@@ -21,6 +21,7 @@ export default {
start: 'Start Cluster',
edit: 'Edit Cluster',
delete: 'Are you sure delete this cluster ?',
+ searchByName: 'Search by cluster name',
form: {
clusterName: 'Cluster Name',
address: 'Cluster URL',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkHome.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkHome.ts
index 870650b6e..166d13673 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkHome.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/flinkHome.ts
@@ -25,6 +25,7 @@ export default {
flinkHome: 'Flink Home',
flinkHomePlaceholder: 'Please enter flink home',
flinkVersion: 'Flink Version',
+ searchByName: 'Search by flink name',
description: 'description',
descriptionPlaceholder: 'Please enter description',
operateMessage: {
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 1b4c57c88..14e66edee 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
@@ -24,8 +24,8 @@ export default {
fail: 'failed',
table: {
title: 'Member List',
- userName: 'User',
- roleName: 'Role',
+ userName: 'Search by username',
+ roleName: 'Search by role',
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 3cbac9a5a..0f9928d78 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
@@ -30,6 +30,7 @@ export default {
exist: 'Sorry, the role name already exists',
empty: 'Role name cannot be empty',
},
+ searchByRole: 'Search by role name',
roleInfo: 'Role Info',
tableTitle: 'Role List',
modifyTime: 'Not yet modified',
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 bd01b6a91..aaa2dc93d 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
@@ -23,6 +23,7 @@ export default {
add: 'Add',
success: 'successful',
fail: 'failed',
+ searchByTeam: 'Search by team name',
table: {
title: 'Team List',
teamName: 'Team',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
index a224827cd..f315f1afb 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
@@ -47,6 +47,7 @@ export default {
edit: 'Edit User',
view: 'View User',
},
+ searchByName: 'Search by username',
roleInfo: 'Role Info',
modifyTime: 'Not yet modified',
male: 'male',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/variable.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/variable.ts
index b40cc90b9..0f6e61182 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/variable.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/variable.ts
@@ -23,6 +23,8 @@ export default {
add: '添加',
success: '成功',
fail: '失败',
+ searchByCode: '根据变量 code 搜索',
+ searchByDesc: '根据变量描述搜索',
table: {
title: '变量列表',
variableCode: '变量Code',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkCluster.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkCluster.ts
index 495302739..ac2154789 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkCluster.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkCluster.ts
@@ -21,6 +21,7 @@ export default {
start: '启动集群',
edit: '编辑集群',
delete: '确定要删除此集群 ?',
+ searchByName: '根据 Flink 集群名称搜索',
form: {
clusterName: '集群名称',
address: '集群URL',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkHome.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkHome.ts
index aeebca1a7..9d4713ea5 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkHome.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/flinkHome.ts
@@ -25,6 +25,7 @@ export default {
flinkHome: '安装路径',
flinkHomePlaceholder: '请输入Flink安装路径',
flinkVersion: 'Flink 版本',
+ searchByName: '根据 Flink 名称搜索',
description: '描述',
descriptionPlaceholder: 'Flink描述',
operateMessage: {
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 a140ca494..f88d6a36e 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
@@ -24,8 +24,8 @@ export default {
fail: '失败',
table: {
title: '成员列表',
- userName: '用户',
- roleName: '角色',
+ userName: '根据用户名搜索',
+ roleName: '根据角色名称搜索',
createTime: '创建时间',
modifyTime: '修改时间',
},
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts
index 0b8bd92dc..eea69760e 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/role.ts
@@ -30,6 +30,7 @@ export default {
exist: '角色名已存在',
empty: '角色名不能为空',
},
+ searchByRole: '根据角色名称搜索',
roleInfo: '角色信息',
tableTitle: '角色列表',
modifyTime: '尚未修改',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts
index 7a659dce8..d5de5cad4 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/team.ts
@@ -23,9 +23,9 @@ export default {
add: '创建',
success: '成功',
fail: '失败',
+ searchByTeam: '根据团队名称搜索',
table: {
- title: 'Team列表',
- teamName: 'Team',
+ teamName: '团队',
description: '描述',
descriptionMessage: '超过了100个字符的最大长度限制',
teamNamePlaceholder: '请输入team名称',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
index c0358129f..53f02954e 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
@@ -47,6 +47,7 @@ export default {
edit: '编辑用户',
view: '查看用户',
},
+ searchByName: '根据用户名搜索',
roleInfo: '角色信息',
modifyTime: '尚未修改',
male: '男',
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 cc41e2cc8..8b2fc548f 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
@@ -275,7 +275,7 @@
>
<template #tableTitle>
<div class="flex justify-between" style="width: 100%">
- <Form name="appTableForm" :model="searchRef" layout="inline"
class="flex-1">
+ <Form name="appTableForm" :model="searchRef" layout="inline"
class="flex-1 search-bar">
<Row :gutter="4" class="w-full">
<Col :span="5">
<Form.Item>
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
index a4ed72920..6a122c056 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
+++
b/streampark-console/streampark-console-webapp/src/views/flink/app/styles/View.less
@@ -38,6 +38,20 @@
padding-left: 4px !important;
}
+.search-bar {
+ .ant-input-affix-wrapper {
+ padding: 3px 5px;
+ border-radius: 6px;
+ }
+ .ant-select-single:not(.ant-select-customize-input) {
+ .ant-select-selector {
+ padding: 0 7px;
+ height: 30px;
+ border-radius: 6px;
+ }
+ }
+}
+
.gutter-box {
padding: 10px 15px;
background: @component-background;
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
index 8338a47d5..b277cc27f 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/project/View.vue
@@ -15,7 +15,13 @@
limitations under the License.
-->
<template>
- <PageWrapper contentFullHeight fixed-height content-background
contentClass="px-10px">
+ <PageWrapper
+ contentFullHeight
+ fixed-height
+ content-background
+ contentClass="px-10px"
+ class="sp-project"
+ >
<a-card class="header" :bordered="false">
<template #title>
<div class="flex items-center justify-between">
@@ -99,8 +105,11 @@
icon: 'ant-design:thunderbolt-outlined',
auth: 'project:build',
ifShow: record.buildState !== BuildStateEnum.BUILDING,
- tooltip: t('flink.project.operationTips.buildProjectMessage'),
- onClick: handleBuild.bind(null, record),
+ popConfirm: {
+ title: t('flink.project.operationTips.buildProjectMessage'),
+ placement: 'left',
+ confirm: handleBuild.bind(null, record),
+ },
},
{
icon: 'clarity:note-edit-line',
@@ -329,13 +338,17 @@
},
});
</script>
-<style lang="less" scoped>
- .search-input {
- width: 272px;
- margin-left: 16px;
- }
-
- .add-btn {
- margin-left: 30px;
+<style lang="less">
+ .sp-project {
+ .search-input {
+ width: 272px;
+ margin-left: 16px;
+ }
+ .add-btn {
+ margin-left: 30px;
+ }
+ .ant-card-head {
+ padding: 0 2px !important;
+ }
}
</style>
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/variable/variable.data.ts
b/streampark-console/streampark-console-webapp/src/views/flink/variable/variable.data.ts
index e869ae8d9..c8b2fc2e2 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/variable/variable.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/flink/variable/variable.data.ts
@@ -39,7 +39,7 @@ export const searchFormSchema: FormSchema[] = [
label: '',
component: 'Input',
componentProps: {
- placeholder: t('flink.variable.table.variableCode'),
+ placeholder: t('flink.variable.searchByCode'),
allowClear: true,
},
colProps: { span: 4 },
@@ -49,7 +49,7 @@ export const searchFormSchema: FormSchema[] = [
label: '',
component: 'Input',
componentProps: {
- placeholder: t('flink.variable.table.description'),
+ placeholder: t('flink.variable.searchByDesc'),
allowClear: true,
},
colProps: { span: 5 },
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 7c55c463e..5945f53e9 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
@@ -18,7 +18,7 @@
import { nextTick, onUnmounted } from 'vue';
import { useTimeoutFn } from '@vueuse/core';
import { SvgIcon } from '/@/components/Icon';
- import { Tag } from 'ant-design-vue';
+ import { Col, Tag } from 'ant-design-vue';
import { ClusterStateEnum, ExecModeEnum } from '/@/enums/flinkEnum';
import { PlusOutlined } from '@ant-design/icons-vue';
import { useMessage } from '/@/hooks/web/useMessage';
@@ -55,7 +55,6 @@
const { t } = useI18n();
const { Swal, createMessage } = useMessage();
const [registerTable, { reload, getLoading }] = useTable({
- // title: t('setting.flinkCluster.title'),
api: fetchFlinkCluster,
columns: [
{ dataIndex: 'clusterName', title:
t('setting.flinkCluster.form.clusterName') },
@@ -63,12 +62,31 @@
{ dataIndex: 'address', title: t('setting.flinkCluster.form.address') },
{ dataIndex: 'description', title: t('setting.flinkHome.description') },
],
- useSearchForm: false,
- striped: false,
- bordered: false,
- canResize: false,
+ formConfig: {
+ schemas: [
+ {
+ field: 'clusterName',
+ label: '',
+ component: 'Input',
+ componentProps: {
+ placeholder: t('setting.flinkCluster.searchByName'),
+ allowClear: true,
+ },
+ colProps: { span: 5 },
+ },
+ ],
+ rowProps: {
+ gutter: 14,
+ },
+ submitOnChange: true,
+ showActionButtonGroup: false,
+ },
+ rowKey: 'id',
+ pagination: true,
+ useSearchForm: true,
+ showTableSetting: false,
showIndexColumn: false,
- pagination: false,
+ canResize: false,
actionColumn: {
width: 200,
title: t('component.table.operation'),
@@ -142,13 +160,13 @@
<template>
<PageWrapper contentFullHeight fixed-height content-class="flex flex-col">
<BasicTable @register="registerTable" class="flex flex-col">
- <template #toolbar>
- <div v-auth="'project:create'">
- <a-button type="primary" class="w-full mt-10px" @click="() =>
go('/setting/add_cluster')">
+ <template #form-formFooter>
+ <Col :span="5" :offset="14" class="text-right">
+ <a-button type="primary" @click="() => go('/setting/add_cluster')">
<PlusOutlined />
{{ t('common.add') }}
</a-button>
- </div>
+ </Col>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'clusterName'">
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 10177eb2f..5457fe904 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
@@ -19,7 +19,7 @@
import { useModal } from '/@/components/Modal';
import { useI18n } from '/@/hooks/web/useI18n';
import { SvgIcon } from '/@/components/Icon';
- import { Switch } from 'ant-design-vue';
+ import { Col, Switch } from 'ant-design-vue';
import { CheckOutlined, CloseOutlined, PlusOutlined } from
'@ant-design/icons-vue';
import { FlinkEnvModal, FlinkEnvDrawer } from './components';
import {
@@ -44,7 +44,6 @@
const [registerModal, { openModal: openFlinkModal }] = useModal();
const [registerFlinkDraw, { openDrawer: openEnvDrawer }] = useDrawer();
const [registerTable, { reload, getDataSource }] = useTable({
- // title: t('setting.flinkHome.title'),
api: fetchFlinkEnv,
columns: [
{ dataIndex: 'flinkName', title: t('setting.flinkHome.flinkName') },
@@ -53,12 +52,31 @@
{ dataIndex: 'default', title: 'Default' },
{ dataIndex: 'description', title: t('setting.flinkHome.description') },
],
- useSearchForm: false,
- striped: false,
- canResize: false,
- bordered: false,
+ formConfig: {
+ schemas: [
+ {
+ field: 'flinkName',
+ label: '',
+ component: 'Input',
+ componentProps: {
+ placeholder: t('setting.flinkHome.searchByName'),
+ allowClear: true,
+ },
+ colProps: { span: 5 },
+ },
+ ],
+ rowProps: {
+ gutter: 14,
+ },
+ submitOnChange: true,
+ showActionButtonGroup: false,
+ },
+ rowKey: 'id',
+ pagination: true,
+ useSearchForm: true,
+ showTableSetting: false,
showIndexColumn: false,
- pagination: false,
+ canResize: false,
actionColumn: {
width: 200,
title: t('component.table.operation'),
@@ -112,13 +130,13 @@
<template>
<PageWrapper contentFullHeight fixed-height content-class="flex flex-col">
<BasicTable @register="registerTable" class="flex flex-col">
- <template #toolbar>
- <div v-auth="'project:create'">
- <a-button type="primary" class="w-full mt-10px"
@click="openFlinkModal(true, {})">
+ <template #form-formFooter>
+ <Col :span="5" :offset="14" class="text-right">
+ <a-button type="primary" @click="openFlinkModal(true, {})">
<PlusOutlined />
{{ t('common.add') }}
</a-button>
- </div>
+ </Col>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'flinkName'">
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.data.ts
b/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.data.ts
index b21ec7c33..cd0cfd752 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/setting/YarnQueue/index.data.ts
@@ -57,13 +57,4 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: { span: 6 },
},
- {
- field: 'createTime',
- label: '',
- component: 'RangePicker',
- componentProps: {
- allowClear: true,
- },
- colProps: { span: 6 },
- },
];
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 6f1196ea2..25c546630 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
@@ -18,7 +18,7 @@
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" class="flex flex-col">
<template #form-formFooter>
- <Col :span="4" :offset="8" class="text-right">
+ <Col :span="5" :offset="13" class="text-right">
<a-button type="primary" @click="handleCreate"
v-auth="'yarnQueue:create'">
<Icon icon="ant-design:plus-outlined" />
{{ t('common.add') }}
@@ -78,7 +78,6 @@
columns,
formConfig: {
schemas: searchFormSchema,
- fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
rowProps: {
gutter: 14,
},
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 7c019c8fe..84b34299e 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
@@ -19,7 +19,7 @@
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" :formConfig="formConfig" class="flex
flex-col">
<template #form-formFooter>
- <Col :span="4" :offset="5" class="text-right">
+ <Col :span="5" :offset="9" class="text-right">
<a-button type="primary" @click="handleCreate" v-auth="'member:add'">
<Icon icon="ant-design:plus-outlined" />
{{ t('common.add') }}
@@ -95,7 +95,7 @@
placeholder: t('system.member.table.userName'),
allowClear: true,
},
- colProps: { span: 4 },
+ colProps: { span: 5 },
},
{
field: 'roleName',
@@ -109,17 +109,7 @@
},
colProps: { span: 5 },
},
- {
- field: 'createTime',
- label: '',
- component: 'RangePicker',
- componentProps: {
- allowClear: true,
- },
- colProps: { span: 6 },
- },
],
- fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
rowProps: {
gutter: 14,
},
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 95ecbc176..429196110 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
@@ -18,7 +18,7 @@
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" class="flex flex-col">
<template #form-formFooter>
- <Col :span="4" :offset="10" class="text-right">
+ <Col :span="5" :offset="14" class="text-right">
<a-button type="primary" @click="handleCreate" v-auth="'role:add'">
<Icon icon="ant-design:plus-outlined" />
{{ t('common.add') }}
@@ -101,7 +101,6 @@
columns,
formConfig: {
schemas: searchFormSchema,
- fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
rowProps: {
gutter: 14,
},
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
b/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
index 533b06319..495ddb9cd 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
@@ -48,19 +48,10 @@ export const searchFormSchema: FormSchema[] = [
label: '',
component: 'Input',
componentProps: {
- placeholder: t('system.role.form.roleName'),
+ placeholder: t('system.role.searchByRole'),
allowClear: true,
},
- colProps: { span: 4 },
- },
- {
- field: 'createTime',
- label: '',
- component: 'RangePicker',
- componentProps: {
- allowClear: true,
- },
- colProps: { span: 6 },
+ colProps: { span: 5 },
},
];
export async function handleRoleCheck(_rule: RuleObject, value: StoreValue) {
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 0da828cae..d1a8ae753 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
@@ -18,7 +18,7 @@
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" class="flex flex-col">
<template #form-formFooter>
- <Col :span="4" :offset="10" class="text-right">
+ <Col :span="5" :offset="14" class="text-right">
<a-button type="primary" @click="handleCreate" v-auth="'team:add'">
<Icon icon="ant-design:plus-outlined" />
{{ t('common.add') }}
@@ -77,7 +77,6 @@
columns,
formConfig: {
schemas: searchFormSchema,
- fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
rowProps: {
gutter: 14,
},
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/team/team.data.ts
b/streampark-console/streampark-console-webapp/src/views/system/team/team.data.ts
index e298022c4..159cad0f5 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/team/team.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/system/team/team.data.ts
@@ -19,7 +19,7 @@ import { useI18n } from '/@/hooks/web/useI18n';
const { t } = useI18n();
export const columns: BasicColumn[] = [
{
- title: t('system.team.table.teamName'),
+ title: t('system.team.teamName'),
dataIndex: 'teamName',
sorter: true,
},
@@ -47,18 +47,9 @@ export const searchFormSchema: FormSchema[] = [
label: '',
component: 'Input',
componentProps: {
- placeholder: t('system.team.table.teamName'),
+ placeholder: t('system.team.searchByTeam'),
allowClear: true,
},
- colProps: { span: 4 },
- },
- {
- field: 'createTime',
- label: '',
- component: 'RangePicker',
- componentProps: {
- allowClear: true,
- },
- colProps: { span: 6 },
+ colProps: { span: 5 },
},
];
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 97504cc5e..cf30b2ef9 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
@@ -17,11 +17,13 @@
<template>
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" class="flex flex-col">
- <template #toolbar>
- <a-button type="primary" @click="handleCreate" v-auth="'token:add'">
- <Icon icon="ant-design:plus-outlined" />
- {{ t('common.add') }}
- </a-button>
+ <template #form-formFooter>
+ <Col :span="5" :offset="14" class="text-right">
+ <a-button type="primary" @click="handleCreate" v-auth="'token:add'">
+ <Icon icon="ant-design:plus-outlined" />
+ {{ t('common.add') }}
+ </a-button>
+ </Col>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'action'">
@@ -64,16 +66,16 @@
import { useI18n } from '/@/hooks/web/useI18n';
import Icon from '/@/components/Icon';
import { PageWrapper } from '/@/components/Page';
+ import { Col } from 'ant-design-vue';
export default defineComponent({
name: 'UserToken',
- components: { BasicTable, TokenDrawer, TableAction, Icon, PageWrapper },
+ components: { Col, BasicTable, TokenDrawer, TableAction, Icon, PageWrapper
},
setup() {
const { t } = useI18n();
const { createMessage } = useMessage();
const [registerDrawer, { openDrawer }] = useDrawer();
const { clipboardRef, copiedRef } = useCopyToClipboard();
const [registerTable, { reload, updateTableDataRecord }] = useTable({
- // title: t('system.token.table.title'),
api: fetTokenList,
// beforeFetch: (params) => {
// if (params.user) {
@@ -84,12 +86,19 @@
// },
columns,
formConfig: {
- baseColProps: { style: { paddingRight: '30px' } },
schemas: searchFormSchema,
+ rowProps: {
+ gutter: 14,
+ },
+ submitOnChange: true,
+ showActionButtonGroup: false,
},
- useSearchForm: false,
- showTableSetting: false,
rowKey: 'tokenId',
+ pagination: true,
+ striped: false,
+ useSearchForm: true,
+ showTableSetting: false,
+ bordered: false,
showIndexColumn: false,
canResize: false,
actionColumn: {
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 a7f9d26b3..f7426d370 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
@@ -83,10 +83,14 @@ export const columns: BasicColumn[] = [
export const searchFormSchema: FormSchema[] = [
{
- field: 'user',
- label: t('system.token.table.userName'),
+ field: 'username',
+ label: '',
component: 'Input',
- colProps: { span: 8 },
+ componentProps: {
+ placeholder: t('system.user.searchByName'),
+ allowClear: true,
+ },
+ colProps: { span: 5 },
},
];
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 12829d4ea..e40866fd1 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
@@ -18,7 +18,7 @@
<PageWrapper content-full-height fixed-height>
<BasicTable @register="registerTable" class="flex flex-col">
<template #form-formFooter>
- <Col :span="4" :offset="10" class="text-right">
+ <Col :span="5" :offset="14" class="text-right">
<a-button type="primary" @click="handleCreate" v-auth="'user:add'">
<Icon icon="ant-design:plus-outlined" />
{{ t('common.add') }}
@@ -72,7 +72,6 @@
formConfig: {
// labelWidth: 120,
schemas: searchFormSchema,
- fieldMapToTime: [['createTime', ['createTimeFrom', 'createTimeTo'],
'YYYY-MM-DD']],
rowProps: {
gutter: 14,
},
@@ -198,7 +197,6 @@
handleDelete,
handleSuccess,
handleView,
- handleReset,
getUserAction,
};
},
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
index fe58ca6ce..55e185d38 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
@@ -73,19 +73,10 @@ export const searchFormSchema: FormSchema[] = [
label: '',
component: 'Input',
componentProps: {
- placeholder: t('system.user.form.userName'),
+ placeholder: t('system.user.searchByName'),
allowClear: true,
},
- colProps: { span: 4 },
- },
- {
- field: 'createTime',
- label: '',
- component: 'RangePicker',
- componentProps: {
- allowClear: true,
- },
- colProps: { span: 6 },
+ colProps: { span: 5 },
},
];
