From 566a31700530ad968d2782a8b7bac44b99cd59cd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 15 Nov 2021 15:53:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=8C=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 1 + frontend/src/lang/zh.js | 1 + .../src/views/dataset/data/RowPermissions.vue | 35 ++ frontend/src/views/dataset/data/ViewTable.vue | 6 +- .../src/views/dataset/data/authConfig.vue | 226 +++++++++++ .../dataset/data/components/LazyTree.vue | 373 ++++++++++++++++++ 6 files changed, 641 insertions(+), 1 deletion(-) create mode 100644 frontend/src/views/dataset/data/RowPermissions.vue create mode 100644 frontend/src/views/dataset/data/authConfig.vue create mode 100644 frontend/src/views/dataset/data/components/LazyTree.vue 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 e14690a455..7838ca7e31 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1228,6 +1228,7 @@ public class DataSetTableService { dataSetDetail.setTable(table); if (ObjectUtils.isNotEmpty(table)) { Datasource datasource = datasourceMapper.selectByPrimaryKey(table.getDataSourceId()); + datasource.setConfiguration(null); dataSetDetail.setDatasource(datasource); } return dataSetDetail; diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index eafbcbcc02..9ed6e3e856 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1014,6 +1014,7 @@ export default { field_check: '选中', update_info: '更新信息', join_view: '数据关联', + row_permissions: '行权限', text: '文本', time: '时间', value: '数值', diff --git a/frontend/src/views/dataset/data/RowPermissions.vue b/frontend/src/views/dataset/data/RowPermissions.vue new file mode 100644 index 0000000000..5c061fc5ca --- /dev/null +++ b/frontend/src/views/dataset/data/RowPermissions.vue @@ -0,0 +1,35 @@ + + + + diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 32eafed33c..bad5538a6b 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -56,6 +56,9 @@ + + + @@ -69,11 +72,12 @@ import TabDataPreview from './TabDataPreview' import UpdateInfo from './UpdateInfo' import DatasetChartDetail from '../common/DatasetChartDetail' import UnionView from './UnionView' +import RowPermissions from './RowPermissions' import FieldEdit from './FieldEdit' export default { name: 'ViewTable', - components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview }, + components: {RowPermissions, FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview }, props: { param: { type: Object, diff --git a/frontend/src/views/dataset/data/authConfig.vue b/frontend/src/views/dataset/data/authConfig.vue new file mode 100644 index 0000000000..8324e167d8 --- /dev/null +++ b/frontend/src/views/dataset/data/authConfig.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/frontend/src/views/dataset/data/components/LazyTree.vue b/frontend/src/views/dataset/data/components/LazyTree.vue new file mode 100644 index 0000000000..762e0bcc99 --- /dev/null +++ b/frontend/src/views/dataset/data/components/LazyTree.vue @@ -0,0 +1,373 @@ + + + + +