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:
junjun 2022-06-20 17:40:13 +08:00
parent 3cf23370fe
commit 78022a8244
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<DatasetTableFunction> listByTableId(@PathVariable String tableId) {

5
frontend/src/views/chart/view/CalcChartFieldEdit.vue
View File

@ -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()
})
},

10
frontend/src/views/chart/view/ChartFieldEdit.vue
View File

@ -28,7 +28,6 @@
<el-input
v-model="scope.row.name"
size="mini"
:disabled="!hasDataPermission('manage',param.privileges)"
@blur="saveEdit(scope.row)"
@keyup.enter.native="saveEdit(scope.row)"
/>
@ -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)"
>
<el-option
@ -149,7 +147,6 @@
icon="el-icon-sort"
size="mini"
circle
:disabled="!hasDataPermission('manage',param.privileges)"
@click="dqTrans(scope.row,'d')"
/>
</template>
@ -158,7 +155,6 @@
<template slot-scope="scope">
<el-button
v-if="scope.row.extField === 2"
:disabled="!hasDataPermission('manage',param.privileges)"
type="text"
size="mini"
@click="editField(scope.row)"
@ -166,7 +162,6 @@
</el-button>
<el-button
v-if="scope.row.extField !== 0"
:disabled="!hasDataPermission('manage',param.privileges)"
type="text"
size="mini"
@click="deleteField(scope.row)"
@ -184,7 +179,6 @@
<el-input
v-model="scope.row.name"
size="mini"
:disabled="!hasDataPermission('manage',param.privileges)"
@blur="saveEdit(scope.row)"
@keyup.enter.native="saveEdit(scope.row)"
/>
@ -196,7 +190,6 @@
v-model="scope.row.deType"
size="mini"
style="display: inline-block;width: 26px;"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="saveEdit(scope.row)"
>
<el-option
@ -297,7 +290,6 @@
icon="el-icon-sort"
size="mini"
circle
:disabled="!hasDataPermission('manage',param.privileges)"
@click="dqTrans(scope.row,'q')"
/>
</template>
@ -306,7 +298,6 @@
<template slot-scope="scope">
<el-button
v-if="scope.row.extField === 2"
:disabled="!hasDataPermission('manage',param.privileges)"
type="text"
size="mini"
@click="editField(scope.row)"
@ -314,7 +305,6 @@
</el-button>
<el-button
v-if="scope.row.extField !== 0"
:disabled="!hasDataPermission('manage',param.privileges)"
type="text"
size="mini"
@click="deleteField(scope.row)"