vxe-table 3.7.8-beta.1 → 3.7.9-beta.0

package/lib/index.umd.js

@@ -10373,6 +10373,8 @@ var iconPrefix = 'vxe-icon-';
     SELECT_OPEN: iconPrefix + 'caret-down rotate180',
     SELECT_CLOSE: iconPrefix + 'caret-down',
     // pager
+    PAGER_HOME: iconPrefix + 'home-page',
+    PAGER_END: iconPrefix + 'end-page',
     PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
     PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
     PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
@@ -10591,7 +10593,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.7.8-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.7.9-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12023,7 +12025,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.7.8-beta.0",
+  version: "3.7.9-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -14370,7 +14372,7 @@ var es_promise_finally = __webpack_require__(7727);
 
 
 
-function renderHelpIcon(h, params) {
+function renderTitlePrefixIcon(h, params) {
   var $table = params.$table,
     column = params.column;
   var titlePrefix = column.titlePrefix || column.titleHelp;
@@ -14536,7 +14538,7 @@ var Cell = {
     return renderTitleContent(h, params, utils.formatText(column.getTitle(), 1));
   },
   renderDefaultHeader: function renderDefaultHeader(h, params) {
-    return renderHelpIcon(h, params).concat(Cell.renderHeaderTitle(h, params));
+    return renderTitlePrefixIcon(h, params).concat(Cell.renderHeaderTitle(h, params));
   },
   renderDefaultCell: function renderDefaultCell(h, params) {
     var $table = params.$table,
@@ -16832,12 +16834,14 @@ var Methods = {
    * 如果存在排序，继续处理
    */
   getTableData: function getTableData() {
-    var tableFullData = this.tableFullData,
+    var treeConfig = this.treeConfig,
+      tableFullData = this.tableFullData,
       afterFullData = this.afterFullData,
       tableData = this.tableData,
-      footerTableData = this.footerTableData;
+      footerTableData = this.footerTableData,
+      tableFullTreeData = this.tableFullTreeData;
     return {
-      fullData: tableFullData.slice(0),
+      fullData: treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0),
       visibleData: afterFullData.slice(0),
       tableData: tableData.slice(0),
       footerData: footerTableData.slice(0)
@@ -16885,9 +16889,22 @@ var Methods = {
    * 设置为固定列
    */
   setColumnFixed: function setColumnFixed(fieldOrColumn, fixed) {
+    var isMaxFixedColumn = this.isMaxFixedColumn,
+      columnOpts = this.columnOpts;
+    var maxFixedSize = columnOpts.maxFixedSize;
     var column = handleFieldOrColumn(this, fieldOrColumn);
     var targetColumn = getRootColumn(this, column);
     if (targetColumn && targetColumn.fixed !== fixed) {
+      // 是否超过最大固定列数量
+      if (!targetColumn.fixed && isMaxFixedColumn) {
+        if (v_x_e_table.modal) {
+          v_x_e_table.modal.message({
+            status: 'error',
+            content: conf.i18n('vxe.table.maxFixedCol', [maxFixedSize])
+          });
+        }
+        return this.$nextTick();
+      }
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], function (column) {
         column.fixed = fixed;
       });
@@ -22794,8 +22811,10 @@ var Table = Object.assign(table, {
       }))];
     },
     renderFooter: function renderFooter(h) {
-      var hasCheckOption = this.hasCheckOption,
+      var $xetable = this.$parent,
+        hasCheckOption = this.hasCheckOption,
         filterStore = this.filterStore;
+      var filterOpts = $xetable.filterOpts;
       var column = filterStore.column,
         multiple = filterStore.multiple;
       var filterRender = column.filterRender;
@@ -22813,11 +22832,11 @@ var Table = Object.assign(table, {
         on: {
           click: this.confirmFilter
         }
-      }, conf.i18n('vxe.table.confirmFilter')), h('button', {
+      }, filterOpts.confirmButtonText || conf.i18n('vxe.table.confirmFilter')), h('button', {
         on: {
           click: this.resetFilter
         }
-      }, conf.i18n('vxe.table.resetFilter'))])] : [];
+      }, filterOpts.resetButtonText || conf.i18n('vxe.table.resetFilter'))])] : [];
     },
     // 全部筛选事件
     filterCheckAllEvent: function filterCheckAllEvent(evnt, value) {
@@ -33635,6 +33654,152 @@ function getTableOns(_vm) {
   }
   return ons;
 }
