custom-vxe-table 2.0.14-beta → 2.0.15-beta

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.
@@ -24157,17 +24157,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
24157
24157
  };
24158
24158
 
24159
24159
 
24160
- /***/ }),
24161
-
24162
- /***/ "3203":
24163
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
24164
-
24165
- "use strict";
24166
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("df0e");
24167
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0__);
24168
- /* unused harmony reexport * */
24169
-
24170
-
24171
24160
  /***/ }),
24172
24161
 
24173
24162
  /***/ "332f":
@@ -36968,6 +36957,17 @@ module.exports = staticEscapeMap
36968
36957
 
36969
36958
  module.exports = require("vue");
36970
36959
 
36960
+ /***/ }),
36961
+
36962
+ /***/ "8c12":
36963
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
36964
+
36965
+ "use strict";
36966
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e8a8");
36967
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__);
36968
+ /* unused harmony reexport * */
36969
+
36970
+
36971
36971
  /***/ }),
36972
36972
 
36973
36973
  /***/ "8d47":
@@ -53530,13 +53530,6 @@ var some = helperCreateIterateHandle('some', 1, 0, true, false)
53530
53530
  module.exports = some
53531
53531
 
53532
53532
 
53533
- /***/ }),
53534
-
53535
- /***/ "df0e":
53536
- /***/ (function(module, exports, __webpack_require__) {
53537
-
53538
- // extracted by mini-css-extract-plugin
53539
-
53540
53533
  /***/ }),
53541
53534
 
53542
53535
  /***/ "df75":
@@ -55120,6 +55113,13 @@ module.exports = function (target, source) {
55120
55113
  };
55121
55114
 
55122
55115
 
55116
+ /***/ }),
55117
+
55118
+ /***/ "e8a8":
55119
+ /***/ (function(module, exports, __webpack_require__) {
55120
+
55121
+ // extracted by mini-css-extract-plugin
55122
+
55123
55123
  /***/ }),
55124
55124
 
55125
55125
  /***/ "e8b5":
@@ -58485,7 +58485,7 @@ var es_string_fixed = __webpack_require__("c7cd");
58485
58485
  // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
58486
58486
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
58487
58487
 
58488
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=037df920&ts=true
58488
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
58489
58489
 
58490
58490
 
58491
58491
 
@@ -58513,7 +58513,7 @@ var _hoisted_5 = {
58513
58513
  href: "#"
58514
58514
  };
58515
58515
  var _hoisted_6 = ["onClick"];
58516
- function CustomTablevue_type_template_id_037df920_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
58516
+ function CustomTablevue_type_template_id_3a203e33_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
58517
58517
  var _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
58518
58518
 
58519
58519
  var _component_vxe_input = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-input");
@@ -58924,7 +58924,7 @@ function CustomTablevue_type_template_id_037df920_ts_true_render(_ctx, _cache, $
58924
58924
  "page-sizes": [10, 20, 100, 200, 500, 1000]
58925
58925
  }, null, 8, ["current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
58926
58926
  }
58927
- // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=037df920&ts=true
58927
+ // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
58928
58928
 
58929
58929
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
58930
58930
  var es_object_assign = __webpack_require__("cca6");
@@ -96016,6 +96016,37 @@ Sortable.mount(Remove, Revert);
96016
96016
  }
96017
96017
  };
96018
96018
 
96019
+ var getVisibleColumn = function getVisibleColumn() {
96020
+ var $grid = xTable1.value;
96021
+
96022
+ var _$grid$getTableColumn = $grid.getTableColumn(),
96023
+ tableColumn = _$grid$getTableColumn.tableColumn,
96024
+ collectColumn = _$grid$getTableColumn.collectColumn; // 处理分组的情况
96025
+
96026
+
96027
+ var result = [];
96028
+ tableColumn.forEach(function (item) {
96029
+ if (item.level == 1) {
96030
+ // 1级直接插入
96031
+ result.push(item);
96032
+ } else {
96033
+ // 2级寻找父级再插入
96034
+ var tmp = result.find(function (c) {
96035
+ return c.id == item.parentId;
96036
+ });
96037
+
96038
+ if (!tmp) {
96039
+ var dt = collectColumn.find(function (c) {
96040
+ return c.id == item.parentId;
96041
+ });
96042
+ result.push(dt);
96043
+ }
96044
+ }
96045
+ }); // console.log("##############getVisibleColumn", result)
96046
+
96047
+ return result;
96048
+ };
96049
+
96019
96050
  var sortable;
96020
96051
 
