center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 拼写纠正

Browse Source
This commit is contained in:
Wangjiahao 2023-06-14 18:22:36 +08:00
parent 4866c2a725
commit dc3e3bf6f2
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/commons/pool/PriorityThreadPoolExecutor.java
View File

@ -8,7 +8,7 @@ import io.dataease.commons.utils.LogUtil;
public class PriorityThreadPoolExecutor extends ThreadPoolExecutor {
public static AtomicInteger globaInteger = new AtomicInteger(1);
public static AtomicInteger globalInteger = new AtomicInteger(1);
private ThreadLocal<Integer> local = new ThreadLocal<Integer>() {
@Override
@ -42,7 +42,7 @@ public class PriorityThreadPoolExecutor extends ThreadPoolExecutor {
@Override
public void execute(Runnable command) {
int andIncrement = globaInteger.getAndIncrement();
int andIncrement = globalInteger.getAndIncrement();
Integer theadInteger = local.get();
try {
if (theadInteger == 0) {

4
backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
View File

@ -66,8 +66,8 @@ public class XDeptServer {
@PostMapping("/search")
public List<DeptNodeResponse> search(@RequestBody XpackGridRequest request){
DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
List<XpackSysDept> ndoes = deptService.nodesTreeByCondition(request);
List<DeptNodeResponse> nodeResponses = ndoes.stream().map(node -> {
List<XpackSysDept> nodes = deptService.nodesTreeByCondition(request);
List<DeptNodeResponse> nodeResponses = nodes.stream().map(node -> {
DeptNodeResponse deptNodeResponse = BeanUtils.copyBean(new DeptNodeResponse(), node);
deptNodeResponse.setHasChildren(node.getSubCount() > 0);
deptNodeResponse.setLeaf(node.getSubCount() == 0);

8
backend/src/main/java/io/dataease/service/panel/ShareService.java
View File

@ -398,8 +398,8 @@ public class ShareService {
return;
}
panelShareOutDTOS.forEach(shareOut -> {
SysLogConstants.SOURCE_TYPE buiType = buiType(shareOut.getType());
DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), shareOut.getTargetId(), buiType);
SysLogConstants.SOURCE_TYPE busiType = busiType(shareOut.getType());
DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), shareOut.getTargetId(), busiType);
});
Map<Integer, List<PanelShareOutDTO>> listMap = panelShareOutDTOS.stream().collect(Collectors.groupingBy(dto -> dto.getType()));
@ -426,7 +426,7 @@ public class ShareService {
}
}
private SysLogConstants.SOURCE_TYPE buiType(Integer type) {
private SysLogConstants.SOURCE_TYPE busiType(Integer type) {
SysLogConstants.SOURCE_TYPE targetType = SysLogConstants.SOURCE_TYPE.USER;
if (type == 1) {
targetType = SysLogConstants.SOURCE_TYPE.ROLE;
@ -443,7 +443,7 @@ public class ShareService {
extPanelShareMapper.removeShares(removeRequest);
SysLogConstants.SOURCE_TYPE targetType = buiType(removeRequest.getType());
SysLogConstants.SOURCE_TYPE targetType = busiType(removeRequest.getType());
DeLogUtils.save(SysLogConstants.OPERATE_TYPE.UNSHARE, SysLogConstants.SOURCE_TYPE.PANEL, panelId, panelGroup.getPid(), removeRequest.getTargetId(), targetType);

2
frontend/src/lang/en.js
View File

@ -2451,7 +2451,7 @@ export default {
add_condition: 'Add condition',
add_relationship: 'Add relationship',
filter_fields: 'Filter fields',
selct_filter_fields: 'Please select a filter field',
select_filter_fields: 'Please select a filter field',
enter_keywords: 'Please enter keywords',
screen_method: 'Screening method',
select: 'Please select',

2
frontend/src/lang/tw.js
View File

@ -2445,7 +2445,7 @@ export default {
add_condition: '添加條件',
add_relationship: '添加關系',
filter_fields: '篩選字段',
selct_filter_fields: '請選擇篩選字段',
select_filter_fields: '請選擇篩選字段',
enter_keywords: '請輸關鍵字',
screen_method: '篩選方式',
select: '請選擇',

2
frontend/src/lang/zh.js
View File

@ -2460,7 +2460,7 @@ export default {
add_condition: '添加条件',
add_relationship: '添加关系',
filter_fields: '筛选字段',
selct_filter_fields: '请选择筛选字段',
select_filter_fields: '请选择筛选字段',
enter_keywords: '请输关键字',
screen_method: '筛选方式',
select: '请选择',

2
frontend/src/views/dataset/data/components/filterFiled.vue
View File

@ -15,7 +15,7 @@
<el-input
v-model="item.name"
class="w100"
:placeholder="$t('auth.selct_filter_fields')"
:placeholder="$t('auth.select_filter_fields')"
size="mini"
@input="cancel"
/>