custom-vxe-table 3.2.28 → 3.2.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4426,6 +4426,17 @@ exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
4426
4426
  })));
4427
4427
 
4428
4428
 
4429
+ /***/ }),
4430
+
4431
+ /***/ "2427":
4432
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
4433
+
4434
+ "use strict";
4435
+ /* 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_615777d6_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("dc59");
4436
+ /* 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_615777d6_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_615777d6_lang_less__WEBPACK_IMPORTED_MODULE_0__);
4437
+ /* unused harmony reexport * */
4438
+
4439
+
4429
4440
  /***/ }),
4430
4441
 
4431
4442
  /***/ "2444":
@@ -22957,13 +22968,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
22957
22968
  };
22958
22969
 
22959
22970
 
22960
- /***/ }),
22961
-
22962
- /***/ "331d":
22963
- /***/ (function(module, exports, __webpack_require__) {
22964
-
22965
- // extracted by mini-css-extract-plugin
22966
-
22967
22971
  /***/ }),
22968
22972
 
22969
22973
  /***/ "332f":
@@ -28967,17 +28971,6 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
28967
28971
 
28968
28972
  /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
28969
28973
 
28970
- /***/ }),
28971
-
28972
- /***/ "5f05":
28973
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
28974
-
28975
- "use strict";
28976
- /* 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");
28977
- /* 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__);
28978
- /* unused harmony reexport * */
28979
-
28980
-
28981
28974
  /***/ }),
28982
28975
 
28983
28976
  /***/ "5fbd":
@@ -49192,6 +49185,13 @@ module.exports = function (V, P) {
49192
49185
  })));
49193
49186
 
49194
49187
 
49188
+ /***/ }),
49189
+
49190
+ /***/ "dc59":
49191
+ /***/ (function(module, exports, __webpack_require__) {
49192
+
49193
+ // extracted by mini-css-extract-plugin
49194
+
49195
49195
  /***/ }),
49196
49196
 
49197
49197
  /***/ "dce7":
@@ -53550,7 +53550,7 @@ if (typeof window !== 'undefined') {
53550
53550
  // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
53551
53551
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
53552
53552
 
53553
- // 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
53553
+ // 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=615777d6&ts=true
53554
53554
 
53555
53555
  const _hoisted_1 = {
53556
53556
  style: {
@@ -53579,7 +53579,7 @@ const _hoisted_9 = {
53579
53579
  href: "#"
53580
53580
  };
53581
53581
  const _hoisted_10 = ["onClick"];
53582
- function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
53582
+ function CustomTablevue_type_template_id_615777d6_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
53583
53583
  const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
53584
53584
  const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
53585
53585
  const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53924,7 +53924,7 @@ function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $
53924
53924
  "page-sizes": [10, 20, 100, 200, 500, 1000]
53925
53925
  }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
53926
53926
  }
53927
- // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
53927
+ // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=615777d6&ts=true
53928
53928
 
53929
53929
  // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
53930
53930
  function _extends() {
@@ -90229,22 +90229,32 @@ Sortable.mount(Remove, Revert);
90229
90229
  arr = arr.sort(function (a, b) {
90230
90230
  return a.index - b.index;
90231
90231
  });
90232
+ //基础序号
90233
+ let priIndex = 0;
90234
+ if (props.showCheckBox || props.showRadio) {
90235
+ priIndex++;
90236
+ }
90237
+ if (props.showSeq) {
90238
+ priIndex++;
90239
+ }
90232
90240
  if (arr.length) {
90233
90241
  arr = arr.map((item, index) => {
90234
90242
  const overnum = arr[arr.length - 1].index - columns.length + 1;
90243
+ let i = item.index;
90235
90244
  if (overnum > 0) {
90236
- let i = item.index - overnum >= 0 ? item.index - overnum : 0;
90237
- if (props.showCheckBox || props.showRadio) {
90238
- i++;
90239
- }
90240
- if (props.showSeq) {
90241
- i++;
90242
- }
90243
- item.index = i;
90245
+ i = item.index - overnum >= 0 ? item.index - overnum : item.index;
90246
+ }
90247
+ // if (props.showCheckBox || props.showRadio) {
90248
+ // i++;
90249
+ // }
90250
+ if (i < priIndex) {
90251
+ i = priIndex;
90244
90252
  }
90253
+ item.index = i;
90245
90254
  return item;
90246
90255
  });
90247
90256
  }
90257
+ // console.log("##########arr####", arr);
90248
90258
  const result1 = [];
90249
90259
  const result = [];
90250
90260
  const tmpArr = [];
@@ -90259,24 +90269,40 @@ Sortable.mount(Remove, Revert);
90259
90269
  if (!arr.some(item => item.key == column.key)) {
90260
90270
  tmpArr.push(column);
90261
90271
  }
90262
- const index = arr.findIndex(item => item.index == gIndex);
90263
- if (index >= 0) {
90264
- const tmp = columns.find(item => item.key == arr[index].key);
90265
- if (tmp) {
90266
- result1.push(tmp);
90267
- result.push(tmp);
90268
- // tmpArr.push({});
90272
+ let cIndex = idx;
90273
+ if (props.showCheckBox || props.showRadio) {
90274
+ cIndex++;
90275
+ }
90276
+ if (props.showSeq) {
90277
+ cIndex++;
90278
+ }
90279
+ if (cIndex == gIndex) {
90280
+ const sArr = arr.filter(item => item.index == gIndex);
90281
+ // console.log(">>>>>>>>>>>>>>>>>>>>sArr>>>>>>>>>>>>>>>>>>>>", sArr);
90282
+ if (sArr.length > 0) {
90283
+ sArr.forEach(si => {
90284
+ const tmp = columns.find(item => item.key == si.key);
90285
+ // console.log(
90286
+ // ">>>>>>>>>>>>>>>>>>>>tmp>>>>>>>>>>>>>>>>>>>>",
90287
+ // tmp,
90288
+ // );
90289
+ if (tmp) {
90290
+ result1.push(tmp);
90291
+ result.push(tmp);
90292
+ // tmpArr.push({});
90293
+ gIndex++;
90294
+ }
90295
+ });
90269
90296
  } else {
90270
90297
  result1.push({});
90271
90298
  result.push({});
90299
+ gIndex++;
90272
90300
  }
90273
- } else {
90274
- result1.push({});
90275
- result.push({});
90276
90301
  }
90277
- gIndex++;
90278
90302
  });
90303
+ // console.log("##########111111d####", result, tmpArr);
90279
90304
  const d = replaceEmptyObjects(result, tmpArr);
90305
+ // console.log("##########d####", d);
90280
90306
  return d;
90281
90307
  }
90282
90308
  }
