Merge pull request #563 from revolist/cellParser-support

feat: Cell parser support
revolist · Sep 12, 2024 · 9117a91 · 9117a91
2 parents 6772bea + 7eabc87
commit 9117a91
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/components/data/column.service.ts b/src/components/data/column.service.ts
@@ -4,6 +4,7 @@ import {
   Observable,
   CELL_CLASS,
   DISABLED_CLASS,
+  getCellRaw,
 } from '../../utils';
 import { getRange } from '@store';
 
@@ -155,7 +156,6 @@ export default class ColumnService {
     const column = this.columns[colIndex];
     const prop: ColumnProp | undefined = column?.prop;
     const model = getSourceItem(this.dataStore, rowIndex) || {};
-    const value = model[prop];
     const type = this.dataStore.get('type');
     return {
       prop,
@@ -166,7 +166,7 @@ export default class ColumnService {
       colIndex,
       colType: this.type,
       type,
-      value,
+      value: getCellRaw(model, column),
     };
   }
 

diff --git a/src/plugins/sorting/sorting.plugin.ts b/src/plugins/sorting/sorting.plugin.ts
@@ -12,7 +12,7 @@ import {
   DimensionRows,
   PluginProviders,
 } from '@type';
-import { getColumnByProp } from '../../utils/column.utils';
+import { getCellRaw, getColumnByProp } from '../../utils/column.utils';
 import { rowTypes } from '@store';
 
 export type SortingOrder = Record<ColumnProp, Order>;
@@ -123,7 +123,7 @@ export default class SortingPlugin extends BasePlugin {
 
   getComparer(column: ColumnRegular | undefined, order: Order): CellCompareFunc | undefined {
     const cellCmp: CellCompareFunc =
-      column?.cellCompare?.bind({ order }) || this.defaultCellCompare;
+      column?.cellCompare?.bind({ order }) || this.defaultCellCompare?.bind({ column });
     if (order == 'asc') {
       return cellCmp;
     }
@@ -258,9 +258,11 @@ export default class SortingPlugin extends BasePlugin {
     this.emit('aftersortingapply');
   }
 
-  defaultCellCompare(prop: ColumnProp, a: DataType, b: DataType) {
-    const av = a?.[prop]?.toString().toLowerCase();
-    const bv = b?.[prop]?.toString().toLowerCase();
+  defaultCellCompare(this: { column?: ColumnRegular }, prop: ColumnProp, a: DataType, b: DataType) {
+    const aRaw = this.column ? getCellRaw(a, this.column) : a?.[prop];
+    const bRaw = this.column ? getCellRaw(b, this.column) : b?.[prop];
+    const av = aRaw?.toString().toLowerCase();
+    const bv = bRaw?.toString().toLowerCase();
 
     return av == bv ? 0 : av > bv ? 1 : -1;
   }

diff --git a/src/utils/column.utils.ts b/src/utils/column.utils.ts
@@ -26,9 +26,15 @@ export function getCellData(val?: any) {
   return val;
 }
 
+export function getCellRaw(model: DataType, column: ColumnRegular) {
+  if (column.cellParser) {
+    return column.cellParser(model, column);
+  }
+  return model[column.prop];
+}
+
 export function getCellDataParsed(model: DataType, column: ColumnRegular) {
-  const val = column.cellParser ? column.cellParser(model, column) : model[column.prop];
-  return getCellData(val);
+  return getCellData(getCellRaw(model, column));
 }
 
 /**