vxe-table 3.10.4 → 3.10.6

package/packages/table/module/export/export-panel.ts

@@ -311,7 +311,7 @@ export default {
                             ? h('td', [
                               h('div', {
                                 class: 'vxe-table-export--panel-option-row'
-                              }, $xeTable.callSlot(parameterSlot, params))
+                              }, $xeTable.callSlot(parameterSlot, params, h))
                             ])
                             : h('td', [
                               h('div', {
@@ -437,7 +437,7 @@ export default {
           return h('div', {
             class: 'vxe-table-export--panel-footer'
           }, footerSlot
-            ? $xeTable.callSlot(footerSlot, params)
+            ? $xeTable.callSlot(footerSlot, params, h)
             : [
                 h('div', {
                   class: 'vxe-table-export--panel-btns'

package/packages/table/src/methods.ts

@@ -1862,31 +1862,8 @@ const Methods = {
    * 如果已关联工具栏，则会同步更新
    */
   resetColumn (options: any) {
-    const { collectColumn, customOpts } = this
-    const { checkMethod } = customOpts
-    const opts = Object.assign({
-      visible: true,
-      resizable: options === true,
-      fixed: options === true,
-      sort: options === true
-    }, options)
-    XEUtils.eachTree(collectColumn, (column) => {
-      if (opts.resizable) {
-        column.resizeWidth = 0
-      }
-      if (opts.fixed) {
-        column.fixed = column.defaultFixed
-      }
-      if (opts.sort) {
-        column.renderSortNumber = column.sortNumber
-      }
-      if (!checkMethod || checkMethod({ column })) {
-        column.visible = column.defaultVisible
-      }
-      column.renderResizeWidth = column.renderWidth
-    })
-    this.saveCustomStore('reset')
-    return this.handleCustom()
+    warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom'])
+    return this.resetCustom(options)
   },
   handleCustom () {
     const { mouseConfig } = this
@@ -5049,10 +5026,14 @@ const Methods = {
         rowExpandLazyLoadedMaps[rowid] = row
         loadMethod({ $table: $xeTable, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }).then(() => {
           const { rowExpandedMaps } = this
-          rowRest.expandLoaded = true
+          if (rowRest) {
+            rowRest.expandLoaded = true
+          }
           rowExpandedMaps[rowid] = row
         }).catch(() => {
-          rowRest.expandLoaded = false
+          if (rowRest) {
+            rowRest.expandLoaded = false
+          }
         }).finally(() => {
           const { rowExpandLazyLoadedMaps } = this
           if (rowExpandLazyLoadedMaps[rowid]) {
@@ -5319,7 +5300,9 @@ const Methods = {
         Promise.resolve(
           loadMethod({ $table: $xeTable, row })
         ).then((childRecords: any) => {
-          rowRest.treeLoaded = true
+          if (rowRest) {
+            rowRest.treeLoaded = true
+          }
           if (treeExpandLazyLoadedMaps[rowid]) {
             delete treeExpandLazyLoadedMaps[rowid]
           }
@@ -5345,7 +5328,9 @@ const Methods = {
           }
         }).catch(() => {
           const { treeExpandLazyLoadedMaps } = this
-          rowRest.treeLoaded = false
+          if (rowRest) {
+            rowRest.treeLoaded = false
+          }
           if (treeExpandLazyLoadedMaps[rowid]) {
             delete treeExpandLazyLoadedMaps[rowid]
           }
@@ -5408,13 +5393,15 @@ const Methods = {
         const rowid = getRowid(this, row)
         if (!treeTempExpandedMaps[rowid]) {
           const rowRest = fullAllDataRowIdData[rowid]
-          const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
-          // 是否使用懒加载
-          if (isLoad) {
-            result.push(this.handleAsyncTreeExpandChilds(row))
-          } else {
-            if (row[childrenField] && row[childrenField].length) {
-              treeTempExpandedMaps[rowid] = row
+          if (rowRest) {
+            const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
+            // 是否使用懒加载
+            if (isLoad) {
+              result.push(this.handleAsyncTreeExpandChilds(row))
+            } else {
+              if (row[childrenField] && row[childrenField].length) {
+                treeTempExpandedMaps[rowid] = row
+              }
             }
           }
         }
@@ -6192,7 +6179,7 @@ const Methods = {
 } as any
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args: any[]) {

package/styles/components/table-module/custom.scss

@@ -94,15 +94,14 @@
   }
 }
 
-.vxe-table-custom--list-wrapper {
+.vxe-table-custom--body {
   display: block;
   flex-grow: 1;
   overflow-x: hidden;
   overflow-y: auto;
 }
 
-.vxe-table-custom--header,
-.vxe-table-custom--body {
+.vxe-table-custom--panel-list {
   list-style-type: none;
   margin: 0;
   padding: 0;
@@ -130,7 +129,7 @@
   user-select: none;
 }
 
-.vxe-table-custom--body {
+.vxe-table-custom--panel-list {
   padding: 0.2em 0;
   .vxe-table-custom--checkbox-option {
     &:hover {
@@ -139,7 +138,8 @@
   }
 }
 
-.vxe-table-custom--footer {
+.vxe-table-custom--footer-buttons {
+  width: 100%;
   display: flex;
   flex-direction: row;
   flex-shrink: 0;
@@ -390,3 +390,19 @@
   margin-left: 5px;
   cursor: help;
 }
+
+.vxe-table-custom-popup--table-col-seq {
+  width: 80px;
+}
+.vxe-table-custom-popup--table-col-sort {
+  width: 80px;
+}
+.vxe-table-custom-popup--table-col-title {
+  min-width: 120px;
+}
+.vxe-table-custom-popup--table-col-width {
+  width: 140px;
+}
+.vxe-table-custom-popup--table-col-fixed {
+  width: 200px;
+}