+
+/**
+ * 渲染表单
+ */
+function renderForms(h, _vm) {
+  var _e = _vm._e,
+    $scopedSlots = _vm.$scopedSlots,
+    formConfig = _vm.formConfig;
+  var formSlot = $scopedSlots.form;
+  var hasForm = !!(formSlot || isEnableConf(formConfig));
+  return hasForm ? h('div', {
+    key: 'form',
+    ref: 'formWrapper',
+    class: 'vxe-grid--form-wrapper'
+  }, formSlot ? formSlot.call(_vm, {
+    $grid: _vm
+  }, h) : renderDefaultForm(h, _vm)) : _e();
+}
+
+/**
+ * 渲染工具栏
+ */
+function renderToolbars(h, _vm) {
+  var _e = _vm._e,
+    $scopedSlots = _vm.$scopedSlots,
+    toolbarConfig = _vm.toolbarConfig,
+    toolbar = _vm.toolbar;
+  var toolbarSlot = $scopedSlots.toolbar;
+  var hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
+  return hasToolbar ? h('div', {
+    key: 'toolbar',
+    ref: 'toolbarWrapper',
+    class: 'vxe-grid--toolbar-wrapper'
+  }, toolbarSlot ? toolbarSlot.call(_vm, {
+    $grid: _vm
+  }, h) : [h('vxe-toolbar', {
+    props: _vm.toolbarOpts,
+    ref: 'xToolbar',
+    scopedSlots: getToolbarSlots(_vm)
+  })]) : _e();
+}
+
+/**
+ * 渲染表格顶部区域
+ */
+function renderTops(h, _vm) {
+  var _e = _vm._e,
+    $scopedSlots = _vm.$scopedSlots;
+  var topSlot = $scopedSlots.top;
+  return topSlot ? h('div', {
+    key: 'top',
+    ref: 'topWrapper',
+    class: 'vxe-grid--top-wrapper'
+  }, topSlot.call(_vm, {
+    $grid: _vm
+  }, h)) : _e();
+}
+
+/**
+ * 渲染表格
+ */
+function renderTables(h, _vm) {
+  var $scopedSlots = _vm.$scopedSlots,
+    tableProps = _vm.tableProps;
+  return h('vxe-table', {
+    key: 'table',
+    props: tableProps,
+    on: getTableOns(_vm),
+    scopedSlots: $scopedSlots,
+    ref: 'xTable'
+  });
+}
+
+/**
+ * 渲染表格底部区域
+ */
+function renderBottoms(h, _vm) {
+  var _e = _vm._e,
+    $scopedSlots = _vm.$scopedSlots;
+  var bottomSlot = $scopedSlots.bottom;
+  return bottomSlot ? h('div', {
+    key: 'bottom',
+    ref: 'bottomWrapper',
+    class: 'vxe-grid--bottom-wrapper'
+  }, bottomSlot.call(_vm, {
+    $grid: _vm
+  }, h)) : _e();
+}
+
+/**
+ * 渲染分页
+ */
+function renderPagers(h, _vm) {
+  var _e = _vm._e,
+    $scopedSlots = _vm.$scopedSlots,
+    pagerConfig = _vm.pagerConfig,
+    proxyConfig = _vm.proxyConfig,
+    tablePage = _vm.tablePage;
+  var pagerSlot = $scopedSlots.pager;
+  var hasPager = !!(pagerSlot || isEnableConf(pagerConfig));
+  return hasPager ? h('div', {
+    key: 'pager',
+    ref: 'pagerWrapper',
+    class: 'vxe-grid--pager-wrapper'
+  }, pagerSlot ? pagerSlot.call(_vm, {
+    $grid: _vm
+  }, h) : [h('vxe-pager', {
+    props: _objectSpread2(_objectSpread2({}, _vm.pagerOpts), proxyConfig ? tablePage : {}),
+    on: {
+      'page-change': _vm.pageChangeEvent
+    },
+    scopedSlots: getPagerSlots(_vm)
+  })]) : _e();
+}
+var defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
+function renderLayout(h, _vm) {
+  var layouts = _vm.layouts;
+  var vns = [];
+  var currLayouts = layouts && layouts.length ? layouts : conf.grid.layouts || defaultLayouts;
+  currLayouts.forEach(function (name) {
+    switch (name) {
+      case 'Form':
+        vns.push(renderForms(h, _vm));
+        break;
+      case 'Toolbar':
+        vns.push(renderToolbars(h, _vm));
+        break;
+      case 'Top':
+        vns.push(renderTops(h, _vm));
+        break;
+      case 'Table':
+        vns.push(renderTables(h, _vm));
+        break;
+      case 'Bottom':
+        vns.push(renderBottoms(h, _vm));
+        break;
+      case 'Pager':
+        vns.push(renderPagers(h, _vm));
+        break;
+      default:
+        if (false) {}
+        break;
+    }
+  });
+  return vns;
+}
 Object.keys(packages_table.methods).forEach(function (name) {
   grid_methods[name] = function () {
     var _this$$refs$xTable;
@@ -33645,6 +33810,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
   name: 'VxeGrid',
   mixins: [size],
   props: _objectSpread2(_objectSpread2({}, packages_table.props), {}, {
+    layouts: Array,
     columns: Array,
     pagerConfig: [Boolean, Object],
     proxyConfig: Object,
@@ -33795,80 +33961,12 @@ Object.keys(packages_table.methods).forEach(function (name) {
   },
   render: function render(h) {
     var _ref;
-    var $scopedSlots = this.$scopedSlots,
-      vSize = this.vSize,
+    var vSize = this.vSize,
       isZMax = this.isZMax;
-    var hasForm = !!($scopedSlots.form || isEnableConf(this.formConfig));
-    var hasToolbar = !!($scopedSlots.toolbar || isEnableConf(this.toolbarConfig) || this.toolbar);
-    var hasPager = !!($scopedSlots.pager || isEnableConf(this.pagerConfig));
     return h('div', {
       class: ['vxe-grid', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--maximize', isZMax), _defineProperty(_ref, 'is--loading', this.loading || this.tableLoading), _ref)],
       style: this.renderStyle
-    }, [
-    /**
-     * 渲染表单
-     */
-    hasForm ? h('div', {
-      ref: 'formWrapper',
-      class: 'vxe-grid--form-wrapper'
-    }, $scopedSlots.form ? $scopedSlots.form.call(this, {
-      $grid: this
-    }, h) : renderDefaultForm(h, this)) : null,
-    /**
-     * 渲染工具栏
-     */
-    hasToolbar ? h('div', {
-      ref: 'toolbarWrapper',
-      class: 'vxe-grid--toolbar-wrapper'
-    }, $scopedSlots.toolbar ? $scopedSlots.toolbar.call(this, {
-      $grid: this
-    }, h) : [h('vxe-toolbar', {
-      props: this.toolbarOpts,
-      ref: 'xToolbar',
-      scopedSlots: getToolbarSlots(this)
-    })]) : null,
-    /**
-     * 渲染表格顶部区域
-     */
-    $scopedSlots.top ? h('div', {
-      ref: 'topWrapper',
-      class: 'vxe-grid--top-wrapper'
-    }, $scopedSlots.top.call(this, {
-      $grid: this
-    }, h)) : null,
-    /**
-     * 渲染表格
-     */
-    h('vxe-table', {
-      props: this.tableProps,
-      on: getTableOns(this),
-      scopedSlots: $scopedSlots,
-      ref: 'xTable'
-    }),
-    /**
-     * 渲染表格底部区域
-     */
-    $scopedSlots.bottom ? h('div', {
-      ref: 'bottomWrapper',
-      class: 'vxe-grid--bottom-wrapper'
-    }, $scopedSlots.bottom.call(this, {
-      $grid: this
-    }, h)) : null,
-    /**
-     * 渲染分页
-     */
-    hasPager ? h('div', {
-      ref: 'pagerWrapper',
-      class: 'vxe-grid--pager-wrapper'
-    }, $scopedSlots.pager ? $scopedSlots.pager.call(this, {
-      $grid: this
-    }, h) : [h('vxe-pager', {
-      props: _objectSpread2(_objectSpread2({}, this.pagerOpts), this.proxyConfig ? this.tablePage : {}),
-      on: {
-        'page-change': this.pageChangeEvent
-      },
-      scopedSlots: getPagerSlots(this)
-    })]) : null]);
+    }, renderLayout(h, this));
   },
   methods: _objectSpread2(_objectSpread2({}, grid_methods), {}, {
     callSlot: function callSlot(slotFunc, params, h, vNodes) {
@@ -35436,6 +35534,7 @@ var Toolbar = Object.assign(toolbar, {
 
 
 
+
 /* harmony default export */ var pager = ({
   name: 'VxePager',
   mixins: [size],
@@ -35533,7 +35632,9 @@ var Toolbar = Object.assign(toolbar, {
     iconJumpPrev: String,
     iconJumpNext: String,
     iconNextPage: String,
-    iconJumpMore: String
+    iconJumpMore: String,
+    iconHomePage: String,
+    iconEndPage: String
   },
   inject: {
     $xegrid: {
@@ -35602,7 +35703,11 @@ var Toolbar = Object.assign(toolbar, {
       })));
     }
     this.layouts.forEach(function (name) {
-      childNodes.push(_this["render".concat(name)](h));
+      if (_this["render".concat(name)](h)) {
+        childNodes.push(_this["render".concat(name)](h));
+      } else {
+        if (false) {}
+      }
     });
     if ($scopedSlots.right) {
       childNodes.push(h('span', {
@@ -35620,6 +35725,40 @@ var Toolbar = Object.assign(toolbar, {
     }, childNodes)]);
   },
   methods: {
+    // 首页
+    renderHome: function renderHome(h) {
+      return h('button', {
+        class: ['vxe-pager--prev-btn', {
+          'is--disabled': this.currentPage <= 1
+        }],
+        attrs: {
+          type: 'button',
+          title: conf.i18n('vxe.pager.homePageTitle')
+        },
+        on: {
+          click: this.homePage
+        }
+      }, [h('i', {
+        class: ['vxe-pager--btn-icon', this.iconHomePage || conf.icon.PAGER_HOME]
+      })]);
+    },
+    // 末页
+    renderEnd: function renderEnd(h) {
+      return h('button', {
+        class: ['vxe-pager--prev-btn', {
+          'is--disabled': this.currentPage <= 1
+        }],
+        attrs: {
+          type: 'button',
+          title: conf.i18n('vxe.pager.endPageTitle')
+        },
+        on: {
+          click: this.endPage
+        }
+      }, [h('i', {
+        class: ['vxe-pager--btn-icon', this.iconEndPage || conf.icon.PAGER_END]
+      })]);
+    },
     // 上一页
     renderPrevPage: function renderPrevPage(h) {
       return h('button', {
@@ -35628,7 +35767,7 @@ var Toolbar = Object.assign(toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.prevPage')
+          title: conf.i18n('vxe.pager.prevPageTitle')
         },
         on: {
           click: this.prevPage
@@ -35646,7 +35785,7 @@ var Toolbar = Object.assign(toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.prevJump')
+          title: conf.i18n('vxe.pager.prevJumpTitle')
         },
         on: {
           click: this.prevJump
@@ -35678,7 +35817,7 @@ var Toolbar = Object.assign(toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.nextJump')
+          title: conf.i18n('vxe.pager.nextJumpTitle')
         },
         on: {
           click: this.nextJump
@@ -35697,7 +35836,7 @@ var Toolbar = Object.assign(toolbar, {
         }],
         attrs: {
           type: 'button',
-          title: conf.i18n('vxe.pager.nextPage')
+          title: conf.i18n('vxe.pager.nextPageTitle')
         },
         on: {
           click: this.nextPage
@@ -35837,6 +35976,19 @@ var Toolbar = Object.assign(toolbar, {
     getPageCount: function getPageCount(total, size) {
       return Math.max(Math.ceil(total / size), 1);
     },
+    homePage: function homePage() {
+      var currentPage = this.currentPage;
+      if (currentPage > 1) {
+        this.jumpPage(1);
+      }
+    },
+    endPage: function endPage() {
+      var currentPage = this.currentPage,
+        pageCount = this.pageCount;
+      if (currentPage < pageCount) {
+        this.jumpPage(pageCount);
+      }
+    },
     prevPage: function prevPage() {
       var currentPage = this.currentPage,
         pageCount = this.pageCount;
@@ -39906,10 +40058,18 @@ var Pulldown = Object.assign(pulldown, {
       pagesize: '{0}条/页',
       total: '共 {0} 条记录',
       pageClassifier: '页',
+      homePage: '首页',
+      homePageTitle: '首页',
       prevPage: '上一页',
+      prevPageTitle: '上一页',
       nextPage: '下一页',
+      nextPageTitle: '下一页',
       prevJump: '向上跳页',
-      nextJump: '向下跳页'
+      prevJumpTitle: '向上跳页',
+      nextJump: '向下跳页',
+      nextJumpTitle: '向下跳页',
+      endPage: '末页',
+      endPageTitle: '末页'
     },
     alert: {
       title: '消息提示'