vxe-table 4.2.8 → 4.3.0-beta.2

package/es/switch/src/switch.js

@@ -103,7 +103,7 @@ export default defineComponent({
             var offShowLabel = computeOffShowLabel.value;
             return h('div', {
                 class: ['vxe-switch', isChecked ? 'is--on' : 'is--off', (_a = {},
-                        _a["size--" + vSize] = vSize,
+                        _a["size--".concat(vSize)] = vSize,
                         _a['is--disabled'] = disabled,
                         _a['is--animat'] = reactData.hasAnimat,
                         _a)]

package/es/table/src/body.js

@@ -9,10 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { createCommentVNode, defineComponent, h, ref, inject, nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue';
 import XEUtils from 'xe-utils';
@@ -111,8 +115,8 @@ export default defineComponent({
                         h('div', {
                             class: 'vxe-tree--line',
                             style: {
-                                height: calcTreeLine(params, items, rIndex) + "px",
-                                left: (rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize() : 0) + 16 + "px"
+                                height: "".concat(calcTreeLine(params, items, rIndex), "px"),
+                                left: "".concat((rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize() : 0) + 16, "px")
                             }
                         })
                     ])
@@ -253,28 +257,28 @@ export default defineComponent({
                             'c--ellipsis': showEllipsis
                         }],
                     style: {
-                        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
+                        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
                     }
                 }));
             }
             else {
                 // 渲染单元格
-                tdVNs.push.apply(tdVNs, __spreadArray(__spreadArray([], renderLine(params)), [h('div', {
+                tdVNs.push.apply(tdVNs, __spreadArray(__spreadArray([], renderLine(params), false), [h('div', {
                         class: ['vxe-cell', {
                                 'c--title': showTitle,
                                 'c--tooltip': showTooltip,
                                 'c--ellipsis': showEllipsis
                             }],
                         style: {
-                            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
+                            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
                         },
                         title: showTitle ? $xetable.getCellLabel(row, column) : null
-                    }, column.renderCell(params))]));
+                    }, column.renderCell(params))], false));
                 if (showValidTip && hasValidError) {
                     tdVNs.push(h('div', {
                         class: 'vxe-cell--valid',
                         style: validStore.rule && validStore.rule.maxWidth ? {
-                            width: validStore.rule.maxWidth + "px"
+                            width: "".concat(validStore.rule.maxWidth, "px")
                         } : null
                     }, [
                         h('span', {
@@ -287,8 +291,8 @@ export default defineComponent({
                     'vxe-body--column',
                     column.id,
                     (_a = {},
-                        _a["col--" + cellAlign] = cellAlign,
-                        _a["col--" + type] = type,
+                        _a["col--".concat(cellAlign)] = cellAlign,
+                        _a["col--".concat(type)] = type,
                         _a['col--last'] = $columnIndex === columns.length - 1,
                         _a['col--tree-node'] = treeNode,
                         _a['col--edit'] = isEdit,
@@ -303,7 +307,7 @@ export default defineComponent({
                     getPropClass(className, params),
                     getPropClass(allCellClassName, params)
                 ], key: columnKey || columnOpts.useKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
-                    height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
+                    height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
         var renderRows = function (fixedType, tableData, tableColumn) {
@@ -364,7 +368,7 @@ export default defineComponent({
                 }
                 rows.push(h('tr', __assign({ class: [
                         'vxe-body--row',
-                        treeConfig ? "row--level-" + rowLevel : '',
+                        treeConfig ? "row--level-".concat(rowLevel) : '',
                         {
                             'row--stripe': stripe && ($xetable.getVTRowIndex(row) + 1) % 2 === 0,
                             'is--new': isNewRow,
@@ -383,13 +387,13 @@ export default defineComponent({
                     var cellStyle = void 0;
                     if (treeConfig) {
                         cellStyle = {
-                            paddingLeft: (rowLevel * treeOpts.indent) + 30 + "px"
+                            paddingLeft: "".concat((rowLevel * treeOpts.indent) + 30, "px")
                         };
                     }
                     var showOverflow = expandColumn.showOverflow;
                     var hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow;
                     var expandParams = { $table: $xetable, seq: seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
-                    rows.push(h('tr', __assign({ class: 'vxe-body--expanded-row', key: "expand_" + rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle) : null }, trOn), [
+                    rows.push(h('tr', __assign({ class: 'vxe-body--expanded-row', key: "expand_".concat(rowid), style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle) : null }, trOn), [
                         h('td', {
                             class: ['vxe-body--expanded-column', {
                                     'fixed--hidden': fixedType && !hasFixedColumn,
@@ -646,15 +650,15 @@ export default defineComponent({
             nextTick(function () {
                 var fixedType = props.fixedType;
                 var elemStore = tableInternalData.elemStore;
-                var prefix = (fixedType || 'main') + "-body-";
+                var prefix = "".concat(fixedType || 'main', "-body-");
                 var el = refElem.value;
-                elemStore[prefix + "wrapper"] = refElem;
-                elemStore[prefix + "table"] = refBodyTable;
-                elemStore[prefix + "colgroup"] = refBodyColgroup;
-                elemStore[prefix + "list"] = refBodyTBody;
-                elemStore[prefix + "xSpace"] = refBodyXSpace;
-                elemStore[prefix + "ySpace"] = refBodyYSpace;
-                elemStore[prefix + "emptyBlock"] = refBodyEmptyBlock;
+                elemStore["".concat(prefix, "wrapper")] = refElem;
+                elemStore["".concat(prefix, "table")] = refBodyTable;
+                elemStore["".concat(prefix, "colgroup")] = refBodyColgroup;
+                elemStore["".concat(prefix, "list")] = refBodyTBody;
+                elemStore["".concat(prefix, "xSpace")] = refBodyXSpace;
+                elemStore["".concat(prefix, "ySpace")] = refBodyYSpace;
+                elemStore["".concat(prefix, "emptyBlock")] = refBodyEmptyBlock;
                 el.onscroll = scrollEvent;
                 el._onscroll = scrollEvent;
             });
@@ -668,14 +672,14 @@ export default defineComponent({
         onUnmounted(function () {
             var fixedType = props.fixedType;
             var elemStore = tableInternalData.elemStore;
-            var prefix = (fixedType || 'main') + "-body-";
-            elemStore[prefix + "wrapper"] = null;
-            elemStore[prefix + "table"] = null;
-            elemStore[prefix + "colgroup"] = null;
-            elemStore[prefix + "list"] = null;
-            elemStore[prefix + "xSpace"] = null;
-            elemStore[prefix + "ySpace"] = null;
-            elemStore[prefix + "emptyBlock"] = null;
+            var prefix = "".concat(fixedType || 'main', "-body-");
+            elemStore["".concat(prefix, "wrapper")] = null;
+            elemStore["".concat(prefix, "table")] = null;
+            elemStore["".concat(prefix, "colgroup")] = null;
+            elemStore["".concat(prefix, "list")] = null;
+            elemStore["".concat(prefix, "xSpace")] = null;
+            elemStore["".concat(prefix, "ySpace")] = null;
+            elemStore["".concat(prefix, "emptyBlock")] = null;
         });
         var renderVN = function () {
             var fixedColumn = props.fixedColumn, fixedType = props.fixedType, tableColumn = props.tableColumn;
@@ -725,7 +729,7 @@ export default defineComponent({
                     emptyContent = tableProps.emptyText || GlobalConfig.i18n('vxe.table.emptyText');
                 }
             }
-            return h('div', __assign({ ref: refElem, class: ['vxe-table--body-wrapper', fixedType ? "fixed-" + fixedType + "--wrapper" : 'body--wrapper'], xid: xID }, (sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})), [
+            return h('div', __assign({ ref: refElem, class: ['vxe-table--body-wrapper', fixedType ? "fixed-".concat(fixedType, "--wrapper") : 'body--wrapper'], xid: xID }, (sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})), [
                 fixedType ? createCommentVNode() : h('div', {
                     ref: refBodyXSpace,
                     class: 'vxe-body--x-space'

package/es/table/src/cell.js

@@ -16,6 +16,7 @@ import { VXETable } from '../../v-x-e-table';
 import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../tools/utils';
 import { updateCellTitle } from '../../tools/dom';
 import { createColumn } from './util';
+import { getSlotVNs } from '../../tools/vn';
 function renderHelpIcon(params) {
     var $table = params.$table, column = params.column;
     var titlePrefix = column.titlePrefix || column.titleHelp;
@@ -81,7 +82,7 @@ function getFooterContent(params) {
     if (renderOpts) {
         var compConf = VXETable.renderer.get(renderOpts.name);
         if (compConf && compConf.renderFooter) {
-            return compConf.renderFooter(renderOpts, params);
+            return getSlotVNs(compConf.renderFooter(renderOpts, params));
         }
     }
     return [formatText(items[_columnIndex], 1)];
@@ -163,10 +164,10 @@ export var Cell = {
         if (renderOpts) {
             var compConf = VXETable.renderer.get(renderOpts.name);
             if (compConf && compConf.renderHeader) {
-                return renderTitleContent(params, compConf.renderHeader(renderOpts, params));
+                return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
             }
         }
-        return renderTitleContent(params, formatText(column.getTitle(), 1));
+        return renderTitleContent(params, [formatText(column.getTitle(), 1)]);
     },
     renderDefaultHeader: function (params) {
         return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
@@ -184,7 +185,7 @@ export var Cell = {
             var compConf = VXETable.renderer.get(renderOpts.name);
             var compFn = compConf ? compConf[funName] : null;
             if (compFn) {
-                return compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params));
+                return getSlotVNs(compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)));
             }
         }
         var cellValue = $table.getCellLabel(row, column);
@@ -247,7 +248,7 @@ export var Cell = {
                         'is--active': isAceived
                     }],
                 style: {
-                    paddingLeft: level * indent + "px"
+                    paddingLeft: "".concat(level * indent, "px")
                 }
             }, [
                 showIcon && ((rowChilds && rowChilds.length) || hasLazyChilds) ? [
@@ -270,7 +271,7 @@ export var Cell = {
         var $table = params.$table, column = params.column;
         var slots = column.slots;
         var headerSlot = slots ? slots.header : null;
-        return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
+        return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)]);
     },
     renderSeqCell: function (params) {
         var $table = params.$table, column = params.column;
@@ -338,9 +339,7 @@ export var Cell = {
         var radioVNs = [];
         if (isVisible) {
             radioVNs.push(h('span', {
-                class: 'vxe-radio--icon vxe-radio--checked-icon'
-            }), h('span', {
-                class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+                class: ['vxe-radio--icon', isChecked ? GlobalConfig.icon.TABLE_RADIO_CHECKED : GlobalConfig.icon.TABLE_RADIO_UNCHECKED]
             }));
         }
         if (defaultSlot || labelField) {
@@ -400,13 +399,7 @@ export var Cell = {
                         'is--indeterminate': isAllCheckboxIndeterminate
                     }], title: GlobalConfig.i18n('vxe.table.allTitle') }, ons), [
                 h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                    class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                 })
             ].concat(titleSlot || headerTitle ? [
                 h('span', {
@@ -454,11 +447,7 @@ export var Cell = {
         var checkVNs = [];
         if (isVisible) {
             checkVNs.push(h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }), h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }), h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             }));
         }
         if (defaultSlot || labelField) {
@@ -516,11 +505,7 @@ export var Cell = {
         var checkVNs = [];
         if (isVisible) {
             checkVNs.push(h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }), h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }), h('span', {
-                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             }));
             if (defaultSlot || labelField) {
                 checkVNs.push(h('span', {
@@ -591,7 +576,7 @@ export var Cell = {
         if (contentRender) {
             var compConf = VXETable.renderer.get(contentRender.name);
             if (compConf && compConf.renderExpand) {
-                return compConf.renderExpand(contentRender, params);
+                return getSlotVNs(compConf.renderExpand(contentRender, params));
             }
         }
         return [];
@@ -752,7 +737,10 @@ export var Cell = {
             if (editSlot) {
                 return $table.callSlot(editSlot, params);
             }
-            return compConf && compConf.renderEdit ? compConf.renderEdit(editRender, Object.assign({ $type: 'edit' }, params)) : [];
+            if (compConf && compConf.renderEdit) {
+                return getSlotVNs(compConf.renderEdit(editRender, Object.assign({ $type: 'edit' }, params)));
+            }
+            return [];
         }
         if (defaultSlot) {
             return $table.callSlot(defaultSlot, params);

package/es/table/src/columnInfo.js

@@ -14,13 +14,13 @@ var ColumnInfo = /** @class */ (function () {
         if (process.env.NODE_ENV === 'development') {
             var types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
             if (_vm.type && types.indexOf(_vm.type) === -1) {
-                warnLog('vxe.error.errProp', ["type=" + _vm.type, types.join(', ')]);
+                warnLog('vxe.error.errProp', ["type=".concat(_vm.type), types.join(', ')]);
             }
             if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-                warnLog('vxe.error.errProp', ["column.cell-render=" + _vm.cellRender, 'column.cell-render={}']);
+                warnLog('vxe.error.errProp', ["column.cell-render=".concat(_vm.cellRender), 'column.cell-render={}']);
             }
             if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-                warnLog('vxe.error.errProp', ["column.edit-render=" + _vm.editRender, 'column.edit-render={}']);
+                warnLog('vxe.error.errProp', ["column.edit-render=".concat(_vm.editRender), 'column.edit-render={}']);
             }
             if (_vm.cellRender && _vm.editRender) {
                 warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
@@ -129,7 +129,7 @@ var ColumnInfo = /** @class */ (function () {
         return getFuncText(this.title || (this.type === 'seq' ? GlobalConfig.i18n('vxe.table.seqTitle') : ''));
     };
     ColumnInfo.prototype.getKey = function () {
-        return this.field || (this.type ? "type=" + this.type : null);
+        return this.field || (this.type ? "type=".concat(this.type) : null);
     };
     ColumnInfo.prototype.update = function (name, value) {
         // 不支持双向的属性