vxe-table 3.23.0-beta.7 → 3.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.23.0-beta.7",
+  "version": "3.23.1",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -65,7 +65,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.17.13"
+    "vxe-pc-ui": "3.17.14"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/table/module/export/mixin.ts

@@ -1107,7 +1107,7 @@ function handleImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
     }
     VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' })
     if (_importReject) {
-      _importReject({ status: false })
+      _importReject({ status: false, msg: 'field mismatching' })
     }
   }
 }
@@ -1128,7 +1128,7 @@ function handleFileImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
       }
       VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' })
     }
-    const params = { status: false }
+    const params = { status: false, msg: 'type error' }
     return Promise.reject(params)
   }
 
@@ -1163,7 +1163,7 @@ function handleFileImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           const reader = new FileReader()
           reader.onerror = () => {
             errLog('vxe.error.notType', [type])
-            _importReject({ status: false })
+            _importReject({ status: false, msg: 'reading file error' })
           }
           reader.onload = (e: any) => {
             handleImport($xeTable, e.target.result, options)
@@ -1174,7 +1174,7 @@ function handleFileImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
     } else {
       // 不支持的浏览器
       errLog('vxe.error.notExp')
-      _importResolve({ status: true })
+      _importResolve({ status: false, msg: 'unsupported browser' })
     }
   })
 
@@ -1653,7 +1653,7 @@ export default {
         if (['xlsx', 'pdf'].includes(type)) {
           warnLog('vxe.error.reqPlugin', [3, 'plugin-export-xlsx'])
         }
-        const params = { status: false }
+        const params = { status: false, msg: 'type error' }
         return Promise.reject(params)
       }
 
@@ -1662,7 +1662,7 @@ export default {
           const beRest = beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
           if (XEUtils.isBoolean(beRest)) {
             if (!beRest) {
-              const params = { status: false }
+              const params = { status: false, msg: 'before prevent' }
               return Promise.reject(params)
             }
           } else {
@@ -1778,7 +1778,7 @@ export default {
         const biRest = beforeImportMethod({ options: opts, $table: $xeTable })
         if (XEUtils.isBoolean(biRest)) {
           if (!biRest) {
-            const params = { status: false }
+            const params = { status: false, mas: 'before prevent' }
             return Promise.reject(params)
           }
         } else {
@@ -1801,7 +1801,7 @@ export default {
         const biRest = beforeImportMethod({ options: opts, $table: $xeTable })
         if (XEUtils.isBoolean(biRest)) {
           if (!biRest) {
-            const params = { status: false }
+            const params = { status: false, mas: 'before prevent' }
             return Promise.reject(params)
           }
         } else {
@@ -1963,7 +1963,8 @@ export default {
             )
           }
         } else {
-          const e = { status: false }
+          errLog('vxe.error.reqComp', ['vxe-print'])
+          const e = { status: false, msg: 'print not exist' }
           reject(e)
         }
       })

package/packages/table/src/methods.ts

@@ -2634,9 +2634,10 @@ const calcCellHeight = ($xeTable: VxeTableConstructor) => {
   if (!el || !el.clientWidth) {
     return
   }
+  const cellOpts = $xeTable.computeCellOpts
   const treeOpts = $xeTable.computeTreeOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
-  if (!isAllOverflow && (scrollYLoad || scrollXLoad || (treeConfig && treeOpts.showLine))) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad || cellOpts.maxHeight || (treeConfig && treeOpts.showLine))) {
     const { handleGetRowId } = createHandleGetRowId($xeTable)
     el.setAttribute('data-calc-row', 'Y')
     tableData.forEach(row => {
@@ -4467,7 +4468,7 @@ function updateRowOffsetTop ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
     const rowid = handleGetRowId(row)
     const rowRest = fullAllDataRowIdData[rowid] || {}
     rowRest.oTop = offsetTop
-    offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+    offsetTop += getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
     // 是否展开行
     if (expandColumn && rowExpandedMaps[rowid]) {
       offsetTop += rowRest.expandHeight || expandOpts.height || 0
@@ -4510,7 +4511,7 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
             if (isScrollYBig && trEl) {
               offsetTop = trEl.offsetTop + trEl.offsetHeight
             } else {
-              offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
+              offsetTop = rowRest.oTop + getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
             }
           } else {
             if (trEl) {
@@ -7384,7 +7385,7 @@ const tableMethods: any = {
       return
     }
     const defaultRowHeight = $xeTable.computeDefaultRowHeight
-    let currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+    let currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
     if (!showOverflow) {
       currCellHeight = tdEl.clientHeight
     }
@@ -7551,7 +7552,7 @@ const tableMethods: any = {
       if (rowRest) {
         const resizeHeight = rowRest.resizeHeight
         if (resizeHeight || isFull) {
-          const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+          const currCellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
           rest[rowid] = currCellHeight
         }
       }
@@ -7626,7 +7627,7 @@ const tableMethods: any = {
     const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId)
     const rowRest = fullAllDataRowIdData[rowid]
     if (rowRest) {
-      return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
+      return getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight)
     }
     return 0
   },

package/packages/table/src/util.ts

@@ -735,10 +735,10 @@ export function handleRowidOrRow ($xeTable: VxeTableConstructor, rowidOrRow: any
 export function getCellRestHeight (rowRest: VxeTableDefines.RowCacheItem, cellOpts: VxeTablePropTypes.CellConfig, rowOpts: VxeTablePropTypes.RowConfig, defaultRowHeight: number) {
   const { height, minHeight, maxHeight } = cellOpts
   let cellHeight = rowRest.resizeHeight || height || rowOpts.height || rowRest.height || defaultRowHeight
-  if (maxHeight && maxHeight < cellHeight) {
+  if (maxHeight && maxHeight <= cellHeight) {
     cellHeight = maxHeight
   }
-  if (minHeight && minHeight > cellHeight) {
+  if (minHeight && minHeight >= cellHeight) {
     cellHeight = minHeight
   }
   return cellHeight

package/styles/components/table.scss

@@ -2188,7 +2188,6 @@ $btnThemeList: (
     & > .vxe-cell {
       display: flex;
       flex-direction: row;
-      align-items: center;
     }
   }
   /*溢出列*/
@@ -2705,6 +2704,9 @@ $btnThemeList: (
     }
   }
 
+  .vxe-cell--wrapper {
+    margin: auto 0;
+  }
   .vxe-body--row {
     .vxe-table--column {
       .vxe-cell {