custom-vxe-table 2.0.14-beta → 2.0.16-beta

package/lib/index.common.js

@@ -1143,6 +1143,13 @@ exports.f = DESCRIPTORS ? $getOwnPropertyDescriptor : function getOwnPropertyDes
 })));
 
 
+/***/ }),
+
+/***/ "0815":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "086f":
@@ -4275,6 +4282,13 @@ module.exports = function (index, length) {
 };
 
 
+/***/ }),
+
+/***/ "23dc":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "23e7":
@@ -4905,6 +4919,17 @@ module.exports = function (CONSTRUCTOR_NAME) {
 };
 
 
+/***/ }),
+
+/***/ "2699":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* 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_4bd3fe91_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("23dc");
+/* 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_4bd3fe91_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_4bd3fe91_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "26f9":
@@ -24157,17 +24182,6 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 };
 
 
-/***/ }),
-
-/***/ "3203":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* 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");
-/* 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__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "332f":
@@ -25353,13 +25367,6 @@ module.exports = getWhatDay
 })));
 
 
-/***/ }),
-
-/***/ "3ab6":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "3ae2":
@@ -36524,6 +36531,17 @@ module.exports = function (it) {
 })));
 
 
+/***/ }),
+
+/***/ "876c":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* 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_CustomSelectH_vue_vue_type_style_index_0_id_40ab17e6_lang_less_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0815");
+/* 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_CustomSelectH_vue_vue_type_style_index_0_id_40ab17e6_lang_less_scoped_true__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_CustomSelectH_vue_vue_type_style_index_0_id_40ab17e6_lang_less_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "87de":
@@ -51259,17 +51277,6 @@ module.exports = function isBuffer (obj) {
 }
 
 
-/***/ }),
-
-/***/ "c860":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* 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_CustomSelectH_vue_vue_type_style_index_0_id_35309c8d_lang_less_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("3ab6");
-/* 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_CustomSelectH_vue_vue_type_style_index_0_id_35309c8d_lang_less_scoped_true__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_CustomSelectH_vue_vue_type_style_index_0_id_35309c8d_lang_less_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "c8af":
@@ -53530,13 +53537,6 @@ var some = helperCreateIterateHandle('some', 1, 0, true, false)
 module.exports = some
 
 
-/***/ }),
-
-/***/ "df0e":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "df75":
@@ -58485,7 +58485,7 @@ var es_string_fixed = __webpack_require__("c7cd");
 // 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--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
+// 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=4bd3fe91&ts=true
 
 
 
@@ -58513,7 +58513,7 @@ var _hoisted_5 = {
   href: "#"
 };
 var _hoisted_6 = ["onClick"];
-function CustomTablevue_type_template_id_037df920_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_4bd3fe91_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   var _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
 
   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, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["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=037df920&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=4bd3fe91&ts=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -95297,7 +95297,9 @@ Sortable.mount(Remove, Revert);
       loadData();
     };
 
-    Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(props.queryParams, function () {
+    Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
+      return props.queryParams;
+    }, function () {
       cQueryParams = props.queryParams ? JSON.parse(JSON.stringify(props.queryParams)) : null; // 合并模糊查询条件
 
       var searchKeys = cQueryParams.searchKeys;
@@ -96016,6 +96018,37 @@ Sortable.mount(Remove, Revert);
       }
     };
 
+    var getVisibleColumn = function getVisibleColumn() {
+      var $grid = xTable1.value;
+
+      var _$grid$getTableColumn = $grid.getTableColumn(),
+          tableColumn = _$grid$getTableColumn.tableColumn,
+          collectColumn = _$grid$getTableColumn.collectColumn; // 处理分组的情况
+
+
+      var result = [];
+      tableColumn.forEach(function (item) {
+        if (item.level == 1) {
+          // 1级直接插入
+          result.push(item);
+        } else {
+          // 2级寻找父级再插入
+          var tmp = result.find(function (c) {
+            return c.id == item.parentId;
+          });
+
+          if (!tmp) {
+            var dt = collectColumn.find(function (c) {
+              return c.id == item.parentId;
+            });
+            result.push(dt);
+          }
+        }
+      }); // console.log("##############getVisibleColumn", result)
+
+      return result;
+    };
+
     var sortable;
 
     var columnDrop = function columnDrop() {
@@ -96027,9 +96060,10 @@ Sortable.mount(Remove, Revert);
           var newIndex = sortableEvent.newIndex;
           var oldIndex = sortableEvent.oldIndex;
 
-          var _$grid$getTableColumn = $grid.getTableColumn(),
-              collectColumn = _$grid$getTableColumn.collectColumn;
+          var _$grid$getTableColumn2 = $grid.getTableColumn(),
+              collectColumn = _$grid$getTableColumn2.collectColumn;
 
+          var visibleColumn = getVisibleColumn();
           var wrapperElem = targetThElem.parentNode;
           var newColumn = collectColumn[newIndex];
 
@@ -96050,17 +96084,17 @@ Sortable.mount(Remove, Revert);
           } else {
             // 转换真实索引
             var oldColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[oldIndex].field;
+              return item.field == visibleColumn[oldIndex].field;
             });
             var newColumnIndex = collectColumn.findIndex(function (item) {
-              return item.field == collectColumn[newIndex].field;
+              return item.field == visibleColumn[newIndex].field;
             }); // console.log(
             //   "######collectColumn###",
             //   collectColumn,
             //   $grid.getTableColumn()
             // );
 
