Merge pull request #715 from VisActor/712-bug-edit-blankCell-pivotTable

712 bug edit blank cell pivot table
VisActor · Dec 13, 2023 · 01433c3 · 01433c3
2 parents 2ff6ee4 + db2746d
commit 01433c3
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 2 deletions.
diff --git a/common/changes/@visactor/vtable/712-bug-edit-blankCell-pivotTable_2023-12-12-10-34.json b/common/changes/@visactor/vtable/712-bug-edit-blankCell-pivotTable_2023-12-12-10-34.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: blank cell edit invalid on pivottbale #712\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/PivotTable.ts b/packages/vtable/src/PivotTable.ts
@@ -952,6 +952,10 @@ export class PivotTable extends BaseTable implements PivotTableAPI {
     }
     this.eventManager.updateEventBinder();
   }
+  /** 结束编辑 */
+  completeEditCell() {
+    this.editorManager.completeEdit();
+  }
   /** 获取单元格对应的编辑器 */
   getEditor(col: number, row: number) {
     const define = this.getBodyColumnDefine(col, row);

diff --git a/packages/vtable/src/dataset/dataset.ts b/packages/vtable/src/dataset/dataset.ts
@@ -816,6 +816,24 @@ export class Dataset {
         //   return changeValue;
         // };
       }
+      return {
+        value() {
+          return changeValue;
+        },
+        className: '',
+        push() {
+          // do nothing
+        },
+        formatValue() {
+          return changeValue;
+        },
+        clearCacheValue() {
+          // do nothing
+        },
+        reset() {
+          // do nothing
+        }
+      };
     }
 
     // }

diff --git a/packages/vtable/src/event/listener/container-dom.ts b/packages/vtable/src/event/listener/container-dom.ts
@@ -1,6 +1,6 @@
 import { isValid } from '@visactor/vutils';
 import type { EventHandler } from '../EventHandler';
-import type { KeydownEvent } from '../../ts-types';
+import type { KeydownEvent, ListTableAPI } from '../../ts-types';
 import { TABLE_EVENT_TYPE } from '../../core/TABLE_EVENT_TYPE';
 import { handleWhell } from '../scroll';
 import { browser } from '../../tools/helper';

diff --git a/packages/vtable/src/event/listener/table-group.ts b/packages/vtable/src/event/listener/table-group.ts
@@ -1,6 +1,11 @@
 import type { IEventTarget } from '@visactor/vrender';
 import { Gesture, type FederatedPointerEvent } from '@visactor/vrender';
-import type { MousePointerCellEvent, MousePointerMultiCellEvent, MousePointerSparklineEvent } from '../../ts-types';
+import type {
+  ListTableAPI,
+  MousePointerCellEvent,
+  MousePointerMultiCellEvent,
+  MousePointerSparklineEvent
+} from '../../ts-types';
 import { InteractionState } from '../../ts-types';
 import type { SceneEvent } from '../util';
 import { getCellEventArgsSet } from '../util';
@@ -320,6 +325,9 @@ export function bindTableGroupListener(eventManager: EventManager) {
         }
       }
     }
+    if ((table as ListTableAPI).editorManager) {
+      (table as ListTableAPI).editorManager.completeEdit();
+    }
     stateManager.updateInteractionState(InteractionState.default);
     eventManager.dealTableHover();
     //点击到表格外部不需要取消选中状态

diff --git a/packages/vtable/src/scenegraph/group-creater/cell-helper.ts b/packages/vtable/src/scenegraph/group-creater/cell-helper.ts
@@ -449,7 +449,23 @@ export function updateCell(col: number, row: number, table: BaseTableAPI, addNew
         dx: hierarchyOffset,
         x
       };
+      const oldText = textMark.attribute.text;
       textMark.setAttributes(cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute);
+      if (!oldText && textMark.attribute.text) {
+        const textBaseline = cellTheme.text.textBaseline;
+        const height = cellHeight - (padding[0] + padding[2]);
+        let y = 0;
+        if (textBaseline === 'middle') {
+          y = padding[0] + (height - textMark.AABBBounds.height()) / 2;
+        } else if (textBaseline === 'bottom') {
+          y = padding[0] + height - textMark.AABBBounds.height();
+        } else {
+          y = padding[0];
+        }
+        textMark.setAttributes({
+          y
+        });
+      }
     }
     return oldCellGroup;
   }

diff --git a/packages/vtable/src/ts-types/table-engine.ts b/packages/vtable/src/ts-types/table-engine.ts
@@ -20,6 +20,7 @@ import type { ICellAxisOption, ITableAxisOption } from './component/axis';
 import type { IEditor } from '@visactor/vtable-editors';
 import type { ITextStyleOption } from '../body-helper/style';
 import type { DataSource } from '../data';
+import type { EditManeger } from '../edit/edit-manager';
 
 export interface CellAddress {
   col: number;
@@ -157,6 +158,7 @@ export interface ListTableConstructorOptions extends BaseTableConstructorOptions
 
 export interface ListTableAPI extends BaseTableAPI {
   options: ListTableConstructorOptions;
+  editorManager: EditManeger;
   sortState: SortState[] | SortState | null;
   // internalProps: ListTableProtected;
   isListTable: () => true;
@@ -309,6 +311,7 @@ export interface PivotChartConstructorOptions extends BaseTableConstructorOption
 export interface PivotTableAPI extends BaseTableAPI {
   records?: any;
   options: PivotTableConstructorOptions;
+  editorManager: EditManeger;
   // internalProps: PivotTableProtected;
   pivotSortState: PivotSortState[];
   isListTable: () => false;