@opentinyvue/vue-grid-toolbar 3.22.0 → 3.23.0

package/lib/index.js

@@ -1263,12 +1263,12 @@ var _sfc_main$2 = defineComponent({
       return [].concat(fixedLeft, normal, fixedRight);
     },
     initNumberSorting: function initNumberSorting(columns) {
-      var _this10 = this;
+      var _this0 = this;
       if (this.isGroup) return;
       this.sortingOptions = [];
       columns.forEach(function(column, index) {
         column.sortingIndex = index + 1;
-        _this10.sortingOptions.push(column.sortingIndex);
+        _this0.sortingOptions.push(column.sortingIndex);
       });
     },
     handelNumberSorting: function handelNumberSorting(sort, row) {
@@ -1423,12 +1423,12 @@ var _sfc_main$2 = defineComponent({
       this.handleClose();
     },
     resetSettings: function resetSettings(event) {
-      var _this11 = this;
+      var _this1 = this;
       if (this.activeName === "base") {
         this.columns = this.getColumnConfigs(this.data);
         if (this.settings.columns && this.settings.columns.length) {
           this.settings.columns.forEach(function(setting) {
-            var column = find(_this11.columns, function(item) {
+            var column = find(_this1.columns, function(item) {
               return item.property === setting.property;
             });
             if (column) {
@@ -1452,7 +1452,7 @@ var _sfc_main$2 = defineComponent({
       this.$emit("showModal", false);
     },
     handleReset: function handleReset(event) {
-      var _this12 = this;
+      var _this10 = this;
       var equal = function equal2(cols1, cols2) {
         var props1 = [];
         var props2 = [];
@@ -1466,14 +1466,14 @@ var _sfc_main$2 = defineComponent({
       };
       if (typeof this.resetMethod === "function") {
         this.resetMethod().then(function(sourceSettings) {
-          _this12.buildSettings();
+          _this10.buildSettings();
           var _ref5 = sourceSettings || {}, columns = _ref5.columns, sortType = _ref5.sortType, pageSize = _ref5.pageSize;
-          if (columns && columns.length && _this12.settings.columns && _this12.settings.columns.length) {
-            _this12.settings.columns.forEach(function(setting) {
+          if (columns && columns.length && _this10.settings.columns && _this10.settings.columns.length) {
+            _this10.settings.columns.forEach(function(setting) {
               var source = find(columns, function(item) {
                 return item.property === setting.property;
               });
-              var target = find(_this12.columns, function(item) {
+              var target = find(_this10.columns, function(item) {
                 return item.property === setting.property;
               });
               if (source) {
@@ -1481,25 +1481,25 @@ var _sfc_main$2 = defineComponent({
                 Object.assign(target, source);
               }
             });
-            if (equal(columns, _this12.settings.columns)) {
+            if (equal(columns, _this10.settings.columns)) {
               var settingColumns = [];
               var gridColumns = [];
               columns.forEach(function(source) {
-                var settingCol = find(_this12.settings.columns, function(item) {
+                var settingCol = find(_this10.settings.columns, function(item) {
                   return source.property === item.property;
                 });
-                var targetCol = find(_this12.columns, function(item) {
+                var targetCol = find(_this10.columns, function(item) {
                   return source.property === item.property;
                 });
                 settingColumns.push(settingCol);
                 gridColumns.push(targetCol);
               });
-              _this12.settings.columns = settingColumns;
-              _this12.columns = gridColumns;
+              _this10.settings.columns = settingColumns;
+              _this10.columns = gridColumns;
             }
           }
-          sortType && (_this12.settings.sortType = sortType);
-          pageSize && (_this12.settings.pageSize = pageSize);
+          sortType && (_this10.settings.sortType = sortType);
+          pageSize && (_this10.settings.pageSize = pageSize);
         });
       } else {
         this.resetSettings(event);
@@ -1944,12 +1944,12 @@ var _sfc_main$1 = {
       });
     },
     getColumnConfigs: function getColumnConfigs2(configs) {
-      var _this13 = this;
+      var _this11 = this;
       var _getColNodes2 = function getColNodes(columns2) {
         return columns2.map(function(_ref8) {
           var id = _ref8.id, title = _ref8.title, property = _ref8.property, fixed = _ref8.fixed, visible = _ref8.visible, order = _ref8.order, sortable = _ref8.sortable, level = _ref8.level, children = _ref8.children;
           if (property) {
-            var _this13$setting;
+            var _this11$setting;
             var column = {
               id,
               title,
@@ -1961,7 +1961,7 @@ var _sfc_main$1 = {
               level,
               children
             };
-            column.disabled = Boolean((_this13$setting = _this13.setting) == null ? void 0 : _this13$setting.customDisable == null ? void 0 : _this13$setting.customDisable(column));
+            column.disabled = Boolean((_this11$setting = _this11.setting) == null ? void 0 : _this11$setting.customDisable == null ? void 0 : _this11$setting.customDisable(column));
             children && (column.children = _getColNodes2(children));
             return column;
           }
@@ -2176,7 +2176,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   },
   watch: {
     value: function value2(val) {
-      var _this14 = this;
+      var _this12 = this;
       if (val) {
         this.initOpt();
         this.columns = this.getColumnConfigs(this.data);
@@ -2188,10 +2188,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         });
         this.defaultcheckedkeys = this.getDefaultcheckedkeys();
         setTimeout(function() {
-          _this14.initDragEvent();
-          _this14.initDrag = true;
-          if (_this14.$refs.tree) {
-            _this14.allCheckedKeys = [].concat(_this14.$refs.tree.getCheckedKeys(), _this14.$refs.tree.getHalfCheckedKeys());
+          _this12.initDragEvent();
+          _this12.initDrag = true;
+          if (_this12.$refs.tree) {
+            _this12.allCheckedKeys = [].concat(_this12.$refs.tree.getCheckedKeys(), _this12.$refs.tree.getHalfCheckedKeys());
           }
         }, 100);
         this.reset();
@@ -2215,9 +2215,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     activeName: {
       handler: function handler7(val) {
-        var _this15 = this;
+        var _this13 = this;
         setTimeout(function() {
-          _this15.animateShow = val;
+          _this13.animateShow = val;
         }, 0);
       }
     }
@@ -2247,10 +2247,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return this.tinyTable.tinyTheme || GridConfig.themes.AURORA;
     },
     visibleColumns: function visibleColumns() {
-      var _this16 = this;
+      var _this14 = this;
       if (this.isGroup) {
         return this.columns.filter(function(column) {
-          return _this16.allCheckedKeys.includes(column.id);
+          return _this14.allCheckedKeys.includes(column.id);
         });
       } else {
         return this.columns.filter(function(column) {
@@ -2259,9 +2259,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     },
     selectedTemplateVal: function selectedTemplateVal() {
-      var _this17 = this;
+      var _this15 = this;
       return this.templateOptions.find(function(item) {
-        return item.id === _this17.selectedTemplate;
+        return item.id === _this15.selectedTemplate;
       }) || {};
     },
     isIndeterminate: {
@@ -2361,8 +2361,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         this.hideOrShowColumns(false);
       }
     },
-    checkNode: function checkNode(node, data6, checked) {
-      node.visible = checked;
+    // 勿同步，tree组件check事件参数不一致
+    checkNode: function checkNode(node, data6) {
+      var _data$checkedNodes;
+      var isCheck = data6 == null ? void 0 : (_data$checkedNodes = data6.checkedNodes) == null ? void 0 : _data$checkedNodes.includes(node);
+      node.visible = isCheck;
       if (node.children && Array.isArray(node.children)) {
         node.children.forEach(function(item) {
           item.visible = node.visible;
@@ -2393,7 +2396,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     },
     getColumnConfigs: function getColumnConfigs3(configs) {
-      var _this18 = this;
+      var _this16 = this;
       var alwaysShowColumns = this.alwaysShowColumns;
       this.colIds = [];
       var _getColNodes3 = function getColNodes(columns2) {
@@ -2415,7 +2418,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               expand: true
             };
             children && (column.children = _getColNodes3(children));
-            _this18.colIds.push(id);
+            _this16.colIds.push(id);
             return column;
           }
           return null;
@@ -2435,10 +2438,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }
     },
     initSortAndFixedOption: function initSortAndFixedOption(columns) {
-      var _this19 = this;
+      var _this17 = this;
       columns.forEach(function(column) {
-        column.sortOption = column.order === "asc" ? [_this19.opt.desc, _this19.opt.cancelSort] : column.order === "desc" ? [_this19.opt.asc, _this19.opt.cancelSort] : [_this19.opt.asc, _this19.opt.desc];
-        column.fixedOption = column.fixed === "left" ? [_this19.opt.right, _this19.opt.cancelFixed] : column.fixed === "right" ? [_this19.opt.left, _this19.opt.cancelFixed] : [_this19.opt.left, _this19.opt.right];
+        column.sortOption = column.order === "asc" ? [_this17.opt.desc, _this17.opt.cancelSort] : column.order === "desc" ? [_this17.opt.asc, _this17.opt.cancelSort] : [_this17.opt.asc, _this17.opt.desc];
+        column.fixedOption = column.fixed === "left" ? [_this17.opt.right, _this17.opt.cancelFixed] : column.fixed === "right" ? [_this17.opt.left, _this17.opt.cancelFixed] : [_this17.opt.left, _this17.opt.right];
       });
     },
     initSortingColumns: function initSortingColumns(columns) {
@@ -2459,13 +2462,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return result;
     },
     getGroupedColumns: function getGroupedColumns() {
-      var _this20 = this;
+      var _this18 = this;
       var result = [];
       if (this.columnsGroup.length) {
         this.columnsGroup.forEach(function(item) {
           var data6 = [];
           item.data.forEach(function(col) {
-            var column = _this20.originColumns.find(function(c) {
+            var column = _this18.originColumns.find(function(c) {
               return c.property === col;
             });
             if (column) {
@@ -2500,25 +2503,25 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return checkedkeys;
     },
     deleteTemplate: function deleteTemplate(item, $event) {
-      var _this21 = this;
+      var _this19 = this;
       $event.stopPropagation();
       Modal.confirm(t("ui.grid.individuation.switchdelcon"), t("ui.grid.individuation.switchdelconfirm")).then(function(res) {
         if (res === "confirm") {
-          if (!_this21.setting.remote && item.id === _this21.selectedTemplate) {
-            _this21.selectedTemplate = "";
+          if (!_this19.setting.remote && item.id === _this19.selectedTemplate) {
+            _this19.selectedTemplate = "";
             setTimeout(function() {
-              _this21.templateOptions = _this21.$refs.switch.options;
+              _this19.templateOptions = _this19.$refs.switch.options;
             });
           }
-          _this21.$refs.switch.handleDelConfirm("yes", item);
-          _this21.$emit("delete-template", item);
+          _this19.$refs.switch.handleDelConfirm("yes", item);
+          _this19.$emit("delete-template", item);
         }
       });
     },
     selectedTemplateChange: function selectedTemplateChange() {
-      var _this22 = this;
+      var _this20 = this;
       var selected = this.templateOptions.find(function(opt) {
-        return opt.id === _this22.selectedTemplate;
+        return opt.id === _this20.selectedTemplate;
       });
       if (selected) {
         this.columns = mergeArray(this.columns, selected.setting.custom.columns);
@@ -2536,7 +2539,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         this.updatedSorting = true;
         if (this.$refs.tree) {
           setTimeout(function() {
-            _this22.allCheckedKeys = [].concat(_this22.$refs.tree.getCheckedKeys(), _this22.$refs.tree.getHalfCheckedKeys());
+            _this20.allCheckedKeys = [].concat(_this20.$refs.tree.getCheckedKeys(), _this20.$refs.tree.getHalfCheckedKeys());
           }, 100);
         }
       }
@@ -2555,11 +2558,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     // 勿同步，search组件input事件第一个参数就是val
     searchChange: function searchChange(val) {
-      var _this23 = this;
+      var _this21 = this;
       var getRenderedTitle = function getRenderedTitle2(col) {
         var result = "";
         if (typeof col.title === "function") {
-          var titleElm = _this23.$el.querySelector(".custom-saas-title-render." + col.id);
+          var titleElm = _this21.$el.querySelector(".custom-saas-title-render." + col.id);
           result = titleElm && titleElm.textContent || "";
           result = result.toUpperCase();
         } else if (col.title) {
@@ -2659,13 +2662,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }).length >= this.maxFixedNum;
     },
     updateSortingIndex: function updateSortingIndex() {
-      var _this24 = this;
+      var _this22 = this;
       this.sortingOptions = [];
       var index = 1;
       this.columns.forEach(function(column) {
         if (column.visible) {
           column.sortingIndex = index;
-          _this24.sortingOptions.push(column.sortingIndex);
+          _this22.sortingOptions.push(column.sortingIndex);
           index++;
         } else {
           column.sortingIndex = null;
@@ -2702,8 +2705,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     buildSettings: function buildSettings2() {
       var props = ["order", "fixed", "visible", "sortable"].concat(this.keys);
       !this.updatedSorting && !this.columnsGroup.length && (this.columns = [].concat(this.groupedColumns[0].data));
-      this.settings.columns = mapTree(this.columns, function(_ref10) {
-        var property = _ref10.property, rest = _objectWithoutPropertiesLoose(_ref10, _excluded3);
+      this.settings.columns = mapTree(this.columns, function(_ref0) {
+        var property = _ref0.property, rest = _objectWithoutPropertiesLoose(_ref0, _excluded3);
         var node = {
           property
         };
@@ -2715,13 +2718,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return this.settings;
     },
     saveSettings: function saveSettings2(val) {
-      var _this25 = this;
+      var _this23 = this;
       var visible = typeof val === "boolean" ? val : false;
       this.buildSettings();
       this.$emit("saveSettings", this.settings, visible, this.updatedSorting);
       if (this.multipleHistory && this.selectedTemplate) {
         var selected = this.templateOptions.find(function(opt) {
-          return opt.id === _this25.selectedTemplate;
+          return opt.id === _this23.selectedTemplate;
         });
         if (selected && JSON.stringify(selected.setting.custom.columns) !== JSON.stringify(this.settings.columns)) {
           this.$refs.switch.handleSaveConfirm("overwrite", true);
@@ -2730,7 +2733,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       !visible && this.handleClose();
     },
     resetSettings: function resetSettings2(event) {
-      var _this26 = this;
+      var _this24 = this;
       if (this.activeName === "base") {
         this.columns = this.getColumnConfigs(this.data);
         this.checkedColumns = this.columns.filter(function(col) {
@@ -2740,7 +2743,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         });
         if (this.settings.columns && this.settings.columns.length) {
           this.settings.columns.forEach(function(setting) {
-            var column = find(_this26.columns, function(item) {
+            var column = find(_this24.columns, function(item) {
               return item.property === setting.property;
             });
             if (column) {
@@ -2764,7 +2767,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       this.$emit("showModal", false);
     },
     handleReset: function handleReset2(event) {
-      var _this27 = this;
+      var _this25 = this;
       var equal = function equal2(cols1, cols2) {
         var props1 = [];
         var props2 = [];
@@ -2778,15 +2781,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       };
       if (typeof this.resetMethod === "function") {
         this.resetMethod().then(function(sourceSettings) {
-          _this27.updatedSorting = true;
-          _this27.buildSettings();
-          var _ref11 = sourceSettings || {}, columns = _ref11.columns, sortType = _ref11.sortType, pageSize = _ref11.pageSize;
-          if (columns && columns.length && _this27.settings.columns && _this27.settings.columns.length) {
-            _this27.settings.columns.forEach(function(setting) {
+          _this25.updatedSorting = true;
+          _this25.buildSettings();
+          var _ref1 = sourceSettings || {}, columns = _ref1.columns, sortType = _ref1.sortType, pageSize = _ref1.pageSize;
+          if (columns && columns.length && _this25.settings.columns && _this25.settings.columns.length) {
+            _this25.settings.columns.forEach(function(setting) {
               var source = find(columns, function(item) {
                 return item.property === setting.property;
               });
-              var target = find(_this27.columns, function(item) {
+              var target = find(_this25.columns, function(item) {
                 return item.property === setting.property;
               });
               if (source) {
@@ -2794,26 +2797,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 Object.assign(target, source);
               }
             });
-            if (equal(columns, _this27.settings.columns)) {
+            if (equal(columns, _this25.settings.columns)) {
               var settingColumns = [];
               var gridColumns = [];
               columns.forEach(function(source) {
-                var settingCol = find(_this27.settings.columns, function(item) {
+                var settingCol = find(_this25.settings.columns, function(item) {
                   return source.property === item.property;
                 });
-                var targetCol = find(_this27.columns, function(item) {
+                var targetCol = find(_this25.columns, function(item) {
                   return source.property === item.property;
                 });
                 settingColumns.push(settingCol);
                 gridColumns.push(targetCol);
               });
-              _this27.settings.columns = settingColumns;
-              _this27.columns = gridColumns;
+              _this25.settings.columns = settingColumns;
+              _this25.columns = gridColumns;
             }
           }
-          sortType && (_this27.settings.sortType = sortType);
-          pageSize && (_this27.settings.pageSize = pageSize);
-          _this27.checkedColumns = _this27.columns.filter(function(col) {
+          sortType && (_this25.settings.sortType = sortType);
+          pageSize && (_this25.settings.pageSize = pageSize);
+          _this25.checkedColumns = _this25.columns.filter(function(col) {
             return col.visible;
           }).map(function(col) {
             return col.property;
@@ -2870,10 +2873,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       this.columnsSorted = true;
     },
     initDragEvent: function initDragEvent() {
-      var _this28 = this;
+      var _this26 = this;
       var handleUpdate = function handleUpdate2(e) {
         var from = e.from, to = e.to, oldIndex = e.oldIndex, newIndex = e.newIndex;
-        _this28.handleFixed("drag", from, to, oldIndex, newIndex);
+        _this26.handleFixed("drag", from, to, oldIndex, newIndex);
       };
       if (!this.dropConfig.plugin) return;
       this.dropConfig.plugin.create(this.$refs.list, {
@@ -2882,7 +2885,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         handle: ".toolbar-drag-item",
         onUpdate: handleUpdate,
         onMove: function onMove(e) {
-          if (e.related && (e.related.classList.contains("left") || e.related.classList.contains("right")) && !(e.dragged.classList.contains("left") || e.dragged.classList.contains("right")) && _this28.fixedNumberIsMax()) {
+          if (e.related && (e.related.classList.contains("left") || e.related.classList.contains("right")) && !(e.dragged.classList.contains("left") || e.dragged.classList.contains("right")) && _this26.fixedNumberIsMax()) {
             Modal.message({
               message: t("ui.grid.individuation.maxFreezeNumMsg"),
               status: "warning",
@@ -2891,22 +2894,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             return false;
           }
           var rowName = e.dragged && e.dragged.getAttribute("data-row");
-          var row = _this28.columns.find(function(row2) {
+          var row = _this26.columns.find(function(row2) {
             return row2.property === rowName;
           }) || {};
-          var cancel = typeof _this28.onBeforeMove === "function" ? _this28.onBeforeMove("row", row, e) : true;
+          var cancel = typeof _this26.onBeforeMove === "function" ? _this26.onBeforeMove("row", row, e) : true;
           return cancel === void 0 || cancel;
         }
       });
     },
     clickSortDisplay: function clickSortDisplay(column, index) {
-      var _this29 = this;
+      var _this27 = this;
       column.numberSortVisible = true;
       this.columns.forEach(function(col) {
         return col !== column && (col.numberSortVisible = false);
       });
       this.$nextTick(function() {
-        var selectVm = _this29.$refs["select" + index];
+        var selectVm = _this27.$refs["select" + index];
         selectVm = isArray(selectVm) && selectVm[0] ? selectVm[0] : null;
         if (selectVm) {
           selectVm.focus();
@@ -3788,15 +3791,15 @@ var GridCustomSaas = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_ren
 var classMap = {
   isActive: "is__active"
 };
-function createMacroTask(_ref12) {
-  var _vm = _ref12._vm;
+function createMacroTask(_ref10) {
+  var _vm = _ref10._vm;
   setTimeout(function() {
     if (_vm.settingStore.activeBtn || _vm.settingStore.activeWrapper) return;
     _vm.closeSetting();
   }, 300);
 }
-function renderToolsWrapper(_ref13) {
-  var _vm = _ref13._vm, $tools = _ref13.$tools, $grid = _ref13.$grid, table = _ref13.table;
+function renderToolsWrapper(_ref11) {
+  var _vm = _ref11._vm, $tools = _ref11.$tools, $grid = _ref11.$grid, table = _ref11.table;
   return h("div", {
     class: "tiny-grid-tools__wrapper"
   }, $tools.call(_vm, {
@@ -3804,8 +3807,8 @@ function renderToolsWrapper(_ref13) {
     $table: table
   }, h));
 }
-function renderFullScreenWrapper(_ref14) {
-  var _vm = _ref14._vm;
+function renderFullScreenWrapper(_ref12) {
+  var _vm = _ref12._vm;
   return h("div", {
     class: "tiny-grid-fullscreen__wrapper"
   }, [h("div", {
@@ -3817,8 +3820,8 @@ function renderFullScreenWrapper(_ref14) {
     class: "tiny-svg-size"
   })])]);
 }
-function renderRefreshWrapper(_ref15) {
-  var _vm = _ref15._vm;
+function renderRefreshWrapper(_ref13) {
+  var _vm = _ref13._vm;
   return h("div", {
     class: "tiny-grid-refresh__wrapper"
   }, [h("div", {
@@ -3832,11 +3835,11 @@ function renderRefreshWrapper(_ref15) {
     }]
   })])]);
 }
-function renderCustomWrapper(_ref16) {
-  var _ref17;
-  var _vm = _ref16._vm, settingStore = _ref16.settingStore, settingsBtnOns = _ref16.settingsBtnOns, tableFullColumn = _ref16.tableFullColumn, setting = _ref16.setting, initSettings = _ref16.initSettings;
+function renderCustomWrapper(_ref14) {
+  var _ref15;
+  var _vm = _ref14._vm, settingStore = _ref14.settingStore, settingsBtnOns = _ref14.settingsBtnOns, tableFullColumn = _ref14.tableFullColumn, setting = _ref14.setting, initSettings = _ref14.initSettings;
   return h("div", {
-    class: ["tiny-grid-custom__wrapper", (_ref17 = {}, _ref17[classMap.isActive] = settingStore.customVisible, _ref17)],
+    class: ["tiny-grid-custom__wrapper", (_ref15 = {}, _ref15[classMap.isActive] = settingStore.customVisible, _ref15)],
     ref: "customWrapper"
   }, [
     // TODO: 此处应使用图标按钮，但saas主题图标按钮样式有问题。
@@ -3899,8 +3902,8 @@ function renderCustomWrapper(_ref16) {
     })])
   ]);
 }
-function getScopedSlots(_ref18) {
-  var item = _ref18.item, _vm = _ref18._vm, vSize2 = _ref18.vSize;
+function getScopedSlots(_ref16) {
+  var item = _ref16.item, _vm = _ref16._vm, vSize2 = _ref16.vSize;
   var scopedSlots = null;
   var childHandler = function childHandler2(child) {
     var res = [null];
@@ -3933,9 +3936,9 @@ function getScopedSlots(_ref18) {
   }
   return scopedSlots;
 }
-function renderButtonWrapper(_ref19) {
+function renderButtonWrapper(_ref17) {
   var _childrenArg;
-  var _vm = _ref19._vm, $buttons = _ref19.$buttons, $grid = _ref19.$grid, table = _ref19.table, buttons = _ref19.buttons, vSize2 = _ref19.vSize;
+  var _vm = _ref17._vm, $buttons = _ref17.$buttons, $grid = _ref17.$grid, table = _ref17.table, buttons = _ref17.buttons, vSize2 = _ref17.vSize;
   var childrenArg;
   if ($buttons) {
     childrenArg = $buttons.call(_vm, {
@@ -4100,7 +4103,7 @@ var GridToolbar = defineComponent({
     }
   },
   created: function created5() {
-    var _this30 = this;
+    var _this28 = this;
     var settingOpts2 = this.settingOpts, id = this.id, customs = this.customs, $grid = this.$grid;
     this.initSettings.pageSizes = $grid.pagerConfig && $grid.pagerConfig.pageSizes || [10, 15, 20, 30, 50, 100];
     this.initSettings.pageSize = $grid.pagerConfig && $grid.pagerConfig.pageSize || 10;
@@ -4119,16 +4122,16 @@ var GridToolbar = defineComponent({
     GlobalEvent.on(this, "mousedown", this.handleGlobalMousedownEvent);
     GlobalEvent.on(this, "blur", this.handleGlobalBlurEvent);
     this.removeHandler = function() {
-      GlobalEvent.off(_this30, "mousedown");
-      GlobalEvent.off(_this30, "blur");
+      GlobalEvent.off(_this28, "mousedown");
+      GlobalEvent.off(_this28, "blur");
     };
     this.$grid.connect({
       name: "toolbar",
       vm: this
     });
   },
-  setup: function setup2(props, _ref20) {
-    var slots = _ref20.slots, attrs = _ref20.attrs, listeners = _ref20.listeners;
+  setup: function setup2(props, _ref18) {
+    var slots = _ref18.slots, attrs = _ref18.attrs, listeners = _ref18.listeners;
     var instance = hooks.getCurrentInstance().proxy;
     var tableListeners = getListeners(attrs, listeners);
     hooks.onBeforeUnmount(function() {
@@ -4140,7 +4143,7 @@ var GridToolbar = defineComponent({
     };
   },
   render: function render2() {
-    var _ref21;
+    var _ref19;
     var $grid = this.$grid, $slots = this.slots, table = this.table, loading = this.loading, settingStore = this.settingStore, refresh = this.refresh, fullScreen = this.fullScreen;
     var setting = this.setting, initSettings = this.initSettings, _this$buttons = this.buttons, buttons = _this$buttons === void 0 ? [] : _this$buttons, vSize2 = this.vSize, tableFullColumn = this.tableFullColumn;
     var $buttons = $slots.buttons, $tools = $slots.tools;
@@ -4150,7 +4153,7 @@ var GridToolbar = defineComponent({
       isLoading: "is__loading"
     };
     var propsArg = {
-      class: ["tiny-grid-toolbar", (_ref21 = {}, _ref21["size__" + vSize2] = vSize2, _ref21[map.isLoading] = loading, _ref21)]
+      class: ["tiny-grid-toolbar", (_ref19 = {}, _ref19["size__" + vSize2] = vSize2, _ref19[map.isLoading] = loading, _ref19)]
     };
     var args = {
       _vm: this,
@@ -4201,11 +4204,11 @@ var GridToolbar = defineComponent({
       return this.setting && this.setting.customSetting ? this.setting.settingBtnClickFn() : this.handleClickCustomEvent();
     },
     updateConf: function updateConf() {
-      var _this31 = this;
+      var _this29 = this;
       var data6 = this.data;
       var $children = this.$parent.$children;
       var findHandler = function findHandler2(childComp, childIndex) {
-        return childComp && childComp.refreshColumn && childIndex > $children.indexOf(_this31) && (data6 ? childComp.data === data6 : childComp.$vnode.componentOptions.tag === "tiny-grid-table");
+        return childComp && childComp.refreshColumn && childIndex > $children.indexOf(_this29) && (data6 ? childComp.data === data6 : childComp.$vnode.componentOptions.tag === "tiny-grid-table");
       };
       this.table = find$1($children, findHandler);
     },
@@ -4266,7 +4269,7 @@ var GridToolbar = defineComponent({
       }
     },
     loadStorage: function loadStorage() {
-      var _this32 = this;
+      var _this30 = this;
       var $grid = this.$grid, id = this.id, resizable = this.resizable, setting = this.setting, settingOpts2 = this.settingOpts;
       if (!$grid) {
         return;
@@ -4287,13 +4290,13 @@ var GridToolbar = defineComponent({
             var pageSize = settingsStorage.pageSize;
             if (this.$grid.pagerConfig && this.$grid.pagerConfig.pageSize !== pageSize) {
               this.$grid.createJob("pageSizeChangeCallback", function() {
-                _this32.$grid.pageSizeChange(pageSize, $grid.autoLoad === false);
+                _this30.$grid.pageSizeChange(pageSize, $grid.autoLoad === false);
               });
             }
           }
         }
         this.$grid.createJob("updateCustomsCallback", function() {
-          _this32.updateCustoms(customSettings.length ? customSettings : _this32.tableFullColumn);
+          _this30.updateCustoms(customSettings.length ? customSettings : _this30.tableFullColumn);
         });
       }
     },
@@ -4301,14 +4304,14 @@ var GridToolbar = defineComponent({
       this.tableFullColumn = fullColumn;
     },
     updateCustoms: function updateCustoms(customs) {
-      var _this33 = this;
+      var _this31 = this;
       var $grid = this.$grid, table = this.table, setting = this.setting;
       var comp = $grid || table;
       var sort = setting && !!setting.sortable;
       if (comp) {
         var colWidth = this.loadColWidth();
         comp.reloadCustoms(customs, sort, colWidth).then(function(fullColumn) {
-          _this33.tableFullColumn = fullColumn;
+          _this31.tableFullColumn = fullColumn;
         });
       }
     },
@@ -4373,8 +4376,8 @@ var GridToolbar = defineComponent({
       if (storage && !isReset) {
         columnWidthStorage = columnWidthStorageMap[id];
         columnWidthStorage = isPlainObject(columnWidthStorage) ? columnWidthStorage : {};
-        tableFullColumn.forEach(function(_ref22) {
-          var property = _ref22.property, resizeWidth = _ref22.resizeWidth, renderWidth = _ref22.renderWidth;
+        tableFullColumn.forEach(function(_ref20) {
+          var property = _ref20.property, resizeWidth = _ref20.resizeWidth, renderWidth = _ref20.renderWidth;
           if (property && resizeWidth) {
             columnWidthStorage[property] = renderWidth;
           }
@@ -4396,24 +4399,24 @@ var GridToolbar = defineComponent({
       return tableComp.recalculate();
     },
     updateSetting: function updateSetting() {
-      var _this34 = this;
+      var _this32 = this;
       var tableComp = this.$grid || this.table;
       tableComp.refreshColumn();
       this.tableFullColumn = this.tableFullColumn.slice(0);
       return this.$nextTick(function() {
-        return _this34.$refs.custom && _this34.$refs.custom.saveSettings();
+        return _this32.$refs.custom && _this32.$refs.custom.saveSettings();
       });
     },
-    applySettings: function applySettings(_ref23) {
-      var _this35 = this;
-      var columns = _ref23.columns, pageSize = _ref23.pageSize, updatedSorting = _ref23.updatedSorting;
+    applySettings: function applySettings(_ref21) {
+      var _this33 = this;
+      var columns = _ref21.columns, pageSize = _ref21.pageSize, updatedSorting = _ref21.updatedSorting;
       var sort = this.setting && !!this.setting.sortable || updatedSorting;
       if (this.$grid) {
         if (columns && columns.length) {
           var colWidth = this.loadColWidth();
           this.$grid.reloadCustoms(columns, sort, colWidth).then(function() {
-            _this35.$grid.handleTableData(true).then(function() {
-              _this35.$grid.recalculate();
+            _this33.$grid.handleTableData(true).then(function() {
+              _this33.$grid.recalculate();
             });
           });
         }
@@ -4501,13 +4504,13 @@ var GridToolbar = defineComponent({
       });
     },
     refreshEvent: function refreshEvent() {
-      var _this36 = this;
+      var _this34 = this;
       var $grid = this.$grid, isRefresh = this.isRefresh, refreshOpts2 = this.refreshOpts;
       var catchHandler = function catchHandler2(e) {
         return e;
       };
       var nextHandler = function nextHandler2() {
-        return _this36.isRefresh = false;
+        return _this34.isRefresh = false;
       };
       if (isRefresh) return;
       this.isRefresh = true;
@@ -4562,7 +4565,7 @@ var GridToolbar = defineComponent({
     }
   }
 });
-var version = "3.22.0";
+var version = "3.23.0";
 GridToolbar.install = function(Vue) {
   Vue.component(GridToolbar.name, GridToolbar);
 };

package/package.json

@@ -1,45 +1,45 @@
 {
   "name": "@opentinyvue/vue-grid-toolbar",
   "type": "module",
-  "version": "3.22.0",
+  "version": "3.23.0",
   "description": "",
   "license": "MIT",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./lib/index.js",
   "dependencies": {
-    "@opentinyvue/utils": "~3.22.0",
-    "@opentinyvue/vue-alert": "~3.22.0",
-    "@opentinyvue/vue-button": "~3.22.0",
-    "@opentinyvue/vue-checkbox": "~3.22.0",
-    "@opentinyvue/vue-checkbox-group": "~3.22.0",
-    "@opentinyvue/vue-col": "~3.22.0",
-    "@opentinyvue/vue-common": "~3.22.0",
-    "@opentinyvue/vue-dialog-box": "~3.22.0",
-    "@opentinyvue/vue-directive": "~3.22.0",
-    "@opentinyvue/vue-dropdown": "~3.22.0",
-    "@opentinyvue/vue-dropdown-item": "~3.22.0",
-    "@opentinyvue/vue-dropdown-menu": "~3.22.0",
-    "@opentinyvue/vue-grid": "~3.22.0",
-    "@opentinyvue/vue-icon": "~3.22.0",
-    "@opentinyvue/vue-input": "~3.22.0",
-    "@opentinyvue/vue-layout": "~3.22.0",
-    "@opentinyvue/vue-locale": "~3.22.0",
-    "@opentinyvue/vue-modal": "~3.22.0",
-    "@opentinyvue/vue-option": "~3.22.0",
-    "@opentinyvue/vue-popover": "~3.22.0",
-    "@opentinyvue/vue-radio": "~3.22.0",
-    "@opentinyvue/vue-radio-group": "~3.22.0",
-    "@opentinyvue/vue-renderless": "~3.22.0",
-    "@opentinyvue/vue-row": "~3.22.0",
-    "@opentinyvue/vue-search": "~3.22.0",
-    "@opentinyvue/vue-select": "~3.22.0",
-    "@opentinyvue/vue-split": "~3.22.0",
-    "@opentinyvue/vue-tab-item": "~3.22.0",
-    "@opentinyvue/vue-tabs": "~3.22.0",
-    "@opentinyvue/vue-theme": "~3.22.0",
-    "@opentinyvue/vue-tooltip": "~3.22.0",
-    "@opentinyvue/vue-tree": "~3.22.0"
+    "@opentinyvue/utils": "~3.23.0",
+    "@opentinyvue/vue-alert": "~3.23.0",
+    "@opentinyvue/vue-button": "~3.23.0",
+    "@opentinyvue/vue-checkbox": "~3.23.0",
+    "@opentinyvue/vue-checkbox-group": "~3.23.0",
+    "@opentinyvue/vue-col": "~3.23.0",
+    "@opentinyvue/vue-common": "~3.23.0",
+    "@opentinyvue/vue-dialog-box": "~3.23.0",
+    "@opentinyvue/vue-directive": "~3.23.0",
+    "@opentinyvue/vue-dropdown": "~3.23.0",
+    "@opentinyvue/vue-dropdown-item": "~3.23.0",
+    "@opentinyvue/vue-dropdown-menu": "~3.23.0",
+    "@opentinyvue/vue-grid": "~3.23.0",
+    "@opentinyvue/vue-icon": "~3.23.0",
+    "@opentinyvue/vue-input": "~3.23.0",
+    "@opentinyvue/vue-layout": "~3.23.0",
+    "@opentinyvue/vue-locale": "~3.23.0",
+    "@opentinyvue/vue-modal": "~3.23.0",
+    "@opentinyvue/vue-option": "~3.23.0",
+    "@opentinyvue/vue-popover": "~3.23.0",
+    "@opentinyvue/vue-radio": "~3.23.0",
+    "@opentinyvue/vue-radio-group": "~3.23.0",
+    "@opentinyvue/vue-renderless": "~3.23.0",
+    "@opentinyvue/vue-row": "~3.23.0",
+    "@opentinyvue/vue-search": "~3.23.0",
+    "@opentinyvue/vue-select": "~3.23.0",
+    "@opentinyvue/vue-split": "~3.23.0",
+    "@opentinyvue/vue-tab-item": "~3.23.0",
+    "@opentinyvue/vue-tabs": "~3.23.0",
+    "@opentinyvue/vue-theme": "~3.23.0",
+    "@opentinyvue/vue-tooltip": "~3.23.0",
+    "@opentinyvue/vue-tree": "~3.23.0"
   },
   "types": "index.d.ts",
   "scripts": {

package/src/custom.vue.d.ts

@@ -156,8 +156,8 @@ declare const _default: import("@vue/runtime-core").DefineComponent<{
     onCancelSettings?: ((...args: any[]) => any) | undefined;
 }, {
     value: boolean;
-    data: unknown[];
     keys: unknown[];
+    data: unknown[];
     tiny_mode_root: boolean;
     refresh: boolean;
     other: boolean;