Merge pull request #566 from revolist/parser-support

feat: parser support for edit
revolist · Sep 13, 2024 · 52c8861 · 52c8861
2 parents 31f4227 + 4642b6a
commit 52c8861
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/src/components/data/column.service.ts b/src/components/data/column.service.ts
@@ -1,10 +1,10 @@
 import { DSourceState, getSourceItem, getVisibleSourceItem } from '@store';
 import {
-  getCellData,
   Observable,
   CELL_CLASS,
   DISABLED_CLASS,
   getCellRaw,
+  getCellData,
 } from '../../utils';
 import { getRange } from '@store';
 
@@ -107,19 +107,14 @@ export default class ColumnService {
     return model[prop] || '';
   }
 
-  getCellData(r: number, c: number): string {
-    const data = this.rowDataModel(r, c);
-    return getCellData(data.model[data.prop as number]);
-  }
-
   getSaveData(
     rowIndex: number,
     colIndex: number,
     val?: string,
   ): BeforeSaveDataDetails {
     const data = this.rowDataModel(rowIndex, colIndex);
     if (typeof val === 'undefined') {
-      val = getCellData(data.model[data.prop as number]);
+      val = getCellData(data.value);
     }
     return {
       prop: data.prop,

diff --git a/src/components/overlay/revogr-overlay-selection.tsx b/src/components/overlay/revogr-overlay-selection.tsx
@@ -25,6 +25,7 @@ import { isEditInput } from '../editors/edit.utils';
 import { KeyboardService } from './keyboard.service';
 import { AutoFillService } from './autofill.service';
 import { verifyTouchTarget } from '../../utils/events';
+import { getCellData } from '../../utils';
 import {
   Observable,
   SelectionStoreState,
@@ -492,11 +493,18 @@ export class OverlaySelection {
     if (this.readonly || !editCell) {
       return null;
     }
-    const val =
-      editCell.val || this.columnService.getCellData(editCell.y, editCell.x);
+    const enteredOrModelValue =
+      editCell.val ||
+        getCellData(
+          this.columnService.rowDataModel(editCell.y, editCell.x).value
+        );
     const editable = {
       ...editCell,
-      ...this.columnService.getSaveData(editCell.y, editCell.x, val),
+      ...this.columnService.getSaveData(
+        editCell.y,
+        editCell.x,
+        enteredOrModelValue,
+      ),
     };
     const renderEvent = this.beforeEditRender.emit({
       range: {
@@ -860,7 +868,9 @@ export class OverlaySelection {
   }
 
   private rowDragStart({ detail }: CustomEvent<{ cell: Cell; text: string }>) {
-    detail.text = this.columnService.getCellData(detail.cell.y, detail.cell.x);
+    detail.text = getCellData(
+      this.columnService.rowDataModel(detail.cell.y, detail.cell.x).value
+    );
   }
 
   /**

diff --git a/src/serve/data.js b/src/serve/data.js
@@ -79,8 +79,8 @@ export function generateFakeDataObject(config = {}) {
         prop: rgCol,
         sortable: true,
         size: 100,
-        // custom sorting
-        cellCompare: rgCol % 2 == 0 ? naturalSort : undefined,
+        // custom sorting except of 0 row
+        cellCompare: !!rgCol && rgCol % 2 == 0 ? naturalSort : undefined,
         cellProperties: ({ colIndex }) => ({
           className: {
             'first-column': colIndex === 0,
@@ -115,6 +115,7 @@ export function generateFakeDataObject(config = {}) {
           'custom-row-index': rowIndex
         };
       }
+      columns[rgCol].cellParser = () => 'a';
       columns[rgCol].cellTemplate = (h, { value }) => {
       //   // delay
       //   // for(let i = 0; i < 10000000; i++) {