vxe-table 3.6.10 → 3.6.12-beta.0

package/lib/validator/src/mixin.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _utils = require("../../tools/utils");
 var _dom = _interopRequireDefault(require("../../tools/dom"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -54,21 +54,21 @@ function validErrorRuleValue(rule, val) {
     max = rule.max,
     pattern = rule.pattern;
   var isNumType = type === 'number';
-  var numVal = isNumType ? _xeUtils.default.toNumber(val) : _xeUtils.default.getSize(val);
+  var numVal = isNumType ? _xeUtils["default"].toNumber(val) : _xeUtils["default"].getSize(val);
   // 判断数值
   if (isNumType && isNaN(val)) {
     return true;
   }
   // 如果存在 min，判断最小值
-  if (!_xeUtils.default.eqNull(min) && numVal < _xeUtils.default.toNumber(min)) {
+  if (!_xeUtils["default"].eqNull(min) && numVal < _xeUtils["default"].toNumber(min)) {
     return true;
   }
   // 如果存在 max，判断最大值
-  if (!_xeUtils.default.eqNull(max) && numVal > _xeUtils.default.toNumber(max)) {
+  if (!_xeUtils["default"].eqNull(max) && numVal > _xeUtils["default"].toNumber(max)) {
     return true;
   }
   // 如果存在 pattern，正则校验
-  if (pattern && !(_xeUtils.default.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+  if (pattern && !(_xeUtils["default"].isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
     return true;
   }
   return false;
@@ -128,10 +128,10 @@ var _default = {
       if (rows === true) {
         vaildDatas = afterFullData;
       } else if (rows) {
-        if (_xeUtils.default.isFunction(rows)) {
+        if (_xeUtils["default"].isFunction(rows)) {
           cb = rows;
         } else {
-          vaildDatas = _xeUtils.default.isArray(rows) ? rows : [rows];
+          vaildDatas = _xeUtils["default"].isArray(rows) ? rows : [rows];
         }
       }
       if (!vaildDatas) {
@@ -147,8 +147,8 @@ var _default = {
           if (isFull || !_this2.validRuleErr) {
             var colVailds = [];
             columns.forEach(function (column) {
-              if ((isFull || !_this2.validRuleErr) && _xeUtils.default.has(editRules, column.property)) {
-                colVailds.push(_this2.validCellRules('all', row, column).catch(function (_ref) {
+              if ((isFull || !_this2.validRuleErr) && _xeUtils["default"].has(editRules, column.property)) {
+                colVailds.push(_this2.validCellRules('all', row, column)["catch"](function (_ref) {
                   var rule = _ref.rule,
                     rules = _ref.rules;
                   var rest = {
@@ -176,7 +176,7 @@ var _default = {
           }
         };
         if (treeConfig) {
-          _xeUtils.default.eachTree(vaildDatas, handleVaild, treeOpts);
+          _xeUtils["default"].eachTree(vaildDatas, handleVaild, treeOpts);
         } else {
           vaildDatas.forEach(handleVaild);
         }
@@ -190,7 +190,7 @@ var _default = {
               cb();
             }
           });
-        }).catch(function (firstErrParams) {
+        })["catch"](function (firstErrParams) {
           return new Promise(function (resolve, reject) {
             var finish = function finish() {
               _this2.$nextTick(function () {
@@ -198,7 +198,7 @@ var _default = {
                   cb(validRest);
                   resolve();
                 } else {
-                  if (_conf.default.validToReject === 'obsolete') {
+                  if (_conf["default"].validToReject === 'obsolete') {
                     // 已废弃，校验失败将不会执行catch
                     reject(validRest);
                   } else {
@@ -209,7 +209,7 @@ var _default = {
             };
             var posAndFinish = function posAndFinish() {
               firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
-              _dom.default.scrollToView(firstErrParams.cell);
+              _dom["default"].scrollToView(firstErrParams.cell);
               _this2.handleValidError(firstErrParams).then(finish);
             };
             /**
@@ -242,8 +242,8 @@ var _default = {
       var editRules = this.editRules;
       var property = column.property;
       if (property && editRules) {
-        var rules = _xeUtils.default.get(editRules, property);
-        return rules && _xeUtils.default.find(rules, function (rule) {
+        var rules = _xeUtils["default"].get(editRules, property);
+        return rules && _xeUtils["default"].find(rules, function (rule) {
           return type === 'all' || !rule.trigger || type === rule.trigger;
         });
       }
@@ -270,15 +270,15 @@ var _default = {
       var errorRules = [];
       var syncVailds = [];
       if (property && editRules) {
-        var rules = _xeUtils.default.get(editRules, property);
+        var rules = _xeUtils["default"].get(editRules, property);
         if (rules) {
-          var cellValue = _xeUtils.default.isUndefined(val) ? _xeUtils.default.get(row, property) : val;
+          var cellValue = _xeUtils["default"].isUndefined(val) ? _xeUtils["default"].get(row, property) : val;
           rules.forEach(function (rule) {
             var type = rule.type,
               trigger = rule.trigger,
               required = rule.required;
             if (validType === 'all' || !trigger || validType === trigger) {
-              if (_xeUtils.default.isFunction(rule.validator)) {
+              if (_xeUtils["default"].isFunction(rule.validator)) {
                 var customValid = rule.validator({
                   cellValue: cellValue,
                   rule: rule,
@@ -291,7 +291,7 @@ var _default = {
                   $table: _this3
                 });
                 if (customValid) {
-                  if (_xeUtils.default.isError(customValid)) {
+                  if (_xeUtils["default"].isError(customValid)) {
                     _this3.validRuleErr = true;
                     errorRules.push(new Rule({
                       type: 'custom',
@@ -299,9 +299,9 @@ var _default = {
                       content: customValid.message,
                       rule: new Rule(rule)
                     }));
-                  } else if (customValid.catch) {
+                  } else if (customValid["catch"]) {
                     // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(customValid.catch(function (e) {
+                    syncVailds.push(customValid["catch"](function (e) {
                       _this3.validRuleErr = true;
                       errorRules.push(new Rule({
                         type: 'custom',
@@ -314,7 +314,7 @@ var _default = {
                 }
               } else {
                 var isArrType = type === 'array';
-                var hasEmpty = isArrType || _xeUtils.default.isArray(cellValue) ? !_xeUtils.default.isArray(cellValue) || !cellValue.length : (0, _utils.eqEmptyValue)(cellValue);
+                var hasEmpty = isArrType || _xeUtils["default"].isArray(cellValue) ? !_xeUtils["default"].isArray(cellValue) || !cellValue.length : (0, _utils.eqEmptyValue)(cellValue);
                 if (required ? hasEmpty || validErrorRuleValue(rule, cellValue) : !hasEmpty && validErrorRuleValue(rule, cellValue)) {
                   _this3.validRuleErr = true;
                   errorRules.push(new Rule(rule));
@@ -370,7 +370,7 @@ var _default = {
                 _this4.clearValidate();
               }
             }
-          }).catch(function (_ref2) {
+          })["catch"](function (_ref2) {
             var rule = _ref2.rule;
             // 如果校验不通过与触发方式一致，则聚焦提示错误，否则跳过并不作任何处理
             if (!rule.trigger || type === rule.trigger) {
@@ -420,4 +420,4 @@ var _default = {
     }
   }
 };
-exports.default = _default;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.6.10",
+  "version": "3.6.12-beta.0",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -99,9 +99,5 @@
   "bugs": {
     "url": "https://github.com/x-extends/vxe-table/issues"
   },
-  "homepage": "https://vxetable.cn/",
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
+  "homepage": "https://vxetable.cn/"
 }

package/packages/form/src/form-config-item.js

@@ -100,11 +100,7 @@ const VxeFormConfigItem = {
           'is--active': isActivetem($xeform, item),
           'is--error': showError
         }
-      ],
-      props: {
-        itemConfig: item
-      },
-      key: item.id
+      ]
     }, [
       h('div', {
         class: 'vxe-form--item-inner'

package/packages/list/src/list.js

@@ -145,7 +145,8 @@ export default {
         visibleSize: 0
       })
       this.fullData = fullData
-      this.scrollYLoad = sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt <= fullData.length
+      // 如果gt为0，则总是启用
+      this.scrollYLoad = sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length)
       this.handleData()
       return this.computeScrollLoad().then(() => {
         this.refreshScroll()

package/packages/table/src/methods.js

@@ -343,7 +343,8 @@ const Methods = {
   updateScrollYStatus (fullData) {
     const { treeConfig, treeOpts, sYOpts } = this
     const { transform } = treeOpts
-    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < fullData.length
+    // 如果gt为0，则总是启用
+    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= fullData.length)
     this.scrollYLoad = scrollYLoad
     return scrollYLoad
   },
@@ -1627,7 +1628,8 @@ const Methods = {
       })
     }
     const visibleColumn = leftList.concat(centerList).concat(rightList)
-    const scrollXLoad = sXOpts.enabled && sXOpts.gt > -1 && sXOpts.gt < tableFullColumn.length
+    // 如果gt为0，则总是启用
+    const scrollXLoad = sXOpts.enabled && sXOpts.gt > -1 && (sXOpts.gt === 0 || sXOpts.gt <= tableFullColumn.length)
     this.hasFixedColumn = leftList.length > 0 || rightList.length > 0
     Object.assign(columnStore, { leftList, centerList, rightList })
     if (scrollXLoad) {
@@ -2725,9 +2727,12 @@ const Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords (isFull) {
-    const { treeConfig, treeIndeterminates, afterFullData } = this
+    const { treeConfig, treeIndeterminates, fullDataRowIdData } = this
     if (treeConfig) {
-      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => this.findRowIndexOf(afterFullData, row) > -1)
+      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => {
+        const rowid = getRowid(this, row)
+        return fullDataRowIdData[rowid]
+      })
     }
     return []
   },
@@ -2830,7 +2835,7 @@ const Methods = {
         } else {
           // 更新子节点状态
           XEUtils.eachTree([row], (item) => {
-            if (this.eqRow(item, row) || (isForce && (!checkMethod || checkMethod({ row: item })))) {
+            if (this.eqRow(item, row) || (isForce || (!checkMethod || checkMethod({ row: item })))) {
               if (value) {
                 selection.push(item)
               } else {