From 2b41447a1bebeffa44ed4ad5e9e703d62cfebdfc Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 1 Mar 2022 16:51:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=B8=8A=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/background/BackgroundItem.vue | 2 +- frontend/src/views/background/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/background/BackgroundItem.vue b/frontend/src/views/background/BackgroundItem.vue index c4a0250398..8acecde821 100644 --- a/frontend/src/views/background/BackgroundItem.vue +++ b/frontend/src/views/background/BackgroundItem.vue @@ -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) { diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue index fc5eaa7d0d..b4643e8a7f 100644 --- a/frontend/src/views/background/index.vue +++ b/frontend/src/views/background/index.vue @@ -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) From 6b2d3e1222dc7185487dd59df347433b60ad97fd Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 1 Mar 2022 17:21:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DataSetGroupController.java | 2 -- .../controller/dataset/DataSetTableController.java | 9 --------- .../controller/dataset/DataSetTableUnionController.java | 3 --- 3 files changed, 14 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java index 4338ee09be..f30c9a0061 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java @@ -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}") diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index e6a204d9c0..7da1663912 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -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 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") diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java index 8f0c8048c4..0cd3a0724e 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java @@ -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}")