vxe-table 4.19.14 → 4.19.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.19.14",
+  "version": "4.19.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",
@@ -69,7 +69,7 @@
     "typescript": "~4.7.4",
     "vue": "3.4.27",
     "vue-router": "~4.5.1",
-    "vxe-pc-ui": "4.14.36"
+    "vxe-pc-ui": "4.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/hook.ts

@@ -715,7 +715,7 @@ hooks.add('tableExportModule', {
     const toHtml = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
       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 = computeTreeOpts.value
       const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts
       const allCls = 'check-all'
@@ -856,16 +856,35 @@ hooks.add('tableExportModule', {
         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: any) => {
+              `<tr>${columns.map((column) => {
                 const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign
                 const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
                 const cellValue = getFooterCellValue(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

@@ -882,7 +882,7 @@ function handleSetTreeSelectValue (renderOpts: VxeGlobalRendererHandles.RenderTa
  */
 renderer.mixin({
   input: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender,
     renderTableDefault: nativeEditRender,
     createTableFilterOptions: defaultFilterOptions,
@@ -890,7 +890,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableEdit: nativeEditRender
   },
   select: {
@@ -936,7 +936,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
@@ -976,7 +976,7 @@ renderer.mixin({
     }
   },
   VxeNumberInput: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell: handleNumberCell,
     renderTableFooter (renderOpts, params) {
@@ -1027,7 +1027,7 @@ renderer.mixin({
     }
   },
   VxeDatePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultEditRender,
     renderTableCell (renderOpts, params) {
       const props = renderOpts.props || {}
@@ -1053,7 +1053,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod
   },
   VxeDateRangePicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { startField, endField } = renderOpts
       const { $table, row, column } = params
@@ -1157,7 +1157,7 @@ renderer.mixin({
     }
   },
   VxeTextarea: {
-    tableAutoFocus: 'textarea',
+    tableAutoFocus: true,
     renderTableDefault: defaultEditRender,
     renderTableEdit: defaultEditRender,
     renderTableCell (renderOpts, params) {
@@ -1182,7 +1182,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultSelectEditRender,
     renderTableDefault: defaultSelectEditRender,
     renderTableCell (renderOpts, params) {
@@ -1300,7 +1300,7 @@ renderer.mixin({
     tableExportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1362,8 +1362,36 @@ renderer.mixin({
     tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
+  VxeCascader: {
+    tableAutoFocus: true,
+    renderTableEdit: defaultTableOrTreeSelectEditRender,
+    renderTableCell (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(renderOpts, params, cellResult)
+    },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit: defaultTableOrTreeSelectEditRender,
     renderTableCell (renderOpts, params) {
       const { options, optionGroups } = renderOpts
@@ -1391,7 +1419,7 @@ renderer.mixin({
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeColorPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1419,7 +1447,7 @@ renderer.mixin({
     }
   },
   VxeIconPicker: {
-    tableAutoFocus: 'input',
+    tableAutoFocus: true,
     renderTableEdit (renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { row, column } = params
       const { options } = renderOpts
@@ -1509,7 +1537,7 @@ renderer.mixin({
 
   // 以下已废弃
   $input: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldEditRender,
     renderTableCell (renderOpts, params) {
       const { props = {} } = renderOpts
@@ -1536,7 +1564,7 @@ renderer.mixin({
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   $textarea: {
-    tableAutoFocus: '.vxe-textarea--inner'
+    tableAutoFocus: 'textarea'
   },
   $button: {
     renderTableDefault: oldButtonEditRender
@@ -1545,7 +1573,7 @@ renderer.mixin({
     renderTableDefault: oldButtonsEditRender
   },
   $select: {
-    tableAutoFocus: '.vxe-input--inner',
+    tableAutoFocus: 'input',
     renderTableEdit: oldSelectEditRender,
     renderTableDefault: oldSelectEditRender,
     renderTableCell (renderOpts, params) {
@@ -1567,13 +1595,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

@@ -263,6 +263,8 @@ export default defineVxeComponent({
       const cellOpts = computeCellOpts.value
       const defaultRowHeight = computeDefaultRowHeight.value
       const headerCellOpts = computeHeaderCellOpts.value
+      const floatingFilterOpts = computeFloatingFilterOpts.value
+      const { cellClassName } = floatingFilterOpts
       const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
 
       return cols.map((column, $columnIndex) => {
@@ -322,7 +324,7 @@ export default defineVxeComponent({
         }
 
         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,
@@ -338,7 +340,7 @@ export default defineVxeComponent({
           ...thAttrs
         }, [
           h('div', {
-            class: ['vxe-cell', {
+            class: ['vxe-cell', '' + (cellClassName || ''), {
               'c--title': showTitle,
               'c--tooltip': showTooltip,
               'c--ellipsis': showEllipsis
@@ -382,7 +384,8 @@ export default defineVxeComponent({
           h('tr', {
             key: 'ff',
             class: [
-              'vxe-header--row'
+              'vxe-header--row is--floating-filters',
+              '' + (floatingFilterOpts.rowClassName || '')
             ]
           }, renderFilterRows(isOptimizeMode, renderColumnList))
         )