vxe-table 3.11.33 → 3.11.35

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.33";
+const version = "3.11.35";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2325,6 +2325,7 @@ core_.VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {
@@ -2792,7 +2793,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.33"}`;
+const log_version = `table v${"3.11.35"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8057,7 +8058,7 @@ const Methods = {
         rceTimeout
       } = internalData;
       const el = $xeTable.$refs.refElem;
-      if (!el || !el.clientWidth) {
+      if (el && el.clientWidth) {
         $xeTable.autoCellWidth();
       }
       if (rceTimeout) {
@@ -12293,7 +12294,7 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)];
     return rowRest && !!rowRest.treeLoaded;
   },
-  clearTreeExpandLoaded(row) {
+  clearTreeExpandLoaded(rows) {
     const $xeTable = this;
     const {
       treeOpts,
@@ -12301,16 +12302,22 @@ const Methods = {
       fullAllDataRowIdData
     } = this;
     const {
-      transform,
-      lazy
+      transform
     } = treeOpts;
-    const rowid = getRowid($xeTable, row);
-    const rowRest = fullAllDataRowIdData[rowid];
-    if (lazy && rowRest) {
-      rowRest.treeLoaded = false;
-      if (treeExpandedMaps[rowid]) {
-        delete treeExpandedMaps[rowid];
+    if (rows) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+        rows = [rows];
       }
+      rows.forEach(row => {
+        const rowid = getRowid($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest.treeLoaded = false;
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
+          }
+        }
+      });
     }
     if (transform) {
       this.handleVirtualTreeToList();
@@ -14044,6 +14051,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,
@@ -14053,6 +14061,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,
@@ -14791,6 +14800,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,
@@ -14799,6 +14809,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,
@@ -15314,11 +15325,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
@@ -17021,28 +17034,34 @@ const {
     }
   },
   render(h) {
+    const $xeTable = this.$parent;
     const {
-      $parent: $xetable,
       filterStore
     } = this;
     const {
       args,
+      visible,
+      multiple,
       column
     } = filterStore;
     const filterRender = column ? column.filterRender : null;
     const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
     const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
+    const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      destroyOnClose
+    } = filterOpts;
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, Object.assign({
         $panel: this,
-        $table: $xetable
+        $table: $xeTable
       }, args)), {
-        'is--animat': $xetable.animat,
-        'is--multiple': filterStore.multiple,
-        'is--active': filterStore.visible
+        'is--animat': $xeTable.animat,
+        'is--multiple': multiple,
+        'is--active': visible
       }],
       style: filterStore.style
-    }, filterStore.visible && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
+    }, filterStore.visible && (destroyOnClose ? visible : true) && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
   },
   methods: {
     renderOptions(h, filterRender, compConf) {
@@ -19972,7 +19991,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) {
@@ -20180,7 +20199,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 {
@@ -20774,7 +20793,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);
     }
@@ -21166,13 +21185,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;
           }
@@ -21309,18 +21328,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 ? ({
+        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;
@@ -21334,11 +21366,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) {
@@ -27515,7 +27547,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) {
@@ -27553,14 +27586,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);
@@ -27580,11 +27618,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
           });
@@ -27594,7 +27633,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',
@@ -28219,6 +28266,9 @@ const Toolbar = VxeToolbar;
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {