vxe-table 4.3.9 → 4.3.10

package/es/table/src/table.js

@@ -1584,7 +1584,7 @@ export default defineComponent({
                 var checkboxOpts = computeCheckboxOpts.value;
                 var checkAll = checkboxOpts.checkAll, checkRowKeys = checkboxOpts.checkRowKeys;
                 if (checkAll) {
-                    tableMethods.setAllCheckboxRow(true);
+                    handleCheckedAllCheckboxRow(true, true);
                 }
                 else if (checkRowKeys) {
                     var defSelection_1 = [];
@@ -1593,7 +1593,7 @@ export default defineComponent({
                             defSelection_1.push(fullDataRowIdData_1[rowid].row);
                         }
                     });
-                    tableMethods.setCheckboxRow(defSelection_1, true);
+                    handleCheckedCheckboxRow(defSelection_1, true, true);
                 }
             }
         };
@@ -1609,7 +1609,7 @@ export default defineComponent({
                 var rowid = radioOpts.checkRowKey, reserve = radioOpts.reserve;
                 if (rowid) {
                     if (fullDataRowIdData[rowid]) {
-                        tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
+                        handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
                     }
                     if (reserve) {
                         var rowkey = getRowkey($xetable);
@@ -1660,6 +1660,130 @@ export default defineComponent({
                 }
             }
         };
+        var handleCheckedRadioRow = function (row, isForce) {
+            var radioOpts = computeRadioOpts.value;
+            var checkMethod = radioOpts.checkMethod;
+            if (row && (isForce || (!checkMethod || checkMethod({ row: row })))) {
+                reactData.selectRow = row;
+                handleRadioReserveRow(row);
+            }
+            return nextTick();
+        };
+        var handleCheckedCheckboxRow = function (rows, value, isForce) {
+            if (rows && !XEUtils.isArray(rows)) {
+                rows = [rows];
+            }
+            rows.forEach(function (row) { return tablePrivateMethods.handleSelectRow({ row: row }, !!value, isForce); });
+            return nextTick();
+        };
+        var handleCheckedAllCheckboxRow = function (value, isForce) {
+            var treeConfig = props.treeConfig;
+            var selection = reactData.selection;
+            var afterFullData = internalData.afterFullData, checkboxReserveRowMap = internalData.checkboxReserveRowMap;
+            var treeOpts = computeTreeOpts.value;
+            var checkboxOpts = computeCheckboxOpts.value;
+            var checkField = checkboxOpts.checkField, reserve = checkboxOpts.reserve, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
+            var selectRows = [];
+            var beforeSelection = treeConfig ? [] : selection.filter(function (row) { return $xetable.findRowIndexOf(afterFullData, row) === -1; });
+            if (checkStrictly) {
+                reactData.isAllSelected = value;
+            }
+            else {
+                /**
+                 * 绑定属性方式（高性能，有污染）
+                 * 必须在行数据存在对应的属性，否则将不响应
+                 */
+                if (checkField) {
+                    var checkValFn = function (row) {
+                        if (isForce || (!checkMethod || checkMethod({ row: row }))) {
+                            if (value) {
+                                selectRows.push(row);
+                            }
+                            XEUtils.set(row, checkField, value);
+                        }
+                    };
+                    // 如果存在选中方法
+                    // 如果方法成立，则更新值，否则忽略该数据
+                    if (treeConfig) {
+                        XEUtils.eachTree(afterFullData, checkValFn, treeOpts);
+                    }
+                    else {
+                        afterFullData.forEach(checkValFn);
+                    }
+                }
+                else {
+                    /**
+                     * 默认方式（低性能，无污染）
+                     * 无需任何属性，直接绑定
+                     */
+                    if (treeConfig) {
+                        if (value) {
+                            /**
+                             * 如果是树勾选
+                             * 如果方法成立，则添加到临时集合中
+                             */
+                            XEUtils.eachTree(afterFullData, function (row) {
+                                if (isForce || (!checkMethod || checkMethod({ row: row }))) {
+                                    selectRows.push(row);
+                                }
+                            }, treeOpts);
+                        }
+                        else {
+                            /**
+                             * 如果是树取消
+                             * 如果方法成立，则不添加到临时集合中
+                             */
+                            if (!isForce && checkMethod) {
+                                XEUtils.eachTree(afterFullData, function (row) {
+                                    if (checkMethod({ row: row }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
+                                        selectRows.push(row);
+                                    }
+                                }, treeOpts);
+                            }
+                        }
+                    }
+                    else {
+                        if (value) {
+                            /**
+                             * 如果是行勾选
+                             * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
+                             * 如果不存在选中方法，则添加所有数据到临时集合中
+                             */
+                            if (!isForce && checkMethod) {
+                                selectRows = afterFullData.filter(function (row) { return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({ row: row }); });
+                            }
+                            else {
+                                selectRows = afterFullData.slice(0);
+                            }
+                        }
+                        else {
+                            /**
+                             * 如果是行取消
+                             * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
+                             * 如果不存在选中方法，无需处理，临时集合默认为空
+                             */
+                            if (!isForce && checkMethod) {
+                                selectRows = afterFullData.filter(function (row) { return checkMethod({ row: row }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1; });
+                            }
+                        }
+                    }
+                }
+                if (reserve) {
+                    if (value) {
+                        selectRows.forEach(function (row) {
+                            checkboxReserveRowMap[getRowid($xetable, row)] = row;
+                        });
+                    }
+                    else {
+                        afterFullData.forEach(function (row) { return handleCheckboxReserveRow(row, false); });
+                    }
+                }
+                reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
+            }
+            reactData.treeIndeterminates = [];
+            tablePrivateMethods.checkSelectionStatus();
+            return nextTick();
+        };
         // 还原展开、选中等相关状态
         var handleReserveStatus = function () {
             var treeConfig = props.treeConfig;
@@ -1677,14 +1801,14 @@ export default defineComponent({
             if (radioOpts.reserve && radioReserveRow) {
                 var rowid = getRowid($xetable, radioReserveRow);
                 if (fullDataRowIdData[rowid]) {
-                    tableMethods.setRadioRow(fullDataRowIdData[rowid].row);
+                    handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
                 }
             }
             // 复选框
             reactData.selection = getRecoverRow(selection); // 刷新多选行状态
             // 还原保留选中状态
             if (checkboxOpts.reserve) {
-                tableMethods.setCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true);
+                handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
             }
             if (currentRow && !fullAllDataRowIdData[getRowid($xetable, currentRow)]) {
                 reactData.currentRow = null; // 刷新当前行状态
@@ -1750,7 +1874,7 @@ export default defineComponent({
                                 }
                                 // 如果当前节点已选中，则展开后子节点也被选中
                                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
-                                    tableMethods.setCheckboxRow(childRows, true);
+                                    handleCheckedCheckboxRow(childRows, true);
                                 }
                                 return nextTick().then(function () {
                                     if (transform) {
@@ -3005,11 +3129,7 @@ export default defineComponent({
              * @param {Boolean} value 是否选中
              */
             setCheckboxRow: function (rows, value) {
-                if (rows && !XEUtils.isArray(rows)) {
-                    rows = [rows];
-                }
-                rows.forEach(function (row) { return tablePrivateMethods.handleSelectRow({ row: row }, !!value); });
-                return nextTick();
+                return handleCheckedCheckboxRow(rows, value, true);
             },
             isCheckedByCheckboxRow: function (row) {
                 var selection = reactData.selection;
@@ -3028,7 +3148,11 @@ export default defineComponent({
              * 多选，切换某一行的选中状态
              */
             toggleCheckboxRow: function (row) {
-                tablePrivateMethods.handleToggleCheckRowEvent(null, { row: row });
+                var selection = reactData.selection;
+                var checkboxOpts = computeCheckboxOpts.value;
+                var checkField = checkboxOpts.checkField;
+                var value = checkField ? !XEUtils.get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
+                tablePrivateMethods.handleSelectRow({ row: row }, value, true);
                 return nextTick();
             },
             /**
@@ -3036,112 +3160,7 @@ export default defineComponent({
              * @param {Boolean} value 是否选中
              */
             setAllCheckboxRow: function (value) {
-                var treeConfig = props.treeConfig;
-                var selection = reactData.selection;
-                var afterFullData = internalData.afterFullData, checkboxReserveRowMap = internalData.checkboxReserveRowMap;
-                var treeOpts = computeTreeOpts.value;
-                var checkboxOpts = computeCheckboxOpts.value;
-                var checkField = checkboxOpts.checkField, reserve = checkboxOpts.reserve, checkStrictly = checkboxOpts.checkStrictly, checkMethod = checkboxOpts.checkMethod;
-                var selectRows = [];
-                var beforeSelection = treeConfig ? [] : selection.filter(function (row) { return $xetable.findRowIndexOf(afterFullData, row) === -1; });
-                if (checkStrictly) {
-                    reactData.isAllSelected = value;
-                }
-                else {
-                    /**
-                     * 绑定属性方式（高性能，有污染）
-                     * 必须在行数据存在对应的属性，否则将不响应
-                     */
-                    if (checkField) {
-                        var checkValFn = function (row) {
-                            if (!checkMethod || checkMethod({ row: row })) {
-                                if (value) {
-                                    selectRows.push(row);
-                                }
-                                XEUtils.set(row, checkField, value);
-                            }
-                        };
-                        // 如果存在选中方法
-                        // 如果方法成立，则更新值，否则忽略该数据
-                        if (treeConfig) {
-                            XEUtils.eachTree(afterFullData, checkValFn, treeOpts);
-                        }
-                        else {
-                            afterFullData.forEach(checkValFn);
-                        }
-                    }
-                    else {
-                        /**
-                         * 默认方式（低性能，无污染）
-                         * 无需任何属性，直接绑定
-                         */
-                        if (treeConfig) {
-                            if (value) {
-                                /**
-                                 * 如果是树勾选
-                                 * 如果方法成立，则添加到临时集合中
-                                 */
-                                XEUtils.eachTree(afterFullData, function (row) {
-                                    if (!checkMethod || checkMethod({ row: row })) {
-                                        selectRows.push(row);
-                                    }
-                                }, treeOpts);
-                            }
-                            else {
-                                /**
-                                 * 如果是树取消
-                                 * 如果方法成立，则不添加到临时集合中
-                                 */
-                                if (checkMethod) {
-                                    XEUtils.eachTree(afterFullData, function (row) {
-                                        if (checkMethod({ row: row }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1) {
-                                            selectRows.push(row);
-                                        }
-                                    }, treeOpts);
-                                }
-                            }
-                        }
-                        else {
-                            if (value) {
-                                /**
-                                 * 如果是行勾选
-                                 * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
-                                 * 如果不存在选中方法，则添加所有数据到临时集合中
-                                 */
-                                if (checkMethod) {
-                                    selectRows = afterFullData.filter(function (row) { return $xetable.findRowIndexOf(selection, row) > -1 || checkMethod({ row: row }); });
-                                }
-                                else {
-                                    selectRows = afterFullData.slice(0);
-                                }
-                            }
-                            else {
-                                /**
-                                 * 如果是行取消
-                                 * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
-                                 * 如果不存在选中方法，无需处理，临时集合默认为空
-                                 */
-                                if (checkMethod) {
-                                    selectRows = afterFullData.filter(function (row) { return checkMethod({ row: row }) ? 0 : $xetable.findRowIndexOf(selection, row) > -1; });
-                                }
-                            }
-                        }
-                    }
-                    if (reserve) {
-                        if (value) {
-                            selectRows.forEach(function (row) {
-                                checkboxReserveRowMap[getRowid($xetable, row)] = row;
-                            });
-                        }
-                        else {
-                            afterFullData.forEach(function (row) { return handleCheckboxReserveRow(row, false); });
-                        }
-                    }
-                    reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
-                }
-                reactData.treeIndeterminates = [];
-                tablePrivateMethods.checkSelectionStatus();
-                return nextTick();
+                return handleCheckedAllCheckboxRow(value, true);
             },
             /**
              * 获取单选框保留选中的行
@@ -3263,7 +3282,7 @@ export default defineComponent({
                 var rowOpts = computeRowOpts.value;
                 var el = refElem.value;
                 tableMethods.clearCurrentRow();
-                tableMethods.clearCurrentColumn();
+                // tableMethods.clearCurrentColumn()
                 reactData.currentRow = row;
                 if (rowOpts.isCurrent || props.highlightCurrentRow) {
                     if (el) {
@@ -3280,13 +3299,7 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             setRadioRow: function (row) {
-                var radioOpts = computeRadioOpts.value;
-                var checkMethod = radioOpts.checkMethod;
-                if (row && (!checkMethod || checkMethod({ row: row }))) {
-                    reactData.selectRow = row;
-                    handleRadioReserveRow(row);
-                }
-                return nextTick();
+                return handleCheckedRadioRow(row, true);
             },
             /**
              * 用于当前行，手动清空当前高亮的状态
@@ -3356,7 +3369,7 @@ export default defineComponent({
             setCurrentColumn: function (fieldOrColumn) {
                 var column = handleFieldOrColumn($xetable, fieldOrColumn);
                 if (column) {
-                    tableMethods.clearCurrentRow();
+                    // tableMethods.clearCurrentRow()
                     tableMethods.clearCurrentColumn();
                     reactData.currentColumn = column;
                 }
@@ -4871,7 +4884,7 @@ export default defineComponent({
              * 多选，行选中事件
              * value 选中true 不选false 半选-1
              */
-            handleSelectRow: function (_a, value) {
+            handleSelectRow: function (_a, value, isForce) {
                 var row = _a.row;
                 var treeConfig = props.treeConfig;
                 var selection = reactData.selection, treeIndeterminates = reactData.treeIndeterminates;
@@ -4890,7 +4903,7 @@ export default defineComponent({
                         else {
                             // 更新子节点状态
                             XEUtils.eachTree([row], function (item) {
-                                if ($xetable.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
+                                if ($xetable.eqRow(item, row) || (isForce || (!checkMethod || checkMethod({ row: item })))) {
                                     XEUtils.set(item, checkField, value);
                                     XEUtils.remove(treeIndeterminates, function (half) { return $xetable.eqRow(half, item); });
                                     handleCheckboxReserveRow(row, value);
@@ -4901,7 +4914,7 @@ export default defineComponent({
                         var matchObj = XEUtils.findTree(afterFullData, function (item) { return $xetable.eqRow(item, row); }, treeOpts);
                         if (matchObj && matchObj.parent) {
                             var parentStatus = void 0;
-                            var vItems_1 = checkMethod ? matchObj.items.filter(function (item) { return checkMethod({ row: item }); }) : matchObj.items;
+                            var vItems_1 = !isForce && checkMethod ? matchObj.items.filter(function (item) { return checkMethod({ row: item }); }) : matchObj.items;
                             var indeterminatesItem = XEUtils.find(matchObj.items, function (item) { return $xetable.findRowIndexOf(treeIndeterminates, item) > -1; });
                             if (indeterminatesItem) {
                                 parentStatus = -1;
@@ -4910,11 +4923,11 @@ export default defineComponent({
                                 var selectItems = matchObj.items.filter(function (item) { return XEUtils.get(item, checkField); });
                                 parentStatus = selectItems.filter(function (item) { return $xetable.findRowIndexOf(vItems_1, item) > -1; }).length === vItems_1.length ? true : (selectItems.length || value === -1 ? -1 : false);
                             }
-                            return tablePrivateMethods.handleSelectRow({ row: matchObj.parent }, parentStatus);
+                            return tablePrivateMethods.handleSelectRow({ row: matchObj.parent }, parentStatus, isForce);
                         }
                     }
                     else {
-                        if (!checkMethod || checkMethod({ row: row })) {
+                        if (isForce || (!checkMethod || checkMethod({ row: row }))) {
                             XEUtils.set(row, checkField, value);
                             handleCheckboxReserveRow(row, value);
                         }
@@ -4931,7 +4944,7 @@ export default defineComponent({
                         else {
                             // 更新子节点状态
                             XEUtils.eachTree([row], function (item) {
-                                if ($xetable.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
+                                if ($xetable.eqRow(item, row) || (isForce || (!checkMethod || checkMethod({ row: item })))) {
                                     if (value) {
                                         selection.push(item);
                                     }
@@ -4947,7 +4960,7 @@ export default defineComponent({
                         var matchObj = XEUtils.findTree(afterFullData, function (item) { return $xetable.eqRow(item, row); }, treeOpts);
                         if (matchObj && matchObj.parent) {
                             var parentStatus = void 0;
-                            var vItems_2 = checkMethod ? matchObj.items.filter(function (item) { return checkMethod({ row: item }); }) : matchObj.items;
+                            var vItems_2 = !isForce && checkMethod ? matchObj.items.filter(function (item) { return checkMethod({ row: item }); }) : matchObj.items;
                             var indeterminatesItem = XEUtils.find(matchObj.items, function (item) { return $xetable.findRowIndexOf(treeIndeterminates, item) > -1; });
                             if (indeterminatesItem) {
                                 parentStatus = -1;
@@ -4956,11 +4969,11 @@ export default defineComponent({
                                 var selectItems = matchObj.items.filter(function (item) { return $xetable.findRowIndexOf(selection, item) > -1; });
                                 parentStatus = selectItems.filter(function (item) { return $xetable.findRowIndexOf(vItems_2, item) > -1; }).length === vItems_2.length ? true : (selectItems.length || value === -1 ? -1 : false);
                             }
-                            return tablePrivateMethods.handleSelectRow({ row: matchObj.parent }, parentStatus);
+                            return tablePrivateMethods.handleSelectRow({ row: matchObj.parent }, parentStatus, isForce);
                         }
                     }
                     else {
-                        if (!checkMethod || checkMethod({ row: row })) {
+                        if (isForce || (!checkMethod || checkMethod({ row: row }))) {
                             if (value) {
                                 if ($xetable.findRowIndexOf(selection, row) === -1) {
                                     selection.push(row);
@@ -5228,7 +5241,7 @@ export default defineComponent({
              * 多选，选中所有事件
              */
             triggerCheckAllEvent: function (evnt, value) {
-                tableMethods.setAllCheckboxRow(value);
+                handleCheckedAllCheckboxRow(value);
                 if (evnt) {
                     tableMethods.dispatchEvent('checkbox-all', {
                         records: tableMethods.getCheckboxRecords(),
@@ -5248,7 +5261,7 @@ export default defineComponent({
                 var newValue = row;
                 var isChange = oldValue !== newValue;
                 if (isChange) {
-                    tableMethods.setRadioRow(newValue);
+                    handleCheckedRadioRow(newValue);
                 }
                 else if (!radioOpts.strict) {
                     isChange = oldValue === newValue;

package/es/toolbar/src/toolbar.js

@@ -237,7 +237,7 @@ export default defineComponent({
                 }
             }, 300);
         };
-        var refreshEvent = function () {
+        var refreshEvent = function (evnt) {
             var isRefresh = reactData.isRefresh;
             var refreshOpts = computeRefreshOpts.value;
             if (!isRefresh) {
@@ -255,7 +255,7 @@ export default defineComponent({
                 }
                 else if ($xegrid) {
                     reactData.isRefresh = true;
-                    $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) { return e; }).then(function () {
+                    $xegrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, evnt).catch(function (e) { return e; }).then(function () {
                         reactData.isRefresh = false;
                     });
                 }

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v".concat("4.3.9", "] ").concat(GlobalConfig.i18n(message, params));
+    return "[vxe-table v".concat("4.3.10", "] ").concat(GlobalConfig.i18n(message, params));
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.3.9",
+    version: "4.3.10",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,