From cc14b0f3beba94c70b2587a2fbc4753a67d6f0b5 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 6 Jul 2021 19:26:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtDataSetTableMapper.java     |  2 +
 .../base/mapper/ext/ExtDataSetTableMapper.xml | 29 +++++++++++-
 .../dataset/DataSetTableController.java       |  5 ++
 .../service/dataset/DataSetTableService.java  |  8 ++++
 .../BackgroundColorSelector.vue               |  6 ++-
 .../component-style/LegendSelector.vue        |  7 ++-
 .../component-style/SplitSelector.vue         |  6 ++-
 .../component-style/TitleSelector.vue         |  7 ++-
 .../component-style/XAxisSelector.vue         |  7 ++-
 .../component-style/YAxisSelector.vue         |  7 ++-
 .../components/drag-item/DimensionItem.vue    |  6 ++-
 .../chart/components/drag-item/QuotaItem.vue  |  8 +++-
 .../components/shape-attr/ColorSelector.vue   |  6 ++-
 .../components/shape-attr/LabelSelector.vue   |  7 ++-
 .../components/shape-attr/SizeSelector.vue    |  6 ++-
 .../components/shape-attr/TooltipSelector.vue |  7 ++-
 frontend/src/views/chart/group/Group.vue      |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue   | 47 +++++++++++--------
 .../src/views/dataset/data/TabDataPreview.vue |  4 ++
 frontend/src/views/dataset/data/UnionView.vue | 10 ++--
 .../src/views/dataset/data/UpdateInfo.vue     |  6 ++-
 frontend/src/views/dataset/data/ViewTable.vue | 16 +++----
 frontend/src/views/dataset/group/Group.vue    |  2 +-
 23 files changed, 162 insertions(+), 49 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java
