vxe-table 3.5.9-beta.6 → 3.5.9-beta.9

package/lib/index.umd.js

@@ -8707,8 +8707,8 @@ var iconPrefix = 'vxe-icon--';
     // parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
     // labelFormat: '',
     // valueFormat: '',
-    minDate: new Date(1900, 0, 1),
-    maxDate: new Date(2100, 0, 1),
+    startDate: new Date(1900, 0, 1),
+    endDate: new Date(2100, 0, 1),
     startDay: 1,
     selectDay: 1,
     digits: 2,
@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.6", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.8", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10077,7 +10077,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.6",
+  version: "3.5.9-beta.8",
   reg: reg,
   use: use,
   setup: setup,
@@ -10964,7 +10964,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       isAllOverflow = $xetable.isAllOverflow,
       allAlign = $xetable.align,
       currentColumn = $xetable.currentColumn,
-      cellClassName = $xetable.cellClassName,
+      allCellClassName = $xetable.cellClassName,
       cellStyle = $xetable.cellStyle,
       mergeList = $xetable.mergeList,
       spanMethod = $xetable.spanMethod,
@@ -10993,6 +10993,9 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var actived = editStore.actived;
   var scrollYRHeight = sYOpts.rHeight;
   var rowHeight = rowOpts.height;
+  var renderOpts = editRender || cellRender;
+  var compConf = renderOpts ? v_x_e_table.renderer.get(renderOpts.name) : null;
+  var cellClassName = compConf ? compConf.cellClassName : '';
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
 
@@ -11198,7 +11201,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }
 
   return h('td', {
-    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(className, params), utils.getClass(cellClassName, params)],
+    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), utils.getClass(cellClassName, params), utils.getClass(className, params), utils.getClass(allCellClassName, params)],
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs: attrs,
     style: Object.assign({
@@ -13619,14 +13622,14 @@ function setMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(utils.getLog('vxe.error.noTree', ['merge-footer-items']));
-    }
-
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col,
@@ -13683,14 +13686,14 @@ function removeMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(utils.getLog('vxe.error.noTree', ['merge-cells']));
-    }
-
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      errLog('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col;
@@ -14645,7 +14648,7 @@ var Methods = {
           var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
-            throw new Error(utils.getLog('vxe.error.noTree', ['revertData']));
+            errLog('vxe.error.noTree', ['revertData']);
           }
 
           var oRow = tableSourceData[rowIndex];
@@ -21116,11 +21119,15 @@ var Table = Object.assign(table, {
   render: function render(h) {
     var $xetable = this.$parent,
         filterStore = this.filterStore;
-    var column = filterStore.column;
+    var args = filterStore.args,
+        column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
     var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+    var filterClassName = compConf ? compConf.filterClassName : '';
     return h('div', {
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', utils.getClass(filterClassName, Object.assign({
+        $panel: this
+      }, args)), {
         'is--animat': $xetable.animat,
         'is--multiple': filterStore.multiple,
         'is--active': filterStore.visible
@@ -22357,7 +22364,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
           } else {
             if (treeConfig) {
-              throw new Error(utils.getLog('vxe.error.noTree', ['insert']));
+              throw new Error(getLog('vxe.error.noTree', ['insert']));
             }
 
             var afIndex = -1; // 如果是可视索引
@@ -25214,18 +25221,20 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     // date、week、month、year
     dateConfig: Object,
-    minDate: {
+    startDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.minDate;
+        return conf.input.startDate;
       }
     },
-    maxDate: {
+    endDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.maxDate;
+        return conf.input.endDate;
       }
     },
+    minDate: [String, Number, Date],
+    maxDate: [String, Number, Date],
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     startDay: {
@@ -25342,29 +25351,29 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     isDisabledPrevDateBtn: function isDisabledPrevDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMinTime = this.dateMinTime;
+          dateStartTime = this.dateStartTime;
 
       if (selectMonth) {
-        return selectMonth <= dateMinTime;
+        return selectMonth <= dateStartTime;
       }
 
       return false;
     },
     isDisabledNextDateBtn: function isDisabledNextDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMaxTime = this.dateMaxTime;
+          dateEndTime = this.dateEndTime;
 
       if (selectMonth) {
-        return selectMonth >= dateMaxTime;
+        return selectMonth >= dateEndTime;
       }
 
       return false;
     },
-    dateMinTime: function dateMinTime() {
-      return this.minDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.minDate) : null;
+    dateStartTime: function dateStartTime() {
+      return this.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.startDate) : null;
     },
-    dateMaxTime: function dateMaxTime() {
-      return this.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.maxDate) : null;
+    dateEndTime: function dateEndTime() {
+      return this.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.endDate) : null;
     },
     supportMultiples: function supportMultiples() {
       return ['date', 'week', 'month', 'quarter', 'year'].includes(this.type);
@@ -25624,10 +25633,10 @@ function renderExtraSuffixIcon(h, _vm) {
         var selMonth = selectMonth.getMonth();
         var selDay = selectMonth.getDay();
         var prevOffsetDate = -weekDatas.indexOf(selDay);
-        var startDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
+        var startDayDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
 
         for (var index = 0; index < 42; index++) {
-          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDate, index);
+          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDayDate, index);
           var itemFullYear = date.getFullYear();
           var itemMonth = date.getMonth();
           var itemDate = date.getDate();
@@ -26538,7 +26547,10 @@ function renderExtraSuffixIcon(h, _vm) {
       this.dateTimeChangeEvent(evnt);
     },
     dateConfirmEvent: function dateConfirmEvent() {
-      this.dateChange(this.dateValue || this.currentDate);
+      if (this.isDateTimeType || this.multiple) {
+        this.dateChange(this.dateValue || this.currentDate);
+      }
+
       this.hidePanel();
     },
     dateMinuteEvent: function dateMinuteEvent(evnt, item) {
@@ -29955,7 +29967,7 @@ function saveLocalFile(options) {
     return Promise.resolve();
   }
 
-  return Promise.reject(new Error(utils.getLog('vxe.error.notExp')));
+  return Promise.reject(new Error(getLog('vxe.error.notExp')));
 }
 
 function downloadFile($xetable, opts, content) {
@@ -33008,6 +33020,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
     if (false) {}
 
+    this.initPages();
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
   mounted: function mounted() {
@@ -33016,7 +33029,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
     }
 
     this.initToolbar();
-    this.initPages();
     this.initProxy();
   },
   destroyed: function destroyed() {
@@ -37008,6 +37020,7 @@ var VxeFormConfigItem = {
         titleOverflow = item.titleOverflow,
         children = item.children;
     var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
+    var itemClassName = compConf ? compConf.itemClassName : '';
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
     var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -37083,7 +37096,7 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : className : '', {
         'is--title': title,
         'is--colon': titleColon,
         'is--asterisk': titleAsterisk,
@@ -37947,6 +37960,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
       className = item.className,
       titleOverflow = item.titleOverflow;
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
+  var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
@@ -37999,7 +38013,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
     mouseleave: _vm.handleTitleTipLeaveEvent
   } : {};
   return h('div', {
-    class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
+    class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : className : '', {
       'is--title': title,
       'is--required': isRequired,
       'is--hidden': visible === false || folding && collapseAll,