-            var fieldId = collectColumn[oldIndex].field; // 移动到目标列
+            var fieldId = collectColumn[oldColumnIndex].field; // 移动到目标列
 
             var currRow = collectColumn.splice(oldColumnIndex, 1)[0];
             collectColumn.splice(newColumnIndex, 0, currRow); // console.log(
@@ -96284,8 +96318,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=037df920&lang=less
-var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require__("3203");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=4bd3fe91&lang=less
+var CustomTablevue_type_style_index_0_id_4bd3fe91_lang_less = __webpack_require__("2699");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -96295,7 +96329,7 @@ var CustomTablevue_type_style_index_0_id_037df920_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_037df920_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_4bd3fe91_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts
@@ -96734,9 +96768,9 @@ CustomSelect.install = function (app) {
 };
 
 /* harmony default export */ var packages_CustomSelect = (CustomSelect);
-// 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/CustomSelectH/src/CustomSelectH.vue?vue&type=template&id=35309c8d&scoped=true&ts=true
+// 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/CustomSelectH/src/CustomSelectH.vue?vue&type=template&id=40ab17e6&scoped=true&ts=true
 
-function CustomSelectHvue_type_template_id_35309c8d_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomSelectHvue_type_template_id_40ab17e6_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   var _component_close_circle_filled = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("close-circle-filled");
 
   var _component_down_outlined = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("down-outlined");
@@ -96871,7 +96905,7 @@ function CustomSelectHvue_type_template_id_35309c8d_scoped_true_ts_true_render(_
     _: 1
   }, 8, ["visible", "disabled"])]);
 }
-// CONCATENATED MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue?vue&type=template&id=35309c8d&scoped=true&ts=true
+// CONCATENATED MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue?vue&type=template&id=40ab17e6&scoped=true&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@ant-design/icons-svg/es/asn/CloseOutlined.js
 // This icon file is generated automatically.
@@ -98705,8 +98739,7 @@ icons_DownOutlined_DownOutlined.inheritAttrs = false;
 
 
     var handleInitData = function handleInitData() {
-      console.log("#############handleInitData", cValue.value);
-
+      // console.log("#############handleInitData", cValue.value);
       if (options.value && options.value.length > 0) {
         cValue.value = props.modelValue;
         inputValue.value = props.modelValue;
@@ -98791,8 +98824,8 @@ icons_DownOutlined_DownOutlined.inheritAttrs = false;
 }));
 // CONCATENATED MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue?vue&type=style&index=0&id=35309c8d&lang=less&scoped=true
-var CustomSelectHvue_type_style_index_0_id_35309c8d_lang_less_scoped_true = __webpack_require__("c860");
+// EXTERNAL MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue?vue&type=style&index=0&id=40ab17e6&lang=less&scoped=true
+var CustomSelectHvue_type_style_index_0_id_40ab17e6_lang_less_scoped_true = __webpack_require__("876c");
 
 // CONCATENATED MODULE: ./packages/CustomSelectH/src/CustomSelectH.vue
 
@@ -98802,7 +98835,7 @@ var CustomSelectHvue_type_style_index_0_id_35309c8d_lang_less_scoped_true = __we
 
 
 
-const CustomSelectH_exports_ = /*#__PURE__*/exportHelper_default()(CustomSelectHvue_type_script_lang_ts, [['render',CustomSelectHvue_type_template_id_35309c8d_scoped_true_ts_true_render],['__scopeId',"data-v-35309c8d"]])
+const CustomSelectH_exports_ = /*#__PURE__*/exportHelper_default()(CustomSelectHvue_type_script_lang_ts, [['render',CustomSelectHvue_type_template_id_40ab17e6_scoped_true_ts_true_render],['__scopeId',"data-v-40ab17e6"]])
 
 /* harmony default export */ var CustomSelectH = (CustomSelectH_exports_);
 // CONCATENATED MODULE: ./packages/CustomSelectH/index.ts