vxe-table 3.6.9 → 3.6.10-beta.1

package/lib/index.umd.js

@@ -10572,7 +10572,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.9", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.10-beta.1", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -11742,7 +11742,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.9",
+  version: "3.6.10-beta.1",
   reg: reg,
   use: use,
   setup: setup,
@@ -17813,8 +17813,14 @@ var Methods = {
       column = params.column;
     var cell = evnt.currentTarget;
     this.handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
-    if (isEnableConf(editConfig)) {
-      if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
+    // 单元格处于编辑状态时不触发提示框
+    if (column.editRender && isEnableConf(editConfig)) {
+      // 如果是行编辑模式
+      if (editOpts.mode === 'row' && actived.row === row) {
+        return;
+      }
+      // 如果是单元格编辑模式
+      if (actived.row === row && actived.column === column) {
         return;
       }
     }
@@ -17953,7 +17959,7 @@ var Methods = {
     var checkAll = checkboxOpts.checkAll,
       checkRowKeys = checkboxOpts.checkRowKeys;
     if (checkAll) {
-      this.setAllCheckboxRow(true);
+      this.handleCheckedAllCheckboxRow(true, true);
     } else if (checkRowKeys) {
       var defSelection = [];
       checkRowKeys.forEach(function (rowid) {
@@ -17961,15 +17967,10 @@ var Methods = {
           defSelection.push(fullDataRowIdData[rowid].row);
         }
       });
-      this.setCheckboxRow(defSelection, true);
+      this.handleCheckedCheckboxRow(defSelection, true, true);
     }
   },
-  /**
-   * 用于多选行，设置行为选中状态，第二个参数为选中与否
-   * @param {Array/Row} rows 行数据
-   * @param {Boolean} value 是否选中
-   */
-  setCheckboxRow: function setCheckboxRow(rows, value) {
+  handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
     var _this32 = this;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
@@ -17977,10 +17978,18 @@ var Methods = {
     rows.forEach(function (row) {
       return _this32.handleSelectRow({
         row: row
-      }, !!value);
+      }, !!value, isForce);
     });
     return this.$nextTick();
   },
+  /**
+   * 用于多选行，设置行为选中状态，第二个参数为选中与否
+   * @param {Array/Row} rows 行数据
+   * @param {Boolean} value 是否选中
+   */
+  setCheckboxRow: function setCheckboxRow(rows, value) {
+    return this.handleCheckedCheckboxRow(rows, value, true);
+  },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
     var selection = this.selection;
     var checkField = this.checkboxOpts.checkField;
@@ -17997,7 +18006,7 @@ var Methods = {
    * 多选，行选中事件
    * value 选中true 不选false 半选-1
    */
-  handleSelectRow: function handleSelectRow(_ref6, value) {
+  handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
     var _this33 = this;
     var row = _ref6.row;
     var selection = this.selection,
@@ -18019,7 +18028,7 @@ var Methods = {
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
               row: item
             })) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
@@ -18036,7 +18045,7 @@ var Methods = {
         }, treeOpts);
         if (matchObj && matchObj.parent) {
           var parentStatus;
-          var vItems = checkMethod ? matchObj.items.filter(function (item) {
+          var vItems = !isForce && checkMethod ? matchObj.items.filter(function (item) {
             return checkMethod({
               row: item
             });
@@ -18056,10 +18065,10 @@ var Methods = {
           }
           return this.handleSelectRow({
             row: matchObj.parent
-          }, parentStatus);
+          }, parentStatus, isForce);
         }
       } else {
-        if (!checkMethod || checkMethod({
+        if (isForce || !checkMethod || checkMethod({
           row: row
         })) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
@@ -18078,9 +18087,9 @@ var Methods = {
         } else {
           // 更新子节点状态
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
-            if (_this33.eqRow(item, row) || !checkMethod || checkMethod({
+            if (_this33.eqRow(item, row) || isForce && (!checkMethod || checkMethod({
               row: item
-            })) {
+            }))) {
               if (value) {
                 selection.push(item);
               } else {
@@ -18101,7 +18110,7 @@ var Methods = {
         }, treeOpts);
         if (_matchObj && _matchObj.parent) {
           var _parentStatus;
-          var _vItems = checkMethod ? _matchObj.items.filter(function (item) {
+          var _vItems = !isForce && checkMethod ? _matchObj.items.filter(function (item) {
             return checkMethod({
               row: item
             });
@@ -18121,10 +18130,10 @@ var Methods = {
           }
           return this.handleSelectRow({
             row: _matchObj.parent
-          }, _parentStatus);
+          }, _parentStatus, isForce);
         }
       } else {
-        if (!checkMethod || checkMethod({
+        if (isForce || !checkMethod || checkMethod({
           row: row
         })) {
           if (value) {
@@ -18172,16 +18181,16 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    this.handleToggleCheckRowEvent(null, {
+    var selection = this.selection,
+      checkboxOpts = this.checkboxOpts;
+    var checkField = checkboxOpts.checkField;
+    var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    this.handleSelectRow({
       row: row
-    });
+    }, value, true);
     return this.$nextTick();
   },
-  /**
-   * 用于多选行，设置所有行的选中状态
-   * @param {Boolean} value 是否选中
-   */
-  setAllCheckboxRow: function setAllCheckboxRow(value) {
+  handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
     var _this34 = this;
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
@@ -18206,7 +18215,7 @@ var Methods = {
        */
       if (checkField) {
         var checkValFn = function checkValFn(row) {
-          if (!checkMethod || checkMethod({
+          if (isForce || !checkMethod || checkMethod({
             row: row
           })) {
             if (value) {
@@ -18234,7 +18243,7 @@ var Methods = {
              * 如果方法成立，则添加到临时集合中
              */
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
-              if (!checkMethod || checkMethod({
+              if (isForce || !checkMethod || checkMethod({
                 row: row
               })) {
                 selectRows.push(row);
@@ -18245,7 +18254,7 @@ var Methods = {
              * 如果是树取消
              * 如果方法成立，则不添加到临时集合中
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
@@ -18262,7 +18271,7 @@ var Methods = {
              * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
                 return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
                   row: row
@@ -18277,7 +18286,7 @@ var Methods = {
              * 如果方法成立，则不添加到临时集合中；如果方法不成立则判断当前是否已勾选，如果已被勾选则添加到新集合中
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
-            if (checkMethod) {
+            if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
@@ -18302,6 +18311,14 @@ var Methods = {
     }
     this.treeIndeterminates = [];
     this.checkSelectionStatus();
+    return this.$nextTick();
+  },
+  /**
+   * 用于多选行，设置所有行的选中状态
+   * @param {Boolean} value 是否选中
+   */
+  setAllCheckboxRow: function setAllCheckboxRow(value) {
+    return this.handleCheckedAllCheckboxRow(value, true);
   },
   checkSelectionStatus: function checkSelectionStatus() {
     var _this35 = this;
@@ -18413,14 +18430,14 @@ var Methods = {
     if (radioOpts.reserve && radioReserveRow) {
       var rowid = getRowid(this, radioReserveRow);
       if (fullDataRowIdData[rowid]) {
-        this.setRadioRow(fullDataRowIdData[rowid].row);
+        this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
       }
     }
     // 复选框
     this.selection = getRecoverRow(this, selection); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
-      this.setCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true);
+      this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
     }
     if (currentRow && !fullAllDataRowMap.has(currentRow)) {
       this.currentRow = null; // 刷新当前行状态
@@ -18542,7 +18559,7 @@ var Methods = {
    * 多选，选中所有事件
    */
   triggerCheckAllEvent: function triggerCheckAllEvent(evnt, value) {
-    this.setAllCheckboxRow(value);
+    this.handleCheckedAllCheckboxRow(value);
     this.emitEvent('checkbox-all', {
       records: this.getCheckboxRecords(),
       reserves: this.getCheckboxReserveRecords(),
@@ -18601,7 +18618,7 @@ var Methods = {
       reserve = radioOpts.reserve;
     if (rowid) {
       if (fullDataRowIdData[rowid]) {
-        this.setRadioRow(fullDataRowIdData[rowid].row);
+        this.handleCheckedRadioRow(fullDataRowIdData[rowid].row, true);
       }
       if (reserve) {
         var rowkey = getRowkey(this);
@@ -18619,7 +18636,7 @@ var Methods = {
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
-      this.setRadioRow(newValue);
+      this.handleCheckedRadioRow(newValue);
     } else if (!radioOpts.strict) {
       isChange = oldValue === newValue;
       if (isChange) {
@@ -18654,7 +18671,7 @@ var Methods = {
     var $el = this.$el,
       rowOpts = this.rowOpts;
     this.clearCurrentRow();
-    this.clearCurrentColumn();
+    // this.clearCurrentColumn()
     this.currentRow = row;
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
@@ -18668,14 +18685,10 @@ var Methods = {
   isCheckedByRadioRow: function isCheckedByRadioRow(row) {
     return this.selectRow === row;
   },
-  /**
-   * 用于单选行，设置某一行为选中状态
-   * @param {Row} row 行对象
-   */
-  setRadioRow: function setRadioRow(row) {
+  handleCheckedRadioRow: function handleCheckedRadioRow(row, isForce) {
     var radioOpts = this.radioOpts;
     var checkMethod = radioOpts.checkMethod;
-    if (row && (!checkMethod || checkMethod({
+    if (row && (isForce || !checkMethod || checkMethod({
       row: row
     }))) {
       this.selectRow = row;
@@ -18683,6 +18696,13 @@ var Methods = {
     }
     return this.$nextTick();
   },
+  /**
+   * 用于单选行，设置某一行为选中状态
+   * @param {Row} row 行对象
+   */
+  setRadioRow: function setRadioRow(row) {
+    return this.handleCheckedRadioRow(row, true);
+  },
   /**
    * 用于当前行，手动清空当前高亮的状态
    */
@@ -18807,7 +18827,7 @@ var Methods = {
   setCurrentColumn: function setCurrentColumn(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
     if (column) {
-      this.clearCurrentRow();
+      // this.clearCurrentRow()
       this.clearCurrentColumn();
       this.currentColumn = column;
     }
@@ -19560,7 +19580,7 @@ var Methods = {
             }
             // 如果当前节点已选中，则展开后子节点也被选中
             if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
-              _this48.setCheckboxRow(childRows, true);
+              _this48.handleCheckedCheckboxRow(childRows, true, true);
             }
             return _this48.$nextTick().then(function () {
               if (transform) {
@@ -24758,6 +24778,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
 
 
 
+
 
 
 var yearSize = 12;
@@ -26123,6 +26144,10 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     focusEvent: function focusEvent(evnt) {
       this.isActivated = true;
+      var isDatePickerType = this.isDatePickerType;
+      if (isDatePickerType) {
+        this.datePickerOpenEvent(evnt);
+      }
       this.triggerEvent(evnt);
     },
     blurEvent: function blurEvent(evnt) {
@@ -26174,10 +26199,6 @@ function renderExtraSuffixIcon(h, _vm) {
       this.triggerEvent(evnt);
     },
     clickEvent: function clickEvent(evnt) {
-      var isDatePickerType = this.isDatePickerType;
-      if (isDatePickerType) {
-        this.datePickerOpenEvent(evnt);
-      }
       this.triggerEvent(evnt);
     },
     clickPrefixEvent: function clickPrefixEvent(evnt) {
@@ -26623,8 +26644,39 @@ function renderExtraSuffixIcon(h, _vm) {
       this.dateTimeChangeEvent(evnt);
     },
     dateConfirmEvent: function dateConfirmEvent() {
-      if (this.isDateTimeType || this.multiple) {
-        this.dateChange(this.dateValue || this.currentDate);
+      var datetimePanelValue = this.datetimePanelValue,
+        isDateTimeType = this.isDateTimeType,
+        dateValueFormat = this.dateValueFormat,
+        dateMultipleValue = this.dateMultipleValue;
+      if (this.isDateTimeType) {
+        if (this.multiple) {
+          // 如果为多选
+          if (isDateTimeType) {
+            // 如果是datetime特殊类型
+            var dateListValue = this.dateListValue;
+            var datetimeRest = [];
+            dateListValue.forEach(function (item) {
+              if (item) {
+                item.setHours(datetimePanelValue.getHours());
+                item.setMinutes(datetimePanelValue.getMinutes());
+                item.setSeconds(datetimePanelValue.getSeconds());
+                datetimeRest.push(item);
+              }
+            });
+            this.emitModel(datetimeRest.map(function (date) {
+              return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat);
+            }).join(','), {
+              type: 'update'
+            });
+          } else {
+            // 如果是日期类型
+            this.emitModel(dateMultipleValue.join(','), {
+              type: 'update'
+            });
+          }
+        } else {
+          this.dateChange(this.dateValue || this.currentDate);
+        }
       }
       this.hidePanel();
     },
@@ -26828,15 +26880,22 @@ function renderExtraSuffixIcon(h, _vm) {
           // 如果是datetime特殊类型
           var dateListValue = this.dateListValue;
           var datetimeRest = [];
+          var eqIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(dateListValue, function (val) {
+            return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, val, 'yyyyMMdd');
+          });
+          if (eqIndex === -1) {
+            dateListValue.push(date);
+          } else {
+            dateListValue.splice(eqIndex, 1);
+          }
           dateListValue.forEach(function (item) {
-            if (item && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isDateSame(date, item, 'yyyyMMdd')) {
+            if (item) {
               item.setHours(datetimePanelValue.getHours());
               item.setMinutes(datetimePanelValue.getMinutes());
               item.setSeconds(datetimePanelValue.getSeconds());
               datetimeRest.push(item);
             }
           });
-          datetimeRest.push(date);
           this.emitModel(datetimeRest.map(function (date) {
             return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(date, dateValueFormat);
           }).join(','), {
@@ -32230,6 +32289,7 @@ var Colgroup = Object.assign(group, {
 
 
 
+
 
 
 var grid_methods = {};
@@ -32709,8 +32769,14 @@ Object.keys(packages_table.methods).forEach(function (name) {
         }
         if (!proxyInited && proxyOpts.autoLoad !== false) {
           this.proxyInited = true;
-          this.$nextTick(function () {
+          this.$nextTick().then(function () {
             return _this4.commitProxy('_init');
+          }).then(function (rest) {
+            _this4.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+              isInited: true,
+              $grid: _this4,
+              $event: new Event('init')
+            }));
           });
         }
       }
@@ -32768,14 +32834,12 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }
       switch (code) {
         case 'insert':
-          this.insert();
-          break;
+          return this.insert();
         case 'insert_actived':
-          this.insert().then(function (_ref2) {
+          return this.insert().then(function (_ref2) {
             var row = _ref2.row;
             return _this5.setActiveRow(row);
           });
-          break;
         case 'mark_cancel':
           this.triggerPendingEvent(code);
           break;
@@ -32846,6 +32910,8 @@ Object.keys(packages_table.methods).forEach(function (name) {
               var params = {
                 code: code,
                 button: button,
+                isInited: isInited,
+                isReload: isReload,
                 $grid: this,
                 page: pageParams,
                 sort: sortList.length ? sortList[0] : {},
@@ -32858,9 +32924,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
               this.filterData = filterList;
               this.tableLoading = true;
               var applyArgs = [params].concat(args);
-              return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).catch(function (e) {
-                return e;
-              }).then(function (rest) {
+              return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
                 _this5.tableLoading = false;
                 if (rest) {
                   if (isEnableConf(pagerConfig)) {
@@ -32881,6 +32945,13 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 if (afterQuery) {
                   afterQuery.apply(void 0, _toConsumableArray(applyArgs));
                 }
+                return {
+                  status: true
+                };
+              }).catch(function () {
+                return {
+                  status: false
+                };
               });
             } else {
               if (false) {}
@@ -32929,6 +33000,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     } else {
                       _this5.commitProxy('query');
                     }
+                    return {
+                      status: true
+                    };
                   }).catch(function (rest) {
                     _this5.tableLoading = false;
                     if (isMsg) {
@@ -32940,6 +33014,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                         status: 'error'
                       });
                     }
+                    return {
+                      status: false
+                    };
                   });
                 });
               } else {
@@ -33016,6 +33093,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     } else {
                       _this5.commitProxy('query');
                     }
+                    return {
+                      status: true
+                    };
                   }).catch(function (rest) {
                     _this5.tableLoading = false;
                     if (isMsg) {
@@ -33027,6 +33107,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                         status: 'error'
                       });
                     }
+                    return {
+                      status: false
+                    };
                   });
                 } else {
                   if (isMsg) {
@@ -33079,7 +33162,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
             escClosable: true
           }).then(function (type) {
             if (type === 'confirm') {
-              callback();
+              return callback();
             }
           });
         } else {
@@ -33112,17 +33195,29 @@ Object.keys(packages_table.methods).forEach(function (name) {
     getPendingRecords: function getPendingRecords() {
       return this.pendingRecords;
     },
+    triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
+      var _this6 = this;
+      var code = params.code;
+      return this.commitProxy(params, evnt).then(function (rest) {
+        if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
+          _this6.$emit(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+            isReload: code === 'reload',
+            $grid: _this6,
+            $event: evnt
+          }));
+        }
+      });
+    },
     triggerToolbarBtnEvent: function triggerToolbarBtnEvent(button, evnt) {
-      this.commitProxy(button, evnt);
+      this.triggerToolbarCommitEvent(button, evnt);
       this.$emit('toolbar-button-click', {
         code: button.code,
-        button: button,
         $grid: this,
         $event: evnt
       });
     },
     triggerToolbarTolEvent: function triggerToolbarTolEvent(tool, evnt) {
-      this.commitProxy(tool, evnt);
+      this.triggerToolbarCommitEvent(tool, evnt);
       this.$emit('toolbar-tool-click', {
         code: tool.code,
         tool: tool,
@@ -33167,6 +33262,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }
     },
     pageChangeEvent: function pageChangeEvent(params) {
+      var _this7 = this;
       var proxyConfig = this.proxyConfig,
         tablePage = this.tablePage;
       var currentPage = params.currentPage,
@@ -33177,10 +33273,16 @@ Object.keys(packages_table.methods).forEach(function (name) {
         $grid: this
       }, params));
       if (proxyConfig) {
-        this.commitProxy('query');
+        this.commitProxy('query').then(function (rest) {
+          _this7.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+            $grid: _this7,
+            $event: params.$event
+          }));
+        });
       }
     },
     sortChangeEvent: function sortChangeEvent(params) {
+      var _this8 = this;
       var $table = params.$table,
         column = params.column,
         sortList = params.sortList;
@@ -33190,7 +33292,12 @@ Object.keys(packages_table.methods).forEach(function (name) {
         this.sortData = sortList;
         if (this.proxyConfig) {
           this.tablePage.currentPage = 1;
-          this.commitProxy('query');
+          this.commitProxy('query').then(function (rest) {
+            _this8.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+              $grid: _this8,
+              $event: params.$event
+            }));
+          });
         }
       }
       this.$emit('sort-change', Object.assign({
@@ -33198,6 +33305,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }, params));
     },
     filterChangeEvent: function filterChangeEvent(params) {
+      var _this9 = this;
       var $table = params.$table,
         filterList = params.filterList;
       // 如果是服务端过滤
@@ -33205,7 +33313,12 @@ Object.keys(packages_table.methods).forEach(function (name) {
         this.filterData = filterList;
         if (this.proxyConfig) {
           this.tablePage.currentPage = 1;
-          this.commitProxy('query');
+          this.commitProxy('query').then(function (rest) {
+            _this9.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+              $grid: _this9,
+              $event: params.$event
+            }));
+          });
         }
       }
       this.$emit('filter-change', Object.assign({
@@ -33213,18 +33326,32 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }, params));
     },
     submitEvent: function submitEvent(params) {
+      var _this10 = this;
       var proxyConfig = this.proxyConfig;
       if (proxyConfig) {
-        this.commitProxy('reload');
+        this.commitProxy('reload').then(function (rest) {
+          _this10.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+            isReload: true,
+            $grid: _this10,
+            $event: params.$event
+          }));
+        });
       }
       this.$emit('form-submit', Object.assign({
         $grid: this
       }, params));
     },
     resetEvent: function resetEvent(params) {
+      var _this11 = this;
       var proxyConfig = this.proxyConfig;
       if (proxyConfig) {
-        this.commitProxy('reload');
+        this.commitProxy('reload').then(function (rest) {
+          _this11.$emit('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
+            isReload: true,
+            $grid: _this11,
+            $event: params.$event
+          }));
+        });
       }
       this.$emit('form-reset', Object.assign({
         $grid: this
@@ -33236,9 +33363,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
       }, params));
     },
     collapseEvent: function collapseEvent(params) {
-      var _this6 = this;
+      var _this12 = this;
       this.$nextTick(function () {
-        return _this6.recalculate(true);
+        return _this12.recalculate(true);
       });
       this.$emit('form-toggle-collapse', Object.assign({
         $grid: this
@@ -33268,7 +33395,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
       return this.handleZoom();
     },
     handleZoom: function handleZoom(isMax) {
-      var _this7 = this;
+      var _this13 = this;
       var isZMax = this.isZMax;
       if (isMax ? !isZMax : isZMax) {
         this.isZMax = !isZMax;
@@ -33277,9 +33404,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
         }
       }
       return this.$nextTick().then(function () {
-        return _this7.recalculate(true);
+        return _this13.recalculate(true);
       }).then(function () {
-        return _this7.isZMax;
+        return _this13.isZMax;
       });
     },
     getProxyInfo: function getProxyInfo() {
@@ -33961,7 +34088,7 @@ function renderCustoms(h, _vm) {
         }
       }, 300);
     },
-    refreshEvent: function refreshEvent() {
+    refreshEvent: function refreshEvent(evnt) {
       var _this4 = this;
       var $xegrid = this.$xegrid,
         refreshOpts = this.refreshOpts,
@@ -33981,7 +34108,9 @@ function renderCustoms(h, _vm) {
           }
         } else if ($xegrid) {
           this.isRefresh = true;
-          $xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
+          $xegrid.triggerToolbarCommitEvent({
+            code: refreshOpts.code || 'reload'
+          }, evnt).catch(function (e) {
             return e;
           }).then(function () {
             _this4.isRefresh = false;
@@ -34505,17 +34634,18 @@ var Toolbar = Object.assign(toolbar, {
       }
     },
     pageSizeEvent: function pageSizeEvent(pageSize) {
-      this.changePageSize(pageSize);
-    },
-    changePageSize: function changePageSize(pageSize) {
-      if (pageSize !== this.pageSize) {
-        this.$emit('update:pageSize', pageSize);
-        this.$emit('page-change', {
-          type: 'size',
-          pageSize: pageSize,
-          currentPage: Math.min(this.currentPage, this.getPageCount(this.total, pageSize))
-        });
-      }
+      var pageCount = this.getPageCount(this.total, pageSize);
+      var currentPage = this.currentPage;
+      if (currentPage > pageCount) {
+        currentPage = pageCount;
+        this.$emit('update:currentPage', pageCount);
+      }
+      this.$emit('update:pageSize', pageSize);
+      this.$emit('page-change', {
+        type: 'size',
+        pageSize: pageSize,
+        currentPage: currentPage
+      });
     },
     jumpInputEvent: function jumpInputEvent(evnt) {
       this.inpCurrPage = evnt.target.value;
@@ -34532,7 +34662,7 @@ var Toolbar = Object.assign(toolbar, {
       }
     },
     triggerJumpEvent: function triggerJumpEvent(evnt) {
-      var value = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(evnt.target.value);
+      var value = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(evnt.target.value);
       var current = value <= 0 ? 1 : value >= this.pageCount ? this.pageCount : value;
       evnt.target.value = current;
       this.jumpPage(current);
@@ -37666,6 +37796,12 @@ var Switch = Object.assign(src_switch, {
       this.$resize = resizeObserver;
     }
   },
+  activated: function activated() {
+    var _this3 = this;
+    this.recalculate().then(function () {
+      return _this3.refreshScroll();
+    });
+  },
   beforeDestroy: function beforeDestroy() {
     if (this.$resize) {
       this.$resize.disconnect();
@@ -37730,7 +37866,7 @@ var Switch = Object.assign(src_switch, {
      * @param {Array} datas 数据
      */
     loadData: function loadData(datas) {
-      var _this3 = this;
+      var _this4 = this;
       var sYOpts = this.sYOpts,
         scrollYStore = this.scrollYStore;
       var fullData = datas || [];
@@ -37743,7 +37879,7 @@ var Switch = Object.assign(src_switch, {
       this.scrollYLoad = sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt <= fullData.length;
       this.handleData();
       return this.computeScrollLoad().then(function () {
-        _this3.refreshScroll();
+        _this4.refreshScroll();
       });
     },
     /**
@@ -37785,14 +37921,14 @@ var Switch = Object.assign(src_switch, {
      * 刷新滚动条
      */
     refreshScroll: function refreshScroll() {
-      var _this4 = this;
+      var _this5 = this;
       var lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop;
       return this.clearScroll().then(function () {
         if (lastScrollLeft || lastScrollTop) {
-          _this4.lastScrollLeft = 0;
-          _this4.lastScrollTop = 0;
-          return _this4.scrollTo(lastScrollLeft, lastScrollTop);
+          _this5.lastScrollLeft = 0;
+          _this5.lastScrollTop = 0;
+          return _this5.scrollTo(lastScrollLeft, lastScrollTop);
         }
       });
     },
@@ -37802,7 +37938,7 @@ var Switch = Object.assign(src_switch, {
      * @param {Number} scrollTop 上距离
      */
     scrollTo: function scrollTo(scrollLeft, scrollTop) {
-      var _this5 = this;
+      var _this6 = this;
       var scrollBodyElem = this.$refs.virtualWrapper;
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
         scrollBodyElem.scrollLeft = scrollLeft;
@@ -37813,19 +37949,19 @@ var Switch = Object.assign(src_switch, {
       if (this.scrollYLoad) {
         return new Promise(function (resolve) {
           return setTimeout(function () {
-            return resolve(_this5.$nextTick());
+            return resolve(_this6.$nextTick());
           }, 50);
         });
       }
       return this.$nextTick();
     },
     computeScrollLoad: function computeScrollLoad() {
-      var _this6 = this;
+      var _this7 = this;
       return this.$nextTick().then(function () {
-        var $refs = _this6.$refs,
-          sYOpts = _this6.sYOpts,
-          scrollYLoad = _this6.scrollYLoad,
-          scrollYStore = _this6.scrollYStore;
+        var $refs = _this7.$refs,
+          sYOpts = _this7.sYOpts,
+          scrollYLoad = _this7.scrollYLoad,
+          scrollYStore = _this7.scrollYStore;
         var virtualWrapperElem = $refs.virtualWrapper,
           virtualBodyElem = $refs.virtualBody;
         var rowHeight = 0;
@@ -37850,11 +37986,11 @@ var Switch = Object.assign(src_switch, {
           scrollYStore.offsetSize = offsetYSize;
           scrollYStore.visibleSize = visibleYSize;
           scrollYStore.endIndex = Math.max(scrollYStore.startIndex, visibleYSize + offsetYSize, scrollYStore.endIndex);
-          _this6.updateYData();
+          _this7.updateYData();
         } else {
-          _this6.updateYSpace();
+          _this7.updateYSpace();
         }
-        _this6.rowHeight = rowHeight;
+        _this7.rowHeight = rowHeight;
       });
     },
     scrollEvent: function scrollEvent(evnt) {