vxe-table 3.21.14 → 3.21.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.14",
+  "version": "3.21.16",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -68,7 +68,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.14.36"
+    "vxe-pc-ui": "3.15.2"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/locale/lang/ar-EG.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/de-DE.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/en-US.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0}',
       monthLabel: '{0}'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/es-ES.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/fr-FR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/hu-HU.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/hy-AM.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/id-ID.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/it-IT.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ja-JP.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ko-KR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ms-MY.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/nb-NO.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/pt-BR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/ru-RU.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/th-TH.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uk-UA.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/locale/lang/uz-UZ.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

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

@@ -496,7 +496,7 @@ function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: V
 
   const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props
   const { isAllSelected, isIndeterminate } = reactData
-  const { mergeBodyCellMaps } = internalData
+  const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
   const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts
   const allCls = 'check-all'
@@ -637,16 +637,35 @@ function toHtml ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, opts: V
     const footers = getFooterData($xeTable, opts, footerTableData)
     if (footers.length) {
       tables.push('<tfoot>')
-      footers.forEach((row: any) => {
+      footers.forEach((row, rIndex) => {
         tables.push(
           `<tr>${columns.map(column => {
             const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign
             const classNames = hasEllipsis($xeTable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
             const cellValue = getFooterCellValue($xeTable, opts, row, column)
+            let rowSpan = 1
+                let colSpan = 1
+                if (isMerge) {
+                  const _rowIndex = rIndex
+                  const _columnIndex = $xeTable.getVTColumnIndex(column)
+                  const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`]
+                  if (spanRest) {
+                    const { rowspan, colspan } = spanRest
+                    if (!rowspan || !colspan) {
+                      return ''
+                    }
+                    if (rowspan > 1) {
+                      rowSpan = rowspan
+                    }
+                    if (colspan > 1) {
+                      colSpan = colspan
+                    }
+                  }
+                }
             if (footAlign) {
               classNames.push(`col--${footAlign}`)
             }
-            return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`
+            return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`
           }).join('')}</tr>`
         )
       })

package/packages/table/render/index.ts

@@ -894,14 +894,14 @@ function handleSetTreeSelectValue (renderOpts: VxeGlobalRendererHandles.RenderTa
  */
 renderer.mixin({
   input: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender,
     renderTableDefault: nativeEditRender,
     renderTableFilter: nativeFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender
   },
   select: {
@@ -946,7 +946,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
@@ -986,7 +986,7 @@ renderer.mixin({
     }
   },
   VxeNumberInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell: handleNumberCell,
     renderTableFooter (h, renderOpts, params) {
@@ -1037,7 +1037,7 @@ renderer.mixin({
     }
   },
   VxeDatePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (h, renderOpts, params) {
       const props = renderOpts.props || {}
@@ -1063,7 +1063,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod
   },
   VxeDateRangePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { startField, endField } = renderOpts
       const { $table, row, column } = params
@@ -1167,7 +1167,7 @@ renderer.mixin({
     }
   },
   VxeTextarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableDefault: defaultEditRender,
     renderTableEdit: defaultEditRender
   },
@@ -1189,7 +1189,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultSelectEditRender,
     renderTableDefault: defaultSelectEditRender,
     renderTableCell (h, renderOpts, params) {
@@ -1311,7 +1311,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (h, renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1373,8 +1373,36 @@ renderer.mixin({
     tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
+  VxeCascader: {
+    tableAutoFocus: true,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
+    renderTableCell (h, renderOpts, params) {
+      const { options, optionGroups } = renderOpts
+      const { $table, row, column } = params
+      const opSize = options ? options.length : null
+      const ogSize = optionGroups ? optionGroups.length : null
+      const { cellResult } = $table.effectCellData(row, column, {
+        key: 'render_table_cell',
+        isChanged ({ oldValue, cellValue }) {
+          return oldValue && oldValue[0] === cellValue && oldValue[1] === opSize && oldValue[2] === ogSize
+        },
+        setValue ({ cellValue }) {
+          return [cellValue, opSize, ogSize]
+        },
+        getResult ({ cellValue }) {
+          return handleTreeSelectCellValue(cellValue, renderOpts)
+        }
+      })
+      // const cellResult = getTreeSelectCellValue(renderOpts, params)
+      return getCellLabelVNs(h, renderOpts, params, cellResult)
+    },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (h, renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1402,7 +1430,7 @@ renderer.mixin({
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeColorPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h, renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1430,7 +1458,7 @@ renderer.mixin({
     }
   },
   VxeIconPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (h, renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1526,7 +1554,7 @@ renderer.mixin({
 
   // 以下已废弃
   $input: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldEditRender,
     renderTableCell (h, renderOpts, params) {
       const { props = {} } = renderOpts
@@ -1553,7 +1581,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    tableAutoFocus: '.vxe-textarea--inner'
+    tableAutoFocus: 'textarea'
   },
   $button: {
     renderTableDefault: oldButtonEditRender
@@ -1562,7 +1590,7 @@ renderer.mixin({
     renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldSelectEditRender,
     renderTableDefault: oldSelectEditRender,
     renderTableCell (h, renderOpts, params) {
@@ -1584,13 +1612,13 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    tableAutoFocus: '.vxe-radio--input'
+    tableAutoFocus: 'input'
   },
   $checkbox: {
-    tableAutoFocus: '.vxe-checkbox--input'
+    tableAutoFocus: 'input'
   },
   $switch: {
-    tableAutoFocus: '.vxe-switch--button',
+    tableAutoFocus: 'button',
     renderTableEdit: oldEditRender,
     renderTableDefault: oldEditRender
   }

package/packages/table/src/header.ts

@@ -229,6 +229,8 @@ function renderFilterRows (h: CreateElement, _vm: any, isOptimizeMode: boolean,
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
+  const floatingFilterOpts = $xeTable.computeFloatingFilterOpts
+  const { cellClassName } = floatingFilterOpts
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
 
   return cols.map((column, $columnIndex) => {
@@ -288,7 +290,7 @@ function renderFilterRows (h: CreateElement, _vm: any, isOptimizeMode: boolean,
     }
 
     return h('th', {
-      class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+      class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,
         [`col--${type}`]: type,
         'col--last': isLastColumn,
@@ -304,7 +306,7 @@ function renderFilterRows (h: CreateElement, _vm: any, isOptimizeMode: boolean,
       attrs: thAttrs
     }, [
       h('div', {
-        class: ['vxe-cell', {
+        class: ['vxe-cell', '' + (cellClassName || ''), {
           'c--title': showTitle,
           'c--tooltip': showTooltip,
           'c--ellipsis': showEllipsis
@@ -354,7 +356,8 @@ function renderHeads (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMo
       h('tr', {
         key: 'ff',
         class: [
-          'vxe-header--row'
+          'vxe-header--row is--floating-filters',
+          '' + (floatingFilterOpts.rowClassName || '')
         ]
       }, renderFilterRows(h, _vm, isOptimizeMode, renderColumnList))
     )

package/packages/table/src/methods.ts

@@ -2973,11 +2973,36 @@ function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
   const { tooltipStore } = reactData
   const { column, row } = params
   const { showAll, contentMethod } = tipOpts
-  const customContent = contentMethod ? contentMethod(params) : null
-  const useCustom = contentMethod && !XEUtils.eqNull(customContent)
-  const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim()
+  const cellText = XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim()
   const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth
-  if (content && (showAll || useCustom || isOver)) {
+  let isShow = false
+  let customContent: any = null
+  let content = ''
+  if (contentMethod) {
+    customContent = contentMethod(params)
+  }
+  // 是否全部展示
+  if (showAll) {
+    // 如果为 null 默认显示
+    if (XEUtils.eqNull(customContent)) {
+      isShow = true
+      content = cellText
+    } else if (customContent !== '' && customContent !== false) {
+      // 如果为 '' | false 则不显示
+      isShow = true
+      content = '' + customContent
+    }
+  } else {
+    // 如果为 null 使用默认逻辑
+    if (XEUtils.eqNull(customContent)) {
+      isShow = isOver
+    } else if (customContent !== '' && customContent !== false) {
+      // 如果为 '' | false 则不显示
+      isShow = true
+    }
+    content = cellText
+  }
+  if (isShow && content) {
     const tipContent = formatText(content)
     Object.assign(tooltipStore, {
       row,