vxe-table 3.11.32 → 3.11.34

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.32";
+const version = "3.11.34";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2262,10 +2262,12 @@ core_.VxeUI.setConfig({
       strict: true
     },
     rowDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     columnDragConfig: {
-      showIcon: true
+      showIcon: true,
+      animation: true
     },
     checkboxConfig: {
       // trigger: 'default',
@@ -2790,7 +2792,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.32"}`;
+const log_version = `table v${"3.11.34"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -14042,6 +14044,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', column.id, {
       [`col--${cellAlign}`]: cellAlign,
@@ -14051,6 +14054,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,
@@ -14068,6 +14072,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }, tdVNs);
 }
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     stripe,
     rowKey,
@@ -14090,7 +14096,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     fullAllDataRowIdData,
     rowOpts,
     pendingRowMaps,
-    columnOpts,
     isDragColMove
   } = $xeTable;
   const {
@@ -14186,7 +14191,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 ? h('transition-group', {
+    rows.push(columnOpts.drag && columnDragOpts.animation ? h('transition-group', {
       props: {
         tag: 'tr',
         name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`
@@ -14330,6 +14335,8 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       fixedColumn,
       fixedType
     } = this;
+    const rowOpts = $xeTable.computeRowOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
     let {
       $scopedSlots,
       tId,
@@ -14349,7 +14356,6 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       mouseConfig,
       mouseOpts,
       sYOpts,
-      rowOpts,
       isDragRowMove
     } = $xetable;
     // 如果是使用优化模式
@@ -14434,7 +14440,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     /**
      * 内容
      */
-    rowOpts.drag ? h('transition-group', {
+    rowOpts.drag && rowDragOpts.animation ? h('transition-group', {
       props: {
         tag: 'tbody',
         name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
@@ -14787,6 +14793,7 @@ const header_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,
@@ -14795,6 +14802,7 @@ const header_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,
@@ -14830,29 +14838,28 @@ const header_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;
+  } = $xeTable;
   return headerGroups.map((cols, $rowIndex) => {
     const params = {
-      $table: $xetable,
+      $table: $xeTable,
       $rowIndex,
       fixed: fixedType,
       type: cellType
     };
-    if (columnOpts.drag) {
+    if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         props: {
           tag: 'tr',
@@ -15311,11 +15318,13 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
         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
@@ -15337,6 +15346,9 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
   })] : []);
 }
 function footer_renderHeads(h, _vm, footerTableData) {
+  const $xeTable = _vm.$parent;
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     $parent: $xetable,
     fixedType,
@@ -15347,7 +15359,6 @@ function footer_renderHeads(h, _vm, footerTableData) {
     footerRowStyle,
     isDragColMove
   } = $xetable;
-  const columnOpts = $xetable.columnOpts;
   return footerTableData.map((row, $rowIndex) => {
     const _rowIndex = $rowIndex;
     const rowParams = {
@@ -15358,7 +15369,7 @@ function footer_renderHeads(h, _vm, footerTableData) {
       fixed: fixedType,
       type: footer_renderType
     };
-    if (columnOpts.drag) {
+    if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         props: {
           tag: 'tr',
@@ -16543,12 +16554,8 @@ const renderPopupPanel = (h, _vm) => {
     }
   },
   render(h) {
-    const {
-      $xetable
-    } = this;
-    const {
-      customOpts
-    } = $xetable;
+    const $xeTable = this.$xeTable;
+    const customOpts = $xeTable.computeCustomOpts;
     if (['modal', 'drawer', 'popup'].includes(`${customOpts.mode}`)) {
       return renderPopupPanel(h, this);
     }
@@ -16642,12 +16649,11 @@ const renderPopupPanel = (h, _vm) => {
       }
     },
     handleOptionCheck(column) {
-      const {
-        $xetable
-      } = this;
+      const $xeTable = this.$xeTable;
+      const reactData = $xeTable;
       const {
         customColumnList
-      } = $xetable;
+      } = reactData;
       const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(customColumnList, item => item === column);
       if (matchObj && matchObj.parent) {
         const {
@@ -16661,11 +16667,9 @@ const renderPopupPanel = (h, _vm) => {
       }
     },
     changeCheckboxOption(column) {
-      const $xeTable = this.$xetable;
+      const $xeTable = this.$xeTable;
       const reactData = $xeTable;
-      const {
-        customOpts
-      } = $xeTable.customOpts;
+      const customOpts = $xeTable.computeCustomOpts;
       const isChecked = !column.renderVisible;
       if (customOpts.immediate) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
@@ -19974,7 +19978,7 @@ function getSeq($xetable, cellValue, row, $rowIndex, column, $columnIndex) {
   return cellValue;
 }
 function defaultFilterExportColumn(column) {
-  return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
+  return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
 }
 function toTableBorder(border) {
   if (border === true) {
@@ -20182,7 +20186,7 @@ function getHeaderTitle($xetable, opts, column) {
     column,
     options: opts,
     $table: $xetable
-  }) : (opts.original ? column.property : column.getTitle()) || '';
+  }) : (opts.original ? column.field : column.getTitle()) || '';
 }
 function getFooterCellValue($xetable, opts, row, column) {
   const {
@@ -20776,7 +20780,7 @@ function parseXML(columns, content) {
 function checkImportData(columns, fields) {
   const tableFields = [];
   columns.forEach(column => {
-    const field = column.property;
+    const field = column.field;
     if (field) {
       tableFields.push(field);
     }
@@ -21168,13 +21172,13 @@ function handleExportAndPrint($xetable, options, isPrint) {
         } 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;
           }
@@ -21311,18 +21315,31 @@ const convertToRows = originColumns => {
         mode,
         columns,
         original,
-        beforeExportMethod
+        beforeExportMethod,
+        excludeFields,
+        includeFields
       } = opts;
       let groups = [];
       const customCols = columns && columns.length ? columns : null;
       // 如果设置源数据，则默认导出设置了字段的列
       let columnFilterMethod = opts.columnFilterMethod;
       if (!customCols && !columnFilterMethod) {
-        columnFilterMethod = original ? ({
-          column
-        }) => column.property : ({
+        columnFilterMethod = ({
           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;
@@ -21336,11 +21353,11 @@ const convertToRows = originColumns => {
             } else {
               const colid = item.id || item.colId;
               const type = item.type;
-              const field = item.property || item.field;
+              const field = item.field;
               if (colid) {
                 targetColumn = this.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 = this.getColumnByField(field);
               } else if (type) {
@@ -27517,7 +27534,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) {
@@ -27555,14 +27573,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(h, renderOpts, params, cellValue);
@@ -27582,11 +27605,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
           });
@@ -27596,7 +27620,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',
@@ -28221,6 +28253,9 @@ const Toolbar = VxeToolbar;
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {