vxe-table 3.11.33 → 3.11.35

package/packages/locale/lang/vi-VN.ts

@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '$'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

package/packages/locale/lang/zh-CHT.ts

@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '預覽',
       operBtn: {

package/packages/locale/lang/zh-CN.ts

@@ -289,6 +289,9 @@ export default {
         }
       }
     },
+    numberInput: {
+      currencySymbol: '￥'
+    },
     imagePreview: {
       popupTitle: '预览',
       operBtn: {

package/packages/table/module/export/mixin.ts

@@ -49,7 +49,7 @@ function getSeq ($xetable: any, cellValue: any, row: any, $rowIndex: any, column
 }
 
 function defaultFilterExportColumn (column: any) {
-  return column.property || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1
+  return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1
 }
 
 function toTableBorder (border: any) {
@@ -220,7 +220,7 @@ function getBooleanValue (cellValue: any) {
 function getHeaderTitle ($xetable: any, opts: any, column: any) {
   const { columnOpts } = $xetable
   const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod
-  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.property : column.getTitle()) || '')
+  return headExportMethod ? headExportMethod({ column, options: opts, $table: $xetable }) : ((opts.original ? column.field : column.getTitle()) || '')
 }
 
 function getFooterCellValue ($xetable: any, opts: any, row: any, column: any) {
@@ -776,7 +776,7 @@ function parseXML (columns: any, content: any) {
 function checkImportData (columns: any[], fields: any[]) {
   const tableFields: any[] = []
   columns.forEach((column) => {
-    const field = column.property
+    const field = column.field
     if (field) {
       tableFields.push(field)
     }
@@ -1083,13 +1083,13 @@ function handleExportAndPrint ($xetable: any, options: any, isPrint?: any) {
           } 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
             }
@@ -1219,13 +1219,26 @@ export default {
       }, exportOpts, {
         print: false
       }, options)
-      const { type, mode, columns, original, beforeExportMethod } = opts
+      const { type, mode, columns, original, beforeExportMethod, excludeFields, includeFields } = opts
       let groups = []
       const customCols = columns && columns.length ? columns : null
       // 如果设置源数据，则默认导出设置了字段的列
       let columnFilterMethod = opts.columnFilterMethod
       if (!customCols && !columnFilterMethod) {
-        columnFilterMethod = original ? ({ column }: any) => column.property : ({ column }: any) => defaultFilterExportColumn(column)
+        columnFilterMethod = ({ column }: any) => {
+          if (excludeFields) {
+            if (XEUtils.includes(excludeFields, column.field)) {
+              return false
+            }
+          }
+          if (includeFields) {
+            if (XEUtils.includes(includeFields, column.field)) {
+              return true
+            }
+            return false
+          }
+          return original ? column.field : defaultFilterExportColumn(column)
+        }
       }
       if (customCols) {
         opts._isCustomColumn = true
@@ -1240,11 +1253,11 @@ export default {
               } 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: any) => column.property === field && column.type === type)
+                  targetColumn = tableFullColumn.find((column: any) => column.field === field && column.type === type)
                 } else if (field) {
                   targetColumn = this.getColumnByField(field)
                 } else if (type) {

package/packages/table/module/filter/panel.ts

@@ -17,25 +17,29 @@ export default {
     }
   } as any,
   render (this: any, h: CreateElement) {
-    const { $parent: $xetable, filterStore } = this
-    const { args, column } = filterStore
+    const $xeTable = this.$parent
+
+    const { filterStore } = this
+    const { args, visible, multiple, column } = filterStore
     const filterRender = column ? column.filterRender : null
     const compConf = isEnableConf(filterRender) ? 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 }, args)),
+        getClass(filterClassName, Object.assign({ $panel: this, $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: CreateElement, filterRender: any, compConf: any) {

package/packages/table/render/index.ts

@@ -589,7 +589,8 @@ renderer.mixin({
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column } = params
-      const digits = props.digits || getConfig().input?.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) {
@@ -620,12 +621,17 @@ 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)
@@ -637,11 +643,12 @@ 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 })
         }
       }
@@ -649,7 +656,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/packages/table/src/body.ts

@@ -310,6 +310,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
       )
     }
   }
