vxe-table 3.23.0-beta.6 → 3.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.23.0-beta.6",
+  "version": "3.23.0",
   "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/grid/src/grid.ts

@@ -1076,6 +1076,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     .then(rest => {
                       reactData.tableLoading = false
                       if (aSaveMethod) {
+                        aSaveMethod({ ...commitParams, response: rest, status: 'success' }, ...args)
+                      } else {
                         $xeTable.clearPendingRow()
                         if (isRespMsg) {
                           if (VxeUI.modal) {

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/styles/components/table.scss

@@ -2165,8 +2165,7 @@ $btnThemeList: (
     }
     &.col--cs-height,
     &.col--rs-height,
-    &.col--auto-height,
-    &.col--max-height {
+    &.col--auto-height {
       overflow: hidden;
       &.col--tree-node,
       &.col--valid-error {
@@ -2176,6 +2175,16 @@ $btnThemeList: (
         overflow: hidden;
       }
     }
+    &.col--max-height {
+      overflow: hidden;
+      &.col--tree-node,
+      &.col--valid-error {
+        overflow: unset;
+      }
+      & > .vxe-cell {
+        overflow: auto;
+      }
+    }
     & > .vxe-cell {
       display: flex;
       flex-direction: row;