vxe-table 3.11.32 → 3.11.34

package/es/table/render/index.js

@@ -533,10 +533,10 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
         renderTableCell(h, renderOpts, params) {
-            var _a;
             const { props = {} } = renderOpts;
             const { row, column } = params;
-            const digits = props.digits || ((_a = getConfig().input) === null || _a === void 0 ? void 0 : _a.digits) || 2;
+            const inputConfig = getConfig().input || {};
+            const digits = props.digits || inputConfig.digits || 2;
             let cellValue = XEUtils.get(row, column.field);
             if (cellValue) {
                 switch (props.type) {
@@ -567,13 +567,18 @@ renderer.mixin({
             const { type } = props;
             let cellValue = XEUtils.get(row, column.field);
             if (cellValue) {
+                const numberInputConfig = getConfig().numberInput || {};
                 if (type === 'float') {
-                    const digits = props.digits || getConfig().numberInput.digits || 1;
+                    const digits = props.digits || numberInputConfig.digits || 1;
                     cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
                 }
                 else if (type === 'amount') {
-                    const digits = props.digits || getConfig().numberInput.digits || 2;
+                    const digits = props.digits || numberInputConfig.digits || 2;
                     cellValue = XEUtils.commafy(XEUtils.toNumber(cellValue), { digits });
+                    const showCurrency = props.showCurrency;
+                    if (XEUtils.isBoolean(showCurrency) ? showCurrency : numberInputConfig.showCurrency) {
+                        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+                    }
                 }
             }
             return getCellLabelVNs(h, renderOpts, params, cellValue);
@@ -585,12 +590,13 @@ renderer.mixin({
             // 兼容老模式
             const cellValue = XEUtils.isArray(row) ? row[_columnIndex] : XEUtils.get(row, column.field);
             if (XEUtils.isNumber(cellValue)) {
+                const numberInputConfig = getConfig().numberInput || {};
                 if (type === 'float') {
-                    const digits = props.digits || getConfig().numberInput.digits || 1;
+                    const digits = props.digits || numberInputConfig.digits || 1;
                     return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
                 }
                 else if (type === 'amount') {
-                    const digits = props.digits || getConfig().numberInput.digits || 2;
+                    const digits = props.digits || numberInputConfig.digits || 2;
                     return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits });
                 }
             }
@@ -598,7 +604,12 @@ renderer.mixin({
         },
         renderTableDefault: defaultEditRender,
         renderTableFilter: defaultFilterRender,
-        tableFilterDefaultMethod: handleInputFilterMethod
+        tableFilterDefaultMethod: handleInputFilterMethod,
+        tableExportMethod(params) {
+            const { row, column } = params;
+            const cellValue = XEUtils.get(row, column.field);
+            return cellValue;
+        }
     },
     VxeDatePicker: {
         tableAutoFocus: 'input',

package/es/table/src/body.js

@@ -259,6 +259,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
             }));
         }
     }
+    const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     return h('td', {
         class: [
             'vxe-body--column',
@@ -271,6 +272,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 'col--tree-node': treeNode,
                 'col--edit': isEdit,
                 'col--ellipsis': hasEllipsis,
+                'fixed--width': !isAutoCellWidth,
                 'fixed--hidden': fixedHiddenColumn,
                 'is--drag-cell': isColDragCell,
                 'is--drag-disabled': isDisabledDrag,
@@ -292,7 +294,9 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     }, tdVNs);
 }
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
-    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowMaps, columnOpts, isDragColMove } = $xeTable;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowMaps, isDragColMove } = $xeTable;
     const { transform, seqMode } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
