vxe-table 3.10.4 → 3.10.6

package/es/table/module/export/export-panel.js

@@ -300,7 +300,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', {
@@ -426,7 +426,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/es/table/src/methods.js

@@ -1861,31 +1861,8 @@ const Methods = {
      * 如果已关联工具栏，则会同步更新
      */
     resetColumn(options) {
-        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;
@@ -5083,10 +5060,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]) {
@@ -5353,7 +5334,9 @@ const Methods = {
                 const rowRest = fullAllDataRowIdData[rowid];
                 treeExpandLazyLoadedMaps[rowid] = row;
                 Promise.resolve(loadMethod({ $table: $xeTable, row })).then((childRecords) => {
-                    rowRest.treeLoaded = true;
+                    if (rowRest) {
+                        rowRest.treeLoaded = true;
+                    }
                     if (treeExpandLazyLoadedMaps[rowid]) {
                         delete treeExpandLazyLoadedMaps[rowid];
                     }
@@ -5379,7 +5362,9 @@ const Methods = {
                     }
                 }).catch(() => {
                     const { treeExpandLazyLoadedMaps } = this;
-                    rowRest.treeLoaded = false;
+                    if (rowRest) {
+                        rowRest.treeLoaded = false;
+                    }
                     if (treeExpandLazyLoadedMaps[rowid]) {
                         delete treeExpandLazyLoadedMaps[rowid];
                     }
@@ -5443,14 +5428,16 @@ 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;
+                            }
                         }
                     }
                 }
@@ -6222,7 +6209,7 @@ const Methods = {
     }
 };
 // 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) {
         if (process.env.NODE_ENV === 'development') {

package/es/table/style.css

@@ -784,79 +784,63 @@
   display: flex;
 }
 
-.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;
 }
-.vxe-table-custom--header > li,
-.vxe-table-custom--body > li {
+.vxe-table-custom--panel-list > li {
   max-width: 26em;
   min-width: 17em;
   padding: 0.2em 1em 0.2em 1em;
 }
-.vxe-table-custom--header > li.level--2,
-.vxe-table-custom--body > li.level--2 {
+.vxe-table-custom--panel-list > li.level--2 {
   padding-left: 3.5em;
 }
-.vxe-table-custom--header > li.level--2 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--2 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--2 .vxe-checkbox--icon {
   left: 1.8em;
 }
-.vxe-table-custom--header > li.level--3,
-.vxe-table-custom--body > li.level--3 {
+.vxe-table-custom--panel-list > li.level--3 {
   padding-left: 4.5em;
 }
-.vxe-table-custom--header > li.level--3 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--3 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--3 .vxe-checkbox--icon {
   left: 2.8em;
 }
-.vxe-table-custom--header > li.level--4,
-.vxe-table-custom--body > li.level--4 {
+.vxe-table-custom--panel-list > li.level--4 {
   padding-left: 5.5em;
 }
-.vxe-table-custom--header > li.level--4 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--4 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--4 .vxe-checkbox--icon {
   left: 3.8em;
 }
-.vxe-table-custom--header > li.level--5,
-.vxe-table-custom--body > li.level--5 {
+.vxe-table-custom--panel-list > li.level--5 {
   padding-left: 6.5em;
 }
-.vxe-table-custom--header > li.level--5 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--5 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--5 .vxe-checkbox--icon {
   left: 4.8em;
 }
-.vxe-table-custom--header > li.level--6,
-.vxe-table-custom--body > li.level--6 {
+.vxe-table-custom--panel-list > li.level--6 {
   padding-left: 7.5em;
 }
-.vxe-table-custom--header > li.level--6 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--6 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--6 .vxe-checkbox--icon {
   left: 5.8em;
 }
-.vxe-table-custom--header > li.level--7,
-.vxe-table-custom--body > li.level--7 {
+.vxe-table-custom--panel-list > li.level--7 {
   padding-left: 8.5em;
 }
-.vxe-table-custom--header > li.level--7 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--7 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--7 .vxe-checkbox--icon {
   left: 6.8em;
 }
-.vxe-table-custom--header > li.level--8,
-.vxe-table-custom--body > li.level--8 {
+.vxe-table-custom--panel-list > li.level--8 {
   padding-left: 9.5em;
 }
-.vxe-table-custom--header > li.level--8 .vxe-checkbox--icon,
-.vxe-table-custom--body > li.level--8 .vxe-checkbox--icon {
+.vxe-table-custom--panel-list > li.level--8 .vxe-checkbox--icon {
   left: 7.8em;
 }
 
@@ -870,20 +854,21 @@
           user-select: none;
 }
 
-.vxe-table-custom--body {
+.vxe-table-custom--panel-list {
   padding: 0.2em 0;
 }
-.vxe-table-custom--body .vxe-table-custom--checkbox-option:hover {
+.vxe-table-custom--panel-list .vxe-table-custom--checkbox-option:hover {
   background-color: var(--vxe-ui-table-row-hover-background-color);
 }
 
-.vxe-table-custom--footer {
+.vxe-table-custom--footer-buttons {
+  width: 100%;
   display: flex;
   flex-direction: row;
   flex-shrink: 0;
   border-top: 1px solid var(--vxe-ui-base-popup-border-color);
 }
-.vxe-table-custom--footer button {
+.vxe-table-custom--footer-buttons button {
   flex-grow: 1;
   height: 2.8em;
 }
@@ -1157,6 +1142,26 @@
   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;
+}
+
 .vxe-table-export--panel-column > ul {
   list-style-type: none;
   overflow: auto;