index 5b942d801d..5261a66430 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java
@@ -7,4 +7,6 @@ import java.util.List;
 
 public interface ExtDataSetTableMapper {
     List<DataSetTableDTO> search(DataSetTableRequest request);
+
+    DataSetTableDTO searchOne(DataSetTableRequest request);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
index 1f1d6ad214..cf157449e8 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
@@ -7,6 +7,33 @@
         <result column="privileges" property="privileges"/>
     </resultMap>
 
+    <select id="searchOne" resultMap="BaseResultMapDTO">
+        select
+        id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
+        get_auths(id,'dataset',#{userId}) as `privileges`
+        from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_table
+        <where>
+            FIND_IN_SET(dataset_table.id,cids)
+            <if test="id != null">
+                and id = #{id,jdbcType=VARCHAR}
+            </if>
+            <if test="sceneId != null">
+                and scene_id = #{sceneId,jdbcType=VARCHAR}
+            </if>
+            <if test="mode != null">
+                and mode = #{mode,jdbcType=INTEGER}
+            </if>
+            <if test="typeFilter != null">
+                and type in
+                <foreach collection="typeFilter" item="item" open="(" separator="," close=")">
+                    #{item,jdbcType=INTEGER}
+                </foreach>
+            </if>
+        </where>
+        <if test="sort != null">
+            order by ${sort}
+        </if>
+    </select>
 
     <select id="search" resultMap="BaseResultMapDTO">
         select
@@ -31,7 +58,5 @@
         <if test="sort != null">
             order by ${sort}
         </if>
-
-
     </select>
 </mapper>
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 3fe41d449a..0f51a4ccc3 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -54,6 +54,11 @@ public class DataSetTableController {
         return dataSetTableService.get(id);
     }
 
+    @PostMapping("getWithPermission/{id}")
+    public DataSetTableDTO getWithPermission(@PathVariable String id) {
+        return dataSetTableService.getWithPermission(id);
+    }
+
     @PostMapping("getFields")
     public List<TableFiled> getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
         return dataSetTableService.getFields(dataSetTableRequest);
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 2365207c18..b2720f0451 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -215,6 +215,14 @@ public class DataSetTableService {
         return datasetTableMapper.selectByPrimaryKey(id);
     }
 
+    public DataSetTableDTO getWithPermission(String id) {
+        DataSetTableRequest dataSetTableRequest = new DataSetTableRequest();
+        dataSetTableRequest.setId(id);
+        dataSetTableRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        dataSetTableRequest.setTypeFilter(dataSetTableRequest.getTypeFilter());
+        return extDataSetTableMapper.searchOne(dataSetTableRequest);
+    }
+
     public List<TableFiled> getFields(DataSetTableRequest dataSetTableRequest) throws Exception {
         Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
diff --git a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
index e802ac43d2..92bb45d204 100644
--- a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
+++ b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
@@ -17,7 +17,7 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon--right" /></el-button>
+        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon--right" /></el-button>
       </el-popover>
     </div>
   </div>
@@ -29,6 +29,10 @@ import { DEFAULT_BACKGROUND_COLOR } from '../../chart/chart'
 export default {
   name: 'BackgroundColorSelector',
   props: {
+    param: {
+      type: Object,
+      required: false
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/component-style/LegendSelector.vue b/frontend/src/views/chart/components/component-style/LegendSelector.vue
index 476c4b5590..d515035912 100644
--- a/frontend/src/views/chart/components/component-style/LegendSelector.vue
+++ b/frontend/src/views/chart/components/component-style/LegendSelector.vue
@@ -53,10 +53,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!legendForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!legendForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.legend') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="legendForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeLegendStyle"
@@ -73,6 +74,10 @@ import { DEFAULT_LEGEND_STYLE } from '../../chart/chart'
 export default {
   name: 'LegendSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/component-style/SplitSelector.vue b/frontend/src/views/chart/components/component-style/SplitSelector.vue
index 4e49cdee99..51cb426320 100644
--- a/frontend/src/views/chart/components/component-style/SplitSelector.vue
+++ b/frontend/src/views/chart/components/component-style/SplitSelector.vue
@@ -48,7 +48,7 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item">
+        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">
           {{ $t('chart.split') }}<i class="el-icon-setting el-icon--right" />
         </el-button>
       </el-popover>
@@ -62,6 +62,10 @@ import { DEFAULT_SPLIT } from '../../chart/chart'
 export default {
   name: 'SplitSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index 1a031b82e4..5851a92787 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -51,10 +51,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!titleForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!titleForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.title') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="titleForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeTitleStyle"
@@ -71,6 +72,10 @@ import { DEFAULT_TITLE_STYLE } from '../../chart/chart'
 export default {
   name: 'TitleSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelector.vue b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
index c4f59bd473..65d88477f8 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
@@ -72,10 +72,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.xAxis') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="axisForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeXAxisStyle"
@@ -92,6 +93,10 @@ import { DEFAULT_XAXIS_STYLE } from '../../chart/chart'
 export default {
   name: 'XAxisSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/component-style/YAxisSelector.vue b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
index 3a337923b0..fd5765705f 100644
--- a/frontend/src/views/chart/components/component-style/YAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
@@ -72,10 +72,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.yAxis') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="axisForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeYAxisStyle"
@@ -92,6 +93,10 @@ import { DEFAULT_YAXIS_STYLE } from '../../chart/chart'
 export default {
   name: 'YAxisSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index 6e9d770323..b4ff8061b4 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -5,7 +5,7 @@
         <el-tag size="small" class="item-axis">
           {{ item.name }}<i class="el-icon-arrow-down el-icon--right" />
         </el-tag>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu v-if="hasDataPermission('manage',param.privileges)" slot="dropdown">
           <el-dropdown-item>
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
               <span class="el-dropdown-link inner-dropdown-menu">
@@ -80,6 +80,10 @@
 export default {
   name: 'DimensionItem',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     item: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index d748213e11..eb6921e9a7 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -1,13 +1,13 @@
 <template>
   <span>
-    <el-dropdown trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" :disabled="!hasDataPermission('manage',param.privileges)" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis">
           <span>{{ item.name }}</span>
           <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
           <i class="el-icon-arrow-down el-icon--right" />
         </el-tag>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu v-if="hasDataPermission('manage',param.privileges)" slot="dropdown">
           <el-dropdown-item>
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="summary">
               <span class="el-dropdown-link inner-dropdown-menu">
@@ -81,6 +81,10 @@
 export default {
   name: 'QuotaItem',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     item: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index 6b5163e66b..161f15a6ee 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -49,7 +49,7 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button>
+        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button>
       </el-popover>
     </div>
   </div>
@@ -61,6 +61,10 @@ import { DEFAULT_COLOR_CASE } from '../../chart/chart'
 export default {
   name: 'ColorSelector',
   props: {
+    param: {
+      type: Object,
+      required: false
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
index e50f47093f..0b164606bc 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
@@ -67,10 +67,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!labelForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!labelForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.label') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="labelForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeLabelAttr"
@@ -87,6 +88,10 @@ import { DEFAULT_LABEL } from '../../chart/chart'
 export default {
   name: 'LabelSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index ac70b54cdf..b3d714eb4c 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -143,7 +143,7 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.size') }}<i class="el-icon-setting el-icon--right" /></el-button>
+        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.size') }}<i class="el-icon-setting el-icon--right" /></el-button>
       </el-popover>
     </div>
   </div>
@@ -154,6 +154,10 @@ import { DEFAULT_SIZE } from '../../chart/chart'
 export default {
   name: 'SizeSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
index b509b7012f..6160b55a01 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
@@ -55,10 +55,11 @@
           </el-form>
         </el-col>
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!tooltipForm.show">
+        <el-button slot="reference" size="mini" class="shape-item" :disabled="!tooltipForm.show || !hasDataPermission('manage',param.privileges)">
           {{ $t('chart.tooltip') }}<i class="el-icon-setting el-icon--right" />
           <el-switch
             v-model="tooltipForm.show"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             class="switch-style"
             @click.stop.native
             @change="changeTooltipAttr"
@@ -75,6 +76,10 @@ import { DEFAULT_TOOLTIP } from '../../chart/chart'
 export default {
   name: 'TooltipSelector',
   props: {
+    param: {
+      type: Object,
+      required: true
+    },
     chart: {
       type: Object,
       required: true
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index dc8ecf69f5..caad34775d 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -689,7 +689,7 @@ export default {
 
     nodeClick(data, node) {
       if (data.type !== 'group') {
-        this.$emit('switchComponent', { name: 'ChartEdit', param: { 'id': data.id }})
+        this.$emit('switchComponent', { name: 'ChartEdit', param: data })
       }
       // if (data.type === 'scene') {
       //   this.sceneMode = true
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 6a8e90c373..ff3cdd2abf 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -13,7 +13,7 @@
         <span slot="reference" style="line-height: 40px;cursor: pointer;">{{ view.name }}</span>
       </el-popover>
       <span style="float: right;line-height: 40px;">
-        <el-button size="mini" @click="changeDs">
+        <el-button v-if="hasDataPermission('manage',param.privileges)" size="mini" @click="changeDs">
           {{ $t('chart.change_ds') }}
         </el-button>
         <el-button size="mini" @click="closeEdit">
@@ -37,7 +37,7 @@
             prefix-icon="el-icon-search"
             clearable
           />
-          <el-button icon="el-icon-setting" type="text" size="mini" style="float: right;width: 20px;margin-left: 6px;" @click="editField" />
+          <el-button :disabled="!table || !hasDataPermission('manage',table.privileges)" icon="el-icon-setting" type="text" size="mini" style="float: right;width: 20px;margin-left: 6px;" @click="editField" />
         </div>
         <div style="border-bottom: 1px solid #E6E6E6;" class="padding-lr field-height">
           <span>{{ $t('chart.dimension') }}</span>
@@ -47,6 +47,7 @@
             animation="300"
             :move="onMove"
             class="drag-list"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             @end="end1"
             @start="start1"
           >
@@ -68,6 +69,7 @@
             animation="300"
             :move="onMove"
             class="drag-list"
+            :disabled="!hasDataPermission('manage',param.privileges)"
             @end="end1"
             @start="start1"
           >
@@ -111,6 +113,7 @@
               <el-radio-group
                 v-model="view.type"
                 style="width: 100%"
+                :disabled="!hasDataPermission('manage',param.privileges)"
                 @change="save(true,'chart',true)"
               >
                 <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
@@ -207,7 +210,7 @@
           <el-row class="padding-lr">
             <span>{{ $t('chart.style_priority') }}</span>
             <el-row>
-              <el-radio-group v-model="view.stylePriority" size="mini" @change="save">
+              <el-radio-group v-model="view.stylePriority" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" @change="save">
                 <el-radio label="view"><span>{{ $t('chart.chart') }}</span></el-radio>
                 <el-radio label="panel"><span>{{ $t('chart.dashboard') }}</span></el-radio>
               </el-radio-group>
@@ -215,24 +218,24 @@
           </el-row>
           <el-tabs type="card" :stretch="true" class="tab-header">
             <el-tab-pane :label="$t('chart.shape_attr')" class="padding-lr">
-              <color-selector class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
-              <size-selector class="attr-selector" :chart="chart" @onSizeChange="onSizeChange" />
-              <label-selector v-show="!view.type.includes('table') && !view.type.includes('text')" class="attr-selector" :chart="chart" @onLabelChange="onLabelChange" />
-              <tooltip-selector v-show="!view.type.includes('table') && !view.type.includes('text')" class="attr-selector" :chart="chart" @onTooltipChange="onTooltipChange" />
+              <color-selector :param="param" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
+              <size-selector :param="param" class="attr-selector" :chart="chart" @onSizeChange="onSizeChange" />
+              <label-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLabelChange="onLabelChange" />
+              <tooltip-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onTooltipChange="onTooltipChange" />
             </el-tab-pane>
             <el-tab-pane :label="$t('chart.module_style')" class="padding-lr">
-              <x-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" class="attr-selector" :chart="chart" @onChangeXAxisForm="onChangeXAxisForm" />
-              <y-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" class="attr-selector" :chart="chart" @onChangeYAxisForm="onChangeYAxisForm" />
-              <split-selector v-show="view.type.includes('radar')" class="attr-selector" :chart="chart" @onChangeSplitForm="onChangeSplitForm" />
-              <title-selector class="attr-selector" :chart="chart" @onTextChange="onTextChange" />
-              <legend-selector v-show="!view.type.includes('table') && !view.type.includes('text')" class="attr-selector" :chart="chart" @onLegendChange="onLegendChange" />
-              <background-color-selector class="attr-selector" :chart="chart" @onChangeBackgroundForm="onChangeBackgroundForm" />
+              <x-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" :param="param" class="attr-selector" :chart="chart" @onChangeXAxisForm="onChangeXAxisForm" />
+              <y-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" :param="param" class="attr-selector" :chart="chart" @onChangeYAxisForm="onChangeYAxisForm" />
+              <split-selector v-show="view.type.includes('radar')" :param="param" class="attr-selector" :chart="chart" @onChangeSplitForm="onChangeSplitForm" />
+              <title-selector :param="param" class="attr-selector" :chart="chart" @onTextChange="onTextChange" />
+              <legend-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLegendChange="onLegendChange" />
+              <background-color-selector :param="param" class="attr-selector" :chart="chart" @onChangeBackgroundForm="onChangeBackgroundForm" />
             </el-tab-pane>
           </el-tabs>
         </div>
         <div style="height:60px;overflow:auto;border-top: 1px solid #e6e6e6" class="padding-lr filter-class">
           <span>{{ $t('chart.result_filter') }}</span>
-          <el-button size="mini" class="filter-btn-class" @click="showResultFilter">
+          <el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter">
             {{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon--right" />
           </el-button>
         </div>
@@ -245,6 +248,7 @@
               <span style="line-height: 32px;width: 80px;text-align: right;">{{ $t('chart.dimension') }}</span>
               <draggable
                 v-model="view.xaxis"
+                :disabled="!hasDataPermission('manage',param.privileges)"
                 group="dimension"
                 animation="300"
                 :move="onMove"
@@ -252,7 +256,7 @@
                 @end="end2"
               >
                 <transition-group class="draggable-group">
-                  <dimension-item v-for="(item,index) in view.xaxis" :key="item.id" :index="index" :item="item" @onDimensionItemChange="dimensionItemChange" @onDimensionItemRemove="dimensionItemRemove" @editItemFilter="showDimensionEditFilter" @onNameEdit="showRename" />
+                  <dimension-item v-for="(item,index) in view.xaxis" :key="item.id" :param="param" :index="index" :item="item" @onDimensionItemChange="dimensionItemChange" @onDimensionItemRemove="dimensionItemRemove" @editItemFilter="showDimensionEditFilter" @onNameEdit="showRename" />
                 </transition-group>
               </draggable>
             </el-row>
@@ -260,6 +264,7 @@
               <span style="line-height: 32px;width: 80px;text-align: right;">{{ $t('chart.quota') }}</span>
               <draggable
                 v-model="view.yaxis"
+                :disabled="!hasDataPermission('manage',param.privileges)"
                 group="quota"
                 animation="300"
                 :move="onMove"
@@ -267,7 +272,7 @@
                 @end="end2"
               >
                 <transition-group class="draggable-group">
-                  <quota-item v-for="(item,index) in view.yaxis" :key="item.id" :index="index" :item="item" @onQuotaItemChange="quotaItemChange" @onQuotaItemRemove="quotaItemRemove" @editItemFilter="showQuotaEditFilter" @onNameEdit="showRename" />
+                  <quota-item v-for="(item,index) in view.yaxis" :key="item.id" :param="param" :index="index" :item="item" @onQuotaItemChange="quotaItemChange" @onQuotaItemRemove="quotaItemRemove" @editItemFilter="showQuotaEditFilter" @onNameEdit="showRename" />
                 </transition-group>
               </draggable>
             </el-row>
@@ -348,7 +353,7 @@
     <!--视图更换数据集-->
     <el-dialog
       v-dialogDrag
-      :title="$t('chart.change_ds')+'['+table.name+']'"
+      :title="changeDsTitle"
       :visible="selectTableFlag"
       :show-close="false"
       width="70%"
@@ -359,7 +364,7 @@
       <p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeChangeChart">{{ $t('chart.cancel') }}</el-button>
-        <el-button type="primary" size="mini" :disabled="!table.id" @click="changeChart">{{ $t('chart.confirm') }}</el-button>
+        <el-button type="primary" size="mini" :disabled="!table || !table.id" @click="changeChart">{{ $t('chart.confirm') }}</el-button>
       </div>
     </el-dialog>
 
@@ -485,7 +490,8 @@ export default {
       selectTableFlag: false,
       changeTable: {},
       searchField: '',
-      editDsField: false
+      editDsField: false,
+      changeDsTitle: ''
     }
   },
   computed: {
@@ -520,7 +526,7 @@ export default {
   methods: {
     initTableData(id) {
       if (id != null) {
-        post('/dataset/table/get/' + id, null).then(response => {
+        post('/dataset/table/getWithPermission/' + id, null).then(response => {
           this.table = response.data
           this.initTableField(id)
         }).catch(err => {
@@ -1038,6 +1044,7 @@ export default {
     },
 
     changeDs() {
+      this.changeDsTitle = this.$t('chart.change_ds') + '[' + this.table.name + ']'
       this.selectTableFlag = true
     },
 
diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue
index 551de90bc8..5a61103d15 100644
--- a/frontend/src/views/dataset/data/TabDataPreview.vue
+++ b/frontend/src/views/dataset/data/TabDataPreview.vue
@@ -77,6 +77,10 @@ export default {
       type: Object,
       required: true
     },
+    param: {
+      type: Object,
+      required: true
+    },
     fields: {
       type: Array,
       required: true
diff --git a/frontend/src/views/dataset/data/UnionView.vue b/frontend/src/views/dataset/data/UnionView.vue
index a38f3faddb..c31b8ac35e 100644
--- a/frontend/src/views/dataset/data/UnionView.vue
+++ b/frontend/src/views/dataset/data/UnionView.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-button size="mini" @click="showUnionEdit">{{ $t('dataset.add_union') }}</el-button>
+    <el-button v-if="hasDataPermission('manage',param.privileges)" size="mini" @click="showUnionEdit">{{ $t('dataset.add_union') }}</el-button>
     <el-row>
       <el-table
         size="mini"
@@ -34,8 +34,8 @@
           :label="$t('dataset.operate')"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="mini" @click="edit(scope.row)">{{ $t('dataset.edit') }}</el-button>
-            <el-button type="text" size="mini" @click="deleteUnion(scope.row)">{{ $t('dataset.delete') }}</el-button>
+            <el-button v-if="hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="edit(scope.row)">{{ $t('dataset.edit') }}</el-button>
+            <el-button v-if="hasDataPermission('manage',param.privileges)" type="text" size="mini" @click="deleteUnion(scope.row)">{{ $t('dataset.delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -143,6 +143,10 @@ export default {
     table: {
       type: Object,
       required: true
+    },
+    param: {
+      type: Object,
+      required: true
     }
   },
   data() {
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 74c0af7f74..5c11a97687 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-col>
     <el-row>
-      <el-button icon="el-icon-setting" size="mini" @click="showConfig">
+      <el-button v-if="hasDataPermission('manage',param.privileges)" icon="el-icon-setting" size="mini" @click="showConfig">
         {{ $t('dataset.update_setting') }}
       </el-button>
       <el-button icon="el-icon-refresh" size="mini" @click="refreshLog">
@@ -302,6 +302,10 @@ export default {
     table: {
       type: Object,
       default: null
+    },
+    param: {
+      type: Object,
+      required: true
     }
   },
   data() {
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 8502181d73..ecd316bdde 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row style="height: 100%;overflow-y: hidden;width: 100%;">
-<!--    <span v-show="false">{{ tableRefresh }}</span>-->
+    <!--    <span v-show="false">{{ tableRefresh }}</span>-->
     <el-row style="height: 26px;">
       <el-popover
         placement="right-start"
@@ -14,7 +14,7 @@
           {{ table.name }}
         </span>
       </el-popover>
-      <el-row style="float: right">
+      <el-row v-if="hasDataPermission('manage',param.privileges)" style="float: right">
         <el-dropdown v-if="table.type ==='excel'" style="margin-right: 10px;" size="small" trigger="click" @command="clickEditExcel">
           <el-button size="mini">
             {{ $t('dataset.edit_excel') }}
@@ -46,13 +46,13 @@
 
     <el-tabs v-model="tabActive">
       <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
-        <tab-data-preview :table="table" :fields="fields" :data="data" :page="page" :form="tableViewRowForm" @reSearch="reSearch" />
+        <tab-data-preview :param="param" :table="table" :fields="fields" :data="data" :page="page" :form="tableViewRowForm" @reSearch="reSearch" />
       </el-tab-pane>
       <el-tab-pane v-if="table.type !== 'custom' && table.mode === 1" :label="$t('dataset.join_view')" name="joinView">
-        <union-view :table="table" />
+        <union-view :param="param" :table="table" />
       </el-tab-pane>
       <el-tab-pane v-if="table.mode === 1 && (table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
-        <update-info :table="table" />
+        <update-info :param="param" :table="table" />
       </el-tab-pane>
     </el-tabs>
   </el-row>
@@ -70,7 +70,7 @@ export default {
   components: { UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview },
   props: {
     param: {
-      type: String,
+      type: Object,
       required: true
     }
   },
@@ -101,14 +101,14 @@ export default {
   },
   watch: {
     'param': function() {
-      this.initTable(this.param)
+      this.initTable(this.param.id)
     }
   },
   created() {
 
   },
   mounted() {
-    this.initTable(this.param)
+    this.initTable(this.param.id)
   },
   methods: {
     initTable(id) {
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index f9eb349c62..b44fef8af7 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -672,7 +672,7 @@ export default {
       // }
 
       if (data.type !== 'group') {
-        this.$emit('switchComponent', { name: 'ViewTable', param: data.id })
+        this.$emit('switchComponent', { name: 'ViewTable', param: data })
       }
       // if (node.expanded) {
       //   this.expandedArray.push(data.id)