custom-vxe-table 3.2.26 → 3.2.28

package/lib/index.common.js

@@ -1130,17 +1130,6 @@ function helperCreateGetObjects (name, getIndex) {
 module.exports = helperCreateGetObjects
 
 
-/***/ }),
-
-/***/ "0876":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("c438");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "08a8":
@@ -22968,6 +22957,13 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 };
 
 
+/***/ }),
+
+/***/ "331d":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "332f":
@@ -28971,6 +28967,17 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
 
+/***/ }),
+
+/***/ "5f05":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("331d");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "5fbd":
@@ -46115,13 +46122,6 @@ module.exports = function transformData(data, headers, fns) {
 module.exports = false;
 
 
-/***/ }),
-
-/***/ "c438":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "c532":
@@ -53550,7 +53550,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=734dab18&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53579,7 +53579,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_734dab18_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
   const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
   const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53924,7 +53924,7 @@ function CustomTablevue_type_template_id_734dab18_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=734dab18&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -90211,11 +90211,12 @@ Sortable.mount(Remove, Revert);
     };
     // 结合缓存处理columns配置
     const handleColumns = columns => {
+      // console.log("##########columns####", columns);
       const id = props.id;
       if (id && props.showToolbarCustomPanel) {
         const sortConfig = JSON.parse(localStorage.getItem("VXE_TABLE_CUSTOM_COLUMN_SORT"));
         if (sortConfig && sortConfig[id]) {
-          const arr = [];
+          let arr = [];
           for (const fKey in sortConfig[id]) {
             if (columns.some(item => item.key == fKey)) {
               arr.push({
@@ -90225,9 +90226,25 @@ Sortable.mount(Remove, Revert);
             }
           }
           // 获取已有的排序配置
-          arr.sort(function (a, b) {
+          arr = arr.sort(function (a, b) {
             return a.index - b.index;
           });
+          if (arr.length) {
+            arr = arr.map((item, index) => {
+              const overnum = arr[arr.length - 1].index - columns.length + 1;
+              if (overnum > 0) {
+                let i = item.index - overnum >= 0 ? item.index - overnum : 0;
+                if (props.showCheckBox || props.showRadio) {
+                  i++;
+                }
+                if (props.showSeq) {
+                  i++;
+                }
+                item.index = i;
+              }
+              return item;
+            });
+          }
           const result1 = [];
           const result = [];
           const tmpArr = [];
@@ -91262,8 +91279,8 @@ Sortable.mount(Remove, Revert);
 }));
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=734dab18&lang=less
-var CustomTablevue_type_style_index_0_id_734dab18_lang_less = __webpack_require__("0876");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=093086fd&lang=less
+var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require__("5f05");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91273,7 +91290,7 @@ var CustomTablevue_type_style_index_0_id_734dab18_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_734dab18_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_093086fd_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts

package/lib/index.umd.js

@@ -1139,17 +1139,6 @@ function helperCreateGetObjects (name, getIndex) {
 module.exports = helperCreateGetObjects
 
 
-/***/ }),
-
-/***/ "0876":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("c438");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_734dab18_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "08a8":
@@ -22977,6 +22966,13 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 };
 
 
+/***/ }),
+
+/***/ "331d":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "332f":
@@ -28980,6 +28976,17 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
 
+/***/ }),
+
+/***/ "5f05":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("331d");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_093086fd_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "5fbd":
@@ -46124,13 +46131,6 @@ module.exports = function transformData(data, headers, fns) {
 module.exports = false;
 
 
-/***/ }),
-
-/***/ "c438":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "c532":
@@ -53559,7 +53559,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=734dab18&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53588,7 +53588,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_734dab18_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
   const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
   const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53933,7 +53933,7 @@ function CustomTablevue_type_template_id_734dab18_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=734dab18&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -90220,11 +90220,12 @@ Sortable.mount(Remove, Revert);
     };
     // 结合缓存处理columns配置
     const handleColumns = columns => {
+      // console.log("##########columns####", columns);
       const id = props.id;
       if (id && props.showToolbarCustomPanel) {
         const sortConfig = JSON.parse(localStorage.getItem("VXE_TABLE_CUSTOM_COLUMN_SORT"));
         if (sortConfig && sortConfig[id]) {
-          const arr = [];
+          let arr = [];
           for (const fKey in sortConfig[id]) {
             if (columns.some(item => item.key == fKey)) {
               arr.push({
@@ -90234,9 +90235,25 @@ Sortable.mount(Remove, Revert);
             }
           }
           // 获取已有的排序配置
-          arr.sort(function (a, b) {
+          arr = arr.sort(function (a, b) {
             return a.index - b.index;
           });
+          if (arr.length) {
+            arr = arr.map((item, index) => {
+              const overnum = arr[arr.length - 1].index - columns.length + 1;
+              if (overnum > 0) {
+                let i = item.index - overnum >= 0 ? item.index - overnum : 0;
+                if (props.showCheckBox || props.showRadio) {
+                  i++;
+                }
+                if (props.showSeq) {
+                  i++;
+                }
+                item.index = i;
+              }
+              return item;
+            });
+          }
           const result1 = [];
           const result = [];
           const tmpArr = [];
@@ -91271,8 +91288,8 @@ Sortable.mount(Remove, Revert);
 }));
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=734dab18&lang=less
-var CustomTablevue_type_style_index_0_id_734dab18_lang_less = __webpack_require__("0876");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=093086fd&lang=less
+var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require__("5f05");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91282,7 +91299,7 @@ var CustomTablevue_type_style_index_0_id_734dab18_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_734dab18_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_093086fd_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts