vxe-table 4.8.16 → 4.9.1

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: 'Support {0} file types',
       fileSizeHint: 'Single file size does not exceed {0}',
       fileCountHint: 'Up to {0} file can be uploaded',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: 'You can only choose {0} file!',
       overCountExtraErr: 'It has exceeded the maximum number {0}, and more than {0} file will be ignored!超出最大数量 1 个，超出的 1 个文件将被忽略！',
       overSizeErr: 'The size of the file is not more than {0}}!',

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: 'Поддерживаемые типы файлов: {0}',
       fileSizeHint: 'Размер одного файла не превышает {0}',
       fileCountHint: 'Можно загрузить до {0} файлов.',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: 'Можно выбрать только {0} файлов!',
       overCountExtraErr: 'Превышено максимальное количество файлов ({0}). Лишние файлы ({1}) будут проигнорированы!',
       overSizeErr: 'Максимальный размер файла не может превышать {0}!',

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: '支持 {0} 文件类型',
       fileSizeHint: '单个文件大小不超过{0}',
       fileCountHint: '最多可上传{0}个文件',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: '支持 {0} 文件类型',
       fileSizeHint: '单个文件大小不超过{0}',
       fileCountHint: '最多可上传{0}个文件',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: '支援 {0} 文件類型',
       fileSizeHint: '單一檔案大小不超過{0}',
       fileCountHint: '最多可上傳{0}個文件',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: '最多只能選擇{0}個檔案！',
       overCountExtraErr: '已超出最大數量{0}個，超出的{1}個檔案將被忽略！',
       overSizeErr: '檔案大小最大不能超過{0}！',

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

@@ -308,6 +308,7 @@ export default {
       fileTypeHint: '支持 {0} 文件类型',
       fileSizeHint: '单个文件大小不超过{0}',
       fileCountHint: '最多可上传{0}个文件',
+      uploadTypeErr: '文件类型不匹配！',
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',

package/packages/table/module/custom/hook.ts

@@ -92,6 +92,10 @@ VxeUI.hooks.add('tableCustomModule', {
           column.visible = column.renderVisible
         }
       })
+      reactData.isDragColMove = true
+      setTimeout(() => {
+        reactData.isDragColMove = false
+      }, 1000)
       return $xeTable.saveCustomStore('confirm')
     }
 

package/packages/table/module/edit/hook.ts

@@ -256,6 +256,48 @@ hooks.add('tableEditModule', {
       })
     }
 