96021
96052
  var columnDrop = function columnDrop() {
@@ -96027,9 +96058,10 @@ Sortable.mount(Remove, Revert);
96027
96058
  var newIndex = sortableEvent.newIndex;
96028
96059
  var oldIndex = sortableEvent.oldIndex;
96029
96060
 
96030
- var _$grid$getTableColumn = $grid.getTableColumn(),
96031
- collectColumn = _$grid$getTableColumn.collectColumn;
96061
+ var _$grid$getTableColumn2 = $grid.getTableColumn(),
96062
+ collectColumn = _$grid$getTableColumn2.collectColumn;
96032
96063
 
96064
+ var visibleColumn = getVisibleColumn();
96033
96065
  var wrapperElem = targetThElem.parentNode;
96034
96066
  var newColumn = collectColumn[newIndex];
96035
96067
 
@@ -96050,17 +96082,17 @@ Sortable.mount(Remove, Revert);
96050
96082
  } else {
96051
96083
  // 转换真实索引
96052
96084
  var oldColumnIndex = collectColumn.findIndex(function (item) {
96053
- return item.field == collectColumn[oldIndex].field;
96085
+ return item.field == visibleColumn[oldIndex].field;
96054
96086
  });
96055
96087
  var newColumnIndex = collectColumn.findIndex(function (item) {
96056
- return item.field == collectColumn[newIndex].field;
96088
+ return item.field == visibleColumn[newIndex].field;
96057
96089
  }); // console.log(
96058
96090
  // "######collectColumn###",
96059
96091
  // collectColumn,
96060
96092
  // $grid.getTableColumn()
96061
96093
  // );
96062
96094
 
96063
- var fieldId = collectColumn[oldIndex].field; // 移动到目标列
96095
+ var fieldId = collectColumn[oldColumnIndex].field; // 移动到目标列
96064
96096
 
96065
96097
  var currRow = collectColumn.splice(oldColumnIndex, 1)[0];
96066
96098
  collectColumn.splice(newColumnIndex, 0, currRow); // console.log(
@@ -96284,8 +96316,8 @@ Sortable.mount(Remove, Revert);
96284
96316
  }));
96285
96317
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
96286
96318
 
96287
- // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=037df920&lang=less
96288
- var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require__("3203");
96319
+ // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=3a203e33&lang=less
96320
+ var CustomTablevue_type_style_index_0_id_3a203e33_lang_less = __webpack_require__("8c12");
96289
96321
 
96290
96322
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
96291
96323
 
@@ -96295,7 +96327,7 @@ var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require_
96295
96327
 
96296
96328
 
96297
96329
 
96298
- const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_037df920_ts_true_render]])
96330
+ const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_3a203e33_ts_true_render]])
96299
96331
 
96300
96332
  /* harmony default export */ var CustomTable = (CustomTable_exports_);
96301
96333
  // CONCATENATED MODULE: ./packages/CustomTable/index.ts
package/lib/index.umd.js CHANGED
@@ -24166,17 +24166,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
24166
24166
  };
24167
24167
 
24168
24168
 
24169
- /***/ }),
24170
-
24171
- /***/ "3203":
24172
- /***/ (function(module, __webpack_exports__, __webpack_require__) {
24173
-
24174
- "use strict";
24175
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("df0e");
24176
- /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_037df920_lang_less__WEBPACK_IMPORTED_MODULE_0__);
24177
- /* unused harmony reexport * */
24178
-
24179
-
24180
24169
  /***/ }),
24181
24170
 
24182
24171
  /***/ "332f":
@@ -36977,6 +36966,17 @@ module.exports = staticEscapeMap
36977
36966
 
36978
36967
  module.exports = __WEBPACK_EXTERNAL_MODULE__8bbf__;
36979
36968
 
36969
+ /***/ }),
36970
+
36971
+ /***/ "8c12":
36972
+ /***/ (function(module, __webpack_exports__, __webpack_require__) {
36973
+
36974
+ "use strict";
36975
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e8a8");
36976
+ /* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_cli_service_node_modules_vue_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_3a203e33_lang_less__WEBPACK_IMPORTED_MODULE_0__);
36977
+ /* unused harmony reexport * */
36978
+
36979
+
36980
36980
  /***/ }),
36981
36981
 
36982
36982
  /***/ "8d47":
@@ -53539,13 +53539,6 @@ var some = helperCreateIterateHandle('some', 1, 0, true, false)
53539
53539
  module.exports = some
53540
53540
 
53541
53541
 
53542
- /***/ }),
53543
-
53544
- /***/ "df0e":
53545
- /***/ (function(module, exports, __webpack_require__) {
53546
-
53547
- // extracted by mini-css-extract-plugin
53548
-
53549
53542
  /***/ }),
53550
53543
 
53551
53544
  /***/ "df75":
@@ -55129,6 +55122,13 @@ module.exports = function (target, source) {
55129
55122
  };
55130
55123
 
55131
55124
 
55125
+ /***/ }),
55126
+
55127
+ /***/ "e8a8":
55128
+ /***/ (function(module, exports, __webpack_require__) {
55129
+
55130
+ // extracted by mini-css-extract-plugin
55131
+
55132
55132
  /***/ }),
55133
55133
 
55134
55134
  /***/ "e8b5":
@@ -58494,7 +58494,7 @@ var es_string_fixed = __webpack_require__("c7cd");
58494
58494
  // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
58495
58495
  var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
58496
58496
 
58497
- // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=037df920&ts=true
58497
+ // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--14-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--14-3!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/@vue/cli-service/node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
58498
58498
 
58499
58499
 
58500
58500
 
@@ -58522,7 +58522,7 @@ var _hoisted_5 = {
58522
58522
  href: "#"
58523
58523
  };
58524
58524
  var _hoisted_6 = ["onClick"];
58525
- function CustomTablevue_type_template_id_037df920_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
58525
+ function CustomTablevue_type_template_id_3a203e33_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
58526
58526
  var _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
58527
58527
 
58528
58528
  var _component_vxe_input = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-input");
@@ -58933,7 +58933,7 @@ function CustomTablevue_type_template_id_037df920_ts_true_render(_ctx, _cache, $
58933
58933
  "page-sizes": [10, 20, 100, 200, 500, 1000]
58934
58934
  }, null, 8, ["current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
58935
58935
  }
58936
- // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=037df920&ts=true
58936
+ // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=3a203e33&ts=true
58937
58937
 
58938
58938
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
58939
58939
  var es_object_assign = __webpack_require__("cca6");
@@ -96025,6 +96025,37 @@ Sortable.mount(Remove, Revert);
96025
96025
  }
96026
96026
  };
96027
96027
 
96028
+ var getVisibleColumn = function getVisibleColumn() {
96029
+ var $grid = xTable1.value;
96030
+
96031
+ var _$grid$getTableColumn = $grid.getTableColumn(),
96032
+ tableColumn = _$grid$getTableColumn.tableColumn,
96033
+ collectColumn = _$grid$getTableColumn.collectColumn; // 处理分组的情况
96034
+
96035
+
96036
+ var result = [];
96037
+ tableColumn.forEach(function (item) {
96038
+ if (item.level == 1) {
96039
+ // 1级直接插入
96040
+ result.push(item);
96041
+ } else {
96042
+ // 2级寻找父级再插入
96043
+ var tmp = result.find(function (c) {
96044
+ return c.id == item.parentId;
96045
+ });
96046
+
96047
+ if (!tmp) {
96048
+ var dt = collectColumn.find(function (c) {
96049
+ return c.id == item.parentId;
96050
+ });
96051
+ result.push(dt);
96052
+ }
96053
+ }
96054
+ }); // console.log("##############getVisibleColumn", result)
96055
+
96056
+ return result;
96057
+ };
96058
+
96028
96059
  var sortable;
96029
96060
 
96030
96061
  var columnDrop = function columnDrop() {
@@ -96036,9 +96067,10 @@ Sortable.mount(Remove, Revert);
96036
96067
  var newIndex = sortableEvent.newIndex;
96037
96068
  var oldIndex = sortableEvent.oldIndex;
96038
96069
 
96039
- var _$grid$getTableColumn = $grid.getTableColumn(),
96040
- collectColumn = _$grid$getTableColumn.collectColumn;
96070
+ var _$grid$getTableColumn2 = $grid.getTableColumn(),
96071
+ collectColumn = _$grid$getTableColumn2.collectColumn;
96041
96072
 
96073
+ var visibleColumn = getVisibleColumn();
96042
96074
  var wrapperElem = targetThElem.parentNode;
96043
96075
  var newColumn = collectColumn[newIndex];
96044
96076
 
@@ -96059,17 +96091,17 @@ Sortable.mount(Remove, Revert);
96059
96091
  } else {
96060
96092
  // 转换真实索引
96061
96093
  var oldColumnIndex = collectColumn.findIndex(function (item) {
96062
- return item.field == collectColumn[oldIndex].field;
96094
+ return item.field == visibleColumn[oldIndex].field;
96063
96095
  });
96064
96096
  var newColumnIndex = collectColumn.findIndex(function (item) {
96065
- return item.field == collectColumn[newIndex].field;
96097
+ return item.field == visibleColumn[newIndex].field;
96066
96098
  }); // console.log(
96067
96099
  // "######collectColumn###",
96068
96100
  // collectColumn,
96069
96101
  // $grid.getTableColumn()
96070
96102
  // );
96071
96103
 
96072
- var fieldId = collectColumn[oldIndex].field; // 移动到目标列
96104
+ var fieldId = collectColumn[oldColumnIndex].field; // 移动到目标列
96073
96105
 
96074
96106
  var currRow = collectColumn.splice(oldColumnIndex, 1)[0];
96075
96107
  collectColumn.splice(newColumnIndex, 0, currRow); // console.log(
@@ -96293,8 +96325,8 @@ Sortable.mount(Remove, Revert);
96293
96325
  }));
96294
96326
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
96295
96327
 
96296
- // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=037df920&lang=less
96297
- var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require__("3203");
96328
+ // EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=3a203e33&lang=less
96329
+ var CustomTablevue_type_style_index_0_id_3a203e33_lang_less = __webpack_require__("8c12");
96298
96330
 
96299
96331
  // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
96300
96332
 
@@ -96304,7 +96336,7 @@ var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require_
96304
96336
 
96305
96337
 
96306
96338
 
96307
- const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_037df920_ts_true_render]])
96339
+ const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_3a203e33_ts_true_render]])
96308
96340
 
96309
96341
  /* harmony default export */ var CustomTable = (CustomTable_exports_);
96310
96342
  // CONCATENATED MODULE: ./packages/CustomTable/index.ts