custom-vxe-table 1.2.4 → 1.2.7

package/lib/index.common.js

@@ -1530,13 +1530,6 @@ module.exports = function (exec, SKIP_CLOSING) {
 };
 
 
-/***/ }),
-
-/***/ "1cd9":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "1cdc":
@@ -23502,17 +23495,6 @@ function getValueByPath (obj, property) {
 module.exports = get
 
 
-/***/ }),
-
-/***/ "5bf0":
-/***/ (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_279a2c96_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("1cd9");
-/* 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_279a2c96_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_279a2c96_lang_less__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "5c6c":
@@ -31696,6 +31678,17 @@ $({ target: 'Object', stat: true, sham: !DESCRIPTORS }, {
 });
 
 
+/***/ }),
+
+/***/ "dc43":
+/***/ (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_6e32ae64_lang_less__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("e8b3");
+/* 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_6e32ae64_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_6e32ae64_lang_less__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "dce7":
@@ -33031,6 +33024,13 @@ module.exports = function (target, source) {
 };
 
 
+/***/ }),
+
+/***/ "e8b3":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "e8b5":
@@ -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=279a2c96
+// 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=6e32ae64
 
 
 
@@ -34191,7 +34191,7 @@ var _hoisted_3 = {
   href: "#"
 };
 var _hoisted_4 = ["onClick"];
-function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $setup, $data, $options) {
+function CustomTablevue_type_template_id_6e32ae64_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");
@@ -34213,8 +34213,8 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
   return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", _hoisted_1, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_vxe_toolbar, {
     ref: "xToolbar",
     loading: _ctx.state.loading,
-    "class-name": "custom-toolbar",
-    custom: _ctx.showToolbarCustomPanel
+    custom: _ctx.showToolbarCustomPanel,
+    "class-name": _ctx.toolbarClass
   }, {
     buttons: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_custom_buttons, {
@@ -34242,7 +34242,7 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
       }, null, 8, ["modelValue", "placeholder", "onKeyup"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true)];
     }),
     _: 1
-  }, 8, ["loading", "custom"]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_vxe_table, {
+  }, 8, ["loading", "custom", "class-name"]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_vxe_table, {
     size: _ctx.size,
     align: _ctx.align,
     "max-height": _ctx.maxHeight,
@@ -34294,6 +34294,7 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
                 fixed: gcolumn.fixed,
                 "edit-render": {},
                 "min-width": gcolumn.minWidth ? gcolumn.minWidth : 120,
+                width: gcolumn.width ? gcolumn.width : undefined,
                 "header-class-name": 'header_' + gcolumn.key,
                 "footer-class-name": 'footer_' + gcolumn.key,
                 "class-name": gcolumn.key
@@ -34331,7 +34332,7 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
                   })];
                 }),
                 _: 2
-              }, 1032, ["field", "title", "fixed", "min-width", "header-class-name", "footer-class-name", "class-name"]);
+              }, 1032, ["field", "title", "fixed", "min-width", "width", "header-class-name", "footer-class-name", "class-name"]);
             }), 128))];
           }),
           _: 2
@@ -34345,7 +34346,8 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
           "header-class-name": 'header_' + column.key,
           "footer-class-name": 'footer_' + column.key,
           "class-name": column.key,
-          "min-width": column.minWidth ? column.minWidth : 120
+          "min-width": column.minWidth ? column.minWidth : 120,
+          width: column.width ? column.width : undefined
         }, {
           header: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
             return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderSlot"])(_ctx.$slots, 'header_' + column.key, {
@@ -34380,7 +34382,7 @@ function CustomTablevue_type_template_id_279a2c96_render(_ctx, _cache, $props, $
             })];
           }),
           _: 2
-        }, 1032, ["field", "title", "fixed", "header-class-name", "footer-class-name", "class-name", "min-width"]))], 64);
+        }, 1032, ["field", "title", "fixed", "header-class-name", "footer-class-name", "class-name", "min-width", "width"]))], 64);
       }), 128)), _ctx.state.rowActions.length > 0 ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_vxe_column, {
         key: 1,
         title: _ctx.$t('basic.operate'),
@@ -34455,7 +34457,7 @@ function CustomTablevue_type_template_id_279a2c96_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=279a2c96
+// CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=template&id=6e32ae64
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__("cca6");
@@ -72274,6 +72276,11 @@ Sortable.mount(Remove, Revert);
         totalPages: totalPages.value
       };
     });
+    var toolbarClass = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      // 无操作按钮、且无快速搜索框、无自定义字段配置面板时，工具栏隐藏
+      var classStr = "custom-toolbar " + (state.buttonList.length > 0 || props.showToolbarCustomPanel || props.queryParams && props.queryParams.searchKeys && props.queryParams.searchKeys.length > 0 ? "" : " custom-toolbar-hidden");
+      return classStr;
+    });
     var filter = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
     /**
      * 处理多语系字段
@@ -72346,6 +72353,7 @@ Sortable.mount(Remove, Revert);
       if (props.isLocalLoad) {
         // 1. 本地加载
         loadLocalData();
+        ceditConfig.value = props.editConfig;
       } else {
         // 2. 远程加载
         return loadData(params).then(function () {
@@ -73002,8 +73010,11 @@ Sortable.mount(Remove, Revert);
       if (props.isLocalLoad) {
         // 1. 本地加载
         // 获取工具栏信息
-        state.buttonList = props.operations.tableActions;
-        state.rowActions = props.operations.rowActions;
+        if (props.operations) {
+          state.buttonList = props.operations.tableActions ? props.operations.tableActions : [];
+          state.rowActions = props.operations.rowActions ? props.operations.rowActions : [];
+        }
+
         initTime = setTimeout(function () {
           // 加载本地表格
           if (props.columns && props.columns.length > 0 && props.dataSource) {
@@ -73047,6 +73058,7 @@ Sortable.mount(Remove, Revert);
       state: state,
       ceditConfig: ceditConfig,
       filter: filter,
+      toolbarClass: toolbarClass,
       //  tableSort,
       total: total,
       current: current,
@@ -73076,8 +73088,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=279a2c96&lang=less
-var CustomTablevue_type_style_index_0_id_279a2c96_lang_less = __webpack_require__("5bf0");
+// EXTERNAL MODULE: ./packages/CustomTable/src/CustomTable.vue?vue&type=style&index=0&id=6e32ae64&lang=less
+var CustomTablevue_type_style_index_0_id_6e32ae64_lang_less = __webpack_require__("dc43");
 
 // CONCATENATED MODULE: ./packages/CustomTable/src/CustomTable.vue
 
@@ -73085,7 +73097,7 @@ var CustomTablevue_type_style_index_0_id_279a2c96_lang_less = __webpack_require_
 
 
 
-CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_279a2c96_render
+CustomTablevue_type_script_lang_ts.render = CustomTablevue_type_template_id_6e32ae64_render
 
 /* harmony default export */ var CustomTable = (CustomTablevue_type_script_lang_ts);
 // CONCATENATED MODULE: ./packages/CustomTable/index.ts