vxe-table 4.19.10 → 4.19.12

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.10";
+const version$1 = "4.19.12";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -555,203 +555,6 @@ const modal = {
 
 const defineVxeComponent = defineComponent;
 
-const { log } = VxeUI;
-const version = `table v${"4.19.10"}`;
-const warnLog = log.create('warn', version);
-const errLog = log.create('error', version);
-
-const { getI18n: getI18n$d, formats: formats$1, renderer: renderer$b } = VxeUI;
-class ColumnInfo {
-    /* eslint-disable @typescript-eslint/no-use-before-define */
-    constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
-        const tableProps = $xeTable.props;
-        const $xeGrid = $xeTable.xeGrid;
-        const $xeGantt = $xeTable.xeGantt;
-        const $xeGGWrapper = $xeGrid || $xeGantt;
-        const { field, editRender, filterRender } = _vm;
-        const colId = _vm.colId || XEUtils.uniqueId('col_');
-        const formatter = _vm.formatter;
-        const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
-        const flCompConf = isEnableConf(filterRender) ? renderer$b.get(filterRender.name) : null;
-        const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
-        const filters = toFilters(_vm.filters, colId);
-        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-        if (_vm.type && types.indexOf(_vm.type) === -1) {
-            warnLog('vxe.error.errProp', [`type=${_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={}']);
-        }
-        if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-            warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
-        }
-        if (_vm.type === 'expand') {
-            const { treeConfig } = tableProps;
-            const { computeTreeOpts } = $xeTable.getComputeMaps();
-            const treeOpts = computeTreeOpts.value;
-            if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-                errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
-            }
-        }
-        if (formatter) {
-            if (XEUtils.isString(formatter)) {
-                const gFormatOpts = formats$1.get(formatter) || XEUtils[formatter];
-                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                    errLog('vxe.error.notFormats', [formatter]);
-                }
-            }
-            else if (XEUtils.isArray(formatter)) {
-                const gFormatOpts = formats$1.get(formatter[0]) || XEUtils[formatter[0]];
-                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                    errLog('vxe.error.notFormats', [formatter[0]]);
-                }
-            }
-        }
-        if (_vm.aggFunc) {
-            if (!$xeTable.handlePivotTableAggData && _vm.aggFunc !== true) {
-                errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
-            }
-        }
-        if (field && editRender) {
-            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
-                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
-            }
-            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
-                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
-            }
-        }
-        Object.assign(this, {
-            // 基本属性
-            type: _vm.type,
-            property: _vm.field,
-            field: field,
-            title: _vm.title,
-            width: _vm.width,
-            minWidth: _vm.minWidth,
-            maxWidth: _vm.maxWidth,
-            resizable: _vm.resizable,
-            fixed: _vm.fixed,
-            align: _vm.align,
-            headerAlign: _vm.headerAlign,
-            footerAlign: _vm.footerAlign,
-            showOverflow: _vm.showOverflow,
-            showHeaderOverflow: _vm.showHeaderOverflow,
-            showFooterOverflow: _vm.showFooterOverflow,
-            className: _vm.className,
-            headerClassName: _vm.headerClassName,
-            footerClassName: _vm.footerClassName,
-            formatter: formatter,
-            headerFormatter: _vm.headerFormatter,
-            footerFormatter: _vm.footerFormatter,
-            padding: _vm.padding,
-            verticalAlign: _vm.verticalAlign,
-            sortable: _vm.sortable,
-            sortBy: _vm.sortBy,
-            sortType: _vm.sortType,
-            filters: filters,
-            filterMultiple: XEUtils.isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
-            filterMethod: _vm.filterMethod,
-            filterResetMethod: _vm.filterResetMethod,
-            filterRecoverMethod: _vm.filterRecoverMethod,
-            filterRender: filterRender,
-            floatingFilters: _vm.floatingFilters,
-            rules: _vm.rules,
-            rowGroupNode: _vm.rowGroupNode,
-            treeNode: _vm.treeNode,
-            dragSort: _vm.dragSort,
-            rowResize: _vm.rowResize,
-            cellType: _vm.cellType,
-            cellRender: _vm.cellRender,
-            editRender: editRender,
-            contentRender: _vm.contentRender,
-            headerExportMethod: _vm.headerExportMethod,
-            exportMethod: _vm.exportMethod,
-            footerExportMethod: _vm.footerExportMethod,
-            titleHelp: _vm.titleHelp,
-            titlePrefix: _vm.titlePrefix,
-            titleSuffix: _vm.titleSuffix,
-            aggFunc: _vm.aggFunc,
-            copyMethod: _vm.copyMethod,
-            cutMethod: _vm.cutMethod,
-            pasteMethod: _vm.pasteMethod,
-            // 自定义参数
-            params: _vm.params,
-            // 渲染属性
-            id: colId,
-            parentId: null,
-            visible,
-            // 内部属性（一旦被使用，将导致不可升级版本）
-            defaultParentId: null,
-            halfVisible: false,
-            defaultVisible: visible,
-            defaultFixed: _vm.fixed,
-            defaultAggGroup: _vm.aggGroup,
-            defaultAggFunc: _vm.aggFunc,
-            checked: false,
-            halfChecked: false,
-            disabled: false,
-            // 分组层级
-            level: 1,
-            // 跨行
-            rowSpan: 1,
-            // 跨列
-            colSpan: 1,
-            // 数据排序
-            order: null,
-            sortTime: 0,
-            // 列排序
-            sortNumber: 0,
-            renderSortNumber: 0,
-            renderAggFn: '',
-            renderAggDigits: null,
-            renderAggFormat: null,
-            renderFixed: '',
-            renderVisible: false,
-            renderWidth: 0,
-            renderHeight: 0,
-            renderResizeWidth: 0,
-            renderAutoWidth: 0,
-            resizeWidth: 0,
-            renderLeft: 0,
-            renderArgs: [],
-            model: {},
-            renderHeader: renderHeader || _vm.renderHeader,
-            renderCell: renderCell || _vm.renderCell,
-            renderFooter: renderFooter || _vm.renderFooter,
-            renderData: renderData,
-            // 单元格插槽，只对 grid 有效
-            slots: _vm.slots
-        });
-        if (ctFilterOptions && (!filters || !filters.length)) {
-            this.filters = toFilters(ctFilterOptions({ $table: $xeTable, column: this }), colId);
-        }
-        if ($xeGGWrapper) {
-            const { computeProxyOpts } = $xeGGWrapper.getComputeMaps();
-            const proxyOpts = computeProxyOpts.value;
-            if (proxyOpts.beforeColumn) {
-                proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this });
-            }
-        }
-    }
-    getTitle() {
-        return getFuncText(this.title || (this.type === 'seq' ? getI18n$d('vxe.table.seqTitle') : ''));
-    }
-    getKey() {
-        const { type } = this;
-        return this.field || (type ? `type=${type}` : null);
-    }
-    update(name, value) {
-        // 不支持直接修改的属性
-        if (name !== 'filters') {
-            if (name === 'field') {
-                // 兼容旧属性
-                this.property = value;
-            }
-            this[name] = value;
-        }
-    }
-}
-
 const reClsMap = {};
 let tpImgEl;
 function initTpImg() {
@@ -939,6 +742,202 @@ function wheelScrollTopTo(diffNum, cb) {
     });
 }
 
+const { log } = VxeUI;
+const version = `table v${"4.19.12"}`;
+const warnLog = log.create('warn', version);
+const errLog = log.create('error', version);
+
+const { getI18n: getI18n$d, formats: formats$1, renderer: renderer$b } = VxeUI;
+class ColumnInfo {
+    /* eslint-disable @typescript-eslint/no-use-before-define */
+    constructor($xeTable, colConfs, { renderHeader, renderCell, renderFooter, renderData } = {}) {
+        const tableProps = $xeTable.props;
+        const $xeGrid = $xeTable.xeGrid;
+        const $xeGantt = $xeTable.xeGantt;
+        const $xeGGWrapper = $xeGrid || $xeGantt;
+        const { type, field, width, visible, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
+        const colId = colConfs.colId || XEUtils.uniqueId('col_');
+        const defaultVisible = XEUtils.isBoolean(visible) ? visible : true;
+        const defaultRenderWidth = width && isPx(width) && width !== 'auto' ? Math.max(0, XEUtils.toInteger(width)) : 0;
+        const flCompConf = filterRender && isEnableConf(filterRender) ? renderer$b.get(filterRender.name) : null;
+        const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
+        const filters = toFilters(colConfs.filters, colId);
+        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+        if (type && types.indexOf(type) === -1) {
+            warnLog('vxe.error.errProp', [`type=${type}`, types.join(', ')]);
+        }
+        if (XEUtils.isBoolean(cellRender) || (cellRender && !XEUtils.isObject(cellRender))) {
+            warnLog('vxe.error.errProp', [`column.cell-render=${cellRender}`, 'column.cell-render={}']);
+        }
+        if (XEUtils.isBoolean(editRender) || (editRender && !XEUtils.isObject(editRender))) {
+            warnLog('vxe.error.errProp', [`column.edit-render=${editRender}`, 'column.edit-render={}']);
+        }
+        if (type === 'expand') {
+            const { treeConfig } = tableProps;
+            const { computeTreeOpts } = $xeTable.getComputeMaps();
+            const treeOpts = computeTreeOpts.value;
+            if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
+                errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+            }
+        }
+        if (formatter) {
+            if (XEUtils.isString(formatter)) {
+                const gFormatOpts = formats$1.get(formatter) || XEUtils[formatter];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter]);
+                }
+            }
+            else if (XEUtils.isArray(formatter)) {
+                const gFormatOpts = formats$1.get(formatter[0]) || XEUtils[formatter[0]];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter[0]]);
+                }
+            }
+        }
+        if (aggFunc) {
+            if (!$xeTable.handlePivotTableAggData && aggFunc !== true) {
+                errLog('vxe.error.errProp', [`column.agg-func=${aggFunc}`, 'column.agg-func=true']);
+            }
+        }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
+        Object.assign(this, {
+            // 基本属性
+            type: colConfs.type,
+            property: colConfs.field,
+            field: field,
+            title: colConfs.title,
+            width: colConfs.width,
+            minWidth: colConfs.minWidth,
+            maxWidth: colConfs.maxWidth,
+            resizable: colConfs.resizable,
+            fixed: colConfs.fixed,
+            align: colConfs.align,
+            headerAlign: colConfs.headerAlign,
+            footerAlign: colConfs.footerAlign,
+            showOverflow: colConfs.showOverflow,
+            showHeaderOverflow: colConfs.showHeaderOverflow,
+            showFooterOverflow: colConfs.showFooterOverflow,
+            className: colConfs.className,
+            headerClassName: colConfs.headerClassName,
+            footerClassName: colConfs.footerClassName,
+            formatter: formatter,
+            headerFormatter: colConfs.headerFormatter,
+            footerFormatter: colConfs.footerFormatter,
+            padding: colConfs.padding,
+            verticalAlign: colConfs.verticalAlign,
+            sortable: colConfs.sortable,
+            sortBy: colConfs.sortBy,
+            sortType: colConfs.sortType,
+            filters: filters,
+            filterMultiple: XEUtils.isBoolean(filterMultiple) ? filterMultiple : true,
+            filterMethod: colConfs.filterMethod,
+            filterResetMethod: colConfs.filterResetMethod,
+            filterRecoverMethod: colConfs.filterRecoverMethod,
+            filterRender: filterRender,
+            floatingFilters: colConfs.floatingFilters,
+            rules: colConfs.rules,
+            rowGroupNode: colConfs.rowGroupNode,
+            treeNode: colConfs.treeNode,
+            dragSort: colConfs.dragSort,
+            rowResize: colConfs.rowResize,
+            cellType: colConfs.cellType,
+            cellRender: cellRender,
+            editRender: editRender,
+            contentRender: colConfs.contentRender,
+            headerExportMethod: colConfs.headerExportMethod,
+            exportMethod: colConfs.exportMethod,
+            footerExportMethod: colConfs.footerExportMethod,
+            titleHelp: colConfs.titleHelp,
+            titlePrefix: colConfs.titlePrefix,
+            titleSuffix: colConfs.titleSuffix,
+            aggFunc: colConfs.aggFunc,
+            copyMethod: colConfs.copyMethod,
+            cutMethod: colConfs.cutMethod,
+            pasteMethod: colConfs.pasteMethod,
+            // 自定义参数
+            params: colConfs.params,
+            // 渲染属性
+            id: colId,
+            parentId: null,
+            visible: defaultVisible,
+            // 内部属性（一旦被使用，将导致不可升级版本）
+            defaultParentId: null,
+            halfVisible: false,
+            defaultVisible: defaultVisible,
+            defaultFixed: colConfs.fixed,
+            defaultAggFunc: colConfs.aggFunc,
+            checked: false,
+            halfChecked: false,
+            disabled: false,
+            // 分组层级
+            level: 1,
+            // 跨行
+            rowSpan: 1,
+            // 跨列
+            colSpan: 1,
+            // 数据排序
+            order: null,
+            sortTime: 0,
+            // 列排序
+            sortNumber: 0,
+            renderSortNumber: 0,
+            renderAggFn: '',
+            renderAggDigits: null,
+            renderAggFormat: null,
+            renderFixed: '',
+            renderVisible: false,
+            renderWidth: defaultRenderWidth,
+            renderHeight: 0,
+            renderResizeWidth: 0,
+            renderAutoWidth: 0,
+            resizeWidth: 0,
+            renderLeft: 0,
+            renderArgs: [],
+            model: {},
+            renderHeader: renderHeader || colConfs.renderHeader,
+            renderCell: renderCell || colConfs.renderCell,
+            renderFooter: renderFooter || colConfs.renderFooter,
+            renderData: renderData,
+            // 单元格插槽，只对 grid 有效
+            slots: colConfs.slots
+        });
+        if (ctFilterOptions && (!filters || !filters.length)) {
+            this.filters = toFilters(ctFilterOptions({ $table: $xeTable, column: this }), colId);
+        }
+        if ($xeGGWrapper) {
+            const { computeProxyOpts } = $xeGGWrapper.getComputeMaps();
+            const proxyOpts = computeProxyOpts.value;
+            if (proxyOpts.beforeColumn) {
+                proxyOpts.beforeColumn({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, column: this });
+            }
+        }
+    }
+    getTitle() {
+        return getFuncText(this.title || (this.type === 'seq' ? getI18n$d('vxe.table.seqTitle') : ''));
+    }
+    getKey() {
+        const { type, field } = this;
+        return field || (type ? `type=${type}` : null);
+    }
+    update(name, value) {
+        // 不支持直接修改的属性
+        if (name !== 'filters') {
+            if (name === 'field') {
+                // 兼容旧属性
+                this.property = value;
+            }
+            this[name] = value;
+        }
+    }
+}
+
 function createInternalData$3() {
     return {
         tZindex: 0,
@@ -2930,24 +2929,28 @@ const Cell = {
         }
         return renderCellBaseVNs(params, [
             showIcon && (!visibleMethod || visibleMethod(params))
-                ? h('span', {
+                ? h('div', {
                     class: ['vxe-table--expanded', {
                             'is--active': isActive
-                        }],
-                    onMousedown(evnt) {
-                        evnt.stopPropagation();
-                    },
-                    onClick(evnt) {
-                        $table.triggerRowExpandEvent(evnt, params);
-                    }
+                        }]
                 }, [
-                    h('i', {
-                        class: ['vxe-table--expand-btn', isLazyLoading ? (iconLoaded || getIcon$7().TABLE_EXPAND_LOADED) : (isActive ? (iconOpen || getIcon$7().TABLE_EXPAND_OPEN) : (iconClose || getIcon$7().TABLE_EXPAND_CLOSE))]
-                    })
+                    h('span', {
+                        class: 'vxe-table--expand-btn',
+                        onMousedown(evnt) {
+                            evnt.stopPropagation();
+                        },
+                        onClick(evnt) {
+                            $table.triggerRowExpandEvent(evnt, params);
+                        }
+                    }, [
+                        h('i', {
+                            class: isLazyLoading ? (iconLoaded || getIcon$7().TABLE_EXPAND_LOADED) : (isActive ? (iconOpen || getIcon$7().TABLE_EXPAND_OPEN) : (iconClose || getIcon$7().TABLE_EXPAND_CLOSE))
+                        })
+                    ])
                 ])
                 : renderEmptyElement$a($table),
             defaultSlot || labelField
-                ? h('span', {
+                ? h('div', {
                     class: 'vxe-table--expand-label'
                 }, defaultSlot ? $table.callSlot(defaultSlot, params) : XEUtils.get(row, labelField))
                 : renderEmptyElement$a($table)
@@ -8186,8 +8189,8 @@ var TableMenuPanelComponent = defineVxeComponent({
             const { ctxMenuStore } = tableReactData;
             const { computeMenuOpts } = $xeTable.getComputeMaps();
             const menuOpts = computeMenuOpts.value;
-            const { transfer, destroyOnClose } = menuOpts;
-            const { visible, list, className } = ctxMenuStore;
+            const { transfer, destroyOnClose, className } = menuOpts;
+            const { visible, list } = ctxMenuStore;
             return h(Teleport, {
                 to: 'body',
                 disabled: !transfer
@@ -16545,9 +16548,9 @@ var VxeTableComponent = defineVxeComponent({
                 if (expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
                     errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=inside']);
                 }
-                if (props.spanMethod) {
-                    warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null']);
-                }
+                // if (props.spanMethod) {
+                //   warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null'])
+                // }
             }
             if (htmlColumn) {
                 if (!columnOpts.useKey) {
@@ -30245,6 +30248,7 @@ var VxeGridComponent = defineVxeComponent({
                 return;
             }
             if (proxyConfig && isEnableConf(proxyOpts)) {
+                $xeGrid.dispatchEvent('form-submit', params, params.$event);
                 internalData.uFoot = true;
                 $xeGrid.commitProxy('reload').then((rest) => {
                     $xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), { isReload: true }), params.$event);
@@ -30252,7 +30256,9 @@ var VxeGridComponent = defineVxeComponent({
                 internalData.uFoot = false;
                 updateQueryFooter();
             }
-            $xeGrid.dispatchEvent('form-submit', params, params.$event);
+            else {
+                $xeGrid.dispatchEvent('form-submit', params, params.$event);
+            }
         };
         const resetFormEvent = (params) => {
             const $xeTable = refTable.value;
@@ -30260,6 +30266,7 @@ var VxeGridComponent = defineVxeComponent({
             const { $event } = params;
             const proxyOpts = computeProxyOpts.value;
             if (proxyConfig && isEnableConf(proxyOpts)) {
+                $xeGrid.dispatchEvent('form-reset', params, $event);
                 if ($xeTable) {
                     $xeTable.clearScroll();
                 }
@@ -30270,7 +30277,9 @@ var VxeGridComponent = defineVxeComponent({
                 internalData.uFoot = false;
                 updateQueryFooter();
             }
-            $xeGrid.dispatchEvent('form-reset', params, $event);
+            else {
+                $xeGrid.dispatchEvent('form-reset', params, $event);
+            }
         };
         const submitInvalidEvent = (params) => {
             $xeGrid.dispatchEvent('form-submit-invalid', params, params.$event);