From 8c33b8e3468eb2740eafaab95544ddc69252af08 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 25 May 2021 14:44:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=201.=E6=9B=BF=E6=8D=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=B7=E5=BC=8F=E5=BC=80=E5=85=B3=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/sys/SysAuthService.java | 15 +++++------ frontend/src/views/panel/edit/index.vue | 3 +++ frontend/src/views/panel/list/PanelList.vue | 4 +-- .../system/authority/components/LazyTree.vue | 25 +++++++++++++------ 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/sys/SysAuthService.java b/backend/src/main/java/io/dataease/service/sys/SysAuthService.java index 5b4bf16dc6..0933492077 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysAuthService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysAuthService.java @@ -91,13 +91,14 @@ public class SysAuthService { }); }); // 授权修改 - if(sysAuthDetail.getPrivilegeValue()==SystemConstants.PRIVILEGE_VALUE_ON){ - //当前为开启1 >>> 关闭0 需要将权限级别（PrivilegeType）大于当前级别的全新都修改为关闭 0 - extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_OFF,sysAuthDetail.getPrivilegeType(),authIdChange); - }else{ - //当前为关闭0 >>> 开启1 需要将权限级别（PrivilegeType）小于当前级别的全新都修改为开启 1 - extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_ON,sysAuthDetail.getPrivilegeType(),authIdChange); - } + extSysAuthDetailMapper.authDetailsChange(sysAuthDetail.getPrivilegeValue(),sysAuthDetail.getPrivilegeType(),authIdChange); +// if(sysAuthDetail.getPrivilegeValue()==SystemConstants.PRIVILEGE_VALUE_ON){ +// //当前为开启1 >>> 关闭0 需要将权限级别（PrivilegeType）大于当前级别的全新都修改为关闭 0 +// extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_OFF,sysAuthDetail.getPrivilegeType(),authIdChange); +// }else{ +// //当前为关闭0 >>> 开启1 需要将权限级别（PrivilegeType）小于当前级别的全新都修改为开启 1 +// extSysAuthDetailMapper.authDetailsChange(SystemConstants.PRIVILEGE_VALUE_ON,sysAuthDetail.getPrivilegeType(),authIdChange); +// } } } diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 11ba687355..e9fbbb5b36 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -475,5 +475,8 @@ export default { .el-main >>> .el-drawer__wrapper{ width: 310px!important; } +.el-main >>> .el-drawer__body{ + overflow-y: auto; +} diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index c188a99a69..cb0e2fb6c7 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -352,7 +352,7 @@ export default { debugger this.defaultTree() // 默认展开 同时点击 新增的节点 - if (panelInfo && this.lastActiveNodeData.id) { + if (panelInfo && panelInfo.panelType === 'self' && this.lastActiveNodeData.id) { if (!this.lastActiveNodeData.children) { this.$set(this.lastActiveNodeData, 'children', []) } @@ -623,7 +623,7 @@ export default { this.$nextTick(() => { document.querySelector('.is-current').firstChild.click() // 如果是仪表盘列表的仪表盘 直接进入编辑界面 - if (panelInfo.nodeType === 'panel' && panelInfo.panelType === 'self') { + if (panelInfo.nodeType === 'panel') { this.edit(this.lastActiveNodeData, this.lastActiveNode) } }) diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue index 4256803a0c..53a29446d7 100644 --- a/frontend/src/views/system/authority/components/LazyTree.vue +++ b/frontend/src/views/system/authority/components/LazyTree.vue @@ -18,24 +18,20 @@ @node-click="nodeClick" > - - + +
- - - +
- - - +
@@ -307,4 +303,17 @@ export default { color: #faaa39 !important; } + >>>.el-switch__core{ + width:30px!important; + height:13px; + /*color:#409EFF;*/ + } + /*设置圆*/ + >>>.el-switch__core::after{ + width:13px; + height:13px; + margin-top:-2px; + margin-bottom: 2px; + } + From 9ff42a43a83998c45cb26b6076d8dc1b8b4c2ad0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 25 May 2021 15:18:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=201.=E6=9B=BF=E6=8D=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=B7=E5=BC=8F=E5=BC=80=E5=85=B3=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/authority/components/LazyTree.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/system/authority/components/LazyTree.vue b/frontend/src/views/system/authority/components/LazyTree.vue index 53a29446d7..179ab2b0f9 100644 --- a/frontend/src/views/system/authority/components/LazyTree.vue +++ b/frontend/src/views/system/authority/components/LazyTree.vue @@ -33,7 +33,8 @@ - + + @@ -282,8 +283,9 @@ export default { padding-left: 8px; } .tree-main{ - height: 100vh; + height: calc(100vh - 206px); border: 1px solid #e6e6e6; + overflow-y: auto; } .tree-head{ height: 30px; From e3d2b4ccfcfa75a44889c6cb7057396a74070143 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 25 May 2021 15:22:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:1.=E8=87=AA=E5=8A=A9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96=EF=BC=9B2.=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86list=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml | 5 ++++- frontend/src/views/dataset/common/DatasetCustomField.vue | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) 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 a955bc86c1..8b51a258e0 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 @@ -16,7 +16,10 @@ FIND_IN_SET(dataset_table.id,cids) - and scene_id = #{sceneId,jdbcType=VARCHAR} + and scene_id = #{sceneId,jdbcType=VARCHAR} + + + and mode = #{mode,jdbcType=INTEGER} diff --git a/frontend/src/views/dataset/common/DatasetCustomField.vue b/frontend/src/views/dataset/common/DatasetCustomField.vue index e7a171341c..ce009078e9 100644 --- a/frontend/src/views/dataset/common/DatasetCustomField.vue +++ b/frontend/src/views/dataset/common/DatasetCustomField.vue @@ -1,5 +1,9 @@