vxe-table 3.10.4 → 3.10.5

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

@@ -36,6 +36,135 @@ export default {
       }
       return this.$nextTick()
     },
+    _saveCustom () {
+      const $xeTable = this
+
+      const { customOpts, customColumnList } = this
+      const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
+      XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
+        if (parent) {
+          // 更新子列信息
+          column.fixed = parent.fixed
+        } else {
+          if (allowSort) {
+            const sortIndex = index + 1
+            column.renderSortNumber = sortIndex
+          }
+          if (allowFixed) {
+            column.fixed = column.renderFixed
+          }
+        }
+        if (allowResizable) {
+          if (column.renderVisible && (!column.children || column.children.length)) {
+            if (column.renderResizeWidth !== column.renderWidth) {
+              column.resizeWidth = column.renderResizeWidth
+              column.renderWidth = column.renderResizeWidth
+            }
+          }
+        }
+        if (allowVisible) {
+          column.visible = column.renderVisible
+        }
+      })
+      $xeTable.closeCustom()
+      return $xeTable.saveCustomStore('confirm')
+    },
+    _cancelCustom () {
+      const $xeTable = this
+
+      const { customStore, customOpts, customColumnList } = $xeTable
+      const { oldSortMaps, oldFixedMaps, oldVisibleMaps } = customStore
+      const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
+      XEUtils.eachTree(customColumnList, column => {
+        const colid = column.getKey()
+        const visible = !!oldVisibleMaps[colid]
+        const fixed = oldFixedMaps[colid] || ''
+        if (allowVisible) {
+          column.renderVisible = visible
+          column.visible = visible
+        }
+        if (allowFixed) {
+          column.renderFixed = fixed
+          column.fixed = fixed
+        }
+        if (allowSort) {
+          column.renderSortNumber = oldSortMaps[colid] || 0
+        }
+        if (allowResizable) {
+          column.renderResizeWidth = column.renderWidth
+        }
+      }, { children: 'children' })
+      return $xeTable.$nextTick()
+    },
+    _resetCustom (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()
+    },
+    _toggleCustomAllCheckbox () {
+      const { customStore } = this
+      const isAll = !customStore.isAll
+      return this.setCustomAllCheckbox(isAll)
+    },
+    _setCustomAllCheckbox (checked: boolean) {
+      const $xeTable = this
+
+      const { customStore } = this
+      const { customColumnList, customOpts } = this
+      const { checkMethod, visibleMethod } = customOpts
+      const isAll = !!checked
+      if (customOpts.immediate) {
+        XEUtils.eachTree(customColumnList, (column) => {
+          if (visibleMethod && !visibleMethod({ column })) {
+            return
+          }
+          if (checkMethod && !checkMethod({ column })) {
+            return
+          }
+          column.visible = isAll
+          column.renderVisible = isAll
+          column.halfVisible = false
+        })
+        customStore.isAll = isAll
+        $xeTable.handleCustom()
+        $xeTable.saveCustomStore('update:visible')
+      } else {
+        XEUtils.eachTree(customColumnList, (column) => {
+          if (visibleMethod && !visibleMethod({ column })) {
+            return
+          }
+          if (checkMethod && !checkMethod({ column })) {
+            return
+          }
+          column.renderVisible = isAll
+          column.halfVisible = false
+        })
+        customStore.isAll = isAll
+      }
+      $xeTable.checkCustomStatus()
+    },
     calcMaxHeight  () {
       const { $el, customStore } = this
       // 判断面板不能大于表格高度
@@ -43,7 +172,7 @@ export default {
       if ($el) {
         tableHeight = $el.clientHeight - 28
       }
-      customStore.maxHeight = Math.max(4, tableHeight)
+      customStore.maxHeight = Math.max(88, tableHeight)
     },
     checkCustomStatus () {
       const { customStore, collectColumn, customOpts } = this
@@ -75,7 +204,7 @@ export default {
         this.emitCustomEvent('open', evnt)
       }
     },
-    customColseEvent (evnt: any) {
+    customCloseEvent (evnt: any) {
       const { customStore } = this
       if (customStore.visible) {
         customStore.activeBtn = false