Skip to content

D
dataease
提交 cd5fb46d authored 作者: wangjiahao's avatar wangjiahao
浏览文件
操作

refactor: 去掉视图权限校验

上级 8823a6e0
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 23 行删除
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
浏览文件 @ cd5fb46d
...@@ -10,19 +10,16 @@ ...@@ -10,19 +10,16 @@
<select id="searchOneWithPrivileges" resultMap="BaseResultMapDTO"> <select id="searchOneWithPrivileges" resultMap="BaseResultMapDTO">
select select
chart_view.*, chart_view.*
get_auths(id,'chart',#{userId}) as `privileges`
from chart_view where id = #{id} from chart_view where id = #{id}
</select> </select>
<select id="searchOne" resultMap="BaseResultMapDTO"> <select id="searchOne" resultMap="BaseResultMapDTO">
select select
id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time, 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, style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot
get_auths(id,'chart',#{userId}) as `privileges` from chart_view
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
<where> <where>
FIND_IN_SET(chart_view.id,cids)
<if test="sceneId != null"> <if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR} and scene_id = #{sceneId,jdbcType=VARCHAR}
</if> </if>
......
frontend/src/views/chart/view/ChartEdit.vue
浏览文件 @ cd5fb46d
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
/> />
<el-button <el-button
:title="$t('chart.change_ds')" :title="$t('chart.change_ds')"
:disabled="!hasDataPermission('manage',param.privileges)"
icon="el-icon-refresh" icon="el-icon-refresh"
type="text" type="text"
size="mini" size="mini"
...@@ -62,7 +61,6 @@ ...@@ -62,7 +61,6 @@
animation="300" animation="300"
:move="onMove" :move="onMove"
class="drag-list" class="drag-list"
:disabled="!hasDataPermission('manage',param.privileges)"
@add="moveToDimension" @add="moveToDimension"
> >
<transition-group> <transition-group>
...@@ -88,7 +86,6 @@ ...@@ -88,7 +86,6 @@
animation="300" animation="300"
:move="onMove" :move="onMove"
class="drag-list" class="drag-list"
:disabled="!hasDataPermission('manage',param.privileges)"
@add="moveToQuota" @add="moveToQuota"
> >
<transition-group> <transition-group>
...@@ -157,7 +154,6 @@ ...@@ -157,7 +154,6 @@
<el-radio-group <el-radio-group
v-model="view.type" v-model="view.type"
style="width: 100%" style="width: 100%"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="changeChartType()" @change="changeChartType()"
> >
<chart-type ref="cu-chart-type" :chart="view" style="height: 480px" /> <chart-type ref="cu-chart-type" :chart="view" style="height: 480px" />
...@@ -182,7 +178,6 @@ ...@@ -182,7 +178,6 @@
slot="reference" slot="reference"
size="mini" size="mini"
style="padding: 6px;" style="padding: 6px;"
:disabled="!hasDataPermission('manage',param.privileges)"
> >
{{ $t('chart.change_chart_type') }} {{ $t('chart.change_chart_type') }}
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
...@@ -202,7 +197,6 @@ ...@@ -202,7 +197,6 @@
<el-radio-group <el-radio-group
v-model="view.resultMode" v-model="view.resultMode"
class="radio-span" class="radio-span"
:disabled="!hasDataPermission('manage',param.privileges)"
size="mini" size="mini"
@change="calcData" @change="calcData"
> >
...@@ -212,7 +206,6 @@ ...@@ -212,7 +206,6 @@
v-model="view.resultCount" v-model="view.resultCount"
class="result-count" class="result-count"
size="mini" size="mini"
:disabled="!hasDataPermission('manage',param.privileges)"
@change="calcData" @change="calcData"
/> />
</el-radio> </el-radio>
...@@ -237,7 +230,6 @@ ...@@ -237,7 +230,6 @@
:no-children-text="$t('commons.treeselect.no_children_text')" :no-children-text="$t('commons.treeselect.no_children_text')"
:no-options-text="$t('commons.treeselect.no_options_text')" :no-options-text="$t('commons.treeselect.no_options_text')"
:no-results-text="$t('commons.treeselect.no_results_text')" :no-results-text="$t('commons.treeselect.no_results_text')"
:disabled="!hasDataPermission('manage',param.privileges)"
@input="calcData" @input="calcData"
@deselect="calcData" @deselect="calcData"
/> />
...@@ -256,7 +248,6 @@ ...@@ -256,7 +248,6 @@
</span> </span>
<draggable <draggable
v-model="view.xaxisExt" v-model="view.xaxisExt"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -310,7 +301,6 @@ ...@@ -310,7 +301,6 @@
</span> </span>
<draggable <draggable
v-model="view.xaxis" v-model="view.xaxis"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -364,7 +354,6 @@ ...@@ -364,7 +354,6 @@
</span> </span>
<draggable <draggable
v-model="view.yaxis" v-model="view.yaxis"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -403,7 +392,6 @@ ...@@ -403,7 +392,6 @@
</span> </span>
<draggable <draggable
v-model="view.yaxisExt" v-model="view.yaxisExt"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -442,7 +430,6 @@ ...@@ -442,7 +430,6 @@
</span> </span>
<draggable <draggable
v-model="view.extStack" v-model="view.extStack"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -484,7 +471,6 @@ ...@@ -484,7 +471,6 @@
</span> </span>
<draggable <draggable
v-model="view.extBubble" v-model="view.extBubble"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -518,7 +504,6 @@ ...@@ -518,7 +504,6 @@
<!-- </el-button>--> <!-- </el-button>-->
<draggable <draggable
v-model="view.customFilter" v-model="view.customFilter"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -557,7 +542,6 @@ ...@@ -557,7 +542,6 @@
</span> </span>
<draggable <draggable
v-model="view.drillFields" v-model="view.drillFields"
:disabled="!hasDataPermission('manage',param.privileges)"
group="drag" group="drag"
animation="300" animation="300"
:move="onMove" :move="onMove"
...@@ -609,7 +593,6 @@ ...@@ -609,7 +593,6 @@
<el-radio-group <el-radio-group
v-model="view.stylePriority" v-model="view.stylePriority"
class="radio-span" class="radio-span"
:disabled="!hasDataPermission('manage',param.privileges)"
size="mini" size="mini"
@change="calcStyle" @change="calcStyle"
> >
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论