@@ -91279,8 +91305,8 @@ Sortable.mount(Remove, Revert);
91279
91305
  }));
91280
91306
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
91281
91307
 
91282
- // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=093086fd&lang=less
91283
- var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require__("5f05");
91308
+ // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=615777d6&lang=less
91309
+ var CustomTablevue_type_style_index_0_id_615777d6_lang_less = __webpack_require__("2427");
91284
91310
 
91285
91311
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
91286
91312
 
@@ -91290,7 +91316,7 @@ var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require_
91290
91316
 
91291
91317
 
91292
91318
 
91293
- const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_093086fd_ts_true_render]])
91319
+ const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_615777d6_ts_true_render]])
91294
91320
 
91295
91321
  /* harmony default export */ var CustomTable = (CustomTable_exports_);
91296
91322
  // CONCATENATED MODULE: ./packages/CustomTable/index.ts
package/lib/index.umd.js CHANGED
@@ -4435,6 +4435,17 @@ exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
4435
4435
  })));
4436
4436
 
4437
4437
 
4438
+ /***/ }),
4439
+
4440
+ /***/ "2427":
4441
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
4442
+
4443
+ "use strict";
4444
+ /* 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_615777d6_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("dc59");
4445
+ /* 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_615777d6_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_615777d6_lang_less__WEBPACK_IMPORTED_MODULE_0__);
4446
+ /* unused harmony reexport * */
4447
+
4448
+
4438
4449
  /***/ }),
4439
4450
 
4440
4451
  /***/ "2444":
@@ -22966,13 +22977,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
22966
22977
  };
22967
22978
 
22968
22979
 
22969
- /***/ }),
22970
-
22971
- /***/ "331d":
22972
- /***/ (function(module, exports, __webpack_require__) {
22973
-
22974
- // extracted by mini-css-extract-plugin
22975
-
22976
22980
  /***/ }),
22977
22981
 
22978
22982
  /***/ "332f":
@@ -28976,17 +28980,6 @@ var freeGlobal = typeof global == 'object' && global && global.Object === Object
28976
28980
 
28977
28981
  /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
28978
28982
 
28979
- /***/ }),
28980
-
28981
- /***/ "5f05":
28982
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
28983
-
28984
- "use strict";
28985
- /* 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");
28986
- /* 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__);
28987
- /* unused harmony reexport * */
28988
-
28989
-
28990
28983
  /***/ }),
28991
28984
 
28992
28985
  /***/ "5fbd":
@@ -49201,6 +49194,13 @@ module.exports = function (V, P) {
49201
49194
  })));
49202
49195
 
49203
49196
 
49197
+ /***/ }),
49198
+
49199
+ /***/ "dc59":
49200
+ /***/ (function(module, exports, __webpack_require__) {
49201
+
49202
+ // extracted by mini-css-extract-plugin
49203
+
49204
49204
  /***/ }),
49205
49205
 
49206
49206
  /***/ "dce7":
