vxe-table 4.17.19 → 4.17.21

package/packages/table/src/cell.ts

@@ -496,7 +496,7 @@ export const Cell = {
     const { rowGroupExpandedFlag } = tableReactData
     const { rowGroupExpandedMaps } = tableInternalData
     const aggregateOpts = computeAggregateOpts.value
-    const { mode, padding, indent } = aggregateOpts
+    const { mode, padding, indent, showIcon, iconOpen, iconClose } = aggregateOpts
     const rowid = getRowid($table, row)
     const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid]
     return h('div', {
@@ -509,7 +509,7 @@ export const Cell = {
           }
         : undefined
     }, [
-      row.isAggregate
+      showIcon && row.isAggregate
         ? h('span', {
           class: 'vxe-row-group--node-btn',
           onClick (evnt: MouseEvent) {
@@ -517,7 +517,7 @@ export const Cell = {
           }
         }, [
           h('i', {
-            class: isExpand ? getIcon().TABLE_ROW_GROUP_OPEN : getIcon().TABLE_ROW_GROUP_CLOSE
+            class: isExpand ? (iconOpen || getIcon().TABLE_ROW_GROUP_OPEN) : (iconClose || getIcon().TABLE_ROW_GROUP_CLOSE)
           })
         ])
         : renderEmptyElement($table),

package/packages/table/src/table.ts

@@ -41,6 +41,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
 
+const sourceType = 'table'
+
 let crossTableDragRowObj: {
   $oldTable: VxeTableConstructor & VxeTablePrivateMethods
   $newTable: (VxeTableConstructor & VxeTablePrivateMethods) | null
@@ -5283,10 +5285,15 @@ export default defineVxeComponent({
         if (!column) {
           return null
         }
-        const { formatter } = column
+        const { editConfig } = props
+        const { formatter, editRender, cellRender } = column
+        // 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 cellValue = getCellValue(row, column)
         let cellLabel = cellValue
-        if (formatter) {
+        if (formatter || tcFormatter) {
           let formatData
           const { fullAllDataRowIdData } = internalData
           const rowid = getRowid($xeTable, row)
@@ -5304,22 +5311,27 @@ export default defineVxeComponent({
             }
           }
           const formatParams = {
+            $table: $xeTable,
             cellValue,
             row,
             rowIndex: $xeTable.getRowIndex(row),
             column,
             columnIndex: $xeTable.getColumnIndex(column)
           }
-          if (XEUtils.isString(formatter)) {
-            const gFormatOpts = formats.get(formatter)
-            const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : ''
-          } else if (XEUtils.isArray(formatter)) {
-            const gFormatOpts = formats.get(formatter[0])
-            const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : ''
-          } else {
-            cellLabel = formatter(formatParams)
+          if (formatter) {
+            if (XEUtils.isString(formatter)) {
+              const gFormatOpts = formats.get(formatter)
+              const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+              cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : ''
+            } else if (XEUtils.isArray(formatter)) {
+              const gFormatOpts = formats.get(formatter[0])
+              const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+              cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : ''
+            } else {
+              cellLabel = `${formatter(formatParams)}`
+            }
+          } else if (renderOpts && tcFormatter) {
+            cellLabel = `${tcFormatter(renderOpts, formatParams)}`
           }
           if (formatData) {
             formatData[colid] = { value: cellValue, label: cellLabel }
@@ -5365,6 +5377,7 @@ export default defineVxeComponent({
             }
           }
           const footerFormatParams = {
+            $table: $xeTable,
             cellValue: itemValue,
             itemValue,
             row,
@@ -11523,6 +11536,7 @@ export default defineVxeComponent({
         }
         reactData.lastScrollTime = Date.now()
         const evntParams = {
+          source: sourceType,
           scrollTop,
           scrollLeft,
           bodyHeight,

package/packages/ui/index.ts

@@ -286,9 +286,10 @@ VxeUI.setConfig({
       showResponseMsg: true,
       showActionMsg: true,
       response: {
-        list: null,
+        list: 'list',
         result: 'result',
         total: 'page.total',
+        footerData: 'footerData',
         message: 'message'
       }
       // beforeItem: null,

package/packages/ui/src/dom.ts

@@ -47,7 +47,7 @@ function getNodeOffset (elem: any, container: any, rest: any): any {
 }
 
 export function isPx (val: any) {
-  return val && /^\d+(\.\d+)?px?$/.test(val)
+  return val && /^\d+(\.\d+)?(px)?$/.test(val)
 }
 
 export function isScale (val: any) {