@@ -376,7 +380,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
         const tdVNs = tableColumn.map((column, $columnIndex) => {
             return renderColumn(h, _vm, $xeTable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
-        rows.push(columnOpts.drag
+        rows.push(columnOpts.drag && columnDragOpts.animation
             ? h('transition-group', {
                 props: {
                     tag: 'tr',
@@ -496,7 +500,9 @@ export default {
     render(h) {
         const $xeTable = this.$parent;
         const { _e, $parent: $xetable, fixedColumn, fixedType } = this;
-        let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, expandColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts, rowOpts, isDragRowMove } = $xetable;
+        const rowOpts = $xeTable.computeRowOpts;
+        const rowDragOpts = $xeTable.computeRowDragOpts;
+        let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, expandColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts, isDragRowMove } = $xetable;
         // 如果是使用优化模式
         if (fixedType) {
             // 如果存在展开行使用全量渲染
@@ -584,7 +590,7 @@ export default {
                 /**
                  * 内容
                  */
-                rowOpts.drag
+                rowOpts.drag && rowDragOpts.animation
                     ? h('transition-group', {
                         props: {
                             tag: 'tbody',

package/es/table/src/footer.js

@@ -114,11 +114,13 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
                 attrs.colspan = colspan;
             }
         }
+        const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         return h('td', {
             class: ['vxe-footer--column', column.id, {
                     [`col--${footAlign}`]: footAlign,
                     [`col--${type}`]: type,
                     'col--last': $columnIndex === tableColumn.length - 1,
+                    'fixed--width': !isAutoCellWidth,
                     'fixed--hidden': fixedHiddenColumn,
                     'col--ellipsis': hasEllipsis,
                     'col--current': currentColumn === column
@@ -146,13 +148,15 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
         : []);
 }
 function renderHeads(h, _vm, footerTableData) {
+    const $xeTable = _vm.$parent;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { $parent: $xetable, fixedType, tableColumn } = _vm;
     const { footerRowClassName, footerRowStyle, isDragColMove } = $xetable;
-    const columnOpts = $xetable.columnOpts;
     return footerTableData.map((row, $rowIndex) => {
         const _rowIndex = $rowIndex;
         const rowParams = { $table: $xetable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
-        if (columnOpts.drag) {
+        if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
                 props: {
                     tag: 'tr',

package/es/table/src/header.js

@@ -61,6 +61,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
                 thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
             }
         }
+        const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         return h('th', {
             class: ['vxe-header--column', colid, {
                     [`col--${headAlign}`]: headAlign,
@@ -69,6 +70,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
                     'col--fixed': column.fixed,
                     'col--group': isColGroup,
                     'col--ellipsis': hasEllipsis,
+                    'fixed--width': !isAutoCellWidth,
                     'fixed--hidden': fixedHiddenColumn,
                     'is--sortable': column.sortable,
                     'col--filter': !!column.filters,
@@ -112,15 +114,16 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
         : []);
 };
 function renderHeads(h, _vm, headerGroups) {
-    const { $parent: $xetable } = _vm;
-    const tableProps = $xetable;
+    const $xeTable = _vm.$parent;
+    const tableProps = $xeTable;
     const { fixedType } = _vm;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { headerRowClassName, headerRowStyle } = tableProps;
-    const { isDragColMove } = $xetable;
-    const columnOpts = $xetable.columnOpts;
+    const { isDragColMove } = $xeTable;
     return headerGroups.map((cols, $rowIndex) => {
-        const params = { $table: $xetable, $rowIndex, fixed: fixedType, type: cellType };
-        if (columnOpts.drag) {
+        const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: cellType };
+        if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
                 props: {
                     tag: 'tr',

package/es/table/style.css

@@ -1748,6 +1748,79 @@
 }
 
 /*默认的渲染*/
+.vxe-header--column.fixed--width > .vxe-cell .vxe-default-input,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-default-textarea,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-default-select,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-default-input,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-default-textarea,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-default-select {
+  width: 100%;
+}
+.vxe-header--column.fixed--width > .vxe-cell .vxe-input,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-textarea,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-select,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-tree-select,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-date-picker,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-number-input,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-ico-picker,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-input,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-textarea,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-select,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-tree-select,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-date-picker,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-number-input,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-ico-picker {
+  width: 100%;
+}
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
+.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
+.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker {
+  width: 100%;
+}
+
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-default-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-select {
+  width: 100%;
+}
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-tree-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-date-picker, .vxe-body--column.fixed--width > .vxe-cell > .vxe-number-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-ico-picker {
+  width: 100%;
+}
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-input,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-textarea,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-select,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-tree-select,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-date-picker,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-number-input,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-ico-picker {
+  width: 100%;
+}
+
+.vxe-table--filter-template > .vxe-default-input, .vxe-table--filter-template > .vxe-default-textarea, .vxe-table--filter-template > .vxe-default-select {
+  width: 100%;
+}
+.vxe-table--filter-template > .vxe-input, .vxe-table--filter-template > .vxe-textarea, .vxe-table--filter-template > .vxe-select, .vxe-table--filter-template > .vxe-tree-select, .vxe-table--filter-template > .vxe-date-picker, .vxe-table--filter-template > .vxe-number-input, .vxe-table--filter-template > .vxe-ico-picker {
+  width: 100%;
+}
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-input,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-textarea,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-select,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-tree-select,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-date-picker,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-number-input,
+.vxe-table--filter-template > .vxe-cell--tree-node .vxe-ico-picker {
+  width: 100%;
+}
+
 .vxe-cell .vxe-default-input,
 .vxe-cell .vxe-default-textarea,
 .vxe-table--filter-template .vxe-default-input,
@@ -1762,7 +1835,6 @@
 .vxe-table--filter-template .vxe-default-select {
   outline: 0;
   padding: 0 2px;
-  width: 100%;
   color: var(--vxe-ui-font-color);
   border-radius: var(--vxe-ui-border-radius);
   border: 1px solid var(--vxe-ui-input-border-color);
@@ -1817,16 +1889,6 @@
 .vxe-table--filter-template .vxe-default-textarea:not([rows]) {
   height: var(--vxe-ui-input-height-default);
 }
-.vxe-cell > .vxe-input, .vxe-cell > .vxe-textarea, .vxe-cell > .vxe-select, .vxe-cell > .vxe-tree-select, .vxe-cell > .vxe-date-picker, .vxe-cell > .vxe-number-input, .vxe-cell > .vxe-ico-picker,
-.vxe-table--filter-template > .vxe-input,
-.vxe-table--filter-template > .vxe-textarea,
-.vxe-table--filter-template > .vxe-select,
-.vxe-table--filter-template > .vxe-tree-select,
-.vxe-table--filter-template > .vxe-date-picker,
-.vxe-table--filter-template > .vxe-number-input,
-.vxe-table--filter-template > .vxe-ico-picker {
-  width: 100%;
-}
 .vxe-cell > .vxe-input > .vxe-input--inner, .vxe-cell > .vxe-textarea > .vxe-textarea--inner,
 .vxe-table--filter-template > .vxe-input > .vxe-input--inner,
 .vxe-table--filter-template > .vxe-textarea > .vxe-textarea--inner {
@@ -1837,22 +1899,6 @@
 .vxe-table--filter-template > .vxe-default-textarea {
   resize: none;
 }
-.vxe-cell > .vxe-cell--tree-node .vxe-input,
-.vxe-cell > .vxe-cell--tree-node .vxe-textarea,
-.vxe-cell > .vxe-cell--tree-node .vxe-select,
-.vxe-cell > .vxe-cell--tree-node .vxe-tree-select,
-.vxe-cell > .vxe-cell--tree-node .vxe-date-picker,
-.vxe-cell > .vxe-cell--tree-node .vxe-number-input,
-.vxe-cell > .vxe-cell--tree-node .vxe-ico-picker,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-textarea,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-tree-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-date-picker,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-number-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-ico-picker {
-  width: 100%;
-}
 .vxe-cell > .vxe-cell--tree-node .vxe-input > .vxe-input--inner,
 .vxe-cell > .vxe-cell--tree-node .vxe-textarea > .vxe-textarea--inner,
 .vxe-table--filter-template > .vxe-cell--tree-node .vxe-input > .vxe-input--inner,