+    const handleClearEdit = (evnt: Event | null, targetRow?: any) => {
+      const { mouseConfig } = props
+      const { editStore } = reactData
+      const { actived, focused } = editStore
+      const { row, column } = actived
+      const validOpts = computeValidOpts.value
+      const mouseOpts = computeMouseOpts.value
+      if (row || column) {
+        if (targetRow && getRowid($xeTable, targetRow) !== getRowid($xeTable, row)) {
+          return nextTick()
+        }
+        syncActivedCell()
+        actived.args = null
+        actived.row = null
+        actived.column = null
+        $xeTable.updateFooter()
+        $xeTable.dispatchEvent('edit-closed', {
+          row,
+          rowIndex: $xeTable.getRowIndex(row),
+          $rowIndex: $xeTable.getVMRowIndex(row),
+          column,
+          columnIndex: $xeTable.getColumnIndex(column),
+          $columnIndex: $xeTable.getVMColumnIndex(column)
+        }, evnt || null)
+      }
+      nextTick(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas()
+        }
+      })
+      if (validOpts.autoClear) {
+        if (validOpts.msgMode !== 'full' || getConfig().cellVaildMode === 'obsolete') {
+          if ($xeTable.clearValidate) {
+            return $xeTable.clearValidate()
+          }
+        }
+      }
+      focused.row = null
+      focused.column = null
+      return nextTick()
+    }
+
     editMethods = {
       /**
        * 往表格中插入临时数据
@@ -514,46 +556,18 @@ hooks.add('tableEditModule', {
         }
         return null
       },
-      clearActived (evnt) {
+      clearActived (row) {
         // 即将废弃
         if (process.env.VUE_APP_VXE_ENV === 'development') {
           warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
         }
-        return this.clearEdit(evnt)
+        return this.clearEdit(row)
       },
       /**
        * 清除激活的编辑
        */
-      clearEdit (evnt) {
-        const { editStore } = reactData
-        const { actived, focused } = editStore
-        const { row, column } = actived
-        const validOpts = computeValidOpts.value
-        if (row || column) {
-          syncActivedCell()
-          actived.args = null
-          actived.row = null
-          actived.column = null
-          $xeTable.updateFooter()
-          $xeTable.dispatchEvent('edit-closed', {
-            row,
-            rowIndex: $xeTable.getRowIndex(row),
-            $rowIndex: $xeTable.getVMRowIndex(row),
-            column,
-            columnIndex: $xeTable.getColumnIndex(column),
-            $columnIndex: $xeTable.getVMColumnIndex(column)
-          }, evnt || null)
-        }
-        if (validOpts.autoClear) {
-          if (validOpts.msgMode !== 'full' || getConfig().cellVaildMode === 'obsolete') {
-            if ($xeTable.clearValidate) {
-              return $xeTable.clearValidate()
-            }
-          }
-        }
-        focused.row = null
-        focused.column = null
-        return nextTick()
+      clearEdit (row) {
+        return handleClearEdit(null, row)
       },
       /**
        * 清除所选中源状态
@@ -687,7 +701,7 @@ hooks.add('tableEditModule', {
                 }
                 $xeTable.closeTooltip()
                 if (actived.column) {
-                  editMethods.clearEdit(evnt)
+                  handleClearEdit(evnt)
                 }
                 type = 'edit-activated'
                 column.renderHeight = cell.offsetHeight
@@ -765,6 +779,12 @@ hooks.add('tableEditModule', {
       handleActived (params, evnt) {
         return editPrivateMethods.handleEdit(params, evnt)
       },
+      /**
+       * 处理取消编辑
+       * @param evnt
+       * @returns
+       */
+      handleClearEdit,
       /**
        * 处理聚焦
        */
@@ -836,7 +856,7 @@ hooks.add('tableEditModule', {
         const selectMethod = () => {
           if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
             if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-              editMethods.clearEdit(evnt)
+              handleClearEdit(evnt)
               editMethods.clearSelected()
               if ($xeTable.clearCellAreas) {
                 $xeTable.clearCellAreas()

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

@@ -1,7 +1,7 @@
 import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
-import { toFilters, handleFieldOrColumn } from '../../src/util'
+import { toFilters, handleFieldOrColumn, getRefElem } from '../../src/util'
 import { getDomNode, triggerEvent } from '../../../ui/src/dom'
 import { isEnableConf } from '../../../ui/src/utils'
 
@@ -251,8 +251,7 @@ hooks.add('tableFilterModule', {
           const { elemStore } = internalData
           const { fixed } = column
           return $xeTable.scrollToColumn(column).then(() => {
-            const headerWrapperRef = elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper']
-            const headerWrapperElem = headerWrapperRef ? headerWrapperRef.value : null
+            const headerWrapperElem = getRefElem(elemStore[`${fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper'])
             if (headerWrapperElem) {
               const filterBtnElem = headerWrapperElem.querySelector(`.vxe-header--column.${column.id} .vxe-filter--btn`) as HTMLElement
               triggerEvent(filterBtnElem, 'click')

package/packages/table/module/keyboard/hook.ts

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
+import { getRefElem } from '../../src/util'
 import { browse, hasClass, getAbsolutePos, addClass, removeClass, getEventTargetNode } from '../../../ui/src/dom'
 
 import type { TableKeyboardPrivateMethods } from '../../../../types'
@@ -79,8 +80,7 @@ hooks.add('tableKeyboardModule', {
         const { elemStore } = internalData
         const disX = evnt.clientX
         const disY = evnt.clientY
-        const bodyWrapperRef = elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper']
-        const bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null
+        const bodyWrapperElem = getRefElem(elemStore[`${column.fixed || 'main'}-body-wrapper`] || elemStore['main-body-wrapper'])
         if (!bodyWrapperElem) {
           return
         }

package/packages/table/src/body.ts

@@ -1,7 +1,7 @@
 import { createCommentVNode, defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, ComputedRef, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
-import { mergeBodyMethod, getRowid, XEBodyScrollElement } from './util'
+import { mergeBodyMethod, getRowid, XEBodyScrollElement, getRefElem } from './util'
 import { updateCellTitle, getPropClass, setScrollTop, setScrollLeft } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { getSlotVNs } from '../../ui/src/vn'
@@ -359,7 +359,7 @@ export default defineComponent({
           getPropClass(className, params),
           getPropClass(allCellClassName, params)
         ],
-        key: columnKey || columnOpts.useKey || rowOpts.useKey ? colid : $columnIndex,
+        key: columnKey || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex,
         ...attrs,
         style: Object.assign({
           height: cellHeight
@@ -370,13 +370,14 @@ export default defineComponent({
 
     const renderRows = (fixedType: any, tableData: any, tableColumn: any) => {
       const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, showOverflow: allColumnOverflow, editConfig, treeConfig } = tableProps
-      const { hasFixedColumn, treeExpandedMaps, scrollYLoad, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, pendingRowList } = tableReactData
+      const { hasFixedColumn, treeExpandedMaps, scrollYLoad, rowExpandedMaps, expandColumn, selectRadioRow, pendingRowMaps, pendingRowList, isDragColMove } = tableReactData
       const { fullAllDataRowIdData } = tableInternalData
       const checkboxOpts = computeCheckboxOpts.value
       const radioOpts = computeRadioOpts.value
       const treeOpts = computeTreeOpts.value
       const editOpts = computeEditOpts.value
       const rowOpts = computeRowOpts.value
+      const columnOpts = computeColumnOpts.value
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
       const rows: any[] = []
@@ -431,30 +432,44 @@ export default defineComponent({
           rowChildren = row[childrenField]
           isExpandTree = rowChildren && rowChildren.length > 0 && !!treeExpandedMaps[rowid]
         }
+        const trClass = [
+          'vxe-body--row',
+          treeConfig ? `row--level-${rowLevel}` : '',
+          {
+            'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
+            'is--new': isNewRow,
+            'is--expand-row': isExpandRow,
+            'is--expand-tree': isExpandTree,
+            'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
+            'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
+            'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
+            'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
+          },
+          getPropClass(rowClassName, params)
+        ]
+        const tdVNs = tableColumn.map((column: any, $columnIndex: any) => {
+          return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
+        })
         rows.push(
-          h('tr', {
-            class: [
-              'vxe-body--row',
-              treeConfig ? `row--level-${rowLevel}` : '',
-              {
-                'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
-                'is--new': isNewRow,
-                'is--expand-row': isExpandRow,
-                'is--expand-tree': isExpandTree,
-                'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
-                'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
-                'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-                'row--pending': pendingRowList.length && !!pendingRowMaps[rowid]
-              },
-              getPropClass(rowClassName, params)
-            ],
-            rowid: rowid,
-            style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-            key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
-            ...trOn
-          }, tableColumn.map((column: any, $columnIndex: any) => {
-            return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
-          }))
+          columnOpts.drag
+            ? h(TransitionGroup, {
+              name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
+              tag: 'tr',
+              class: trClass,
+              rowid: rowid,
+              style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
+              key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+              ...trOn
+            }, {
+              default: () => tdVNs
+            })
+            : h('tr', {
+              class: trClass,
+              rowid: rowid,
+              style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
+              key: rowKey || rowOpts.useKey || rowOpts.drag || treeConfig ? rowid : $rowIndex,
+              ...trOn
+            }, tdVNs)
         )
         // 如果行被展开了
         if (isExpandRow) {
@@ -578,10 +593,8 @@ export default defineComponent({
       const leftElem = leftBody ? leftBody.$el as HTMLDivElement : null
       const rightElem = rightBody ? rightBody.$el as HTMLDivElement : null
       const bodyElem = tableBody.$el as HTMLDivElement
-      const bodyYRef = elemStore['main-body-ySpace']
-      const bodyYElem = bodyYRef ? bodyYRef.value : null
-      const bodyXRef = elemStore['main-body-xSpace']
-      const bodyXElem = bodyXRef ? bodyXRef.value : null
+      const bodyYElem = getRefElem(elemStore['main-body-ySpace'])
+      const bodyXElem = getRefElem(elemStore['main-body-xSpace'])
       const bodyHeight = scrollYLoad && bodyYElem ? bodyYElem.clientHeight : bodyElem.clientHeight
       const bodyWidth = scrollXLoad && bodyXElem ? bodyXElem.clientWidth : bodyElem.clientWidth
       const remainSize = isPrevWheelTop === isTopWheel ? Math.max(0, wheelYSize - wheelYTotal) : 0
@@ -712,6 +725,7 @@ export default defineComponent({
       const emptyOpts = computeEmptyOpts.value
       const keyboardOpts = computeKeyboardOpts.value
       const mouseOpts = computeMouseOpts.value
+      const columnOpts = computeColumnOpts.value
       // const isMergeLeftFixedExceeded = computeIsMergeLeftFixedExceeded.value
       // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
       // 如果是使用优化模式
@@ -787,8 +801,9 @@ export default defineComponent({
           /**
            * 内容
            */
-          rowOpts.drag
+          rowOpts.drag || columnOpts.drag
             ? h(TransitionGroup, {
+              ref: refBodyTBody,
               name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
               tag: 'tbody'
             }, {