vxe-table 4.9.28 → 4.9.30

package/es/table/render/index.js

@@ -472,10 +472,10 @@ renderer.mixin({
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
         renderTableCell(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) {
@@ -506,13 +506,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(renderOpts, params, cellValue);
@@ -524,12 +529,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 });
                 }
             }
@@ -537,7 +543,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

@@ -28,7 +28,7 @@ export default defineComponent({
         const xesize = inject('xesize', null);
         const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
         const { refTableBody, refTableHeader, refTableFooter, refTableLeftBody, refTableRightBody, refScrollXHandleElem, refScrollYHandleElem } = $xeTable.getRefMaps();
-        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refBodyTable = ref();
         const refBodyColgroup = ref();
@@ -340,6 +340,7 @@ export default defineComponent({
                     }));
                 }
             }
+            const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
             return h('td', Object.assign(Object.assign(Object.assign({ class: [
                     'vxe-body--column',
                     colid,
@@ -351,6 +352,7 @@ export default defineComponent({
                         'col--tree-node': treeNode,
                         'col--edit': isEdit,
                         'col--ellipsis': hasEllipsis,
+                        'fixed--width': !isAutoCellWidth,
                         'fixed--hidden': fixedHiddenColumn,
                         'is--drag-cell': isColDragCell,
                         'is--drag-disabled': isDisabledDrag,
@@ -376,6 +378,7 @@ export default defineComponent({
             const editOpts = computeEditOpts.value;
             const rowOpts = computeRowOpts.value;
             const columnOpts = computeColumnOpts.value;
+            const columnDragOpts = computeColumnDragOpts.value;
             const { transform, seqMode } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const rows = [];
@@ -452,7 +455,7 @@ export default defineComponent({
                 const tdVNs = tableColumn.map((column, $columnIndex) => {
                     return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 });
-                rows.push(columnOpts.drag
+                rows.push(columnOpts.drag && columnDragOpts.animation
                     ? h(TransitionGroup, Object.assign({ name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`, tag: 'tr', class: trClass, rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex }, trOn), {
                         default: () => tdVNs
                     })
@@ -707,7 +710,7 @@ export default defineComponent({
             const emptyOpts = computeEmptyOpts.value;
             const keyboardOpts = computeKeyboardOpts.value;
             const mouseOpts = computeMouseOpts.value;
-            const columnOpts = computeColumnOpts.value;
+            const rowDragOpts = computeRowDragOpts.value;
             // const isMergeLeftFixedExceeded = computeIsMergeLeftFixedExceeded.value
             // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
             // 如果是使用优化模式
@@ -787,7 +790,7 @@ export default defineComponent({
                     /**
                      * 内容
                      */
-                    rowOpts.drag || columnOpts.drag
+                    rowOpts.drag && rowDragOpts.animation
                         ? h(TransitionGroup, {
                             ref: refBodyTBody,
                             name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,

package/es/table/src/footer.js

@@ -41,7 +41,7 @@ export default defineComponent({
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
         const { refTableHeader, refTableBody, refScrollXHandleElem } = $xeTable.getRefMaps();
-        const { computeTooltipOpts, computeColumnOpts } = $xeTable.getComputeMaps();
+        const { computeTooltipOpts, computeColumnOpts, computeColumnDragOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refFooterTable = ref();
         const refFooterColgroup = ref();
@@ -184,10 +184,12 @@ export default defineComponent({
                         attrs.colspan = colspan;
                     }
                 }
+                const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 return h('td', Object.assign(Object.assign(Object.assign(Object.assign({ 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
@@ -214,10 +216,11 @@ export default defineComponent({
             const { footerRowClassName, footerRowStyle } = tableProps;
             const { isDragColMove } = tableReactData;
             const columnOpts = computeColumnOpts.value;
+            const columnDragOpts = computeColumnDragOpts.value;
             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(TransitionGroup, {
                         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
                         tag: 'tr',

package/es/table/src/header.js

@@ -209,6 +209,7 @@ export default defineComponent({
                         thOns.onMouseup = $xeTable.handleHeaderCellDragMouseupEvent;
                     }
                 }
+                const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 return h('th', Object.assign(Object.assign(Object.assign({ class: ['vxe-header--column', colid, {
                             [`col--${headAlign}`]: headAlign,
                             [`col--${type}`]: type,
@@ -216,6 +217,7 @@ export default defineComponent({
                             'col--fixed': column.fixed,
                             'col--group': isColGroup,
                             'col--ellipsis': hasEllipsis,
+                            'fixed--width': !isAutoCellWidth,
                             'fixed--hidden': fixedHiddenColumn,
                             'is--sortable': column.sortable,
                             'col--filter': !!column.filters,
@@ -259,9 +261,10 @@ export default defineComponent({
             const { headerRowClassName, headerRowStyle } = tableProps;
             const { isDragColMove } = tableReactData;
             const columnOpts = computeColumnOpts.value;
+            const columnDragOpts = computeColumnDragOpts.value;
             return headerGroups.map((cols, $rowIndex) => {
                 const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType };
-                if (columnOpts.drag) {
+                if (columnOpts.drag && columnDragOpts.animation) {
                     return h(TransitionGroup, {
                         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
                         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,