vxe-table 4.8.4 → 4.8.5

package/packages/table/src/table.ts

@@ -2271,7 +2271,9 @@ export default defineComponent({
           Promise.resolve(
             loadMethod({ $table: $xeTable, row })
           ).then((childRecords: any) => {
-            rowRest.treeLoaded = true
+            if (rowRest) {
+              rowRest.treeLoaded = true
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid]
             }
@@ -2297,7 +2299,9 @@ export default defineComponent({
             }
           }).catch(() => {
             const { treeExpandLazyLoadedMaps } = reactData
-            rowRest.treeLoaded = false
+            if (rowRest) {
+              rowRest.treeLoaded = false
+            }
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid]
             }
@@ -3721,32 +3725,8 @@ export default defineComponent({
        * 如果已关联工具栏，则会同步更新
        */
       resetColumn (options) {
-        const { collectColumn } = internalData
-        const customOpts = computeCustomOpts.value
-        const { checkMethod } = customOpts
-        const opts: VxeTableDefines.VxeTableCustomStorageObj = 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
-        })
-        $xeTable.saveCustomStore('reset')
-        return tablePrivateMethods.handleCustom()
+        warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom'])
+        return $xeTable.resetCustom(options)
       },
       /**
        * 刷新列信息

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;
+}