custom-vxe-table 3.2.25 → 3.2.27

package/lib/index.common.js

@@ -33148,6 +33148,17 @@ function multiply (num1, num2) {
 module.exports = multiply
 
 
+/***/ }),
+
+/***/ "795b":
+/***/ (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_7afea46a_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f87d");
+/* 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_7afea46a_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_7afea46a_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "7a77":
@@ -35878,13 +35889,6 @@ var POLYFILL = isForced.POLYFILL = 'P';
 module.exports = isForced;
 
 
-/***/ }),
-
-/***/ "950b":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "955b":
@@ -48202,17 +48206,6 @@ module.exports = Object.setPrototypeOf || ('__proto__' in {} ? function () {
 })));
 
 
-/***/ }),
-
-/***/ "d3b1":
-/***/ (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_c37618a0_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("950b");
-/* 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_c37618a0_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_c37618a0_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "d3f7":
@@ -51897,6 +51890,13 @@ function createEmitter() {
 
 /***/ }),
 
+/***/ "f87d":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "f8cd":
 /***/ (function(module, exports) {
 
@@ -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=c37618a0&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=7afea46a&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53579,7 +53579,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_c37618a0_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_7afea46a_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");
@@ -53626,7 +53626,7 @@ function CustomTablevue_type_template_id_c37618a0_ts_true_render(_ctx, _cache, $
     size: _ctx.size,
     align: _ctx.align,
     "max-height": _ctx.maxHeight,
-    height: !_ctx.maxHeight ? _ctx.height : null,
+    height: _ctx.height,
     perfect: true,
     "show-footer": _ctx.showFooter,
     "footer-method": _ctx.footerMethod,
@@ -53924,7 +53924,7 @@ function CustomTablevue_type_template_id_c37618a0_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=c37618a0&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=7afea46a&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -90195,68 +90195,85 @@ Sortable.mount(Remove, Revert);
     const resizableChangeEvent = type => {
       syncRemoteColumnSetting();
     };
+    const replaceEmptyObjects = (arr1, arr2) => {
+      const pool = [...arr2]; // 防止污染原数组
+      return arr1.map((item, index) => {
+        // 判断是否是空对象 {}
+        if (item && typeof item === "object" && !Array.isArray(item) && Object.keys(item).length === 0) {
+          const t = pool.shift();
+          // console.log("##########item####", index, t.title);
+          return t; // 从 arr2 取一个
+        } else {
+          // console.log("##########item##fffff##", index, item.title);
+        }
+        return item;
+      });
+    };
     // 结合缓存处理columns配置
     const handleColumns = columns => {
-      // console.log("#########columns####", 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]) {
-            arr.push({
-              key: fKey,
-              index: sortConfig[id][fKey]
-            });
+            if (columns.some(item => item.key == fKey)) {
+              arr.push({
+                key: fKey,
+                index: sortConfig[id][fKey]
+              });
+            }
           }
-          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) {
+                item.index = item.index - overnum >= 0 ? item.index - overnum : 0;
+              }
+              return item;
+            });
+          }
+          // console.log("##########arr####", arr);
+          const result1 = [];
           const result = [];
-          // console.log("##########sortConfig[id]####", sortConfig[id]);
+          const tmpArr = [];
+          let gIndex = 0;
+          if (props.showCheckBox || props.showRadio) {
+            gIndex++;
+          }
+          if (props.showSeq) {
+            gIndex++;
+          }
           columns.forEach((column, idx) => {
-            let gIndex = idx;
-            if (props.showCheckBox || props.showRadio) {
-              gIndex++;
-            }
-            if (props.showSeq) {
-              gIndex++;
+            if (!arr.some(item => item.key == column.key)) {
+              tmpArr.push(column);
             }
             const index = arr.findIndex(item => item.index == gIndex);
             if (index >= 0) {
               const tmp = columns.find(item => item.key == arr[index].key);
               if (tmp) {
+                result1.push(tmp);
                 result.push(tmp);
+                // tmpArr.push({});
               } else {
+                result1.push({});
                 result.push({});
               }
             } else {
+              result1.push({});
               result.push({});
             }
             gIndex++;
           });
-          // console.log(
-          //   "##########result####11",
-          //   JSON.parse(JSON.stringify(result))
-          // );
-          let n = 0;
-          columns.forEach((column, idx) => {
-            const isExist = result.findIndex(item => item && item.key == column.key) >= 0; // result是否存在
-            if (isExist) {
-              // 不操作
-            } else {
-              if (JSON.stringify(result[n]) == "{}") {
-                result[n] = column;
-                n++;
-              } else {
-                n = result.findIndex(r => JSON.stringify(r) == "{}");
-                result[n] = column;
-                n++;
-              }
-            }
-          });
-          // console.log("##########result####22", result);
-          return result;
+          // console.log("##########result####", result);
+          // console.log("##########tmpArr####", tmpArr);
+          const d = replaceEmptyObjects(result, tmpArr);
+          return d;
         }
       }
       return columns;
@@ -91258,8 +91275,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=c37618a0&lang=less
-var CustomTablevue_type_style_index_0_id_c37618a0_lang_less = __webpack_require__("d3b1");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=7afea46a&lang=less
+var CustomTablevue_type_style_index_0_id_7afea46a_lang_less = __webpack_require__("795b");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91269,7 +91286,7 @@ var CustomTablevue_type_style_index_0_id_c37618a0_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_c37618a0_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_7afea46a_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts

