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

package/lib/index.umd.js

@@ -10783,13 +10783,13 @@ var iconPrefix = 'vxe-icon-';
       isReplace: true
     },
     scrollX: {
-      enabled: true,
+      // enabled: false,
       gt: 60
       // oSize: 0
     },
 
     scrollY: {
-      enabled: true,
+      // enabled: false,
       gt: 100
       // oSize: 0
     }
@@ -11045,7 +11045,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.0-beta.10", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.0-beta.12", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12401,7 +12401,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.7.0-beta.10",
+  version: "3.7.0-beta.12",
   reg: reg,
   use: use,
   setup: setup,
@@ -13027,7 +13027,7 @@ function countTreeExpand(prevRow, params) {
   var treeOpts = $table.treeOpts;
   var childrenField = treeOpts.children || treeOpts.childrenField;
   var rowChildren = prevRow[childrenField];
-  if ($table.isTreeExpandByRow(prevRow)) {
+  if (rowChildren && $table.isTreeExpandByRow(prevRow)) {
     for (var index = 0; index < rowChildren.length; index++) {
       count += countTreeExpand(rowChildren[index], params);
     }
@@ -13200,7 +13200,7 @@ function getSlotVNs(vns) {
 var renderType = 'body';
 
 // 滚动、拖动过程中不需要触发
-function isOperateMouse($xetable) {
+function isVMScrollProcess($xetable) {
   return $xetable._isResize || $xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover;
 }
 function renderLine(h, _vm, $xetable, params) {
@@ -13339,7 +13339,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTitle) {
@@ -13358,7 +13358,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = function (evnt) {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return;
       }
       if (showTooltip || showAllTip) {
@@ -13512,7 +13512,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 事件绑定
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = function (evnt) {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.triggerHoverEvent(evnt, {
@@ -13521,7 +13521,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         });
       };
       trOn.mouseleave = function () {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return;
         }
         $xetable.clearHoverRow();
@@ -15271,17 +15271,17 @@ var Cell = {
       column = params.column,
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
-      treeIndeterminates = $table.treeIndeterminates;
-    var _$table$checkboxOpts2 = $table.checkboxOpts,
-      labelField = _$table$checkboxOpts2.labelField,
-      checkField = _$table$checkboxOpts2.checkField,
-      halfField = _$table$checkboxOpts2.halfField,
-      checkMethod = _$table$checkboxOpts2.checkMethod,
-      visibleMethod = _$table$checkboxOpts2.visibleMethod;
+      treeIndeterminates = $table.treeIndeterminates,
+      checkboxOpts = $table.checkboxOpts;
+    var labelField = checkboxOpts.labelField,
+      checkField = checkboxOpts.checkField,
+      checkMethod = checkboxOpts.checkMethod,
+      visibleMethod = checkboxOpts.visibleMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     var slots = column.slots;
     var defaultSlot = slots ? slots["default"] : null;
     var checkboxSlot = slots ? slots.checkbox : null;
-    var indeterminate = false;
+    var isIndeterminate = false;
     var isChecked = false;
     var isVisible = !visibleMethod || visibleMethod({
       row: row
@@ -15304,14 +15304,14 @@ var Cell = {
         });
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
+        isIndeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
       }
     }
     var checkboxParams = _objectSpread2(_objectSpread2({}, params), {}, {
       checked: isChecked,
       disabled: isDisabled,
       visible: isVisible,
-      indeterminate: indeterminate
+      indeterminate: isIndeterminate
     });
     if (checkboxSlot) {
       return $table.callSlot(checkboxSlot, checkboxParams, h);
@@ -15319,7 +15319,7 @@ var Cell = {
     var checkVNs = [];
     if (isVisible) {
       checkVNs.push(h('span', {
-        "class": ['vxe-checkbox--icon', indeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
+        "class": ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
     if (defaultSlot || labelField) {
@@ -15331,7 +15331,7 @@ var Cell = {
       "class": ['vxe-cell--checkbox', {
         'is--checked': isChecked,
         'is--disabled': isDisabled,
-        'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
+        'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate
       }],
       on: on
     }, checkVNs)];
@@ -19136,9 +19136,29 @@ var Methods = {
     }
   },
   triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
-    var checkMethod = this.checkboxOpts.checkMethod;
+    var checkboxOpts = this.checkboxOpts,
+      afterFullData = this.afterFullData;
+    var checkMethod = checkboxOpts.checkMethod;
+    var row = params.row;
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+      var checkboxRecords = this.getCheckboxRecords();
+      if (checkboxRecords.length) {
+        var firstRow = checkboxRecords[0];
+        var _rowIndex = this.getVTRowIndex(row);
+        var _firstRowIndex = this.getVTRowIndex(firstRow);
+        if (_rowIndex !== _firstRowIndex) {
+          this.setAllCheckboxRow(false);
+          var 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: params.row
+      row: row
     })) {
       this.handleSelectRow(params, value);
       this.emitEvent('checkbox-change', Object.assign({
@@ -19174,6 +19194,7 @@ var Methods = {
       reserve = checkboxOpts.reserve,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     var selectRows = [];
     var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
       return _this34.findRowIndexOf(afterFullData, row) === -1;
@@ -19195,6 +19216,9 @@ var Methods = {
             }
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
           }
+          if (treeConfig && indeterminateField) {
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+          }
         };
         // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -19300,9 +19324,9 @@ var Methods = {
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
     var checkField = checkboxOpts.checkField,
-      halfField = checkboxOpts.halfField,
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (!checkStrictly) {
       var disableRows = [];
       var checkRows = [];
@@ -19327,9 +19351,9 @@ var Methods = {
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -19337,9 +19361,9 @@ var Methods = {
             });
           }
         } else {
-          if (halfField) {
+          if (indeterminateField) {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField);
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField);
             });
           } else {
             isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
@@ -19558,15 +19582,18 @@ var Methods = {
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
       reserve = checkboxOpts.reserve;
+    var indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
+      var handleClearChecked = function handleClearChecked(item) {
+        if (treeConfig && indeterminateField) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, indeterminateField, false);
+        }
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
+      };
       if (treeConfig) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
-        }, treeOpts);
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, handleClearChecked, treeOpts);
       } else {
-        tableFullData.forEach(function (item) {
-          return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, false);
-        });
+        tableFullData.forEach(handleClearChecked);
       }
     }
     if (reserve) {
@@ -23784,10 +23811,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
       var parentChilds = parentRow[childrenField];
+      var mapChilds = parentRow[mapChildrenField];
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(parentChilds)) {
         parentChilds = parentRow[childrenField] = [];
       }
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(mapChilds)) {
+        mapChilds = parentRow[childrenField] = [];
+      }
       parentChilds[funcName](item);
+      mapChilds[funcName](item);
       var rest = {
         row: item,
         rowid: rowid,