vxe-table 3.18.0 → 3.18.1

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

@@ -15,11 +15,13 @@ export default {
      * @param column
      */
     _openFilter (fieldOrColumn: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       const column = handleFieldOrColumn(this, fieldOrColumn)
       if (column && column.filters) {
         const { elemStore } = this
         const { fixed } = column
-        return this.scrollToColumn(column).then(() => {
+        return $xeTable.scrollToColumn(column).then(() => {
           const headerWrapperElem = elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper']
           if (headerWrapperElem) {
             const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-cell--filter`)
@@ -27,7 +29,7 @@ export default {
           }
         })
       }
-      return this.$nextTick()
+      return $xeTable.$nextTick()
     },
     /**
      * 修改筛选条件列表
@@ -195,9 +197,9 @@ export default {
       return filterList
     },
     handleColumnConfirmFilter (column: VxeTableDefines.ColumnInfo, evnt: Event | null) {
-      const $xeTable = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
-      const reactData = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
 
       const { mouseConfig } = props
       const { scrollXLoad: oldScrollXLoad, scrollYLoad: oldScrollYLoad } = reactData
@@ -212,22 +214,22 @@ export default {
           datas.push(item.data)
         }
       })
-      const filterList = this.getCheckedFilters()
-      const params = { $table: this, $event: evnt, column, field, property: field, values, datas, filters: filterList, filterList }
+      const filterList = $xeTable.getCheckedFilters()
+      const params = { $table: $xeTable, $event: evnt as Event, column, field, property: field, values, datas, filters: filterList, filterList }
       // 如果是服务端筛选，则跳过本地筛选处理
       if (!filterOpts.remote) {
-        this.handleTableData(true)
-        this.checkSelectionStatus()
+        $xeTable.handleTableData(true)
+        $xeTable.checkSelectionStatus()
       }
-      if (mouseConfig && mouseOpts.area && this.handleFilterEvent) {
-        $xeTable.handleFilterEvent(evnt, params)
+      if (mouseConfig && mouseOpts.area && $xeTable.handleFilterEvent) {
+        $xeTable.handleFilterEvent(evnt as Event, params)
       }
       if (evnt) {
-        $xeTable.emitEvent('filter-change', params, evnt)
+        $xeTable.dispatchEvent('filter-change', params, evnt)
       }
       $xeTable.closeFilter()
       return $xeTable.updateFooter().then(() => {
-        const { scrollXLoad, scrollYLoad } = this
+        const { scrollXLoad, scrollYLoad } = reactData
         if ((oldScrollXLoad || scrollXLoad) || (oldScrollYLoad || scrollYLoad)) {
           if ((oldScrollXLoad || scrollXLoad)) {
             $xeTable.updateScrollXSpace()
@@ -259,6 +261,8 @@ export default {
       $xeTable.handleColumnConfirmFilter(column, evnt)
     },
     handleClearFilter (column: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       if (column) {
         const { filters, filterRender } = column
         if (filters) {
@@ -272,7 +276,7 @@ export default {
             }
           })
           if (filterResetMethod) {
-            filterResetMethod({ options: filters, column, $table: this })
+            filterResetMethod({ options: filters, column, $table: $xeTable })
           }
         }
       }

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

@@ -105,22 +105,29 @@ export default {
           const params: any = { type: layout, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, columns: this.visibleColumn.slice(0), $event: evnt }
           if (columnTargetNode.flag) {
             const cell = columnTargetNode.targetElem
-            const column = this.getColumnNode(cell).item
+            const columnNodeRest = $xeTable.getColumnNode(cell)
+            const column = columnNodeRest ? columnNodeRest.item : null
             let typePrefix = `${layout}-`
-            Object.assign(params, { column, columnIndex: this.getColumnIndex(column), cell })
+            if (column) {
+              Object.assign(params, { column, columnIndex: $xeTable.getColumnIndex(column), cell })
+            }
             if (layout === 'body') {
-              const row = this.getRowNode(cell.parentNode).item
+              const rowNodeRest = $xeTable.getRowNode(cell.parentNode)
+              const row = rowNodeRest ? rowNodeRest.item : null
               typePrefix = ''
-              params.row = row
-              params.rowIndex = this.getRowIndex(row)
+              if (row) {
+                params.row = row
+                params.rowIndex = $xeTable.getRowIndex(row)
+              }
             }
+            const eventType = `${typePrefix}cell-menu` as 'cell-menu' | 'header-cell-menu' | 'footer-cell-menu'
             this.handleOpenMenuEvent(evnt, layout, params)
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
-              this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt)
+              $xeTable.dispatchEvent(`${typePrefix}cell-context-menu` as any, params, evnt)
             } else {
-              this.emitEvent(`${typePrefix}cell-menu`, params, evnt)
+              $xeTable.dispatchEvent(eventType, params, evnt)
             }
             return
           } else if (getEventTargetNode(evnt, this.$el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === tId).flag) {
@@ -271,9 +278,9 @@ export default {
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
           warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
-          this.emitEvent('context-menu-click', params, evnt)
+          $xeTable.dispatchEvent('context-menu-click' as any, params, evnt)
         } else {
-          this.emitEvent('menu-click', params, evnt)
+          $xeTable.dispatchEvent('menu-click', params, evnt)
         }
         this.closeMenu()
       }

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

@@ -5,7 +5,7 @@ import { scrollToView } from '../../../ui/src/dom'
 import { handleFieldOrColumn, getRowid } from '../../src/util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
-import type { VxeTableDefines, TableInternalData, TableReactData } from '../../../../types'
+import type { VxeTableDefines, TableInternalData, TableReactData, VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
 
 const { getConfig, validators } = VxeUI
 
@@ -185,10 +185,12 @@ export default {
      * 聚焦到校验通过的单元格并弹出校验错误提示
      */
     handleValidError (params: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       const { validOpts } = this
       return new Promise<void>(resolve => {
         if (validOpts.autoPos === false) {
-          this.emitEvent('valid-error', params)
+          $xeTable.dispatchEvent('valid-error', params, null)
           resolve()
         } else {
           this.handleEdit(params, { type: 'valid-error', trigger: 'call' }).then(() => {
@@ -227,7 +229,7 @@ export default {
      * 返回 Promise 对象，或者使用回调方式
      */
     beginValidate (rows: any, cols: VxeTableDefines.ColumnInfo[] | null, cb: any, isFull: any) {
-      const $xeTable = this
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
       const reactData = $xeTable as unknown as TableReactData
       const internalData = $xeTable as unknown as TableInternalData
@@ -546,6 +548,8 @@ export default {
      * 弹出校验错误提示
      */
     showValidTooltip (params: any) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
       const { $refs, height, validStore, validErrorMaps, tableData, validOpts } = this
       const { rule, row, column, cell } = params
       const validTip = $refs.refValidTooltip
@@ -570,7 +574,7 @@ export default {
           }
         })
       }
-      this.emitEvent('valid-error', params, null)
+      $xeTable.dispatchEvent('valid-error', params, null)
       if (validTip) {
         if (validTip && (validOpts.message === 'tooltip' || (validOpts.message === 'default' && !height && tableData.length < 2))) {
           return validTip.open(cell, content)