forked from github/dataease
Merge branch 'dev-v2' into pr@dev-v2@sysvariable
This commit is contained in:
commit
781741e182
@ -670,7 +670,7 @@ const getMenuList = (val: boolean) => {
|
||||
<div
|
||||
class="dataset-content"
|
||||
:class="{
|
||||
auto: isIframe
|
||||
auto: isIframe || isDataEaseBi
|
||||
}"
|
||||
>
|
||||
<template v-if="!state.datasetTree.length && mounted">
|
||||
|
@ -309,7 +309,9 @@ const tabList = shallowRef([])
|
||||
|
||||
const initSearch = () => {
|
||||
handleCurrentChange(1)
|
||||
state.filterTable = tableData.value.filter(ele => ele.tableName.includes(nickName.value))
|
||||
state.filterTable = tableData.value.filter(ele =>
|
||||
ele.tableName.toLowerCase().includes(nickName.value.toLowerCase())
|
||||
)
|
||||
state.paginationConfig.total = state.filterTable.length
|
||||
}
|
||||
|
||||
@ -872,7 +874,7 @@ const getMenuList = (val: boolean) => {
|
||||
<div
|
||||
class="datasource-content"
|
||||
:class="{
|
||||
auto: isIframe,
|
||||
auto: isIframe || isDataEaseBi,
|
||||
h100: isDataEaseBi || isIframe
|
||||
}"
|
||||
>
|
||||
|
@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static io.dataease.constant.AuthResourceEnum.USER;
|
||||
|
||||
@ -176,4 +177,8 @@ public interface UserApi {
|
||||
@Operation(summary = "绑定状态")
|
||||
@GetMapping("/bindStatus")
|
||||
List<Integer> bindStatus();
|
||||
|
||||
@Hidden
|
||||
@GetMapping("/getRecipient")
|
||||
List<Map<String, Object>> getRecipient(@RequestBody UserReciRequest request);
|
||||
}
|
||||
|
@ -0,0 +1,17 @@
|
||||
package io.dataease.api.permissions.user.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UserReciRequest implements Serializable {
|
||||
@Serial
|
||||
private static final long serialVersionUID = -2165057126540959376L;
|
||||
|
||||
private List<Long> uidList;
|
||||
|
||||
private List<Long> ridList;
|
||||
}
|
Loading…
Reference in New Issue
Block a user