releases 3.24.0

Author: xuliangzhan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.23.11",
+  "version": "3.24.0-beta.0",
   "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",
@@ -65,7 +65,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.18.10"
+    "vxe-pc-ui": "3.18.11"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

packages/table/module/export/mixin.ts

@@ -66,7 +66,7 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts
   const { treeConfig } = props
   const { isRowGroupStatus } = reactData
-  const { fullColumnFieldData } = internalData
+  const { fullColumnFieldData, fullAllDataRowIdData } = internalData
   const radioOpts = $xeTable.computeRadioOpts
   const checkboxOpts = $xeTable.computeCheckboxOpts
   const treeOpts = $xeTable.computeTreeOpts
@@ -216,8 +216,9 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
     return rest
   }
   if (treeConfig) {
-    const childrenField = treeOpts.children || treeOpts.childrenField
     // 如果是树结构
+    const { seqMode } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const rest: any[] = []
     const expandMaps: Record<string, boolean> = {}
     const useMaps: Record<string, boolean> = {}
@@ -237,6 +238,7 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           _hasChild: hasRowChild,
           _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
         }
+        const rowRest = fullAllDataRowIdData[rowid] || {}
         columns.forEach((column, $columnIndex) => {
           let cellValue: string | number | boolean | null = ''
           const renderOpts = column.editRender || column.cellRender
@@ -255,7 +257,10 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           } else {
             switch (column.type) {
               case 'seq': {
-                const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                let seqVal: number | string = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                if (seqMode === 'increasing') {
+                  seqVal = rowRest ? (rowRest._index + 1) : -1
+                }
                 cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex)
                 break
               }

packages/table/src/cell.ts

@@ -477,16 +477,24 @@ export const Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h))
       }
-      const renderOpts = editRenderOpts || cellRenderOpts
-      // 如果是编辑表格：renderTableCell > formatter
-      // 如果是查看表格：renderTableDefault > formatter
-      if (renderOpts) {
-        const compConf = renderer.get(renderOpts.name)
-        if (compConf) {
-          const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault)
-          if (renderFn) {
-            return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
-          }
+      // 如果是编辑模式-查看：slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
+      // 如果是查看表格：slot default > formatter > cellRender。renderTableDefault > cellRender.tableCellFormatter > field
+      const cellCompConf = cellRenderOpts ? renderer.get(cellRenderOpts.name) : null
+      if (cellRenderOpts) {
+        const cellDefaultRenderFn = cellCompConf ? (cellCompConf.renderTableDefault || cellCompConf.renderDefault) : null
+        if (cellDefaultRenderFn && cellRenderOpts) {
+          return renderCellBaseVNs(h, params, getSlotVNs(cellDefaultRenderFn(h, cellRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
+        }
+      }
+      if (editRenderOpts) {
+        const editCompConf = editRenderOpts ? renderer.get(editRenderOpts.name) : null
+        const editCellRenderFn = editCompConf
+          ? (
+              (editCompConf.renderTableCell || editCompConf.renderCell) ||
+              (editCompConf.renderTableDefault || editCompConf.renderDefault))
+          : null
+        if (editCellRenderFn) {
+          return renderCellBaseVNs(h, params, getSlotVNs(editCellRenderFn(h, editRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
         }
       }
       cellValue = $table.getCellLabel(row, column)
@@ -1319,6 +1327,7 @@ export const Cell = {
       }
     }
 
+    // slot default > formatter
     if (formatter) {
       return renderCellBaseVNs(h, params, [
         h('span', {

packages/table/src/methods.ts

@@ -5774,13 +5774,17 @@ const tableMethods: any = {
       clOpSize = cellRender.options ? cellRender.options.length : 0
       clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0
     }
-    // formatter > tableCellFormatter
-    const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null))
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
-    const tcFormatter = compConf ? compConf.tableCellFormatter : null
+    const isEnableEdit = editConfig && isEnableConf(editConfig)
+    const editRenderOpts = formatter ? null : (isEnableEdit && isEnableConf(editRender) ? editRender : null)
+    const cellRenderOpts = formatter ? null : (isEnableConf(cellRender) ? cellRender : null)
+    // formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
+    const cellCompConf = cellRenderOpts ? renderer.get(cellRenderOpts.name) : null
+    const editCompConf = editRenderOpts ? renderer.get(editRenderOpts.name) : null
+    const cellDfFormatter = cellCompConf ? cellCompConf.tableCellFormatter : null
+    const editDfFormatter = editCompConf ? editCompConf.tableCellFormatter : null
     const cellValue = getCellValue(row, column)
     let cellLabel = cellValue
-    if (formatter || tcFormatter) {
+    if (formatter || cellDfFormatter || editDfFormatter) {
       let formatData: Record<string, VxeTableDefines.RowCacheFormatObj> | undefined
       const { fullAllDataRowIdData } = internalData
       const rowid = getRowid($xeTable, row)
@@ -5818,8 +5822,10 @@ const tableMethods: any = {
         } else {
           cellLabel = formatter(formatParams)
         }
-      } else if (renderOpts && tcFormatter) {
-        cellLabel = tcFormatter(renderOpts, formatParams)
+      } else if (cellRenderOpts && cellDfFormatter) {
+        cellLabel = cellDfFormatter(cellRenderOpts, formatParams)
+      } else if (editRenderOpts && editDfFormatter) {
+        cellLabel = editDfFormatter(editRenderOpts, formatParams)
       }
       if (formatData) {
         const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize]