custom-vxe-table 1.4.7 → 1.4.8

package/lib/index.common.js

@@ -25128,17 +25128,6 @@ function pluck (obj, key) {
 module.exports = pluck
 
 
-/***/ }),
-
-/***/ "7c4f":
-/***/ (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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("ba04");
-/* 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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "7c73":
@@ -25953,6 +25942,17 @@ module.exports = DESCRIPTORS ? function (object, key, value) {
 };
 
 
+/***/ }),
+
+/***/ "9121":
+/***/ (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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f6a5");
+/* 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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "9263":
@@ -29747,13 +29747,6 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ "ba04":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "ba43":
 /***/ (function(module, exports) {
 
@@ -33670,6 +33663,13 @@ module.exports = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
 };
 
 
+/***/ }),
+
+/***/ "f6a5":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "f6b4":
@@ -34175,7 +34175,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--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=e3d950ac
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=4603a409
 
 
 
@@ -34191,7 +34191,7 @@ var _hoisted_3 = {
   href: "#"
 };
 var _hoisted_4 = ["onClick"];
-function CustomTablevue_type_template_id_e3d950ac_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_4603a409_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");
@@ -34492,7 +34492,7 @@ function CustomTablevue_type_template_id_e3d950ac_render(_ctx, _cache, $props, $
     onPageChange: _ctx.handlePageChange
   }, 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=e3d950ac
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=4603a409
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -72436,7 +72436,11 @@ Sortable.mount(Remove, Revert);
       return getTableData(data).then(function (res) {
         // 数据集合
         var dataSource = res.list.records;
-        state.columns = res.columns;
+
+        if (res.columns && res.columns != undefined) {
+          state.columns = res.columns;
+        }
+
         totalPages.value = res.list.pages;
         total.value = res.list.total;
 
@@ -73234,7 +73238,11 @@ Sortable.mount(Remove, Revert);
       $table.connect($toolbar);
       ceditConfig.value = props.editConfig; // 判断是否需要清除列配置缓存
 
-      clearColumnsCache();
+      clearColumnsCache(); // 加载标题
+
+      if (props.columns && props.columns.length > 0) {
+        state.columns = props.columns;
+      }
 
       if (props.isLocalLoad) {
         // 1. 本地加载
@@ -73320,8 +73328,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=e3d950ac&lang=less
-var CustomTablevue_type_style_index_0_id_e3d950ac_lang_less = __webpack_require__("7c4f");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=4603a409&lang=less
+var CustomTablevue_type_style_index_0_id_4603a409_lang_less = __webpack_require__("9121");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -73329,7 +73337,7 @@ var CustomTablevue_type_style_index_0_id_e3d950ac_lang_less = __webpack_require_
 
 
 
-CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_e3d950ac_render
+CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_4603a409_render
 
 /* harmony default export */ var CustomTable = (CustomTablevue_type_script_lang_ts);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts

package/lib/index.umd.js

@@ -25137,17 +25137,6 @@ function pluck (obj, key) {
 module.exports = pluck
 
 
-/***/ }),
-
-/***/ "7c4f":
-/***/ (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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("ba04");
-/* 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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_e3d950ac_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "7c73":
@@ -25962,6 +25951,17 @@ module.exports = DESCRIPTORS ? function (object, key, value) {
 };
 
 
+/***/ }),
+
+/***/ "9121":
+/***/ (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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f6a5");
+/* 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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_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_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_loader_v16_dist_index_js_ref_0_1_CustomTable_vue_vue_type_style_index_0_id_4603a409_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "9263":
@@ -29756,13 +29756,6 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ "ba04":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "ba43":
 /***/ (function(module, exports) {
 
@@ -33679,6 +33672,13 @@ module.exports = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
 };
 
 
+/***/ }),
+
+/***/ "f6a5":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "f6b4":
@@ -34184,7 +34184,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--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=e3d950ac
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader-v16/dist??ref--0-1!./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=4603a409
 
 
 
@@ -34200,7 +34200,7 @@ var _hoisted_3 = {
   href: "#"
 };
 var _hoisted_4 = ["onClick"];
-function CustomTablevue_type_template_id_e3d950ac_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_4603a409_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");
@@ -34501,7 +34501,7 @@ function CustomTablevue_type_template_id_e3d950ac_render(_ctx, _cache, $props, $
     onPageChange: _ctx.handlePageChange
   }, 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=e3d950ac
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=4603a409
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -72445,7 +72445,11 @@ Sortable.mount(Remove, Revert);
       return getTableData(data).then(function (res) {
         // 数据集合
         var dataSource = res.list.records;
-        state.columns = res.columns;
+
+        if (res.columns && res.columns != undefined) {
+          state.columns = res.columns;
+        }
+
         totalPages.value = res.list.pages;
         total.value = res.list.total;
 
@@ -73243,7 +73247,11 @@ Sortable.mount(Remove, Revert);
       $table.connect($toolbar);
       ceditConfig.value = props.editConfig; // 判断是否需要清除列配置缓存
 
-      clearColumnsCache();
+      clearColumnsCache(); // 加载标题
+
+      if (props.columns && props.columns.length > 0) {
+        state.columns = props.columns;
+      }
 
       if (props.isLocalLoad) {
         // 1. 本地加载
@@ -73329,8 +73337,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=e3d950ac&lang=less
-var CustomTablevue_type_style_index_0_id_e3d950ac_lang_less = __webpack_require__("7c4f");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=4603a409&lang=less
+var CustomTablevue_type_style_index_0_id_4603a409_lang_less = __webpack_require__("9121");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -73338,7 +73346,7 @@ var CustomTablevue_type_style_index_0_id_e3d950ac_lang_less = __webpack_require_
 
 
 
-CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_e3d950ac_render
+CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_4603a409_render
 
 /* harmony default export */ var CustomTable = (CustomTablevue_type_script_lang_ts);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts