vxe-table 4.2.0-beta.5 → 4.2.1

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

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: 'The operation cannot be performed on merged cells',
         multiErr: 'The operation cannot be performed on multiple selection areas',
-        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size'
+        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size',
+        pasteMultiErr: 'Cannot paste, copied area and pasted area of the same size are required to perform this operation'
       },
       fnr: {
         title: 'Find and replace',

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

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',

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

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同'
+        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替换',

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

@@ -79,7 +79,8 @@ export default {
       area: {
         mergeErr: '無法對合併儲存格進行該操作',
         multiErr: '無法對多重選擇區域進行該操作',
-        extendErr: '如果延伸的區域包含被合併的儲存格，所有合併的儲存格需大小相同'
+        extendErr: '如果延伸的區域包含被合併的儲存格，所有合併的儲存格需大小相同',
+        pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {
         title: '查找和替換',

package/packages/table/src/emits.ts

@@ -20,6 +20,7 @@ export default [
   'cell-menu',
   'cell-mouseenter',
   'cell-mouseleave',
+  'cell-selected',
   'header-cell-click',
   'header-cell-dblclick',
   'header-cell-menu',

package/packages/table/src/table.ts

@@ -598,8 +598,7 @@ export default defineComponent({
         return true
       }
       if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
-        /* eslint-disable eqeqeq */
-        return val1 == val2
+        return ('' + val1) === ('' + val2)
       }
       return XEUtils.isEqual(val1, val2)
     }
@@ -618,9 +617,9 @@ export default defineComponent({
       return rest && rest._v === version ? rest : { _v: version }
     }
 
-    const getRecoverRow = (list: any) => {
+    const getRecoverRow = (list: any[]) => {
       const { fullAllDataRowIdData } = internalData
-      return list.filter((row: any) => {
+      return list.filter((row) => {
         const rowid = getRowid($xetable, row)
         return !!fullAllDataRowIdData[rowid]
       })
@@ -1210,7 +1209,7 @@ export default defineComponent({
       const treeOpts = computeTreeOpts.value
       const { transform } = treeOpts
       const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
-      const { remote: allRemoteSort, sortMethod: allSortMethod } = sortOpts
+      const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
       let tableData: any[] = []
       let tableTree: any[] = []
 
@@ -1221,12 +1220,7 @@ export default defineComponent({
           valueList: any[]
           itemList: VxeTableDefines.FilterOption[]
         }[] = []
-        const orderColumns: {
-          column: VxeTableDefines.ColumnInfo
-          field: string
-          property: string
-          order: VxeTablePropTypes.SortOrder
-        }[] = []
+        let orderColumns: VxeTableDefines.SortCheckedParams[] = []
         tableFullColumn.forEach((column) => {
           const { property, sortable, order, filters } = column
           if (!allRemoteFilter && filters && filters.length) {
@@ -1243,9 +1237,12 @@ export default defineComponent({
             }
           }
           if (!allRemoteSort && sortable && order) {
-            orderColumns.push({ column, field: property, property, order })
+            orderColumns.push({ column, field: property, property, order, sortTime: column.sortTime })
           }
         })
+        if (sortMultiple && chronological && orderColumns.length > 1) {
+          orderColumns = XEUtils.orderBy(orderColumns, 'sortTime')
+        }
 
         // 处理筛选
         // 支持单列、多列、组合筛选
@@ -1586,12 +1583,13 @@ export default defineComponent({
             defaultSort = [defaultSort]
           }
           if (defaultSort.length) {
-            (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item: any) => {
+            (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item: any, index: number) => {
               const { field, order } = item
               if (field && order) {
                 const column = tableMethods.getColumnByField(field)
                 if (column && column.sortable) {
                   column.order = order
+                  column.sortTime = Date.now() + index
                 }
               }
             })
@@ -3393,7 +3391,7 @@ export default defineComponent({
           if (!multiple) {
             clearAllSort()
           }
-          (multiple ? sortConfs : [sortConfs[0]]).forEach((confs: any) => {
+          (multiple ? sortConfs : [sortConfs[0]]).forEach((confs: any, index: number) => {
             let { field, order } = confs
             let column = field
             if (XEUtils.isString(field)) {
@@ -3406,7 +3404,7 @@ export default defineComponent({
               if (column.order !== order) {
                 column.order = order
               }
-              column.sortTime = Date.now()
+              column.sortTime = Date.now() + index
             }
           })
           // 如果是服务端排序，则跳过本地排序处理
@@ -3445,14 +3443,19 @@ export default defineComponent({
         return tableMethods.getSortColumns().length > 0
       },
       getSortColumns () {
+        const sortOpts = computeSortOpts.value
+        const { multiple, chronological } = sortOpts
         const sortList: VxeTableDefines.SortCheckedParams[] = []
         const { tableFullColumn } = internalData
         tableFullColumn.forEach((column) => {
           const { property, order } = column
           if (column.sortable && order) {
-            sortList.push({ column, field: property, property, order })
+            sortList.push({ column, field: property, property, order, sortTime: column.sortTime })
           }
         })
+        if (multiple && chronological && sortList.length > 1) {
+          return XEUtils.orderBy(sortList, 'sortTime')
+        }
         return sortList
       },
       /**
@@ -5376,12 +5379,18 @@ export default defineComponent({
         nextTick(updateStyle)
       },
       updateScrollXData () {
-        handleTableColumn()
-        tablePrivateMethods.updateScrollXSpace()
+        reactData.tableColumn = []
+        nextTick(() => {
+          handleTableColumn()
+          tablePrivateMethods.updateScrollXSpace()
+        })
       },
       updateScrollYData () {
-        tablePrivateMethods.handleTableData()
-        tablePrivateMethods.updateScrollYSpace()
+        reactData.tableData = []
+        nextTick(() => {
+          tablePrivateMethods.handleTableData()
+          tablePrivateMethods.updateScrollYSpace()
+        })
       },
       /**
        * 处理固定列的显示状态
@@ -5713,13 +5722,13 @@ export default defineComponent({
 
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           // if (props.rowId) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
           // }
           // if (props.rowKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
           // }
           // if (props.columnKey) {
-          //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+          //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
           // }
           if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
             warnLog('vxe.error.reqProp', ['row-config.keyField'])
@@ -5736,6 +5745,18 @@ export default defineComponent({
           if (props.showFooter && !props.footerMethod) {
             warnLog('vxe.error.reqProp', ['footer-method'])
           }
+          // if (props.highlightCurrentRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+          // }
+          // if (props.highlightHoverRow) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+          // }
+          // if (props.highlightCurrentColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+          // }
+          // if (props.highlightHoverColumn) {
+          //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+          // }
           // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
           const { exportConfig, importConfig } = props
           const exportOpts = computeExportOpts.value

package/packages/v-x-e-table/src/conf.ts

@@ -70,7 +70,7 @@ const GlobalConfig: VXETableGlobalConfig = {
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },

package/types/plugins/pro.d.ts

@@ -12,9 +12,13 @@ export interface VxeTableProMethods {
    */
   getActiveCellArea(): VxeTableProDefines.MouseActiveCellArea | null
   /**
-   * 用于 mouse-config.area，用于获取标记为复制粘贴的区域
+   * @deprecated
    */
   getCopyCellArea(): VxeTableProDefines.MouseCellArea | null
+  /**
+   * 用于 mouse-config.area，用于获取标记为复制粘贴的区域
+   */
+  getCopyCellAreas(): VxeTableProDefines.MouseCellArea[]
   /**
    * 用于 mouse-config.area，复制指定区域，返回转换后的文本
    */
@@ -324,7 +328,7 @@ export namespace VxeTableProDefines {
   export interface ActiveCellChangeStartEventParams extends EventParams, ActiveCellChangeStartParams { }
 
   export interface ActiveCellChangeEndParams extends ActiveCellChangeStartParams {
-    targetActiveArea: VxeTableProDefines.MouseCellArea
+    beforeActiveArea: VxeTableProDefines.MouseCellArea
   }
   export interface ActiveCellChangeEndEventParams extends EventParams, ActiveCellChangeEndParams { }
 }

package/types/table.d.ts

@@ -400,7 +400,7 @@ export interface TablePublicMethods {
    */
   clearCheckboxRow(): Promise<any>
   /**
-   * 用于 highlight-current-row，设置某一行为高亮状态
+   * 用于 row-config.isCurrent，设置某一行为高亮状态
    * @param row 指定行
    */
   setCurrentRow(row: any): Promise<any>
@@ -423,7 +423,7 @@ export interface TablePublicMethods {
    */
   clearMergeFooterItems(): Promise<any>
   /**
-   * 用于 highlight-current-row，手动清空当前高亮的状态
+   * 用于 row-config.isCurrent，手动清空当前高亮的状态
    */
   clearCurrentRow(): Promise<any>
   /**
@@ -439,11 +439,11 @@ export interface TablePublicMethods {
    */
   getMergeFooterItems(): VxeTableDefines.MergeInfo[]
   /**
-   * 用于 highlight-current-column，获取当前列
+   * 用于 column-config.isCurrent，获取当前列
    */
   getCurrentColumn(): VxeTableDefines.ColumnInfo | null
   /**
-   * 用于 highlight-current-row，获取当前行的行数据
+   * 用于 row-config.isCurrent，获取当前行的行数据
    */
   getCurrentRecord(): any
   /**
@@ -451,12 +451,12 @@ export interface TablePublicMethods {
    */
   getRadioRecord(isFull?: boolean): any
   /**
-   * 用于 highlight-current-column，设置某列行为高亮状态
+   * 用于 column-config.isCurrent，设置某列行为高亮状态
    * @param columnOrField 列对象或字段名
    */
   setCurrentColumn(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo): Promise<any>
   /**
-   * 用于 highlight-current-column，手动清空当前高亮的状态
+   * 用于 column-config.isCurrent，手动清空当前高亮的状态
    */
   clearCurrentColumn(): Promise<any>
   /**
@@ -1310,6 +1310,7 @@ export namespace VxeTablePropTypes {
     }): any[]
     remote?: boolean
     multiple?: boolean
+    chronological?: boolean
     trigger?: 'default' | 'cell'
     showIcon?: boolean
     iconAsc?: string
@@ -2074,6 +2075,7 @@ export type VxeTableEmits = [
   'cell-menu',
   'cell-mouseenter',
   'cell-mouseleave',
+  'cell-selected',
   'header-cell-click',
   'header-cell-dblclick',
   'header-cell-menu',
@@ -2418,6 +2420,7 @@ export namespace VxeTableDefines {
     field: VxeColumnPropTypes.Field
     property: VxeColumnPropTypes.Field
     order: VxeTablePropTypes.SortOrder
+    sortTime: number
   }
   export interface SortChangeParams extends SortCheckedParams {
     sortList: SortCheckedParams[]