vxe-table 4.14.0-beta.1 → 4.14.0-beta.10

package/packages/table/src/util.ts

@@ -239,7 +239,7 @@ export function getRefElem (refEl: any) {
   return null
 }
 
-export function getCellHeight (height: number | 'unset' | undefined | null) {
+export function getCalcHeight (height: number | 'unset' | undefined | null) {
   if (height === 'unset') {
     return 0
   }
@@ -415,12 +415,16 @@ const countTreeExpand = (prevRow: any, params: VxeTableDefines.CellRenderBodyPar
     return count
   }
   const { $table } = params
+  const reactData = $table.reactData
+  const { treeExpandedFlag } = reactData
+  const internalData = $table.internalData
+  const { treeExpandedMaps } = internalData
   const { computeTreeOpts } = $table.getComputeMaps()
   const treeOpts = computeTreeOpts.value
   const { transform, mapChildrenField } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   const rowChildren = prevRow[transform ? mapChildrenField : childrenField]
-  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && treeExpandedFlag && treeExpandedMaps[getRowid($table, prevRow)]) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
     }

package/packages/ui/index.ts

@@ -77,6 +77,11 @@ VxeUI.setConfig({
       theme: 'beautify'
     },
     columnConfig: {
+      autoOptions: {
+        isCalcHeader: true,
+        isCalcBody: true,
+        isCalcFooter: true
+      },
       maxFixedSize: 4
     },
     cellConfig: {
@@ -257,6 +262,7 @@ VxeUI.setConfig({
     proxyConfig: {
       enabled: true,
       autoLoad: true,
+      showLoading: true,
       showResponseMsg: true,
       showActiveMsg: true,
       response: {

package/styles/components/table.scss

@@ -1920,19 +1920,16 @@ $btnThemeList: (
       background-color: var( --vxe-ui-table-drag-over-background-color);
     }
   }
-  .vxe-header--column,
-  .vxe-body--column,
-  .vxe-footer--column {
+  .vxe-table--column {
+    &.col--drag-move {
+      transition: transform 0.5s ease;
+    }
     &.col--drag-origin {
       & > .vxe-cell {
-        opacity: 0.5;
+        opacity: 0.3;
       }
     }
   }
-  .vxe-header--col-list-move {
-    transition-property: transform;
-    transition-duration: 0.35s;
-  }
 
   .vxe-table--drag-col-line,
   .vxe-table--drag-row-line {
@@ -1984,10 +1981,13 @@ $btnThemeList: (
     }
   }
   .vxe-body--row {
+    &.row--drag-move {
+      transition: transform 0.5s ease;
+    }
     &.row--drag-origin {
       & > .vxe-body--column {
         & > .vxe-cell {
-          opacity: 0.5;
+          opacity: 0.3;
         }
       }
     }

package/types/all.d.ts

@@ -3,11 +3,12 @@ import { VxeUIExport, VxeGlobalConfig } from 'vxe-pc-ui'
 
 declare global {
   interface Window {
+    VxeUITable: VxeUIExport
+
     /**
      * @deprecated
      */
-    VXETable: VxeUIExport;
-    VxeUITable: VxeUIExport;
+    VXETable: VxeUIExport
   }
 }
 
@@ -34,19 +35,3 @@ export * from 'vxe-pc-ui/types/components/colgroup'
 export * from 'vxe-pc-ui/types/components/table'
 export * from 'vxe-pc-ui/types/components/grid'
 export * from 'vxe-pc-ui/types/components/toolbar'
-
-// 已废弃，兼容老版本类型
-export * from 'vxe-pc-ui/types/components/textarea'
-export * from 'vxe-pc-ui/types/components/select'
-export * from 'vxe-pc-ui/types/components/switch'
-export * from 'vxe-pc-ui/types/components/optgroup'
-export * from 'vxe-pc-ui/types/components/option'
-export * from 'vxe-pc-ui/types/components/pager'
-export * from 'vxe-pc-ui/types/components/form'
-export * from 'vxe-pc-ui/types/components/form-item'
-export * from 'vxe-pc-ui/types/components/modal'
-export * from 'vxe-pc-ui/types/components/button'
-export * from 'vxe-pc-ui/types/components/button-group'
-export * from 'vxe-pc-ui/types/components/input'
-export * from 'vxe-pc-ui/types/components/pulldown'
-export * from 'vxe-pc-ui/types/components/tooltip'