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

Merge pull request #1801 from dataease/pr@dev@refactor_panel-view-edit

Browse Source 
refactor: 去掉视图权限校验
This commit is contained in:
王嘉豪 2022-02-22 11:04:43 +08:00 committed by GitHub
commit 4782c74ae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
View File

@ -10,19 +10,16 @@
<select id="searchOneWithPrivileges" resultMap="BaseResultMapDTO">
select
chart_view.*,
get_auths(id,'chart',#{userId}) as `privileges`
chart_view.*
from chart_view where id = #{id}
</select>
<select id="searchOne" resultMap="BaseResultMapDTO">
select
id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,
style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot,
get_auths(id,'chart',#{userId}) as `privileges`
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot
from chart_view
<where>
FIND_IN_SET(chart_view.id,cids)
<if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR}
</if>

17
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -46,7 +46,6 @@
/>
<el-button
:title="$t('chart.change_ds')"
:disabled="!hasDataPermission('manage',param.privileges)"
icon="el-icon-refresh"
type="text"
size="mini"
@ -62,7 +61,6 @@
animation="300"
:move="onMove"
class="drag-list"
:disabled="!hasDataPermission('manage',param.privileges)"
@add="moveToDimension"
>
<transition-group>
@ -88,7 +86,6 @@
animation="300"
:move="onMove"
class="drag-list"
:disabled="!hasDataPermission('manage',param.privileges)"
@add="moveToQuota"
>
<transition-group>
@ -157,7 +154,6 @@
<el-radio-group
v-model="view.type"
style="width: 100%"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="changeChartType()"
>
<chart-type ref="cu-chart-type" :chart="view" style="height: 480px" />
@ -182,7 +178,6 @@
slot="reference"
size="mini"
style="padding: 6px;"
:disabled="!hasDataPermission('manage',param.privileges)"
>
{{ $t('chart.change_chart_type') }}
<i class="el-icon-caret-bottom" />
@ -202,7 +197,6 @@
<el-radio-group
v-model="view.resultMode"
class="radio-span"
:disabled="!hasDataPermission('manage',param.privileges)"
size="mini"
@change="calcData"
>
@ -212,7 +206,6 @@
v-model="view.resultCount"
class="result-count"
size="mini"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="calcData"
/>
</el-radio>
@ -237,7 +230,6 @@
:no-children-text="$t('commons.treeselect.no_children_text')"
:no-options-text="$t('commons.treeselect.no_options_text')"
:no-results-text="$t('commons.treeselect.no_results_text')"
:disabled="!hasDataPermission('manage',param.privileges)"
@input="calcData"
@deselect="calcData"
/>
@ -256,7 +248,6 @@
</span>
<draggable
v-model="view.xaxisExt"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -310,7 +301,6 @@
</span>
<draggable
v-model="view.xaxis"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -364,7 +354,6 @@
</span>
<draggable
v-model="view.yaxis"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -403,7 +392,6 @@
</span>
<draggable
v-model="view.yaxisExt"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -442,7 +430,6 @@
</span>
<draggable
v-model="view.extStack"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -484,7 +471,6 @@
</span>
<draggable
v-model="view.extBubble"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -518,7 +504,6 @@
<!-- </el-button>-->
<draggable
v-model="view.customFilter"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -557,7 +542,6 @@
</span>
<draggable
v-model="view.drillFields"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag"
animation="300"
:move="onMove"
@ -609,7 +593,6 @@
<el-radio-group
v-model="view.stylePriority"
class="radio-span"
:disabled="!hasDataPermission('manage',param.privileges)"
size="mini"
@change="calcStyle"
>