vxe-table 3.17.0-beta.13 → 3.17.0-beta.15

package/packages/table/src/methods.ts

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTarge
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import Cell from './cell'
-import { getRowUniqueId, clearTableAllStatus, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight } from './util'
+import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from './anime'
 import { warnLog, errLog } from '../../ui/src/log'
@@ -134,11 +134,35 @@ function handleCustomRestore ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  let { collectColumn } = internalData
-  const { resizableData, sortData, visibleData, fixedData } = storeData
-  let hasCustomSort = false
+  const { collectColumn } = internalData
+  let { resizableData, sortData, visibleData, fixedData } = storeData
   // 处理还原
   if (resizableData || sortData || visibleData || fixedData) {
+    const sortColMaps: Record<string, {
+          key: string
+          sNum: number
+          pKey: string | null
+        }> = {}
+        // 转换兼容老版本数据
+    if (sortData) {
+      if (!XEUtils.isArray(sortData)) {
+        const sortRests: {key: string, index: number}[] = []
+        XEUtils.each(sortData, (index: number, colKey: string) => {
+          sortRests.push({ key: colKey, index })
+        })
+        sortData = XEUtils.orderBy(sortRests, { field: 'index', order: 'asc' }).map(item => ({ k: item.key }))
+      }
+      let colNum = 1
+      XEUtils.eachTree(sortData, (sObj, index, sOjs, path, pSObj) => {
+        sortColMaps[sObj.k] = {
+          key: sObj.k,
+          sNum: colNum++,
+          pKey: pSObj ? pSObj.k : null
+        }
+      }, { children: 'c' })
+    }
+    const colKeyMaps: Record<string, VxeTableDefines.ColumnInfo> = {}
+    const allCols: VxeTableDefines.ColumnInfo[] = []
     XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey()
       // 支持一级
@@ -146,10 +170,6 @@ function handleCustomRestore ($xeTable: VxeTableConstructor & VxeTablePrivateMet
         if (fixedData && fixedData[colKey] !== undefined) {
           column.fixed = fixedData[colKey]
         }
-        if (sortData && XEUtils.isNumber(sortData[colKey])) {
-          hasCustomSort = true
-          column.renderSortNumber = sortData[colKey]
-        }
       }
       if (resizableData && XEUtils.isNumber(resizableData[colKey])) {
         column.resizeWidth = resizableData[colKey]
@@ -157,12 +177,23 @@ function handleCustomRestore ($xeTable: VxeTableConstructor & VxeTablePrivateMet
       if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
         column.visible = visibleData[colKey]
       }
+      colKeyMaps[colKey] = column
+      allCols.push(column)
     })
     // 如果自定义了顺序
-    if (hasCustomSort) {
-      collectColumn = XEUtils.orderBy(collectColumn, 'renderSortNumber')
-      internalData.collectColumn = collectColumn
-      internalData.tableFullColumn = getColumnList(collectColumn)
+    if (sortData) {
+      allCols.forEach(column => {
+        const colKey = column.getKey()
+        const scItem = sortColMaps[colKey]
+        if (scItem) {
+          const parentColumn = scItem.pKey ? colKeyMaps[scItem.pKey] : null
+          column.parentId = parentColumn ? parentColumn.id : null
+          column.renderSortNumber = scItem.sNum
+        }
+      })
+      const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' })
+      internalData.collectColumn = newCollectCols
+      internalData.tableFullColumn = getColumnList(newCollectCols)
     }
     reactData.isCustomStatus = true
   } else {
@@ -3211,15 +3242,6 @@ function loadScrollXData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   $xeTable.closeTooltip()
 }
 
-// 获取所有的列，排除分组
-function getColumnList (columns: any[]) {
-  const result: any[] = []
-  columns.forEach((column) => {
-    result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]))
-  })
-  return result
-}
-
 function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, isReset: boolean) {
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
@@ -3346,18 +3368,22 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
   return $xeTable.updateFooter()
 }
 
-function initColumnSort ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+function initColumnHierarchy ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const internalData = $xeTable as unknown as TableInternalData
 
   const { collectColumn } = internalData
-  collectColumn.forEach((column, index) => {
-    const sortIndex = index + 1
+  let sortIndex = 1
+  XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+    const parentId = parentColumn ? parentColumn.id : null
+    column.parentId = parentId
+    column.defaultParentId = parentId
     column.sortNumber = sortIndex
     column.renderSortNumber = sortIndex
+    sortIndex++
   })
 }
 
