Merge remote-tracking branch 'origin/dev' into dev

project/dv/apps/AppGridDV.vue

@@ -310,6 +310,7 @@
             }
           }, v.checkType ? (v.checkType === '1' ? '网格员' : '网格长') :'-')])
         })), h('div', {
+          class: 'user-gridName',
           style: {
             display: node.data.label === '子节点' ? 'none' : 'block',
             color: 'rgba(255, 255, 255, 0.8)',
@@ -508,6 +509,7 @@
     display: flex;
     align-items: center;
     height: 100%;
+    user-select: none;
 
     ::-webkit-scrollbar {
       width: 6px;
@@ -797,7 +799,7 @@
         padding: 20px;
         overflow: hidden;
         width: max-content;
-        height: 200%;
+        height: 300%;
       }
 
       ::v-deep .org-chart-container {
@@ -819,6 +821,11 @@
           padding: 0!important;
         }
 
+        .org-chart-node-btn {
+          margin-left: 0;
+          transform: translateX(-50%);
+        }
+
         .org-chart-node {
           // max-width: 500px;
         }