Merge branch 'dev' into zwg

src/page/main/system/organization/index.vue

@@ -886,7 +886,7 @@ onBeforeMount(() => {});
   padding: 16px;
 }
 .tree {
-  overflow: auto;
+  overflow: hidden auto;
   height: calc(100% - 65px);
   /* padding: 5px; */
 }

src/page/main/system/organization/tree.vue

@@ -23,7 +23,6 @@
         <span
           v-else
           class="tree-action-box"
-          :class="{ position_sticky: isSticky(data.name) }"
           @click.stop="showAction($event, data, node)">
           <bg-icon class="tree-more" icon="#bg-ic-s-more"></bg-icon>
         </span>
@@ -369,7 +368,9 @@ defineExpose({ getOrgTree, filterTree, setCurrentNode });
 .file-tree :deep() .el-tree-node__content:hover .tree-action-box {
   display: inline-block;
 }
-
+.file-tree :deep() .el-tree-node__content:hover + .label-text {
+  width: calc(100% - 48px);
+}
 .file-tree :deep() .el-tree-node__content .first_node {
   display: inline-block;
   background-color: #fff;
@@ -395,6 +396,11 @@ defineExpose({ getOrgTree, filterTree, setCurrentNode });
 .label-text {
   font-size: 14px;
   color: #404a62;
+  display: inline-block;
+  width: calc(100% - 24px);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .tree-action-box:hover + .label-text {
   padding: 8px 0;
@@ -403,7 +409,8 @@ defineExpose({ getOrgTree, filterTree, setCurrentNode });
 
 .label-text:hover {
   padding: 8px 0;
-  background-color: var(--el-tree-node-hover-bg-color);
+  /* background-color: var(--el-tree-node-hover-bg-color); */
+  width: calc(100% - 48px);
 }
 .is_active {
   padding: 8px 0;