vxe-table 3.7.0-beta.11 → 3.7.0-beta.12

package/packages/table/src/methods.js

@@ -3080,8 +3080,25 @@ const Methods = {
     }
   },
   triggerCheckRowEvent (evnt, params, value) {
-    const { checkMethod } = this.checkboxOpts
-    if (!checkMethod || checkMethod({ row: params.row })) {
+    const { checkboxOpts, afterFullData } = this
+    const { checkMethod } = checkboxOpts
+    const { row } = params
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+      const checkboxRecords = this.getCheckboxRecords()
+      if (checkboxRecords.length) {
+        const firstRow = checkboxRecords[0]
+        const _rowIndex = this.getVTRowIndex(row)
+        const _firstRowIndex = this.getVTRowIndex(firstRow)
+        if (_rowIndex !== _firstRowIndex) {
+          this.setAllCheckboxRow(false)
+          const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1)
+          this.handleCheckedCheckboxRow(rangeRows, true, false)
+          this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
+          return
+        }
+      }
+    }
+    if (!checkMethod || checkMethod({ row })) {
       this.handleSelectRow(params, value)
       this.emitEvent('checkbox-change', Object.assign({
         records: this.getCheckboxRecords(),
@@ -3104,6 +3121,7 @@ const Methods = {
   handleCheckedAllCheckboxRow (value, isForce) {
     const { afterFullData, treeConfig, treeOpts, selectCheckboxRows, checkboxReserveRowMap, checkboxOpts } = this
     const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     let selectRows = []
     const beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
     if (checkStrictly) {
@@ -3121,6 +3139,9 @@ const Methods = {
             }
             XEUtils.set(row, checkField, value)
           }
+          if (treeConfig && indeterminateField) {
+            XEUtils.set(row, indeterminateField, false)
+          }
         }
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -3206,7 +3227,8 @@ const Methods = {
   },
   checkSelectionStatus () {
     const { afterFullData, selectCheckboxRows, treeIndeterminates, checkboxOpts, treeConfig } = this
-    const { checkField, halfField, checkStrictly, checkMethod } = checkboxOpts
+    const { checkField, checkStrictly, checkMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (!checkStrictly) {
       const disableRows = []
       const checkRows = []
@@ -3231,14 +3253,14 @@ const Methods = {
         )
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
-          if (halfField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
+          if (indeterminateField) {
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, indeterminateField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           }
         } else {
-          if (halfField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField))
+          if (indeterminateField) {
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, indeterminateField))
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField))
           }
@@ -3411,11 +3433,18 @@ const Methods = {
   clearCheckboxRow () {
     const { tableFullData, treeConfig, treeOpts, checkboxOpts } = this
     const { checkField, reserve } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (checkField) {
+      const handleClearChecked = (item) => {
+        if (treeConfig && indeterminateField) {
+          XEUtils.set(item, indeterminateField, false)
+        }
+        XEUtils.set(item, checkField, false)
+      }
       if (treeConfig) {
-        XEUtils.eachTree(tableFullData, item => XEUtils.set(item, checkField, false), treeOpts)
+        XEUtils.eachTree(tableFullData, handleClearChecked, treeOpts)
       } else {
-        tableFullData.forEach(item => XEUtils.set(item, checkField, false))
+        tableFullData.forEach(handleClearChecked)
       }
     }
     if (reserve) {

package/packages/table/src/table.js

@@ -885,6 +885,12 @@ export default {
       if (this.editConfig && this.editOpts.activeMethod) {
         warnLog('vxe.error.delProp', ['table.edit-config.activeMethod', 'table.edit-config.beforeEditMethod'])
       }
+      if (this.treeConfig && this.checkboxOpts.isShiftKey) {
+        errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey'])
+      }
+      if (this.checkboxOpts.halfField) {
+        warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
+      }
     }
 
     // 检查是否有安装需要的模块

package/packages/table/src/util.js

@@ -160,7 +160,7 @@ function countTreeExpand (prevRow, params) {
   const { treeOpts } = $table
   const childrenField = treeOpts.children || treeOpts.childrenField
   const rowChildren = prevRow[childrenField]
-  if ($table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (let index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params)
     }

package/packages/v-x-e-table/src/commands.js

@@ -22,7 +22,7 @@ class VXECommandsStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
+        warnLog('vxe.error.delProp', ['commands -> callback', 'commandMethod'])
       }
       render = {
         commandMethod: render

package/packages/v-x-e-table/src/conf.js

@@ -119,12 +119,12 @@ export default {
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }

package/packages/v-x-e-table/src/formats.js

@@ -22,7 +22,7 @@ class VXEFormatsStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'cellFormatMethod'])
+        warnLog('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod'])
       }
       render = {
         cellFormatMethod: render

package/packages/v-x-e-table/src/menus.js

@@ -22,7 +22,7 @@ class VXEMenusStore {
     // 兼容
     if (XEUtils.isFunction(render)) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
+        warnLog('vxe.error.delProp', ['menus -> callback', 'menuMethod'])
       }
       render = {
         menuMethod: render

package/packages/v-x-e-table/src/renderer.js

@@ -104,8 +104,8 @@ function getNativeOns (renderOpts, params) {
   XEUtils.objectEach(nativeEvents, (func, key) => {
     nativeOns[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)
@@ -123,8 +123,8 @@ function getOns (renderOpts, params, inputFunc, changeFunc) {
   XEUtils.objectEach(events, (func, key) => {
     ons[key] = function (...args) {
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (!XEUtils.isFunction(key)) {
-          errLog('vxe.error.errFunc', [key])
+        if (!XEUtils.isFunction(func)) {
+          errLog('vxe.error.errFunc', [func])
         }
       }
       func(params, ...args)

package/types/table.d.ts

@@ -1340,7 +1340,7 @@ export interface TableCheckboxConfig {
   reserve?: boolean;
   labelField?: string;
   checkField?: string;
-  halfField?: string;
+  indeterminateField?: string;
   showHeader?: boolean;
   checkAll?: boolean;
   checkRowKeys?: string[] | number[];
@@ -1350,6 +1350,12 @@ export interface TableCheckboxConfig {
   trigger?: 'default' | 'cell' | 'row' | '';
   highlight?: boolean;
   range?: boolean;
+
+  /**
+   * 请使用 indeterminateField
+   * @deprecated
+   */
+  halfField?: string;
 }
 export type CheckboxConfig = TableCheckboxConfig
 

package/types/v-x-e-table/index.d.ts

@@ -108,7 +108,7 @@ export interface VXETableCore {
 }
 
 /**
- * 一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为零代码而设计...
+ * 一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式为低/零代码而设计...
  */
 export const VXETable: VXETableCore