evui 3.4.21 → 3.4.22

package/src/components/treeGrid/TreeGrid.vue

@@ -71,7 +71,7 @@
             :key="index"
           >
             <li
-              v-if="!column.hide"
+              v-if="!column.hide && !column.hiddenDisplay"
               :data-index="index"
               :class="getColumnClass(column)"
               :style="getColumnStyle(column, index)"
@@ -249,12 +249,12 @@ import {
   onMounted,
   onUnmounted,
 } from 'vue';
-import treeGridNode from './TreeGridNode';
-import Toolbar from './treeGrid.toolbar';
-import GridPagination from '../grid/grid.pagination';
-import GridSummary from '../grid/grid.summary';
-import GridOptionButton from '../grid/grid.optionButton.vue';
-import ColumnSetting from '../grid/grid.columnSetting.vue';
+import TreeGridNode from './TreeGridNode';
+import Toolbar from './TreeGridToolbar';
+import GridPagination from '../grid/GridPagination';
+import GridSummary from '../grid/GridSummary';
+import ColumnSetting from '../grid/GridColumnSetting.vue';
+import GridOptionButton from '../grid/icon/icon-option-button.vue';
 import {
   commonFunctions,
   scrollEvent,
@@ -273,12 +273,12 @@ import {
 export default {
   name: 'EvTreeGrid',
   components: {
-    ColumnSetting,
-    GridOptionButton,
-    treeGridNode,
+    TreeGridNode,
     Toolbar,
     GridPagination,
     GridSummary,
+    ColumnSetting,
+    GridOptionButton,
   },
   props: {
     columns: {

package/src/components/treeGrid/TreeGridNode.vue

@@ -26,7 +26,7 @@
       :key="cellIndex"
     >
       <td
-        v-if="!column.hide"
+        v-if="!column.hide && !column.hiddenDisplay"
         :data-name="column.field"
         :data-index="node.index"
         :class="getColumnClass(column, cellIndex)"
@@ -133,7 +133,7 @@
 
 <script>
 import { computed } from 'vue';
-import GridOptionButton from '@/components/grid/grid.optionButton.vue';
+import GridOptionButton from '@/components/grid/icon/icon-option-button.vue';
 
 export default {
   name: 'TreeGridNode',
@@ -312,7 +312,7 @@ export default {
     top: -3px;
     width: 11px;
     height: 10px;
-    background: url('./tree_icon.png') no-repeat -43px -61px;
+    background: url('icon/icon-tree.png') no-repeat -43px -61px;
   }
   &.expand > .tree-expand-icon i {
     height: 8px;
@@ -325,13 +325,13 @@ export default {
     height: 14px;
   }
   .tree-parent-icon i {
-    background: url('./tree_icon.png') no-repeat -39px -35px;
+    background: url('icon/icon-tree.png') no-repeat -39px -35px;
   }
   &.expand > .tree-parent-icon i {
     background-position: -65px -35px;
   }
   .tree-child-icon i {
-    background: url('./tree_icon.png') no-repeat -14px -35px;
+    background: url('icon/icon-tree.png') no-repeat -14px -35px;
   }
 }
 .td-content {

package/src/components/treeGrid/uses.js

@@ -197,7 +197,7 @@ export const resizeEvent = (params) => {
       let elWidth = bodyEl.offsetWidth;
       const elHeight = bodyEl.offsetHeight;
       const result = stores.orderedColumns.reduce((acc, column) => {
-        if (column.hide) {
+        if (column.hide || column.hiddenDisplay) {
           return acc;
         }
 
@@ -306,6 +306,7 @@ export const resizeEvent = (params) => {
     const startMouseLeft = event.clientX;
     const startColumnLeft = columnRect.left - headerLeft;
 
+    bodyEl.style.overflow = 'auto';
     resizeLineEl.style.left = `${startLeft}px`;
 
     resizeInfo.showResizeLine = true;