vxe-table 3.10.14 → 3.10.16

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

@@ -23,25 +23,42 @@ function getTargetOffset (target: any, container: any) {
   return { offsetTop, offsetLeft }
 }
 
-function getCheckboxRangeRows (_vm: any, params: any, targetTrElem: any, moveRange: any) {
+function getCheckboxRangeRows ($xeTable: any, evnt: MouseEvent, params: any, targetTrElem: HTMLElement, trRect: DOMRect, offsetClientTop: number, moveRange: number) {
+  const reactData = $xeTable
+  const internalData = $xeTable
+
   let countHeight = 0
-  let rangeRows = []
+  let rangeRows: any[] = []
+  let moveSize = 0
   const isDown = moveRange > 0
-  const moveSize = moveRange > 0 ? moveRange : (Math.abs(moveRange) + targetTrElem.offsetHeight)
-  const { afterFullData, scrollYStore, scrollYLoad } = _vm
+  const { scrollYLoad } = reactData
+  const { afterFullData, scrollYStore } = internalData
   if (scrollYLoad) {
-    const _rowIndex = _vm.getVTRowIndex(params.row)
+    if (isDown) {
+      moveSize = offsetClientTop + moveRange
+    } else {
+      moveSize = (trRect.height - offsetClientTop) + Math.abs(moveRange)
+    }
+    const _rowIndex = $xeTable.getVTRowIndex(params.row)
     if (isDown) {
       rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / scrollYStore.rowHeight))
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight) + 1, _rowIndex + 1)
+      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight), _rowIndex + 1)
     }
   } else {
+    if (isDown) {
+      moveSize = evnt.clientY - trRect.y
+    } else {
+      moveSize = trRect.y - evnt.clientY + trRect.height
+    }
     const siblingProp = isDown ? 'next' : 'previous'
     while (targetTrElem && countHeight < moveSize) {
-      rangeRows.push(_vm.getRowNode(targetTrElem).item)
-      countHeight += targetTrElem.offsetHeight
-      targetTrElem = targetTrElem[`${siblingProp}ElementSibling`]
+      const rowNodeRest = $xeTable.getRowNode(targetTrElem)
+      if (rowNodeRest) {
+        rangeRows.push(rowNodeRest.item)
+        countHeight += targetTrElem.offsetHeight
+        targetTrElem = targetTrElem[`${siblingProp}ElementSibling`] as HTMLElement
+      }
     }
   }
   return rangeRows
@@ -228,6 +245,8 @@ export default {
         const startLeft = offsetRest.offsetLeft + evnt.offsetX
         const startScrollTop = bodyWrapperElem.scrollTop
         const rowHeight = trElem.offsetHeight
+        const trRect = trElem.getBoundingClientRect()
+        const offsetClientTop = disY - trRect.y
         let mouseScrollTimeout: any = null
         let isMouseScrollDown: any = false
         let mouseScrollSpaceSize = 1
@@ -269,7 +288,7 @@ export default {
           checkboxRangeElem.style.left = `${rangeLeft}px`
           checkboxRangeElem.style.top = `${rangeTop}px`
           checkboxRangeElem.style.display = 'block'
-          const rangeRows = getCheckboxRangeRows(this, params, trElem, offsetTop < marginSize ? -rangeHeight : rangeHeight)
+          const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight)
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
             lastRangeRows = rangeRows

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

@@ -5,6 +5,8 @@ import { scrollToView } from '../../../ui/src/dom'
 import { handleFieldOrColumn, getRowid } from '../../src/util'
 import { warnLog, errLog } from '../../../ui/src/log'
 
+import type { VxeTableDefines } from '../../../../types'
+
 const { getConfig, validators } = VxeUI
 
 /**
@@ -73,7 +75,7 @@ export default {
           warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
         }
       }
-      return this.beginValidate(rows, cb, true)
+      return this.beginValidate(rows, null, cb, true)
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
@@ -84,7 +86,27 @@ export default {
           warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
         }
       }
-      return this.beginValidate(rows, cb)
+      return this.beginValidate(rows, null, cb)
+    },
+    /**
+     * 完整校验单元格，和 validateField 的区别就是会给有效数据中的每一行进行校验
+     */
+    _fullValidateField (rows: any, fieldOrColumn: any) {
+      const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column))
+      if (colList.length) {
+        return this.beginValidate(rows, colList, null, true)
+      }
+      return this.$nextTick()
+    },
+    /**
+     * 快速校验单元格，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
+     */
+    _validateField (rows: any, fieldOrColumn: any) {
+      const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column))
+      if (colList.length) {
+        return this.beginValidate(rows, colList, null)
+      }
+      return this.$nextTick()
     },
     /**
      * 聚焦到校验通过的单元格并弹出校验错误提示
@@ -131,7 +153,7 @@ export default {
      * 如果只传 callback 否则默认验证整个表格数据
      * 返回 Promise 对象，或者使用回调方式
      */
-    beginValidate (rows: any, cb: any, isFull: any) {
+    beginValidate (rows: any, cols: VxeTableDefines.ColumnInfo[] | null, cb: any, isFull: any) {
       const validRest: any = {}
       const { editRules, afterFullData, visibleColumn, treeConfig, treeOpts } = this
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -154,12 +176,13 @@ export default {
       this.clearValidate()
       const validErrMaps: any = {}
       if (editRules) {
-        const columns = this.getColumns()
+        const columns = cols && cols.length ? cols : this.getColumns()
         const handleVaild = (row: any) => {
           if (isFull || !this.validRuleErr) {
             const colVailds: any[] = []
             columns.forEach((column: any) => {
-              if ((isFull || !this.validRuleErr) && XEUtils.has(editRules, column.property)) {
+              const field = XEUtils.isString(column) ? column : column.field
+              if ((isFull || !this.validRuleErr) && XEUtils.has(editRules, field)) {
                 colVailds.push(
                   this.validCellRules('all', row, column)
                     .catch(({ rule, rules }: any) => {
@@ -170,11 +193,11 @@ export default {
                         row,
                         columnIndex: this.getColumnIndex(column),
                         column,
-                        field: column.property,
+                        field,
                         $table: this
                       }
-                      if (!validRest[column.property]) {
-                        validRest[column.property] = []
+                      if (!validRest[field]) {
+                        validRest[field] = []
                       }
                       validErrMaps[`${getRowid(this, row)}:${column.id}`] = {
                         column,
@@ -182,7 +205,7 @@ export default {
                         rule,
                         content: rule.content
                       }
-                      validRest[column.property].push(rest)
+                      validRest[field].push(rest)
                       if (!isFull) {
                         this.validRuleErr = true
                         return Promise.reject(rest)
@@ -371,7 +394,7 @@ export default {
       const { validOpts, validErrorMaps } = this
       const validTip = this.$refs.validTip
       const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : [])
-      const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column)))
+      const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn(this, column))
       let validErrMaps: any = {}
       if (validTip && validTip.visible) {
         validTip.close()

package/packages/table/src/methods.ts

@@ -3041,7 +3041,14 @@ const Methods = {
                     // 如果点击了当前表格之外
                     !getEventTargetNode(evnt, $el).flag
                 ) {
-                  setTimeout(() => this.clearEdit(evnt))
+                  setTimeout(() => {
+                    this.clearEdit(evnt).then(() => {
+                      // 如果存在校验，点击了表格之外则清除
+                      if (!this.isActivated && editRules && validOpts.autoClear) {
+                        this.validErrorMaps = {}
+                      }
+                    })
+                  })
                 }
               })
             }
@@ -6370,7 +6377,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,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.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,fullValidateField,validateField,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[]) {