package/lib/index.umd.js

@@ -33157,6 +33157,17 @@ function multiply (num1, num2) {
 module.exports = multiply
 
 
+/***/ }),
+
+/***/ "795b":
+/***/ (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_7afea46a_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f87d");
+/* 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_7afea46a_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_7afea46a_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "7a77":
@@ -35887,13 +35898,6 @@ var POLYFILL = isForced.POLYFILL = 'P';
 module.exports = isForced;
 
 
-/***/ }),
-
-/***/ "950b":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "955b":
@@ -48211,17 +48215,6 @@ module.exports = Object.setPrototypeOf || ('__proto__' in {} ? function () {
 })));
 
 
-/***/ }),
-
-/***/ "d3b1":
-/***/ (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_c37618a0_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("950b");
-/* 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_c37618a0_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_c37618a0_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "d3f7":
@@ -51906,6 +51899,13 @@ function createEmitter() {
 
 /***/ }),
 
+/***/ "f87d":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "f8cd":
 /***/ (function(module, exports) {
 
@@ -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=c37618a0&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=7afea46a&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53588,7 +53588,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_c37618a0_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_7afea46a_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");
@@ -53635,7 +53635,7 @@ function CustomTablevue_type_template_id_c37618a0_ts_true_render(_ctx, _cache, $
     size: _ctx.size,
     align: _ctx.align,
     "max-height": _ctx.maxHeight,
-    height: !_ctx.maxHeight ? _ctx.height : null,
+    height: _ctx.height,
     perfect: true,
     "show-footer": _ctx.showFooter,
     "footer-method": _ctx.footerMethod,
@@ -53933,7 +53933,7 @@ function CustomTablevue_type_template_id_c37618a0_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=c37618a0&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=7afea46a&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -90204,68 +90204,85 @@ Sortable.mount(Remove, Revert);
     const resizableChangeEvent = type => {
       syncRemoteColumnSetting();
     };
+    const replaceEmptyObjects = (arr1, arr2) => {
+      const pool = [...arr2]; // 防止污染原数组
+      return arr1.map((item, index) => {
+        // 判断是否是空对象 {}
+        if (item && typeof item === "object" && !Array.isArray(item) && Object.keys(item).length === 0) {
+          const t = pool.shift();
+          // console.log("##########item####", index, t.title);
+          return t; // 从 arr2 取一个
+        } else {
+          // console.log("##########item##fffff##", index, item.title);
+        }
+        return item;
+      });
+    };
     // 结合缓存处理columns配置
     const handleColumns = columns => {
-      // console.log("#########columns####", 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]) {
-            arr.push({
-              key: fKey,
-              index: sortConfig[id][fKey]
-            });
+            if (columns.some(item => item.key == fKey)) {
+              arr.push({
+                key: fKey,
+                index: sortConfig[id][fKey]
+              });
+            }
           }
-          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) {
+                item.index = item.index - overnum >= 0 ? item.index - overnum : 0;
+              }
+              return item;
+            });
+          }
+          // console.log("##########arr####", arr);
+          const result1 = [];
           const result = [];
-          // console.log("##########sortConfig[id]####", sortConfig[id]);
+          const tmpArr = [];
+          let gIndex = 0;
+          if (props.showCheckBox || props.showRadio) {
+            gIndex++;
+          }
+          if (props.showSeq) {
+            gIndex++;
+          }
           columns.forEach((column, idx) => {
-            let gIndex = idx;
-            if (props.showCheckBox || props.showRadio) {
-              gIndex++;
-            }
-            if (props.showSeq) {
-              gIndex++;
+            if (!arr.some(item => item.key == column.key)) {
+              tmpArr.push(column);
             }
             const index = arr.findIndex(item => item.index == gIndex);
             if (index >= 0) {
               const tmp = columns.find(item => item.key == arr[index].key);
               if (tmp) {
+                result1.push(tmp);
                 result.push(tmp);
+                // tmpArr.push({});
               } else {
+                result1.push({});
                 result.push({});
               }
             } else {
+              result1.push({});
               result.push({});
             }
             gIndex++;
           });
-          // console.log(
-          //   "##########result####11",
-          //   JSON.parse(JSON.stringify(result))
-          // );
-          let n = 0;
-          columns.forEach((column, idx) => {
-            const isExist = result.findIndex(item => item && item.key == column.key) >= 0; // result是否存在
-            if (isExist) {
-              // 不操作
-            } else {
-              if (JSON.stringify(result[n]) == "{}") {
-                result[n] = column;
-                n++;
-              } else {
-                n = result.findIndex(r => JSON.stringify(r) == "{}");
-                result[n] = column;
-                n++;
-              }
-            }
-          });
-          // console.log("##########result####22", result);
-          return result;
+          // console.log("##########result####", result);
+          // console.log("##########tmpArr####", tmpArr);
+          const d = replaceEmptyObjects(result, tmpArr);
+          return d;
         }
       }
       return columns;
@@ -91267,8 +91284,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=c37618a0&lang=less
-var CustomTablevue_type_style_index_0_id_c37618a0_lang_less = __webpack_require__("d3b1");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=7afea46a&lang=less
+var CustomTablevue_type_style_index_0_id_7afea46a_lang_less = __webpack_require__("795b");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91278,7 +91295,7 @@ var CustomTablevue_type_style_index_0_id_c37618a0_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_c37618a0_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_7afea46a_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts