diff --git a/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java b/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java index 88dc66177f..d9cd8c5183 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java @@ -3,7 +3,6 @@ package io.dataease.controller.dataset; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.annotation.DePermission; import io.dataease.commons.constants.DePermissionType; -import io.dataease.commons.constants.ResourceAuthLevel; import io.dataease.plugins.common.base.domain.DatasetTableFunction; import io.dataease.service.dataset.DatasetFunctionService; import io.swagger.annotations.Api; @@ -28,7 +27,7 @@ public class DatasetFunctionController { @Resource private DatasetFunctionService datasetFunctionService; - @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) + @DePermission(type = DePermissionType.DATASET) @ApiOperation("查询") @PostMapping("listByTableId/{tableId}") public List listByTableId(@PathVariable String tableId) { diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index 757a6598f9..13582385d8 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -298,6 +298,7 @@ export default { watch: { 'param': function() { this.initFunctions() + this.initDsFields() }, 'field': { handler: function() { @@ -333,7 +334,7 @@ export default { this.$refs.myCm.codemirror.showHint() }) this.initFunctions() - // this.initField() + this.initDsFields() }, methods: { onCmReady(cm) { @@ -364,8 +365,6 @@ export default { post('/dataset/function/listByTableId/' + this.param.tableId, null).then(response => { this.functions = response.data this.functionData = JSON.parse(JSON.stringify(this.functions)) - - this.initDsFields() }) }, diff --git a/frontend/src/views/chart/view/ChartFieldEdit.vue b/frontend/src/views/chart/view/ChartFieldEdit.vue index 35f6efe6bf..4030b5ce80 100644 --- a/frontend/src/views/chart/view/ChartFieldEdit.vue +++ b/frontend/src/views/chart/view/ChartFieldEdit.vue @@ -28,7 +28,6 @@ @@ -40,7 +39,6 @@ v-model="scope.row.deType" size="mini" style="display: inline-block;width: 26px;" - :disabled="!hasDataPermission('manage',param.privileges)" @change="saveEdit(scope.row)" > @@ -158,7 +155,6 @@ @@ -306,7 +298,6 @@