vxe-table 4.2.6-beta.5 → 4.2.7-beta.1

package/es/filter/src/panel.js

@@ -2,6 +2,7 @@ import { defineComponent, h, computed, inject } from 'vue';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { formatText } from '../../tools/utils';
+import { getPropClass } from '../../tools/dom';
 export default defineComponent({
     name: 'VxeTableFilter',
     props: {
@@ -201,12 +202,20 @@ export default defineComponent({
             var column = filterStore.column;
             var filterRender = column ? column.filterRender : null;
             var compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null;
+            var filterClassName = compConf ? compConf.filterClassName : '';
+            var params = Object.assign({}, tableInternalData._currFilterParams, { $panel: $panel, $table: $xetable });
             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 : '',
+                    getPropClass(filterClassName, params),
+                    {
                         'is--animat': $xetable.props.animat,
                         'is--multiple': filterStore.multiple,
                         'is--active': filterStore.visible
-                    }],
+                    }
+                ],
                 style: filterStore.style
             }, initStore.filter && filterStore.visible ? renderOptions(filterRender, compConf).concat(renderFooters()) : []);
         };

package/es/footer/src/footer.js

@@ -11,8 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
-import { getPropClass } from '../../table/src/util';
-import { updateCellTitle } from '../../tools/dom';
+import { updateCellTitle, getPropClass } from '../../tools/dom';
 var renderType = 'footer';
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     for (var mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {

package/es/form/src/form-config-item.js

@@ -35,6 +35,7 @@ var VxeFormConfigItem = defineComponent({
             var validOpts = computeValidOpts.value;
             var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, visibleMethod = item.visibleMethod, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow, children = item.children;
             var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
+            var itemClassName = compConf ? compConf.itemClassName : '';
             var defaultSlot = slots ? slots.default : null;
             var titleSlot = slots ? slots.title : null;
             var span = item.span || allSpan;
@@ -114,7 +115,13 @@ var VxeFormConfigItem = defineComponent({
                 onMouseleave: $xeform.handleTitleTipLeaveEvent
             } : {};
             return h('div', {
-                class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '', {
+                class: [
+                    'vxe-form--item',
+                    item.id,
+                    span ? "vxe-col--" + span + " is--span" : '',
+                    className ? (XEUtils.isFunction(className) ? className(params) : className) : '',
+                    itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : itemClassName) : '',
+                    {
                         'is--title': title,
                         'is--colon': titleColon,
                         'is--asterisk': titleAsterisk,
@@ -122,7 +129,8 @@ var VxeFormConfigItem = defineComponent({
                         'is--hidden': folding && collapseAll,
                         'is--active': !itemVisibleMethod || itemVisibleMethod(params),
                         'is--error': showError
-                    }],
+                    }
+                ],
                 itemConfig: item,
                 key: item.id
             }, [

package/es/form/src/form-item.js

@@ -72,6 +72,7 @@ export default defineComponent({
             var validOpts = computeValidOpts.value;
             var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, visibleMethod = item.visibleMethod, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow;
             var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
+            var itemClassName = compConf ? compConf.itemClassName : '';
             var defaultSlot = slots ? slots.default : null;
             var titleSlot = slots ? slots.title : null;
             var span = item.span || props.span;
@@ -134,13 +135,20 @@ export default defineComponent({
             } : {};
             return h('div', {
                 ref: refElem,
-                class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '', {
+                class: [
+                    'vxe-form--item',
+                    item.id,
+                    span ? "vxe-col--" + span + " is--span" : '',
+                    className ? (XEUtils.isFunction(className) ? className(params) : className) : '',
+                    itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : itemClassName) : '',
+                    {
                         'is--title': title,
                         'is--required': isRequired,
                         'is--hidden': visible === false || (folding && collapseAll),
                         'is--active': !itemVisibleMethod || itemVisibleMethod(params),
                         'is--error': showError
-                    }]
+                    }
+                ]
             }, [
                 h('div', {
                     class: 'vxe-form--item-inner'

package/es/grid/src/grid.js

@@ -1073,13 +1073,15 @@ export default defineComponent({
                     $xegrid.loadColumn(columns);
                 }
                 initToolbar();
-                initProxy();
             });
             GlobalEvent.on($xegrid, 'keydown', handleGlobalKeydownEvent);
         });
         onUnmounted(function () {
             GlobalEvent.off($xegrid, 'keydown');
         });
+        nextTick(function () {
+            initProxy();
+        });
         var renderVN = function () {
             var _a;
             var vSize = computeSize.value;

package/es/input/src/input.js

@@ -38,8 +38,10 @@ export default defineComponent({
         // float
         digits: { type: [String, Number], default: function () { return GlobalConfig.input.digits; } },
         // date、week、month、quarter、year
-        minDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.minDate; } },
-        maxDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.maxDate; } },
+        startDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.startDate; } },
+        endDate: { type: [String, Number, Date], default: function () { return GlobalConfig.input.endDate; } },
+        minDate: [String, Number, Date],
+        maxDate: [String, Number, Date],
         // 已废弃 startWeek，被 startDay 替换
         startWeek: Number,
         startDay: { type: [String, Number], default: function () { return GlobalConfig.input.startDay; } },
@@ -161,11 +163,11 @@ export default defineComponent({
             var isPawdType = computeIsPawdType.value;
             return props.clearable && (isPawdType || isNumType || isDatePickerType || type === 'text' || type === 'search');
         });
-        var computeDateMinTime = computed(function () {
-            return props.minDate ? XEUtils.toStringDate(props.minDate) : null;
+        var computeDateStartTime = computed(function () {
+            return props.startDate ? XEUtils.toStringDate(props.startDate) : null;
         });
-        var computeDateMaxTime = computed(function () {
-            return props.maxDate ? XEUtils.toStringDate(props.maxDate) : null;
+        var computeDateEndTime = computed(function () {
+            return props.endDate ? XEUtils.toStringDate(props.endDate) : null;
         });
         var computeSupportMultiples = computed(function () {
             return ['date', 'week', 'month', 'quarter', 'year'].includes(props.type);
@@ -213,18 +215,18 @@ export default defineComponent({
             return val;
         });
         var computeIsDisabledPrevDateBtn = computed(function () {
-            var dateMinTime = computeDateMinTime.value;
+            var dateStartTime = computeDateStartTime.value;
             var selectMonth = reactData.selectMonth;
-            if (selectMonth && dateMinTime) {
-                return selectMonth <= dateMinTime;
+            if (selectMonth && dateStartTime) {
+                return selectMonth <= dateStartTime;
             }
             return false;
         });
         var computeIsDisabledNextDateBtn = computed(function () {
-            var dateMaxTime = computeDateMaxTime.value;
+            var dateEndTime = computeDateEndTime.value;
             var selectMonth = reactData.selectMonth;
-            if (selectMonth && dateMaxTime) {
-                return selectMonth >= dateMaxTime;
+            if (selectMonth && dateEndTime) {
+                return selectMonth >= dateEndTime;
             }
             return false;
         });
@@ -410,9 +412,9 @@ export default defineComponent({
                 var selMonth = selectMonth.getMonth();
                 var selDay = selectMonth.getDay();
                 var prevOffsetDate = -weekDatas.indexOf(selDay);
-                var startDate = new Date(XEUtils.getWhatDay(selectMonth, prevOffsetDate).getTime() + dateHMSTime);
+                var startDayDate = new Date(XEUtils.getWhatDay(selectMonth, prevOffsetDate).getTime() + dateHMSTime);
                 for (var index = 0; index < 42; index++) {
-                    var date = XEUtils.getWhatDay(startDate, index);
+                    var date = XEUtils.getWhatDay(startDayDate, index);
                     var itemFullYear = date.getFullYear();
                     var itemMonth = date.getMonth();
                     var itemDate = date.getDate();
@@ -1203,9 +1205,10 @@ export default defineComponent({
             dateTimeChangeEvent(evnt);
         };
         var dateConfirmEvent = function () {
-            var type = props.type;
+            var multiple = props.multiple;
             var dateValue = computeDateValue.value;
-            if (type === 'datetime') {
+            var isDateTimeType = computeIsDateTimeType.value;
+            if (isDateTimeType || multiple) {
                 dateChange(dateValue || reactData.currentDate);
             }
             hidePanel();

package/es/table/src/body.js

@@ -18,8 +18,8 @@ import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onBefore
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
-import { mergeBodyMethod, getRowid, getPropClass, removeScrollListener, restoreScrollListener } from './util';
-import { updateCellTitle } from '../../tools/dom';
+import { mergeBodyMethod, getRowid, removeScrollListener, restoreScrollListener } from './util';
+import { updateCellTitle, getPropClass } from '../../tools/dom';
 import { isEnableConf } from '../../tools/utils';
 var renderType = 'body';
 var lineOffsetSizes = {
@@ -125,7 +125,7 @@ export default defineComponent({
          */
         var renderColumn = function (seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
             var _a;
-            var columnKey = tableProps.columnKey, height = tableProps.height, allColumnOverflow = tableProps.showOverflow, cellClassName = tableProps.cellClassName, cellStyle = tableProps.cellStyle, allAlign = tableProps.align, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig, editConfig = tableProps.editConfig, editRules = tableProps.editRules, tooltipConfig = tableProps.tooltipConfig;
+            var columnKey = tableProps.columnKey, height = tableProps.height, allColumnOverflow = tableProps.showOverflow, allCellClassName = tableProps.cellClassName, cellStyle = tableProps.cellStyle, allAlign = tableProps.align, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig, editConfig = tableProps.editConfig, editRules = tableProps.editRules, tooltipConfig = tableProps.tooltipConfig;
             var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
             var afterFullData = tableInternalData.afterFullData;
             var validOpts = computeValidOpts.value;
@@ -139,6 +139,9 @@ export default defineComponent({
             var actived = editStore.actived;
             var scrollYRHeight = sYOpts.rHeight;
             var rowHeight = rowOpts.height;
+            var renderOpts = editRender || cellRender;
+            var compConf = renderOpts ? VXETable.renderer.get(renderOpts.name) : null;
+            var cellClassName = compConf ? compConf.cellClassName : '';
             var showAllTip = tooltipOpts.showAll;
             var columnIndex = $xetable.getColumnIndex(column);
             var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -280,7 +283,10 @@ export default defineComponent({
                     ]));
                 }
             }
-            return h('td', __assign(__assign(__assign({ class: ['vxe-body--column', column.id, (_a = {},
+            return h('td', __assign(__assign(__assign({ class: [
+                    'vxe-body--column',
+                    column.id,
+                    (_a = {},
                         _a["col--" + cellAlign] = cellAlign,
                         _a["col--" + type] = type,
                         _a['col--last'] = $columnIndex === columns.length - 1,
@@ -292,7 +298,11 @@ export default defineComponent({
                         _a['col--actived'] = editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
                         _a['col--valid-error'] = hasValidError,
                         _a['col--current'] = currentColumn === column,
-                        _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey || columnOpts.useKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
+                        _a),
+                    getPropClass(cellClassName, params),
+                    getPropClass(className, params),
+                    getPropClass(allCellClassName, params)
+                ], key: columnKey || columnOpts.useKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
                     height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
@@ -352,7 +362,10 @@ export default defineComponent({
                     rowChildren = row[treeOpts.children];
                     isExpandTree = rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1;
                 }
-                rows.push(h('tr', __assign({ class: ['vxe-body--row', treeConfig ? "row--level-" + rowLevel : '', {
+                rows.push(h('tr', __assign({ class: [
+                        'vxe-body--row',
+                        treeConfig ? "row--level-" + rowLevel : '',
+                        {
                             'row--stripe': stripe && ($xetable.getVTRowIndex(row) + 1) % 2 === 0,
                             'is--new': isNewRow,
                             'is--expand-row': isExpandRow,
@@ -360,7 +373,9 @@ export default defineComponent({
                             'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                             'row--radio': radioOpts.highlight && selectRow === row,
                             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
-                        }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
+                        },
+                        getPropClass(rowClassName, params)
+                    ], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
                     return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 })));
                 // 如果行被展开了

package/es/table/src/table.js

@@ -18,7 +18,7 @@ import { defineComponent, getCurrentInstance, h, createCommentVNode, resolveComp
 import XEUtils from 'xe-utils';
 import { browse, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, isNodeElement } from '../../tools/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../tools/utils';
-import { warnLog, errLog, getLog } from '../../tools/log';
+import { warnLog, errLog } from '../../tools/log';
 import { createResizeEvent } from '../../tools/resize';
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event';
 import { useSize } from '../../hooks/size';
@@ -660,13 +660,12 @@ export default defineComponent({
             if (merges) {
                 var treeConfig = props.treeConfig;
                 var visibleColumn_1 = internalData.visibleColumn;
-                if (treeConfig) {
-                    errLog('vxe.error.noTree', ['merge-footer-items']);
-                    return;
-                }
                 if (!XEUtils.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, rowspan = item.rowspan, colspan = item.colspan;
                     if (rowList && XEUtils.isNumber(row)) {
@@ -711,12 +710,12 @@ export default defineComponent({
             if (merges) {
                 var treeConfig = props.treeConfig;
                 var visibleColumn_2 = internalData.visibleColumn;
-                if (treeConfig) {
-                    throw new Error(getLog('vxe.error.noTree', ['merge-cells']));
-                }
                 if (!XEUtils.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;
                     if (rowList && XEUtils.isNumber(row)) {

package/es/table/src/util.js

@@ -88,9 +88,6 @@ export function getCellValue(row, column) {
 export function setCellValue(row, column, value) {
     return XEUtils.set(row, column.field, value);
 }
-export function getPropClass(property, params) {
-    return property ? XEUtils.isFunction(property) ? property(params) : property : '';
-}
 export function getColMinWidth(params) {
     var $table = params.$table, column = params.column, cell = params.cell;
     var tableProps = $table.props;

package/es/tools/dom.js

@@ -1,6 +1,9 @@
 import XEUtils from 'xe-utils';
 var reClsMap = {};
 export var browse = XEUtils.browse();
+export function getPropClass(property, params) {
+    return property ? XEUtils.isFunction(property) ? property(params) : property : '';
+}
 function getClsRE(cls) {
     if (!reClsMap[cls]) {
         reClsMap[cls] = new RegExp("(?:^|\\s)" + cls + "(?!\\S)", 'g');

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.6-beta.4" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.7-beta.0" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.6-beta.4",
+    version: "4.2.7-beta.0",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/es/v-x-e-table/src/conf.js

@@ -255,8 +255,8 @@ var GlobalConfig = {
         // 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,

package/lib/filter/src/panel.js

@@ -13,6 +13,8 @@ var _vXETable = require("../../v-x-e-table");
 
 var _utils = require("../../tools/utils");
 
+var _dom = require("../../tools/dom");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = (0, _vue.defineComponent)({
@@ -213,8 +215,13 @@ var _default = (0, _vue.defineComponent)({
       var column = filterStore.column;
       var filterRender = column ? column.filterRender : null;
       var compConf = filterRender ? _vXETable.VXETable.renderer.get(filterRender.name) : null;
+      var filterClassName = compConf ? compConf.filterClassName : '';
+      var params = Object.assign({}, tableInternalData._currFilterParams, {
+        $panel: $panel,
+        $table: $xetable
+      });
       return (0, _vue.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 : '', (0, _dom.getPropClass)(filterClassName, params), {
           'is--animat': $xetable.props.animat,
           'is--multiple': filterStore.multiple,
           'is--active': filterStore.visible

package/lib/filter/src/panel.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeTableFilter",props:{filterStore:Object},setup:function(o){function i(e,t,l){o.filterStore.options.forEach(function(e){e._checked=!1}),l._checked=t,a.checkFilterOptions(),f(e)}function c(e,t,l){l._checked=t,a.checkFilterOptions()}var a=(0,_vue.inject)("$xetable",{}),s=a.reactData,u=a.internalData,v=(0,_vue.computed)(function(){var e=o.filterStore;return e&&e.options.some(function(e){return e.checked})}),f=function(e){o.filterStore.options.forEach(function(e){e.checked=e._checked}),a.confirmFilterEvent(e)},h=function(e){var t=o.filterStore;a.handleClearFilter(t.column),a.confirmFilterEvent(e)},d=function(e,t,l){o.filterStore.multiple?c(0,t,l):i(e,t,l)},x=function(e,t){var l;o.filterStore.multiple?(l=t,(t=o.filterStore).options.forEach(function(e){e._checked=l,e.checked=l}),t.isAllSelected=l,t.isIndeterminate=!1):h(e)},b={changeRadioOption:i,changeMultipleOption:c,changeAllOption:x,changeOption:d,confirmFilter:f,resetFilter:h};return function(){var t,e,l=o.filterStore,i=s.initStore,c=l.column,n=c?c.filterRender:null,r=n?_vXETable.VXETable.renderer.get(n.name):null;return(0,_vue.h)("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",r&&r.className?r.className:"",{"is--animat":a.props.animat,"is--multiple":l.multiple,"is--active":l.visible}],style:l.style},i.filter&&l.visible?(c=n,i=r,t=o.filterStore,l=t.column,e=t.multiple,n=t.maxHeight,r=l.slots,l=r?r.filter:null,r=Object.assign({},u._currFilterParams,{$panel:b,$table:a}),(l?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},a.callSlot(l,r))]:i&&i.renderFilter?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},i.renderFilter(c,r))]:[(0,_vue.h)("ul",{class:"vxe-table--filter-header"},[(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":e?t.isAllSelected:!t.options.some(function(e){return e._checked}),"is--indeterminate":e&&t.isIndeterminate}],title:_conf.default.i18n(e?"vxe.table.allTitle":"vxe.table.allFilter"),onClick:function(e){x(e,!t.isAllSelected)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),(0,_vue.h)("ul",{class:"vxe-table--filter-body",style:n?{maxHeight:n+"px"}:{}},t.options.map(function(t){return(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":t._checked}],title:t.label,onClick:function(e){d(e,!t._checked,t)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))]).concat((i=o.filterStore,c=i.column,r=i.multiple,n=v.value,c=(c=c.filterRender)?_vXETable.VXETable.renderer.get(c.name):null,i=!n&&!i.isAllSelected&&!i.isIndeterminate,!r||c&&!1===c.showFilterFooter?[]:[(0,_vue.h)("div",{class:"vxe-table--filter-footer"},[(0,_vue.h)("button",{class:{"is--disabled":i},disabled:i,onClick:f},_conf.default.i18n("vxe.table.confirmFilter")),(0,_vue.h)("button",{onClick:h},_conf.default.i18n("vxe.table.resetFilter"))])]))):[])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeTableFilter",props:{filterStore:Object},setup:function(a){function i(e,t,l){a.filterStore.options.forEach(function(e){e._checked=!1}),l._checked=t,s.checkFilterOptions(),d(e)}function c(e,t,l){l._checked=t,s.checkFilterOptions()}var s=(0,_vue.inject)("$xetable",{}),u=s.reactData,v=s.internalData,f=(0,_vue.computed)(function(){var e=a.filterStore;return e&&e.options.some(function(e){return e.checked})}),d=function(e){a.filterStore.options.forEach(function(e){e.checked=e._checked}),s.confirmFilterEvent(e)},h=function(e){var t=a.filterStore;s.handleClearFilter(t.column),s.confirmFilterEvent(e)},b=function(e,t,l){a.filterStore.multiple?c(0,t,l):i(e,t,l)},p=function(e,t){var l;a.filterStore.multiple?(l=t,(t=a.filterStore).options.forEach(function(e){e._checked=l,e.checked=l}),t.isAllSelected=l,t.isIndeterminate=!1):h(e)},x={changeRadioOption:i,changeMultipleOption:c,changeAllOption:p,changeOption:b,confirmFilter:d,resetFilter:h};return function(){var t,e,l=a.filterStore,i=u.initStore,c=l.column,n=c?c.filterRender:null,r=n?_vXETable.VXETable.renderer.get(n.name):null,o=r?r.filterClassName:"",c=Object.assign({},v._currFilterParams,{$panel:x,$table:s});return(0,_vue.h)("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",r&&r.className?r.className:"",(0,_dom.getPropClass)(o,c),{"is--animat":s.props.animat,"is--multiple":l.multiple,"is--active":l.visible}],style:l.style},i.filter&&l.visible?(c=n,i=r,t=a.filterStore,l=t.column,e=t.multiple,n=t.maxHeight,r=l.slots,l=r?r.filter:null,r=Object.assign({},v._currFilterParams,{$panel:x,$table:s}),(l?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},s.callSlot(l,r))]:i&&i.renderFilter?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},i.renderFilter(c,r))]:[(0,_vue.h)("ul",{class:"vxe-table--filter-header"},[(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":e?t.isAllSelected:!t.options.some(function(e){return e._checked}),"is--indeterminate":e&&t.isIndeterminate}],title:_conf.default.i18n(e?"vxe.table.allTitle":"vxe.table.allFilter"),onClick:function(e){p(e,!t.isAllSelected)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),(0,_vue.h)("ul",{class:"vxe-table--filter-body",style:n?{maxHeight:n+"px"}:{}},t.options.map(function(t){return(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":t._checked}],title:t.label,onClick:function(e){b(e,!t._checked,t)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))]).concat((i=a.filterStore,c=i.column,r=i.multiple,n=f.value,c=(c=c.filterRender)?_vXETable.VXETable.renderer.get(c.name):null,i=!n&&!i.isAllSelected&&!i.isIndeterminate,!r||c&&!1===c.showFilterFooter?[]:[(0,_vue.h)("div",{class:"vxe-table--filter-footer"},[(0,_vue.h)("button",{class:{"is--disabled":i},disabled:i,onClick:d},_conf.default.i18n("vxe.table.confirmFilter")),(0,_vue.h)("button",{onClick:h},_conf.default.i18n("vxe.table.resetFilter"))])]))):[])}}});exports.default=_default;

package/lib/footer/src/footer.js

@@ -9,8 +9,6 @@ var _vue = require("vue");
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
-var _util = require("../../table/src/util");
-
 var _dom = require("../../tools/dom");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -379,7 +377,7 @@ var _default2 = (0, _vue.defineComponent)({
           }
 
           return (0, _vue.h)('td', __assign(__assign(__assign(__assign({
-            class: ['vxe-footer--column', column.id, (_a = {}, _a["col--" + footAlign] = footAlign, _a["col--" + type] = type, _a['col--last'] = $columnIndex === tableColumn.length - 1, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--ellipsis'] = hasEllipsis, _a['col--current'] = currentColumn === column, _a), (0, _util.getPropClass)(footerClassName, params), (0, _util.getPropClass)(footerCellClassName, params)]
+            class: ['vxe-footer--column', column.id, (_a = {}, _a["col--" + footAlign] = footAlign, _a["col--" + type] = type, _a['col--last'] = $columnIndex === tableColumn.length - 1, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--ellipsis'] = hasEllipsis, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(footerClassName, params), (0, _dom.getPropClass)(footerCellClassName, params)]
           }, attrs), {
             style: footerCellStyle ? _xeUtils.default.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle : null
           }), tfOns), {

package/lib/footer/src/footer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,o=arguments.length;l<o;l++)for(var r in t=arguments[l])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,t,l){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,i=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&i&&r){if(n===t&&a===l)return{rowspan:i,colspan:r};if(n<=t&&t<n+i&&a<=l&&l<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(u){function n(e){var t=u.fixedType,l=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,i=n?n.$el:null,n=x.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),i&&(i.scrollLeft=n),a&&(a.scrollLeft=n),l&&o&&E.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),E.dispatchEvent("scroll",{type:renderType,fixed:t,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var E=(0,_vue.inject)("$xetable",{}),a=E.xID,i=E.props,s=E.reactData,c=E.internalData,e=E.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=E.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),g=(0,_vue.ref)(),m=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=x,t[e+"table"]=g,t[e+"colgroup"]=m,t[e+"list"]=y,t[e+"xSpace"]=h})}),(0,_vue.onUnmounted)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=null,t[e+"table"]=null,t[e+"colgroup"]=null,t[e+"list"]=null,t[e+"xSpace"]=null});return function(){var w=u.fixedType,e=u.fixedColumn,T=u.tableColumn,C=u.footerTableData,t=i.footerRowClassName,I=i.footerCellClassName,l=i.footerRowStyle,S=i.footerCellStyle,F=i.footerAlign,D=i.footerSpanMethod,L=i.align,M=i.columnKey,O=i.showFooterOverflow,o=c.visibleColumn,$=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,q=v.value,A=_.value;return w&&(T=!$&&!O||j.length&&D?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",w?"fixed-"+w+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:g,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:m},T.map(function(e,t){return(0,_vue.h)("col",{name:e.id,key:t})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var b=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",t?_xeUtils.default.isFunction(t)?t({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):t:""],style:l?_xeUtils.default.isFunction(l)?l({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):l:null},T.map(function(t,e){var l=t.type,o=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,i=q.showAll,u=t.children&&t.children.length,s=w?t.fixed!==w&&!u:t.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,u=p||v||d,o={colid:t.id},r={},n=E.getColumnIndex(t),c=E.getVTColumnIndex(t),_={$table:E,_rowIndex:h,$rowIndex:b,column:t,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:w,type:renderType,data:C};if($&&!u&&(d=u=!0),(p||v||i)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,t):(v||i)&&E.triggerFooterTooltipEvent(e,_)}),(v||i)&&(r.onMouseleave=function(e){(v||i)&&E.handleTargetLeaveEvent(e)}),r.onClick=function(e){E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var g=x.rowspan,m=x.colspan;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}}else if(D){var c=D(_)||{},x=c.rowspan,g=void 0===x?1:x,c=c.colspan,m=void 0===c?1:c;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",t.id,((m={})["col--"+f]=f,m["col--"+l]=l,m["col--last"]=e===T.length-1,m["fixed--hidden"]=s,m["col--ellipsis"]=u,m["col--current"]=k===t,m),(0,_util.getPropClass)(a,_),(0,_util.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||A.useKey?t.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},t.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,l=1,o=arguments.length;l<o;l++)for(var r in t=arguments[l])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,t,l){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,i=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&i&&r){if(n===t&&a===l)return{rowspan:i,colspan:r};if(n<=t&&t<n+i&&a<=l&&l<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(u){function n(e){var t=u.fixedType,l=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,i=n?n.$el:null,n=x.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),i&&(i.scrollLeft=n),a&&(a.scrollLeft=n),l&&o&&q.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),q.dispatchEvent("scroll",{type:renderType,fixed:t,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var q=(0,_vue.inject)("$xetable",{}),a=q.xID,i=q.props,s=q.reactData,c=q.internalData,e=q.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=q.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),m=(0,_vue.ref)(),g=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=x,t[e+"table"]=m,t[e+"colgroup"]=g,t[e+"list"]=y,t[e+"xSpace"]=h})}),(0,_vue.onUnmounted)(function(){var e=u.fixedType,t=c.elemStore,e=(e||"main")+"-footer-";t[e+"wrapper"]=null,t[e+"table"]=null,t[e+"colgroup"]=null,t[e+"list"]=null,t[e+"xSpace"]=null});return function(){var b=u.fixedType,e=u.fixedColumn,T=u.tableColumn,C=u.footerTableData,t=i.footerRowClassName,I=i.footerCellClassName,l=i.footerRowStyle,S=i.footerCellStyle,F=i.footerAlign,D=i.footerSpanMethod,L=i.align,M=i.columnKey,O=i.showFooterOverflow,o=c.visibleColumn,$=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,A=v.value,E=_.value;return b&&(T=!$&&!O||j.length&&D?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",b?"fixed-"+b+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[b?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:m,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:g},T.map(function(e,t){return(0,_vue.h)("col",{name:e.id,key:t})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var w=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",t?_xeUtils.default.isFunction(t)?t({$table:q,_rowIndex:h,$rowIndex:w,fixed:b,type:renderType}):t:""],style:l?_xeUtils.default.isFunction(l)?l({$table:q,_rowIndex:h,$rowIndex:w,fixed:b,type:renderType}):l:null},T.map(function(t,e){var l=t.type,o=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,i=A.showAll,u=t.children&&t.children.length,s=b?t.fixed!==b&&!u:t.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,u=p||v||d,o={colid:t.id},r={},n=q.getColumnIndex(t),c=q.getVTColumnIndex(t),_={$table:q,_rowIndex:h,$rowIndex:w,column:t,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:b,type:renderType,data:C};if($&&!u&&(d=u=!0),(p||v||i)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,t):(v||i)&&q.triggerFooterTooltipEvent(e,_)}),(v||i)&&(r.onMouseleave=function(e){(v||i)&&q.handleTargetLeaveEvent(e)}),r.onClick=function(e){q.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){q.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var m=x.rowspan,g=x.colspan;if(!m||!g)return null;1<m&&(o.rowspan=m),1<g&&(o.colspan=g)}}else if(D){var c=D(_)||{},x=c.rowspan,m=void 0===x?1:x,c=c.colspan,g=void 0===c?1:c;if(!m||!g)return null;1<m&&(o.rowspan=m),1<g&&(o.colspan=g)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",t.id,((g={})["col--"+f]=f,g["col--"+l]=l,g["col--last"]=e===T.length-1,g["fixed--hidden"]=s,g["col--ellipsis"]=u,g["col--current"]=k===t,g),(0,_dom.getPropClass)(a,_),(0,_dom.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||E.useKey?t.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},t.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;

package/lib/form/src/form-config-item.js

@@ -79,6 +79,7 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
           titleOverflow = item.titleOverflow,
           children = item.children;
       var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
+      var itemClassName = compConf ? compConf.itemClassName : '';
       var defaultSlot = slots ? slots.default : null;
       var titleSlot = slots ? slots.title : null;
       var span = item.span || allSpan;
@@ -173,7 +174,7 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
         onMouseleave: $xeform.handleTitleTipLeaveEvent
       } : {};
       return (0, _vue.h)('div', {
-        class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', {
+        class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
           'is--colon': titleColon,
           'is--asterisk': titleAsterisk,

package/lib/form/src/form-config-item.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var n in t=arguments[i])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},VxeFormConfigItem=(0,_vue.defineComponent)({name:"VxeFormConfigItem",props:{itemConfig2:Object,itemConfig:Object},setup:function(T){var w=(0,_vue.inject)("$xeform",{}),e={itemConfig:T.itemConfig};(0,_vue.provide)("$xeformiteminfo",e),(0,_vue.provide)("$xeformgather",null);return{renderVN:function(){var e=w.reactData,t=w.props,i=t.data,l=t.rules,n=t.span,r=t.align,o=t.titleAlign,s=t.titleWidth,u=t.titleColon,a=t.titleAsterisk,f=t.titleOverflow,d=w.getComputeMaps().computeValidOpts,v=T.itemConfig,m=e.collapseAll,_=d.value,c=v.slots,g=v.title,p=v.visible,x=v.folding,h=v.visibleMethod,C=v.field,N=v.collapseNode,b=v.itemRender,q=v.showError,O=v.errRule,U=v.className,V=v.titleOverflow,F=v.children,t=(0,_utils.isEnableConf)(b)?_vXETable.VXETable.renderer.get(b.name):null,e=c?c.default:null,d=c?c.title:null,c=v.span||n,n=v.align||r,r=_xeUtils.default.eqNull(v.titleAlign)?o:v.titleAlign,o=_xeUtils.default.eqNull(v.titleWidth)?s:v.titleWidth,s=_xeUtils.default.eqNull(v.titleColon)?u:v.titleColon,u=_xeUtils.default.eqNull(v.titleAsterisk)?a:v.titleAsterisk,a=_xeUtils.default.isUndefined(V)||_xeUtils.default.isNull(V)?f:V,f="title"===a,V=!0===a||"tooltip"===a,a=f||V||"ellipsis"===a,h=h,M={data:i,field:C,property:C,item:v,$form:w};if(!1===p)return(0,_vue.createCommentVNode)();p=!1;if(!l||(l=l[C])&&(p=l.some(function(e){return e.required})),F&&0<F.length){var y=F.map(function(e,t){return(0,_vue.h)(VxeFormConfigItem,{key:t,itemConfig:e})});return y.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",v.id,c?"vxe-col--"+c+" is--span":"",U?_xeUtils.default.isFunction(U)?U(M):U:""]},y):(0,_vue.createCommentVNode)()}!h&&t&&t.itemVisibleMethod&&(h=t.itemVisibleMethod);y=[];e?y=w.callSlot(e,M):t&&t.renderItemContent?y=t.renderItemContent(b,M):C&&(y=[_xeUtils.default.toValueString(_xeUtils.default.get(i,C))]),N&&y.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:w.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},m?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",m?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),O&&_.showMessage&&y.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:O.maxWidth?{width:O.maxWidth+"px"}:null},O.content));V=V?{onMouseenter:function(e){w.triggerTitleTipEvent(e,M)},onMouseleave:w.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{class:["vxe-form--item",v.id,c?"vxe-col--"+c+" is--span":"",U?_xeUtils.default.isFunction(U)?U(M):U:"",{"is--title":g,"is--colon":s,"is--asterisk":u,"is--required":p,"is--hidden":x&&m,"is--active":!h||h(M),"is--error":q}],itemConfig:v,key:v.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[g||d?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",r?"align--"+r:null,{"is--ellipsis":a}],style:o?{width:isNaN(o)?o:o+"px"}:null,title:f?(0,_utils.getFuncText)(g):null},V),(0,_render.renderTitle)(w,v)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",n?"align--"+n:null]},y)])])}}},render:function(){return this.renderVN()}}),_default=VxeFormConfigItem;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var n in t=arguments[i])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},VxeFormConfigItem=(0,_vue.defineComponent)({name:"VxeFormConfigItem",props:{itemConfig2:Object,itemConfig:Object},setup:function(w){var E=(0,_vue.inject)("$xeform",{}),e={itemConfig:w.itemConfig};(0,_vue.provide)("$xeformiteminfo",e),(0,_vue.provide)("$xeformgather",null);return{renderVN:function(){var e=E.reactData,t=E.props,i=t.data,l=t.rules,n=t.span,r=t.align,o=t.titleAlign,s=t.titleWidth,u=t.titleColon,a=t.titleAsterisk,f=t.titleOverflow,d=E.getComputeMaps().computeValidOpts,v=w.itemConfig,m=e.collapseAll,_=d.value,c=v.slots,g=v.title,x=v.visible,p=v.folding,h=v.visibleMethod,C=v.field,N=v.collapseNode,b=v.itemRender,q=v.showError,U=v.errRule,O=v.className,V=v.titleOverflow,F=v.children,M=(0,_utils.isEnableConf)(b)?_vXETable.VXETable.renderer.get(b.name):null,t=M?M.itemClassName:"",e=c?c.default:null,d=c?c.title:null,c=v.span||n,n=v.align||r,r=_xeUtils.default.eqNull(v.titleAlign)?o:v.titleAlign,o=_xeUtils.default.eqNull(v.titleWidth)?s:v.titleWidth,s=_xeUtils.default.eqNull(v.titleColon)?u:v.titleColon,u=_xeUtils.default.eqNull(v.titleAsterisk)?a:v.titleAsterisk,a=_xeUtils.default.isUndefined(V)||_xeUtils.default.isNull(V)?f:V,f="title"===a,V=!0===a||"tooltip"===a,a=f||V||"ellipsis"===a,h=h,y={data:i,field:C,property:C,item:v,$form:E};if(!1===x)return(0,_vue.createCommentVNode)();x=!1;if(!l||(l=l[C])&&(x=l.some(function(e){return e.required})),F&&0<F.length){var T=F.map(function(e,t){return(0,_vue.h)(VxeFormConfigItem,{key:t,itemConfig:e})});return T.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:""]},T):(0,_vue.createCommentVNode)()}!h&&M&&M.itemVisibleMethod&&(h=M.itemVisibleMethod);T=[];e?T=E.callSlot(e,y):M&&M.renderItemContent?T=M.renderItemContent(b,y):C&&(T=[_xeUtils.default.toValueString(_xeUtils.default.get(i,C))]),N&&T.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:E.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},m?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",m?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),U&&_.showMessage&&T.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:U.maxWidth?{width:U.maxWidth+"px"}:null},U.content));V=V?{onMouseenter:function(e){E.triggerTitleTipEvent(e,y)},onMouseleave:E.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{class:["vxe-form--item",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:"",t?_xeUtils.default.isFunction(t)?t(y):t:"",{"is--title":g,"is--colon":s,"is--asterisk":u,"is--required":x,"is--hidden":p&&m,"is--active":!h||h(y),"is--error":q}],itemConfig:v,key:v.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[g||d?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",r?"align--"+r:null,{"is--ellipsis":a}],style:o?{width:isNaN(o)?o:o+"px"}:null,title:f?(0,_utils.getFuncText)(g):null},V),(0,_render.renderTitle)(E,v)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",n?"align--"+n:null]},T)])])}}},render:function(){return this.renderVN()}}),_default=VxeFormConfigItem;exports.default=_default;

package/lib/form/src/form-item.js

@@ -122,6 +122,7 @@ var _default = (0, _vue.defineComponent)({
           className = item.className,
           titleOverflow = item.titleOverflow;
       var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
+      var itemClassName = compConf ? compConf.itemClassName : '';
       var defaultSlot = slots ? slots.default : null;
       var titleSlot = slots ? slots.title : null;
       var span = item.span || props.span;
@@ -195,7 +196,7 @@ var _default = (0, _vue.defineComponent)({
       } : {};
       return (0, _vue.h)('div', {
         ref: refElem,
-        class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', {
+        class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
           'is--required': isRequired,
           'is--hidden': visible === false || folding && collapseAll,

package/lib/form/src/form-item.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,C=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_util.createItem)(l,e),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,C.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,p=e.collapseNode,_=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,I=(0,_utils.isEnableConf)(_)?_vXETable.VXETable.renderer.get(_.name):null,O=a?a.default:null,N=a?a.title:null,y=e.span||i.span,M=e.align||i.align,q=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,S={data:r,field:c,property:c,item:e,$form:t},m=!1;!n||(w=n[c])&&(m=w.some(function(e){return e.required})),!a&&I&&I.itemVisibleMethod&&(a=I.itemVisibleMethod);var w=[];O?w=t.callSlot(O,S):I&&I.renderItemContent?w=I.renderItemContent(_,S):c&&(w=[""+_xeUtils.default.get(r,c)]),p&&w.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&w.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,S)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:C,class:["vxe-form--item",e.id,y?"vxe-col--"+y+" is--span":"",h?_xeUtils.default.isFunction(h)?h(S):h:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(S),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||N?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",q?"align--"+q:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",M?"align--"+M:null]},w)])])}(l,n):(0,_vue.h)("div",{ref:C})}}},render:function(){return this.renderVN()}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,w=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_util.createItem)(l,e),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,w.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,_=e.collapseNode,p=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,I=(0,_utils.isEnableConf)(p)?_vXETable.VXETable.renderer.get(p.name):null,N=I?I.itemClassName:"",O=a?a.default:null,y=a?a.title:null,M=e.span||i.span,q=e.align||i.align,C=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,F={data:r,field:c,property:c,item:e,$form:t},m=!1;!n||(S=n[c])&&(m=S.some(function(e){return e.required})),!a&&I&&I.itemVisibleMethod&&(a=I.itemVisibleMethod);var S=[];O?S=t.callSlot(O,F):I&&I.renderItemContent?S=I.renderItemContent(p,F):c&&(S=[""+_xeUtils.default.get(r,c)]),_&&S.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&S.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,F)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:w,class:["vxe-form--item",e.id,M?"vxe-col--"+M+" is--span":"",h?_xeUtils.default.isFunction(h)?h(F):h:"",N?_xeUtils.default.isFunction(N)?N(F):N:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(F),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||y?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",C?"align--"+C:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",q?"align--"+q:null]},S)])])}(l,n):(0,_vue.h)("div",{ref:w})}}},render:function(){return this.renderVN()}});exports.default=_default;

package/lib/grid/src/grid.js

@@ -1448,7 +1448,6 @@ var _default2 = (0, _vue.defineComponent)({
         }
 
         initToolbar();
-        initProxy();
       });
 
       _event.GlobalEvent.on($xegrid, 'keydown', handleGlobalKeydownEvent);
@@ -1456,6 +1455,9 @@ var _default2 = (0, _vue.defineComponent)({
     (0, _vue.onUnmounted)(function () {
       _event.GlobalEvent.off($xegrid, 'keydown');
     });
+    (0, _vue.nextTick)(function () {
+      initProxy();
+    });
 
     var renderVN = function renderVN() {
       var _a;