@@ -53559,7 +53559,7 @@ if (typeof window !== 'undefined') {
53559
53559
  // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
53560
53560
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
53561
53561
 
53562
- // 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
53562
+ // 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=615777d6&ts=true
53563
53563
 
53564
53564
  const _hoisted_1 = {
53565
53565
  style: {
@@ -53588,7 +53588,7 @@ const _hoisted_9 = {
53588
53588
  href: "#"
53589
53589
  };
53590
53590
  const _hoisted_10 = ["onClick"];
53591
- function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
53591
+ function CustomTablevue_type_template_id_615777d6_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
53592
53592
  const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
53593
53593
  const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
53594
53594
  const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53933,7 +53933,7 @@ function CustomTablevue_type_template_id_093086fd_ts_true_render(_ctx, _cache, $
53933
53933
  "page-sizes": [10, 20, 100, 200, 500, 1000]
53934
53934
  }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
53935
53935
  }
53936
- // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=093086fd&ts=true
53936
+ // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=615777d6&ts=true
53937
53937
 
53938
53938
  // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
53939
53939
  function _extends() {
@@ -90238,22 +90238,32 @@ Sortable.mount(Remove, Revert);
90238
90238
  arr = arr.sort(function (a, b) {
90239
90239
  return a.index - b.index;
90240
90240
  });
90241
+ //基础序号
90242
+ let priIndex = 0;
90243
+ if (props.showCheckBox || props.showRadio) {
90244
+ priIndex++;
90245
+ }
90246
+ if (props.showSeq) {
90247
+ priIndex++;
90248
+ }
90241
90249
  if (arr.length) {
90242
90250
  arr = arr.map((item, index) => {
90243
90251
  const overnum = arr[arr.length - 1].index - columns.length + 1;
90252
+ let i = item.index;
90244
90253
  if (overnum > 0) {
90245
- let i = item.index - overnum >= 0 ? item.index - overnum : 0;
90246
- if (props.showCheckBox || props.showRadio) {
90247
- i++;
90248
- }
90249
- if (props.showSeq) {
90250
- i++;
90251
- }
90252
- item.index = i;
90254
+ i = item.index - overnum >= 0 ? item.index - overnum : item.index;
90255
+ }
90256
+ // if (props.showCheckBox || props.showRadio) {
90257
+ // i++;
90258
+ // }
90259
+ if (i < priIndex) {
90260
+ i = priIndex;
90253
90261
  }
90262
+ item.index = i;
90254
90263
  return item;
90255
90264
  });
90256
90265
  }
90266
+ // console.log("##########arr####", arr);
90257
90267
  const result1 = [];
90258
90268
  const result = [];
90259
90269
  const tmpArr = [];
@@ -90268,24 +90278,40 @@ Sortable.mount(Remove, Revert);
90268
90278
  if (!arr.some(item => item.key == column.key)) {
90269
90279
  tmpArr.push(column);
90270
90280
  }
90271
- const index = arr.findIndex(item => item.index == gIndex);
90272
- if (index >= 0) {
90273
- const tmp = columns.find(item => item.key == arr[index].key);
90274
- if (tmp) {
90275
- result1.push(tmp);
90276
- result.push(tmp);
90277
- // tmpArr.push({});
90281
+ let cIndex = idx;
90282
+ if (props.showCheckBox || props.showRadio) {
90283
+ cIndex++;
90284
+ }
90285
+ if (props.showSeq) {
90286
+ cIndex++;
90287
+ }
90288
+ if (cIndex == gIndex) {
90289
+ const sArr = arr.filter(item => item.index == gIndex);
90290
+ // console.log(">>>>>>>>>>>>>>>>>>>>sArr>>>>>>>>>>>>>>>>>>>>", sArr);
90291
+ if (sArr.length > 0) {
90292
+ sArr.forEach(si => {
90293
+ const tmp = columns.find(item => item.key == si.key);
90294
+ // console.log(
90295
+ // ">>>>>>>>>>>>>>>>>>>>tmp>>>>>>>>>>>>>>>>>>>>",
90296
+ // tmp,
90297
+ // );
90298
+ if (tmp) {
90299
+ result1.push(tmp);
90300
+ result.push(tmp);
90301
+ // tmpArr.push({});
90302
+ gIndex++;
90303
+ }
90304
+ });
90278
90305
  } else {
90279
90306
  result1.push({});
90280
90307
  result.push({});
90308
+ gIndex++;
90281
90309
  }
90282
- } else {
90283
- result1.push({});
90284
- result.push({});
90285
90310
  }
90286
- gIndex++;
90287
90311
  });
90312
+ // console.log("##########111111d####", result, tmpArr);
90288
90313
  const d = replaceEmptyObjects(result, tmpArr);
90314
+ // console.log("##########d####", d);
90289
90315
  return d;
90290
90316
  }
90291
90317
  }
@@ -91288,8 +91314,8 @@ Sortable.mount(Remove, Revert);
91288
91314
  }));
91289
91315
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
91290
91316
 
91291
- // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=093086fd&lang=less
91292
- var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require__("5f05");
91317
+ // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=615777d6&lang=less
91318
+ var CustomTablevue_type_style_index_0_id_615777d6_lang_less = __webpack_require__("2427");
91293
91319
 
91294
91320
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
91295
91321
 
@@ -91299,7 +91325,7 @@ var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require_
91299
91325
 
91300
91326
 
91301
91327
 
91302
- const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_093086fd_ts_true_render]])
91328
+ const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_615777d6_ts_true_render]])
91303
91329
 
91304
91330
  /* harmony default export */ var CustomTable = (CustomTable_exports_);
91305
91331
  // CONCATENATED MODULE: ./packages/CustomTable/index.ts