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] =?UTF-8?q?feat:=201.=E6=9B=BF=E6=8D=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=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;
+}
 
 </style>
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"
       >
         <span slot-scope="{ node, data }" class="custom-tree-node">
-          <span>
-            <span style="margin-left: 6px" v-html="data.name" />
+          <span style="display: flex; flex: 1 1 0%; width: 0px;">
+            <span style="margin-left: 6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" v-html="data.name" />
           </span>
           <span v-if="showExtent" @click.stop>
             <div v-if="authReady && authDetails[data.id]">
               <span v-for="auth in authDetails[data.id]" :key="auth.privilegeType" class="auth-span">
                 <!-- 1-{{ auth.privilegeType }}-{{ auth.privilegeValue }}-->
-                <a href="javascript:;" @click="clickAuth(data.id,auth)">
-                  <svg-icon style="width: 22px;height: 22px" :icon-class="auth.privilegeValue===1?'lock_open':'lock_closed'" />
-                </a>
+                <el-switch v-model="auth.privilegeValue" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="clickAuth(data.id,auth)" />
               </span>
             </div>
             <div v-else>
               <span v-for="auth in defaultAuthDetails" :key="auth.privilegeType" class="auth-span">
                 <!--2-{{ auth.privilegeType }}-{{ auth.privilegeValue }}-->
-                <a href="javascript:;" @click="clickAuth(data.id,auth)">
-                  <svg-icon style="width: 22px;height: 22px" :icon-class="auth.privilegeValue===1?'lock_open':'lock_closed'" />
-                </a>
+                <el-switch v-model="auth.privilegeValue" :active-value="1" :inactive-value="0" inactive-color="#DCDFE6" @change="clickAuth(data.id,auth)" />
               </span>
             </div></span>
         </span>
@@ -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;
+  }
+
 </style>