-function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, collectColumn: VxeTableDefines.ColumnInfo[]) {
+function handleInitColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, collectColumn: VxeTableDefines.ColumnInfo[]) {
   const $xeToolbar = $xeTable.$refs.$xeToolbar as VxeToolbarConstructor
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
@@ -3367,7 +3393,7 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
   const tableFullColumn = getColumnList(collectColumn)
   internalData.tableFullColumn = tableFullColumn
   reactData.isColLoading = true
-  initColumnSort($xeTable)
+  initColumnHierarchy($xeTable)
   return Promise.resolve(
     restoreCustomStorage($xeTable)
   ).then(() => {
@@ -4049,7 +4075,7 @@ const Methods = {
 
     const { lastScrollLeft, lastScrollTop } = internalData
     const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn($xeTable, column), { children: 'children' })
-    return handleColumn($xeTable, collectColumn).then(() => {
+    return handleInitColumn($xeTable, collectColumn).then(() => {
       let targetScrollLeft = lastScrollLeft
       let targetScrollTop = lastScrollTop
       const virtualXOpts = $xeTable.computeVirtualXOpts
@@ -4074,10 +4100,10 @@ const Methods = {
       return this.loadColumn(columns)
     })
   },
-  handleColumn (collectColumn: any[]) {
+  handleInitColumn (collectColumn: any[]) {
     const $xeTable = this
 
-    return handleColumn($xeTable, collectColumn)
+    return handleInitColumn($xeTable, collectColumn)
   },
   /**
    * 更新数据行的 Map
@@ -5278,7 +5304,7 @@ const Methods = {
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
     const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
     const resizableData: Record<string, number> = {}
-    const sortData: Record<string, number> = {}
+    const sortData: VxeTableDefines.CustomSortStoreObj[] = []
     const visibleData: Record<string, boolean> = {}
     const fixedData: Record<string, VxeColumnPropTypes.Fixed> = {}
     const aggFuncData: Record<string, VxeColumnPropTypes.AggFunc> = {}
@@ -5300,18 +5326,35 @@ const Methods = {
     let hasFixed = 0
     let hasVisible = 0
     let hasAggFunc = 0
+    const sortMaps: Record<string, VxeTableDefines.CustomSortStoreObj> = {}
     XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey()
       if (!colKey) {
         errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`])
         return
       }
-      // 只支持一级
-      if (!parentColumn) {
+      if (parentColumn) {
+        if (isCustomSort) {
+          const pColKey = parentColumn.getKey()
+          const psObj = sortMaps[pColKey]
+          hasSort = 1
+          if (psObj) {
+            const sObj = { k: colKey }
+            sortMaps[colKey] = sObj
+            if (!psObj.c) {
+              psObj.c = []
+            }
+            psObj.c.push(sObj)
+          }
+        }
+      } else {
         if (isCustomSort) {
           hasSort = 1
-          sortData[colKey] = column.renderSortNumber
+          const sObj = { k: colKey }
+          sortMaps[colKey] = sObj
+          sortData.push(sObj)
         }
+        // 只支持一级
         if (isCustomFixed && column.fixed !== column.defaultFixed) {
           hasFixed = 1
           fixedData[colKey] = column.fixed

package/packages/table/src/table.ts

@@ -1369,7 +1369,7 @@ export default {
       })
     },
     staticColumns (value: any) {
-      this.handleColumn(XEUtils.clone(value))
+      this.handleInitColumn(XEUtils.clone(value))
     },
     tableColumn () {
       this.analyColumnWidth()

package/packages/table/src/util.ts

@@ -233,6 +233,7 @@ export function assembleColumn (_vm: any) {
     if (!groupConfig.children) {
       groupConfig.children = []
     }
+    columnConfig.defaultParentId = groupConfig.id
     groupConfig.children.splice(XEUtils.arrayIndexOf($xeColumn.$el.children, $el), 0, columnConfig)
   } else {
     staticColumns.splice(XEUtils.arrayIndexOf(($xeTable.$refs.hideColumn as any).children, $el), 0, columnConfig)
@@ -446,6 +447,15 @@ export function isColumnInfo (column: any) {
   return column instanceof ColumnInfo
 }
 
+// 获取所有的列，排除分组
+export function getColumnList (columns: VxeTableDefines.ColumnInfo[]) {
+  const result: VxeTableDefines.ColumnInfo[] = []
+  columns.forEach((column) => {
+    result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]))
+  })
+  return result
+}
+
 export function createColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, options: any, renderOptions: any): any {
   return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions)
 }