custom-vxe-table 3.2.20 → 3.2.22

package/lib/index.common.js

@@ -5388,6 +5388,17 @@ function filter (obj, iterate, context) {
 module.exports = filter
 
 
+/***/ }),
+
+/***/ "2a6b":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_27f2f8e4_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b9d1");
+/* 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_27f2f8e4_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_27f2f8e4_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "2ae6":
@@ -24923,17 +24934,6 @@ function helperEqualCompare (val1, val2, compare, func, key, obj1, obj2) {
 module.exports = helperEqualCompare
 
 
-/***/ }),
-
-/***/ "4012":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_50a24c5d_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f6ae");
-/* 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_50a24c5d_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_50a24c5d_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "4035":
@@ -39913,6 +39913,13 @@ module.exports = !fails(function () {
 });
 
 
+/***/ }),
+
+/***/ "b9d1":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "ba43":
@@ -51463,13 +51470,6 @@ module.exports = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
 };
 
 
-/***/ }),
-
-/***/ "f6ae":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "f6b4":
@@ -53550,7 +53550,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=50a24c5d&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=27f2f8e4&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53579,7 +53579,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_27f2f8e4_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
   const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
   const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53655,7 +53655,7 @@ function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $
     "tooltip-config": _ctx.tooltipConfig,
     "sort-config": {
       multiple: _ctx.multipleSort,
-      remote: !_ctx.isLocalLoad
+      remote: !_ctx.isLocalLoad && !_ctx.isSortByDefault
     },
     "checkbox-config": _ctx.tableCheckboxConfig,
     "radio-config": _ctx.tableRadioConfig,
@@ -53924,7 +53924,7 @@ function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=50a24c5d&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=27f2f8e4&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -89946,6 +89946,11 @@ Sortable.mount(Remove, Revert);
       type: Boolean,
       default: false
     },
+    isSortByDefault: {
+      // 是否按照默认规则排序
+      type: Boolean,
+      default: false
+    },
     scrollY: {
       //虚拟滚动
       type: Object
@@ -90268,6 +90273,7 @@ Sortable.mount(Remove, Revert);
           totalPages.value = res.list.pages;
           total.value = res.list.total;
           if ($table) {
+            console.log("###########state.table#########");
             $table.loadData(dataSource).then(res => {
               updateFilterOptions(dataSource);
             });
@@ -90429,10 +90435,10 @@ Sortable.mount(Remove, Revert);
       const $table = xTable1.value;
       // 排序字段
       const sortList = $table.getSortColumns();
-      console.log("############sortList###", sortList, state.columns);
       if (column.sortable && triggerSort) {
-        if (props.isLocalLoad) {
+        if (props.isLocalLoad || props.isSortByDefault) {
           // 本地加载 走默认排序规则
+          console.log("############默认排序###");
         } else {
           // 远程加载,重组orderByDesc,orderByAsc
           if (sortList.length > 0) {
@@ -91238,8 +91244,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=50a24c5d&lang=less
-var CustomTablevue_type_style_index_0_id_50a24c5d_lang_less = __webpack_require__("4012");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=27f2f8e4&lang=less
+var CustomTablevue_type_style_index_0_id_27f2f8e4_lang_less = __webpack_require__("2a6b");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91249,7 +91255,7 @@ var CustomTablevue_type_style_index_0_id_50a24c5d_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_50a24c5d_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_27f2f8e4_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts

package/lib/index.umd.js

@@ -5397,6 +5397,17 @@ function filter (obj, iterate, context) {
 module.exports = filter
 
 
+/***/ }),
+
+/***/ "2a6b":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_27f2f8e4_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b9d1");
+/* 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_27f2f8e4_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_27f2f8e4_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "2ae6":
@@ -24932,17 +24943,6 @@ function helperEqualCompare (val1, val2, compare, func, key, obj1, obj2) {
 module.exports = helperEqualCompare
 
 
-/***/ }),
-
-/***/ "4012":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_11_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_11_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_11_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_11_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_CustomTable_vue_vue_type_style_index_0_id_50a24c5d_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f6ae");
-/* 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_50a24c5d_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_50a24c5d_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "4035":
@@ -39922,6 +39922,13 @@ module.exports = !fails(function () {
 });
 
 
+/***/ }),
+
+/***/ "b9d1":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "ba43":
@@ -51472,13 +51479,6 @@ module.exports = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
 };
 
 
-/***/ }),
-
-/***/ "f6ae":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "f6b4":
@@ -53559,7 +53559,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=50a24c5d&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=27f2f8e4&ts=true
 
 const _hoisted_1 = {
   style: {
@@ -53588,7 +53588,7 @@ const _hoisted_9 = {
   href: "#"
 };
 const _hoisted_10 = ["onClick"];
-function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_27f2f8e4_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_custom_buttons = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("custom-buttons");
   const _component_a_input_search = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-input-search");
   const _component_vxe_toolbar = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("vxe-toolbar");
@@ -53664,7 +53664,7 @@ function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $
     "tooltip-config": _ctx.tooltipConfig,
     "sort-config": {
       multiple: _ctx.multipleSort,
-      remote: !_ctx.isLocalLoad
+      remote: !_ctx.isLocalLoad && !_ctx.isSortByDefault
     },
     "checkbox-config": _ctx.tableCheckboxConfig,
     "radio-config": _ctx.tableRadioConfig,
@@ -53933,7 +53933,7 @@ function CustomTablevue_type_template_id_50a24c5d_ts_true_render(_ctx, _cache, $
     "page-sizes": [10, 20, 100, 200, 500, 1000]
   }, null, 8, ["layouts", "current-page", "page-size", "total", "onPageChange"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)]);
 }
-// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=50a24c5d&ts=true
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=27f2f8e4&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/extends.js
 function _extends() {
@@ -89955,6 +89955,11 @@ Sortable.mount(Remove, Revert);
       type: Boolean,
       default: false
     },
+    isSortByDefault: {
+      // 是否按照默认规则排序
+      type: Boolean,
+      default: false
+    },
     scrollY: {
       //虚拟滚动
       type: Object
@@ -90277,6 +90282,7 @@ Sortable.mount(Remove, Revert);
           totalPages.value = res.list.pages;
           total.value = res.list.total;
           if ($table) {
+            console.log("###########state.table#########");
             $table.loadData(dataSource).then(res => {
               updateFilterOptions(dataSource);
             });
@@ -90438,10 +90444,10 @@ Sortable.mount(Remove, Revert);
       const $table = xTable1.value;
       // 排序字段
       const sortList = $table.getSortColumns();
-      console.log("############sortList###", sortList, state.columns);
       if (column.sortable && triggerSort) {
-        if (props.isLocalLoad) {
+        if (props.isLocalLoad || props.isSortByDefault) {
           // 本地加载 走默认排序规则
+          console.log("############默认排序###");
         } else {
           // 远程加载,重组orderByDesc,orderByAsc
           if (sortList.length > 0) {
@@ -91247,8 +91253,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=50a24c5d&lang=less
-var CustomTablevue_type_style_index_0_id_50a24c5d_lang_less = __webpack_require__("4012");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=27f2f8e4&lang=less
+var CustomTablevue_type_style_index_0_id_27f2f8e4_lang_less = __webpack_require__("2a6b");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -91258,7 +91264,7 @@ var CustomTablevue_type_style_index_0_id_50a24c5d_lang_less = __webpack_require_
 
 
 
-const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_50a24c5d_ts_true_render]])
+const CustomTable_exports_ = /*#__PURE__*/exportHelper_default()(CustomTablevue_type_script_lang_ts, [['render',CustomTablevue_type_template_id_27f2f8e4_ts_true_render]])
 
 /* harmony default export */ var CustomTable = (CustomTable_exports_);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts