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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-03-01 17:22:22 +08:00
commit 9dc0dcdccd
5 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
View File

@ -34,7 +34,6 @@ public class DataSetGroupController {
@Resource
private ExtractDataService extractDataService;
@RequiresPermissions("data:read")
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, value = "id"),
@DePermission(type = DePermissionType.DATASET, value = "pid", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ -57,7 +56,6 @@ public class DataSetGroupController {
return dataSetGroupService.treeNode(datasetGroup);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("删除")
@PostMapping("/delete/{id}")

9
backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
View File

@ -36,7 +36,6 @@ public class DataSetTableController {
@Resource
private DataSetTableService dataSetTableService;
@RequiresPermissions("data:read")
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, value = "id"),
@DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@ -48,7 +47,6 @@ public class DataSetTableController {
dataSetTableService.batchInsert(datasetTable);
}
@RequiresPermissions("data:read")
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@ -64,7 +62,6 @@ public class DataSetTableController {
}
}
@RequiresPermissions("data:read")
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@ -76,7 +73,6 @@ public class DataSetTableController {
dataSetTableService.alter(request);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("删除")
@PostMapping("delete/{id}")
@ -147,7 +143,6 @@ public class DataSetTableController {
return dataSetTableService.getCustomPreview(dataSetTableRequest);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_USE, value = "tableId")
@ApiOperation("查询增量配置")
@PostMapping("incrementalConfig")
@ -155,7 +150,6 @@ public class DataSetTableController {
return dataSetTableService.incrementalConfig(datasetTableIncrementalConfig);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE, value = "tableId")
@ApiOperation("保存增量配置")
@PostMapping("save/incrementalConfig")
@ -181,7 +175,6 @@ public class DataSetTableController {
return dataSetTableService.excelSaveAndParse(file, tableId, editType);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET)
@ApiOperation("检测doris")
@PostMapping("checkDorisTableIsExists/{id}")
@ -189,7 +182,6 @@ public class DataSetTableController {
return dataSetTableService.checkDorisTableIsExists(id);
}
@RequiresPermissions("data:read")
@ApiOperation("搜索")
@PostMapping("search")
public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) {
@ -203,7 +195,6 @@ public class DataSetTableController {
return dataSetTableService.syncDatasetTableField(id);
}
@RequiresPermissions("data:read")
@DePermission(type = DePermissionType.DATASET, value = "id")
@ApiOperation("关联数据集预览数据")
@PostMapping("unionPreview")

3
backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java
View File

@ -27,14 +27,12 @@ public class DataSetTableUnionController {
@Resource
private DataSetTableUnionService dataSetTableUnionService;
@RequiresPermissions("data:read")
@ApiOperation("保存")
@PostMapping("save")
public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) {
return dataSetTableUnionService.save(datasetTableUnion);
}
@RequiresPermissions("datasource:read")
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("删除")
@PostMapping("delete/{id}")
@ -42,7 +40,6 @@ public class DataSetTableUnionController {
dataSetTableUnionService.delete(id);
}
@RequiresPermissions("datasource:read")
@DePermission(type = DePermissionType.DATASET)
@ApiOperation("查询")
@PostMapping("listByTableId/{tableId}")

2
frontend/src/views/background/BackgroundItem.vue
View File

@ -29,7 +29,7 @@ export default {
},
computed: {
itemActive() {
return this.curComponent.commonBackground && this.curComponent.commonBackground.innerImage === this.template.url
return this.curComponent && this.curComponent.commonBackground && this.curComponent.commonBackground.innerImage === this.template.url
},
classBackground() {
if (this.template.url) {

2
frontend/src/views/background/index.vue
View File

@ -102,7 +102,7 @@ export default {
}
},
mounted() {
if (this.curComponent.commonBackground && this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') {
if (this.curComponent && this.curComponent.commonBackground && this.curComponent.commonBackground.outerImage && typeof (this.curComponent.commonBackground.outerImage) === 'string') {
this.fileList.push({ url: this.curComponent.commonBackground.outerImage })
}
this.backgroundOrigin = deepCopy(this.curComponent.commonBackground)