vxe-table 4.9.28 → 4.9.30

package/lib/index.umd.js

@@ -1998,7 +1998,7 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.9.28";
+const version = "4.9.30";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2040,10 +2040,12 @@ core_.VxeUI.setConfig({
       strict: true
     },
     rowDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     columnDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     checkboxConfig: {
       // trigger: 'default',
@@ -2409,7 +2411,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.9.28"}`;
+const log_version = `table v${"4.9.30"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -4893,7 +4895,8 @@ const lineOffsetSizes = {
       computeValidOpts,
       computeRowOpts,
       computeColumnOpts,
-      computeRowDragOpts
+      computeRowDragOpts,
+      computeColumnDragOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refBodyTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -5267,6 +5270,7 @@ const lineOffsetSizes = {
           }));
         }
       }
+      const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
         class: ['vxe-body--column', colid, {
           [`col--${cellAlign}`]: cellAlign,
@@ -5276,6 +5280,7 @@ const lineOffsetSizes = {
           'col--tree-node': treeNode,
           'col--edit': isEdit,
           'col--ellipsis': hasEllipsis,
+          'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
           'is--drag-cell': isColDragCell,
           'is--drag-disabled': isDisabledDrag,
@@ -5322,6 +5327,7 @@ const lineOffsetSizes = {
       const editOpts = computeEditOpts.value;
       const rowOpts = computeRowOpts.value;
       const columnOpts = computeColumnOpts.value;
+      const columnDragOpts = computeColumnDragOpts.value;
       const {
         transform,
         seqMode
@@ -5409,7 +5415,7 @@ const lineOffsetSizes = {
         const tdVNs = tableColumn.map((column, $columnIndex) => {
           return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
         });
-        rows.push(columnOpts.drag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+        rows.push(columnOpts.drag && columnDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
           name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
           tag: 'tr',
           class: trClass,
@@ -5746,7 +5752,7 @@ const lineOffsetSizes = {
       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
       // 如果是使用优化模式
@@ -5827,7 +5833,7 @@ const lineOffsetSizes = {
       /**
        * 内容
        */
-      rowOpts.drag || columnOpts.drag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+      rowOpts.drag && rowDragOpts.animation ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
         ref: refBodyTBody,
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
         tag: 'tbody'
@@ -6148,6 +6154,7 @@ const header_renderType = 'header';
             thOns.onMouseup = $xeTable.handleHeaderCellDragMouseupEvent;
           }
         }
+        const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {
           class: ['vxe-header--column', colid, {
             [`col--${headAlign}`]: headAlign,
@@ -6156,6 +6163,7 @@ const header_renderType = 'header';
             'col--fixed': column.fixed,
             'col--group': isColGroup,
             'col--ellipsis': hasEllipsis,
+            'fixed--width': !isAutoCellWidth,
             'fixed--hidden': fixedHiddenColumn,
             'is--sortable': column.sortable,
             'col--filter': !!column.filters,
@@ -6200,6 +6208,7 @@ const header_renderType = 'header';
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
+      const columnDragOpts = computeColumnDragOpts.value;
       return headerGroups.map((cols, $rowIndex) => {
         const params = {
           $table: $xeTable,
@@ -6207,7 +6216,7 @@ const header_renderType = 'header';
           fixed: fixedType,
           type: header_renderType
         };
-        if (columnOpts.drag) {
+        if (columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
             tag: 'tr',
@@ -6406,7 +6415,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     } = $xeTable.getRefMaps();
     const {
       computeTooltipOpts,
-      computeColumnOpts
+      computeColumnOpts,
+      computeColumnDragOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refFooterTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -6589,11 +6599,13 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
             attrs.colspan = colspan;
           }
         }
+        const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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
@@ -6627,6 +6639,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         isDragColMove
       } = tableReactData;
       const columnOpts = computeColumnOpts.value;
+      const columnDragOpts = computeColumnDragOpts.value;
       return footerTableData.map((row, $rowIndex) => {
         const _rowIndex = $rowIndex;
         const rowParams = {
@@ -6637,7 +6650,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           fixed: fixedType,
           type: footer_renderType
         };
-        if (columnOpts.drag) {
+        if (columnOpts.drag && columnDragOpts.animation) {
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
             tag: 'tr',
@@ -21268,7 +21281,7 @@ let htmlCellElem;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function defaultFilterExportColumn(column) {
-  return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
+  return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
 }
 const getConvertColumns = columns => {
   const result = [];
@@ -21516,7 +21529,7 @@ function clearColumnConvert(columns) {
 function checkImportData(columns, fields) {
   const tableFields = [];
   columns.forEach(column => {
-    const field = column.property;
+    const field = column.field;
     if (field) {
       tableFields.push(field);
     }
@@ -21570,7 +21583,7 @@ export_hook_hooks.add('tableExportModule', {
         column,
         options: opts,
         $table: $xeTable
-      }) : (opts.original ? column.property : column.getTitle()) || '';
+      }) : (opts.original ? column.field : column.getTitle()) || '';
     }
     const toBooleanValue = cellValue => {
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(cellValue) ? cellValue ? 'TRUE' : 'FALSE' : cellValue;
@@ -21686,7 +21699,7 @@ export_hook_hooks.add('tableExportModule', {
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             const compConf = export_hook_renderer.get(renderOpts.name);
             if (compConf) {
-              bodyExportMethod = compConf.exportMethod;
+              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
             }
           }
           if (bodyExportMethod) {
@@ -22393,13 +22406,13 @@ export_hook_hooks.add('tableExportModule', {
             } else {
               const colid = item.id || item.colId;
               const type = item.type;
-              const field = item.property || item.field;
+              const field = item.field;
               if (colid) {
                 return column.id === colid;
               } else if (field && type) {
-                return column.property === field && column.type === type;
+                return column.field === field && column.type === type;
               } else if (field) {
-                return column.property === field;
+                return column.field === field;
               } else if (type) {
                 return column.type === type;
               }
@@ -22493,18 +22506,31 @@ export_hook_hooks.add('tableExportModule', {
           mode,
           columns,
           original,
-          beforeExportMethod
+          beforeExportMethod,
+          includeFields,
+          excludeFields
         } = opts;
         let groups = [];
         const customCols = columns && columns.length ? columns : null;
         let columnFilterMethod = opts.columnFilterMethod;
         // 如果设置源数据，则默认导出设置了字段的列
         if (!customCols && !columnFilterMethod) {
-          columnFilterMethod = original ? ({
+          columnFilterMethod = ({
             column
-          }) => column.property : ({
-            column
-          }) => defaultFilterExportColumn(column);
+          }) => {
+            if (excludeFields) {
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(excludeFields, column.field)) {
+                return false;
+              }
+            }
+            if (includeFields) {
+              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(includeFields, column.field)) {
+                return true;
+              }
+              return false;
+            }
+            return original ? column.field : defaultFilterExportColumn(column);
+          };
         }
         if (customCols) {
           opts._isCustomColumn = true;
@@ -22518,11 +22544,11 @@ export_hook_hooks.add('tableExportModule', {
               } else {
                 const colid = item.id || item.colId;
                 const type = item.type;
-                const field = item.property || item.field;
+                const field = item.field;
                 if (colid) {
                   targetColumn = $xeTable.getColumnById(colid);
                 } else if (field && type) {
-                  targetColumn = tableFullColumn.find(column => column.property === field && column.type === type);
+                  targetColumn = tableFullColumn.find(column => column.field === field && column.type === type);
                 } else if (field) {
                   targetColumn = $xeTable.getColumnByField(field);
                 } else if (type) {
@@ -24946,7 +24972,8 @@ render_renderer.mixin({
         row,
         column
       } = params;
-      const digits = props.digits || render_getConfig().input?.digits || 2;
+      const inputConfig = render_getConfig().input || {};
+      const digits = props.digits || inputConfig.digits || 2;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
         switch (props.type) {
@@ -24984,14 +25011,19 @@ render_renderer.mixin({
       } = props;
       let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (cellValue) {
+        const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || render_getConfig().numberInput.digits || 1;
+          const digits = props.digits || numberInputConfig.digits || 1;
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
         } else if (type === 'amount') {
-          const digits = props.digits || render_getConfig().numberInput.digits || 2;
+          const digits = props.digits || numberInputConfig.digits || 2;
           cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
             digits
           });
+          const showCurrency = props.showCurrency;
+          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(showCurrency) ? showCurrency : numberInputConfig.showCurrency) {
+            cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+          }
         }
       }
       return getCellLabelVNs(renderOpts, params, cellValue);
@@ -25011,11 +25043,12 @@ render_renderer.mixin({
       // 兼容老模式
       const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row) ? row[_columnIndex] : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(cellValue)) {
+        const numberInputConfig = render_getConfig().numberInput || {};
         if (type === 'float') {
-          const digits = props.digits || render_getConfig().numberInput.digits || 1;
+          const digits = props.digits || numberInputConfig.digits || 1;
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
         } else if (type === 'amount') {
-          const digits = props.digits || render_getConfig().numberInput.digits || 2;
+          const digits = props.digits || numberInputConfig.digits || 2;
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().commafy(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue), {
             digits
           });
@@ -25025,7 +25058,15 @@ render_renderer.mixin({
     },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,
-    tableFilterDefaultMethod: handleInputFilterMethod
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
+      const {
+        row,
+        column
+      } = params;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
   },
   VxeDatePicker: {
     tableAutoFocus: 'input',
@@ -27792,6 +27833,9 @@ const Grid = VxeGrid;
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {