vxe-table 3.5.0-beta.2 → 3.5.0

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

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

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

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

package/packages/table/src/methods.js

@@ -31,8 +31,7 @@ function eqCellValue (row1, row2, field) {
     return true
   }
   if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
-    /* eslint-disable eqeqeq */
-    return val1 == val2
+    return ('' + val1) === ('' + val2)
   }
   return XEUtils.isEqual(val1, val2)
 }
@@ -1151,12 +1150,12 @@ const Methods = {
   updateAfterFullData () {
     const { tableFullColumn, tableFullData, filterOpts, sortOpts, treeConfig, treeOpts, tableFullTreeData } = this
     const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
-    const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple } = sortOpts
+    const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
     const { transform } = treeOpts
     let tableData = []
     let tableTree = []
     const filterColumns = []
-    const orderColumns = []
+    let orderColumns = []
     tableFullColumn.forEach(column => {
       const { property, sortable, order, filters } = column
       if (!allRemoteFilter && filters && filters.length) {
@@ -1173,9 +1172,12 @@ const Methods = {
         }
       }
       if (!allRemoteSort && sortable && order) {
-        orderColumns.push({ column, field: column.property, property, order })
+        orderColumns.push({ column, field: column.property, property, order, sortTime: column.sortTime })
       }
     })
+    if (sortMultiple && chronological && orderColumns.length > 1) {
+      orderColumns = XEUtils.orderBy(orderColumns, 'sortTime')
+    }
     if (filterColumns.length) {
       const handleFilter = (row) => {
         return filterColumns.every(({ column, valueList, itemList }) => {
@@ -3513,13 +3515,13 @@ const Methods = {
         defaultSort = [defaultSort]
       }
       if (defaultSort.length) {
-        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item) => {
+        (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index) => {
           const { field, order } = item
           if (field && order) {
             const column = this.getColumnByField(field)
             if (column && column.sortable) {
               column.order = order
-              column.sortTime = Date.now()
+              column.sortTime = Date.now() + index
             }
           }
         })
@@ -3563,7 +3565,7 @@ const Methods = {
       if (!multiple) {
         clearAllSort(this)
       }
-      (multiple ? sortConfs : [sortConfs[0]]).forEach((confs) => {
+      (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
         let { field, order } = confs
         let column = field
         if (XEUtils.isString(field)) {
@@ -3579,6 +3581,7 @@ const Methods = {
           if (column.order !== order) {
             column.order = order
           }
+          column.sortTime = Date.now() + index
         }
       })
       // 如果是服务端排序，则跳过本地排序处理
@@ -3624,13 +3627,17 @@ const Methods = {
     return this.getSortColumns().length > 0
   },
   getSortColumns () {
+    const { multiple, chronological } = this.sortOpts
     const sortList = []
     this.tableFullColumn.forEach((column) => {
       const { property, order } = column
       if ((column.sortable || column.remoteSort) && order) {
-        sortList.push({ column, field: column.property, property, order })
+        sortList.push({ column, field: column.property, property, order, sortTime: column.sortTime })
       }
     })
+    if (multiple && chronological && sortList.length > 1) {
+      return XEUtils.orderBy(sortList, 'sortTime')
+    }
     return sortList
   },
   /**
@@ -4246,8 +4253,11 @@ const Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0)
   },
   updateScrollXData () {
-    this.handleTableColumn()
-    this.updateScrollXSpace()
+    this.tableColumn = []
+    this.$nextTick(() => {
+      this.handleTableColumn()
+      this.updateScrollXSpace()
+    })
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace () {
@@ -4286,8 +4296,11 @@ const Methods = {
     }
   },
   updateScrollYData () {
-    this.handleTableData()
-    this.updateScrollYSpace()
+    this.tableData = []
+    this.$nextTick(() => {
+      this.handleTableData()
+      this.updateScrollYSpace()
+    })
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace () {
@@ -4625,7 +4638,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -713,13 +713,13 @@ export default {
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       // if (this.rowId) {
-      //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
       // }
       // if (this.rowKey) {
-      //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+      //   warnLog('vxe.error.delProp', ['row-id', 'row-config.useKey'])
       // }
       // if (this.columnKey) {
-      //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+      //   warnLog('vxe.error.delProp', ['row-id', 'column-config.useKey'])
       // }
       if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
         warnLog('vxe.error.reqProp', ['row-config.keyField'])
@@ -739,6 +739,18 @@ export default {
       if (this.tooltipOpts.enabled) {
         warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll'])
       }
+      // if (this.highlightCurrentRow) {
+      //   warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
+      // }
+      // if (this.highlightHoverRow) {
+      //   warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
+      // }
+      // if (this.highlightCurrentColumn) {
+      //   warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
+      // }
+      // if (this.highlightHoverColumn) {
+      //   warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
+      // }
       // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
       if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.config.importTypes, importOpts.types)) {

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

@@ -68,7 +68,7 @@ export default {
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },

package/types/table.d.ts

@@ -540,7 +540,7 @@ export declare class Table extends VXETableComponent {
    */
   clearCheckboxRow(): Promise<any>;
   /**
-   * 用于 highlight-current-row，设置某一行为高亮状态
+   * 用于 row-config.isCurrent，设置某一行为高亮状态
    * @param row 指定行
    */
   setCurrentRow(row: RowInfo): Promise<any>;
@@ -563,7 +563,7 @@ export declare class Table extends VXETableComponent {
    */
   clearMergeFooterItems(): Promise<any>;
   /**
-   * 用于 highlight-current-row，手动清空当前高亮的状态
+   * 用于 row-config.isCurrent，手动清空当前高亮的状态
    */
   clearCurrentRow(): Promise<any>;
   /**
@@ -579,11 +579,11 @@ export declare class Table extends VXETableComponent {
    */
   getMergeFooterItems(): MergeItem[];
   /**
-   * 用于 highlight-current-column，获取当前列
+   * 用于 column-config.isCurrent，获取当前列
    */
   getCurrentColumn(): ColumnInfo | null;
   /**
-   * 用于 highlight-current-row，获取当前行的行数据
+   * 用于 row-config.isCurrent，获取当前行的行数据
    */
   getCurrentRecord(): RowInfo;
   /**
@@ -591,12 +591,12 @@ export declare class Table extends VXETableComponent {
    */
   getRadioRecord(isFull?: boolean): RowInfo;
   /**
-   * 用于 highlight-current-column，设置某列行为高亮状态
+   * 用于 column-config.isCurrent，设置某列行为高亮状态
    * @param column 列对象
    */
   setCurrentColumn(column: ColumnInfo): Promise<any>;
   /**
-   * 用于 highlight-current-column，手动清空当前高亮的状态
+   * 用于 column-config.isCurrent，手动清空当前高亮的状态
    */
   clearCurrentColumn(): Promise<any>;
   /**