+  const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
 
   return h('td', {
     class: [
@@ -323,6 +324,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
         'col--tree-node': treeNode,
         'col--edit': isEdit,
         'col--ellipsis': hasEllipsis,
+        'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
         'is--drag-cell': isColDragCell,
         'is--drag-disabled': isDisabledDrag,

package/packages/table/src/footer.ts

@@ -120,11 +120,14 @@ function renderRows (h: CreateElement, _vm: any, tableColumn: VxeTableDefines.Co
         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

package/packages/table/src/header.ts

@@ -69,6 +69,8 @@ const renderRows = (h: CreateElement, _vm: any, cols: VxeTableDefines.ColumnInfo
         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,
@@ -77,6 +79,7 @@ const renderRows = (h: CreateElement, _vm: any, cols: VxeTableDefines.ColumnInfo
         'col--fixed': column.fixed,
         'col--group': isColGroup,
         'col--ellipsis': hasEllipsis,
+        'fixed--width': !isAutoCellWidth,
         'fixed--hidden': fixedHiddenColumn,
         'is--sortable': column.sortable,
         'col--filter': !!column.filters,

package/packages/table/src/methods.ts

@@ -2685,7 +2685,7 @@ const Methods = {
 
       const { rceTimeout } = internalData
       const el = $xeTable.$refs.refElem
-      if (!el || !el.clientWidth) {
+      if (el && el.clientWidth) {
         $xeTable.autoCellWidth()
       }
       if (rceTimeout) {
@@ -6288,18 +6288,25 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)]
     return rowRest && !!rowRest.treeLoaded
   },
-  clearTreeExpandLoaded (row: any) {
+  clearTreeExpandLoaded (rows: any) {
     const $xeTable = this
 
     const { treeOpts, treeExpandedMaps, fullAllDataRowIdData } = this
-    const { transform, lazy } = treeOpts
-    const rowid = getRowid($xeTable, row)
-    const rowRest = fullAllDataRowIdData[rowid]
-    if (lazy && rowRest) {
-      rowRest.treeLoaded = false
-      if (treeExpandedMaps[rowid]) {
-        delete treeExpandedMaps[rowid]
+    const { transform } = treeOpts
+    if (rows) {
+      if (!XEUtils.isArray(rows)) {
+        rows = [rows]
       }
+      rows.forEach((row: any) => {
+        const rowid = getRowid($xeTable, row)
+        const rowRest = fullAllDataRowIdData[rowid]
+        if (rowRest) {
+          rowRest.treeLoaded = false
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid]
+          }
+        }
+      })
     }
     if (transform) {
       this.handleVirtualTreeToList()

package/packages/ui/index.ts

@@ -111,6 +111,7 @@ VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {

package/styles/components/table.scss

@@ -60,6 +60,96 @@
 }
 
 /*默认的渲染*/
+.vxe-header--column,
+.vxe-footer--column {
+  &.fixed--width {
+    & > .vxe-cell {
+      .vxe-default-input,
+      .vxe-default-textarea,
+      .vxe-default-select {
+        width: 100%;
+      }
+      .vxe-input,
+      .vxe-textarea,
+      .vxe-select,
+      .vxe-tree-select,
+      .vxe-date-picker,
+      .vxe-number-input,
+      .vxe-ico-picker {
+        width: 100%;
+      }
+      .vxe-cell--tree-node {
+        .vxe-input,
+        .vxe-textarea,
+        .vxe-select,
+        .vxe-tree-select,
+        .vxe-date-picker,
+        .vxe-number-input,
+        .vxe-ico-picker {
+          width: 100%;
+        }
+      }
+    }
+  }
+}
+.vxe-body--column {
+  &.fixed--width {
+    & > .vxe-cell {
+      & > .vxe-default-input,
+      & > .vxe-default-textarea,
+      & > .vxe-default-select {
+        width: 100%;
+      }
+      & > .vxe-input,
+      & > .vxe-textarea,
+      & > .vxe-select,
+      & > .vxe-tree-select,
+      & > .vxe-date-picker,
+      & > .vxe-number-input,
+      & > .vxe-ico-picker {
+        width: 100%;
+      }
+      & > .vxe-cell--tree-node {
+        .vxe-input,
+        .vxe-textarea,
+        .vxe-select,
+        .vxe-tree-select,
+        .vxe-date-picker,
+        .vxe-number-input,
+        .vxe-ico-picker {
+          width: 100%;
+        }
+      }
+    }
+  }
+}
+.vxe-table--filter-template {
+  & > .vxe-default-input,
+  & > .vxe-default-textarea,
+  & > .vxe-default-select {
+    width: 100%;
+  }
+  & > .vxe-input,
+  & > .vxe-textarea,
+  & > .vxe-select,
+  & > .vxe-tree-select,
+  & > .vxe-date-picker,
+  & > .vxe-number-input,
+  & > .vxe-ico-picker {
+    width: 100%;
+  }
+  & > .vxe-cell--tree-node {
+    .vxe-input,
+    .vxe-textarea,
+    .vxe-select,
+    .vxe-tree-select,
+    .vxe-date-picker,
+    .vxe-number-input,
+    .vxe-ico-picker {
+      width: 100%;
+    }
+  }
+}
 .vxe-cell,
 .vxe-table--filter-template {
   .vxe-default-input,
@@ -71,7 +161,6 @@
   .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);
@@ -107,15 +196,6 @@
       height: var(--vxe-ui-input-height-default);
     }
   }
-  & > .vxe-input,
-  & > .vxe-textarea,
-  & > .vxe-select,
-  & > .vxe-tree-select,
-  & > .vxe-date-picker,
-  & > .vxe-number-input,
-  & > .vxe-ico-picker {
-    width: 100%;
-  }
   & > .vxe-input > .vxe-input--inner,
   & > .vxe-textarea > .vxe-textarea--inner {
     padding: 0 2px;
@@ -125,15 +205,6 @@
     resize: none;
   }
   & > .vxe-cell--tree-node {
-    .vxe-input,
-    .vxe-textarea,
-    .vxe-select,
-    .vxe-tree-select,
-    .vxe-date-picker,
-    .vxe-number-input,
-    .vxe-ico-picker {
-      width: 100%;
-    }
     .vxe-input > .vxe-input--inner,
     .vxe-textarea > .vxe-textarea--inner {
       padding: 0 2px;