custom-vxe-table 3.2.28 → 3.2.30
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.
- package/lib/index.common.js +91 -47
- package/lib/index.umd.js +91 -47
- package/lib/index.umd.min.js +5 -5
- package/package.json +1 -1
package/lib/index.common.js
CHANGED
|
@@ -22957,13 +22957,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
|
|
|
22957
22957
|
};
|
|
22958
22958
|
|
|
22959
22959
|
|
|
22960
|
-
/***/ }),
|
|
22961
|
-
|
|
22962
|
-
/***/ "331d":
|
|
22963
|
-
/***/ (function(module, exports, __webpack_require__) {
|
|
22964
|
-
|
|
22965
|
-
// extracted by mini-css-extract-plugin
|
|
22966
|
-
|
|
22967
22960
|
/***/ }),
|
|
22968
22961
|
|
|
22969
22962
|
/***/ "332f":
|
|
@@ -26300,6 +26293,17 @@ module.exports = isSet
|
|
|
26300
26293
|
})));
|
|
26301
26294
|
|
|
26302
26295
|
|
|
26296
|
+
/***/ }),
|
|
26297
|
+
|
|
26298
|
+
/***/ "4a66":
|
|
26299
|
+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
26300
|
+
|
|
26301
|
+
"use strict";
|
|
26302
|
+
/* 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_ae50dad4_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("73ec");
|
|
26303
|
+
/* 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_ae50dad4_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_ae50dad4_lang_less__WEBPACK_IMPORTED_MODULE_0__);
|
|
26304
|
+
/* unused harmony reexport * */
|
|
26305
|
+
|
|
26306
|
+
|
|
26303
26307
|
/***/ }),
|
|
26304
26308
|
|
|
26305
26309
|
/***/ "4ba9":
|
|
@@ -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":
|
|
@@ -32813,6 +32806,13 @@ module.exports = function (object, key, method) {
|
|
|
32813
32806
|
})));
|
|
32814
32807
|
|
|
32815
32808
|
|
|
32809
|
+
/***/ }),
|
|
32810
|
+
|
|
32811
|
+
/***/ "73ec":
|
|
32812
|
+
/***/ (function(module, exports, __webpack_require__) {
|
|
32813
|
+
|
|
32814
|
+
// extracted by mini-css-extract-plugin
|
|
32815
|
+
|
|
32816
32816
|
/***/ }),
|
|
32817
32817
|
|
|
32818
32818
|
/***/ "7418":
|
|
@@ -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=
|
|
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=ae50dad4&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
|
|
53582
|
+
function CustomTablevue_type_template_id_ae50dad4_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=
|
|
53927
|
+
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=ae50dad4&ts=true
|
|
53928
53928
|
|
|
53929
53929
|
// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
|
|
53930
53930
|
function _extends() {
|
|
@@ -90229,22 +90229,50 @@ 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
|
+
}
|
|
90240
|
+
const dArr = [];
|
|
90232
90241
|
if (arr.length) {
|
|
90233
|
-
arr
|
|
90234
|
-
const overnum =
|
|
90235
|
-
if (overnum
|
|
90236
|
-
|
|
90237
|
-
if (
|
|
90238
|
-
|
|
90239
|
-
|
|
90240
|
-
|
|
90241
|
-
|
|
90242
|
+
arr.forEach(item => {
|
|
90243
|
+
const overnum = item.index - columns.length + 1;
|
|
90244
|
+
if (overnum <= 0) {
|
|
90245
|
+
// 在columns范围内
|
|
90246
|
+
if (item.index < priIndex) {
|
|
90247
|
+
item.index = priIndex;
|
|
90248
|
+
if (dArr.some(di => di.index == item.index)) {
|
|
90249
|
+
item.index = item.index + 1;
|
|
90250
|
+
dArr.push(item);
|
|
90251
|
+
} else {
|
|
90252
|
+
dArr.push(item);
|
|
90253
|
+
}
|
|
90242
90254
|
}
|
|
90243
|
-
|
|
90255
|
+
} else {
|
|
90256
|
+
// 超过columns, 默认最后
|
|
90244
90257
|
}
|
|
90245
|
-
return item;
|
|
90246
90258
|
});
|
|
90259
|
+
// arr = arr.map((item, index) => {
|
|
90260
|
+
// const overnum = arr[arr.length - 1].index - columns.length + 1;
|
|
90261
|
+
// let i = item.index;
|
|
90262
|
+
// if (overnum > 0) {
|
|
90263
|
+
// i = item.index - overnum >= 0 ? item.index - overnum : item.index;
|
|
90264
|
+
// }
|
|
90265
|
+
// // if (props.showCheckBox || props.showRadio) {
|
|
90266
|
+
// // i++;
|
|
90267
|
+
// // }
|
|
90268
|
+
// if (i < priIndex) {
|
|
90269
|
+
// i = priIndex;
|
|
90270
|
+
// }
|
|
90271
|
+
// item.index = i;
|
|
90272
|
+
// return item;
|
|
90273
|
+
// });
|
|
90247
90274
|
}
|
|
90275
|
+
// console.log("##########dArr####", dArr);
|
|
90248
90276
|
const result1 = [];
|
|
90249
90277
|
const result = [];
|
|
90250
90278
|
const tmpArr = [];
|
|
@@ -90256,27 +90284,43 @@ Sortable.mount(Remove, Revert);
|
|
|
90256
90284
|
gIndex++;
|
|
90257
90285
|
}
|
|
90258
90286
|
columns.forEach((column, idx) => {
|
|
90259
|
-
if (!
|
|
90287
|
+
if (!dArr.some(item => item.key == column.key)) {
|
|
90260
90288
|
tmpArr.push(column);
|
|
90261
90289
|
}
|
|
90262
|
-
|
|
90263
|
-
if (
|
|
90264
|
-
|
|
90265
|
-
|
|
90266
|
-
|
|
90267
|
-
|
|
90268
|
-
|
|
90290
|
+
let cIndex = idx;
|
|
90291
|
+
if (props.showCheckBox || props.showRadio) {
|
|
90292
|
+
cIndex++;
|
|
90293
|
+
}
|
|
90294
|
+
if (props.showSeq) {
|
|
90295
|
+
cIndex++;
|
|
90296
|
+
}
|
|
90297
|
+
if (cIndex == gIndex) {
|
|
90298
|
+
const sArr = dArr.filter(item => item.index == gIndex);
|
|
90299
|
+
// console.log(">>>>>>>>>>>>>>>>>>>>sArr>>>>>>>>>>>>>>>>>>>>", sArr);
|
|
90300
|
+
if (sArr.length > 0) {
|
|
90301
|
+
sArr.forEach(si => {
|
|
90302
|
+
const tmp = columns.find(item => item.key == si.key);
|
|
90303
|
+
// console.log(
|
|
90304
|
+
// ">>>>>>>>>>>>>>>>>>>>tmp>>>>>>>>>>>>>>>>>>>>",
|
|
90305
|
+
// tmp,
|
|
90306
|
+
// );
|
|
90307
|
+
if (tmp) {
|
|
90308
|
+
result1.push(tmp);
|
|
90309
|
+
result.push(tmp);
|
|
90310
|
+
// tmpArr.push({});
|
|
90311
|
+
gIndex++;
|
|
90312
|
+
}
|
|
90313
|
+
});
|
|
90269
90314
|
} else {
|
|
90270
90315
|
result1.push({});
|
|
90271
90316
|
result.push({});
|
|
90317
|
+
gIndex++;
|
|
90272
90318
|
}
|
|
90273
|
-
} else {
|
|
90274
|
-
result1.push({});
|
|
90275
|
-
result.push({});
|
|
90276
90319
|
}
|
|
90277
|
-
gIndex++;
|
|
90278
90320
|
});
|
|
90321
|
+
// console.log("##########111111d####", result, tmpArr);
|
|
90279
90322
|
const d = replaceEmptyObjects(result, tmpArr);
|
|
90323
|
+
// console.log("##########d####", d);
|
|
90280
90324
|
return d;
|
|
90281
90325
|
}
|
|
90282
90326
|
}
|
|
@@ -91279,8 +91323,8 @@ Sortable.mount(Remove, Revert);
|
|
|
91279
91323
|
}));
|
|
91280
91324
|
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
|
|
91281
91325
|
|
|
91282
|
-
// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=
|
|
91283
|
-
var
|
|
91326
|
+
// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=ae50dad4&lang=less
|
|
91327
|
+
var CustomTablevue_type_style_index_0_id_ae50dad4_lang_less = __webpack_require__("4a66");
|
|
91284
91328
|
|
|
91285
91329
|
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
|
|
91286
91330
|
|
|
@@ -91290,7 +91334,7 @@ var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require_
|
|
|
91290
91334
|
|
|
91291
91335
|
|
|
91292
91336
|
|
|
91293
|
-
const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',
|
|
91337
|
+
const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_ae50dad4_ts_true_render]])
|
|
91294
91338
|
|
|
91295
91339
|
/* harmony default export */ var CustomTable = (CustomTable_exports_);
|
|
91296
91340
|
// CONCATENATED MODULE: ./packages/CustomTable/index.ts
|
package/lib/index.umd.js
CHANGED
|
@@ -22966,13 +22966,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
|
|
|
22966
22966
|
};
|
|
22967
22967
|
|
|
22968
22968
|
|
|
22969
|
-
/***/ }),
|
|
22970
|
-
|
|
22971
|
-
/***/ "331d":
|
|
22972
|
-
/***/ (function(module, exports, __webpack_require__) {
|
|
22973
|
-
|
|
22974
|
-
// extracted by mini-css-extract-plugin
|
|
22975
|
-
|
|
22976
22969
|
/***/ }),
|
|
22977
22970
|
|
|
22978
22971
|
/***/ "332f":
|
|
@@ -26309,6 +26302,17 @@ module.exports = isSet
|
|
|
26309
26302
|
})));
|
|
26310
26303
|
|
|
26311
26304
|
|
|
26305
|
+
/***/ }),
|
|
26306
|
+
|
|
26307
|
+
/***/ "4a66":
|
|
26308
|
+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
|
26309
|
+
|
|
26310
|
+
"use strict";
|
|
26311
|
+
/* 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_ae50dad4_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("73ec");
|
|
26312
|
+
/* 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_ae50dad4_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_ae50dad4_lang_less__WEBPACK_IMPORTED_MODULE_0__);
|
|
26313
|
+
/* unused harmony reexport * */
|
|
26314
|
+
|
|
26315
|
+
|
|
26312
26316
|
/***/ }),
|
|
26313
26317
|
|
|
26314
26318
|
/***/ "4ba9":
|
|
@@ -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":
|
|
@@ -32822,6 +32815,13 @@ module.exports = function (object, key, method) {
|
|
|
32822
32815
|
})));
|
|
32823
32816
|
|
|
32824
32817
|
|
|
32818
|
+
/***/ }),
|
|
32819
|
+
|
|
32820
|
+
/***/ "73ec":
|
|
32821
|
+
/***/ (function(module, exports, __webpack_require__) {
|
|
32822
|
+
|
|
32823
|
+
// extracted by mini-css-extract-plugin
|
|
32824
|
+
|
|
32825
32825
|
/***/ }),
|
|
32826
32826
|
|
|
32827
32827
|
/***/ "7418":
|
|
@@ -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=
|
|
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=ae50dad4&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
|
|
53591
|
+
function CustomTablevue_type_template_id_ae50dad4_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=
|
|
53936
|
+
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=ae50dad4&ts=true
|
|
53937
53937
|
|
|
53938
53938
|
// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
|
|
53939
53939
|
function _extends() {
|
|
@@ -90238,22 +90238,50 @@ 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
|
+
}
|
|
90249
|
+
const dArr = [];
|
|
90241
90250
|
if (arr.length) {
|
|
90242
|
-
arr
|
|
90243
|
-
const overnum =
|
|
90244
|
-
if (overnum
|
|
90245
|
-
|
|
90246
|
-
if (
|
|
90247
|
-
|
|
90248
|
-
|
|
90249
|
-
|
|
90250
|
-
|
|
90251
|
+
arr.forEach(item => {
|
|
90252
|
+
const overnum = item.index - columns.length + 1;
|
|
90253
|
+
if (overnum <= 0) {
|
|
90254
|
+
// 在columns范围内
|
|
90255
|
+
if (item.index < priIndex) {
|
|
90256
|
+
item.index = priIndex;
|
|
90257
|
+
if (dArr.some(di => di.index == item.index)) {
|
|
90258
|
+
item.index = item.index + 1;
|
|
90259
|
+
dArr.push(item);
|
|
90260
|
+
} else {
|
|
90261
|
+
dArr.push(item);
|
|
90262
|
+
}
|
|
90251
90263
|
}
|
|
90252
|
-
|
|
90264
|
+
} else {
|
|
90265
|
+
// 超过columns, 默认最后
|
|
90253
90266
|
}
|
|
90254
|
-
return item;
|
|
90255
90267
|
});
|
|
90268
|
+
// arr = arr.map((item, index) => {
|
|
90269
|
+
// const overnum = arr[arr.length - 1].index - columns.length + 1;
|
|
90270
|
+
// let i = item.index;
|
|
90271
|
+
// if (overnum > 0) {
|
|
90272
|
+
// i = item.index - overnum >= 0 ? item.index - overnum : item.index;
|
|
90273
|
+
// }
|
|
90274
|
+
// // if (props.showCheckBox || props.showRadio) {
|
|
90275
|
+
// // i++;
|
|
90276
|
+
// // }
|
|
90277
|
+
// if (i < priIndex) {
|
|
90278
|
+
// i = priIndex;
|
|
90279
|
+
// }
|
|
90280
|
+
// item.index = i;
|
|
90281
|
+
// return item;
|
|
90282
|
+
// });
|
|
90256
90283
|
}
|
|
90284
|
+
// console.log("##########dArr####", dArr);
|
|
90257
90285
|
const result1 = [];
|
|
90258
90286
|
const result = [];
|
|
90259
90287
|
const tmpArr = [];
|
|
@@ -90265,27 +90293,43 @@ Sortable.mount(Remove, Revert);
|
|
|
90265
90293
|
gIndex++;
|
|
90266
90294
|
}
|
|
90267
90295
|
columns.forEach((column, idx) => {
|
|
90268
|
-
if (!
|
|
90296
|
+
if (!dArr.some(item => item.key == column.key)) {
|
|
90269
90297
|
tmpArr.push(column);
|
|
90270
90298
|
}
|
|
90271
|
-
|
|
90272
|
-
if (
|
|
90273
|
-
|
|
90274
|
-
|
|
90275
|
-
|
|
90276
|
-
|
|
90277
|
-
|
|
90299
|
+
let cIndex = idx;
|
|
90300
|
+
if (props.showCheckBox || props.showRadio) {
|
|
90301
|
+
cIndex++;
|
|
90302
|
+
}
|
|
90303
|
+
if (props.showSeq) {
|
|
90304
|
+
cIndex++;
|
|
90305
|
+
}
|
|
90306
|
+
if (cIndex == gIndex) {
|
|
90307
|
+
const sArr = dArr.filter(item => item.index == gIndex);
|
|
90308
|
+
// console.log(">>>>>>>>>>>>>>>>>>>>sArr>>>>>>>>>>>>>>>>>>>>", sArr);
|
|
90309
|
+
if (sArr.length > 0) {
|
|
90310
|
+
sArr.forEach(si => {
|
|
90311
|
+
const tmp = columns.find(item => item.key == si.key);
|
|
90312
|
+
// console.log(
|
|
90313
|
+
// ">>>>>>>>>>>>>>>>>>>>tmp>>>>>>>>>>>>>>>>>>>>",
|
|
90314
|
+
// tmp,
|
|
90315
|
+
// );
|
|
90316
|
+
if (tmp) {
|
|
90317
|
+
result1.push(tmp);
|
|
90318
|
+
result.push(tmp);
|
|
90319
|
+
// tmpArr.push({});
|
|
90320
|
+
gIndex++;
|
|
90321
|
+
}
|
|
90322
|
+
});
|
|
90278
90323
|
} else {
|
|
90279
90324
|
result1.push({});
|
|
90280
90325
|
result.push({});
|
|
90326
|
+
gIndex++;
|
|
90281
90327
|
}
|
|
90282
|
-
} else {
|
|
90283
|
-
result1.push({});
|
|
90284
|
-
result.push({});
|
|
90285
90328
|
}
|
|
90286
|
-
gIndex++;
|
|
90287
90329
|
});
|
|
90330
|
+
// console.log("##########111111d####", result, tmpArr);
|
|
90288
90331
|
const d = replaceEmptyObjects(result, tmpArr);
|
|
90332
|
+
// console.log("##########d####", d);
|
|
90289
90333
|
return d;
|
|
90290
90334
|
}
|
|
90291
90335
|
}
|
|
@@ -91288,8 +91332,8 @@ Sortable.mount(Remove, Revert);
|
|
|
91288
91332
|
}));
|
|
91289
91333
|
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=script&lang=ts
|
|
91290
91334
|
|
|
91291
|
-
// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=
|
|
91292
|
-
var
|
|
91335
|
+
// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=ae50dad4&lang=less
|
|
91336
|
+
var CustomTablevue_type_style_index_0_id_ae50dad4_lang_less = __webpack_require__("4a66");
|
|
91293
91337
|
|
|
91294
91338
|
// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
|
|
91295
91339
|
|
|
@@ -91299,7 +91343,7 @@ var CustomTablevue_type_style_index_0_id_093086fd_lang_less = __webpack_require_
|
|
|
91299
91343
|
|
|
91300
91344
|
|
|
91301
91345
|
|
|
91302
|
-
const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',
|
|
91346
|
+
const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_ae50dad4_ts_true_render]])
|
|
91303
91347
|
|
|
91304
91348
|
/* harmony default export */ var CustomTable = (CustomTable_exports_);
|
|
91305
91349
|
// CONCATENATED MODULE: ./packages/CustomTable/index.ts
|