@ai-table/grid 0.1.34 → 0.1.35

package/fesm2022/ai-table-grid.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { InjectionToken, input, EventEmitter, inject, ElementRef, effect, Output, ChangeDetectionStrategy, Component, signal, computed, output, Input, ChangeDetectorRef, ViewChild, untracked, model, Renderer2, Pipe, booleanAttribute, Injectable, DestroyRef, NgZone, ViewContainerRef, viewChild, afterNextRender } from '@angular/core';
+import { InjectionToken, input, EventEmitter, inject, ElementRef, effect, Output, ChangeDetectionStrategy, Component, signal, computed, output, Input, ChangeDetectorRef, ViewChild, model, untracked, Renderer2, Pipe, booleanAttribute, Injectable, DestroyRef, NgZone, ViewContainerRef, viewChild, afterNextRender } from '@angular/core';
 import Konva from 'konva';
 import { Shape } from 'konva/lib/Shape';
 import { Sprite } from 'konva/lib/shapes/Sprite';
@@ -4778,24 +4778,10 @@ class CoverCellBase {
     constructor() {
         this.config = input();
         this.onlyDisplayBorder = input(false);
-        this.height = computed(() => {
-            const { render } = this.config();
-            return render.rowHeight;
-        });
         this.isExpand = computed(() => {
             const { isExpand } = this.config();
             return isExpand;
         });
-        effect(() => {
-            const height = this.height();
-            if (this.isExpand()) {
-                untracked(() => {
-                    const { render, aiTable } = this.config();
-                    const { columnWidth } = render;
-                    setExpandCellInfo(aiTable, { width: columnWidth, height });
-                });
-            }
-        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: CoverCellBase, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.1.0", version: "19.2.10", type: CoverCellBase, isStandalone: true, selector: "ai-table-cover-cell-base", inputs: { config: { classPropertyName: "config", publicName: "config", isSignal: true, isRequired: false, transformFunction: null }, onlyDisplayBorder: { classPropertyName: "onlyDisplayBorder", publicName: "onlyDisplayBorder", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
@@ -4807,7 +4793,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
                     template: '',
                     changeDetection: ChangeDetectionStrategy.OnPush
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 
 class AITableCellLink extends CoverCellBase {
     constructor() {
@@ -8365,9 +8351,6 @@ class AITableScrollableGroup {
             this.rootGroup.getNode().moveTo(this.parentContainer().getNode());
         }
     }
-    stopBubble(e) {
-        e.event.cancelBubble = true;
-    }
     verticalScrollbarClick(e) {
         e.event.cancelBubble = true;
         const { contentHeight, height } = this.config();
@@ -8456,13 +8439,7 @@ class AITableScrollableGroup {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AITableScrollableGroup, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.10", type: AITableScrollableGroup, isStandalone: true, selector: "ai-table-scrollable-group", inputs: { config: { classPropertyName: "config", publicName: "config", isSignal: true, isRequired: true, transformFunction: null }, contentTemplate: { classPropertyName: "contentTemplate", publicName: "contentTemplate", isSignal: true, isRequired: true, transformFunction: null }, parentContainer: { classPropertyName: "parentContainer", publicName: "parentContainer", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { scrollPosition: "scrollPosition" }, viewQueries: [{ propertyName: "verticalTrack", first: true, predicate: ["verticalTrack"], descendants: true }, { propertyName: "verticalThumb", first: true, predicate: ["verticalThumb"], descendants: true }, { propertyName: "horizontalTrack", first: true, predicate: ["horizontalTrack"], descendants: true }, { propertyName: "contentGroup", first: true, predicate: ["contentGroup"], descendants: true }, { propertyName: "rootGroup", first: true, predicate: ["rootGroup"], descendants: true }], ngImport: i0, template: `
-        <ko-group
-            #rootGroup
-            [config]="containerConfig()"
-            (koWheel)="stageWheel($event)"
-            (koMousedown)="stopBubble($event)"
-            (koMouseup)="stopBubble($event)"
-        >
+        <ko-group #rootGroup [config]="containerConfig()" (koWheel)="stageWheel($event)">
             <ko-group>
                 <ko-rect [config]="bgConfig()"></ko-rect>
             </ko-group>
@@ -8514,13 +8491,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
             args: [{
                     selector: 'ai-table-scrollable-group',
                     template: `
-        <ko-group
-            #rootGroup
-            [config]="containerConfig()"
-            (koWheel)="stageWheel($event)"
-            (koMousedown)="stopBubble($event)"
-            (koMouseup)="stopBubble($event)"
-        >
+        <ko-group #rootGroup [config]="containerConfig()" (koWheel)="stageWheel($event)">
             <ko-group>
                 <ko-rect [config]="bgConfig()"></ko-rect>
             </ko-group>
@@ -8608,7 +8579,9 @@ class AITableFillHandle {
             const rowOffset = coordinate.getRowOffset(rowIndex);
             const width = 6;
             const height = 6;
-            const cellHeight = aiTable.selection().expandCellInfo?.height ?? AI_TABLE_ROW_HEIGHT;
+            const cellHeight = aiTable.selection().expandCellInfo?.height
+                ? aiTable.selection().expandCellInfo.height + AI_TABLE_CELL_LINE_BORDER
+                : AI_TABLE_ROW_HEIGHT;
             return {
                 x: columnOffset + columnWidth - width / 2 + AI_TABLE_OFFSET,
                 y: rowOffset + cellHeight - height + AI_TABLE_CELL_BORDER + AI_TABLE_OFFSET,
@@ -9998,8 +9971,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
         }] });
 
 class AITableCellText extends CoverCellBase {
+    static { this.fieldType = AITableFieldType.text; }
     constructor() {
-        super(...arguments);
+        super();
         this.expandBorderConfig = computed(() => {
             const { render, field, recordId, readonly, isExpand } = this.config();
             const { columnWidth } = render;
@@ -10123,9 +10097,18 @@ class AITableCellText extends CoverCellBase {
             }
             return;
         });
+        effect(() => {
+            const height = this.height();
+            if (this.isExpand()) {
+                untracked(() => {
+                    const { render, aiTable } = this.config();
+                    const { columnWidth } = render;
+                    setExpandCellInfo(aiTable, { width: columnWidth, height });
+                });
+            }
+        });
     }
-    static { this.fieldType = AITableFieldType.text; }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AITableCellText, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AITableCellText, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.10", type: AITableCellText, isStandalone: true, selector: "ai-table-single-text", usesInheritance: true, ngImport: i0, template: `
         <ko-group>
             @if (isExpand()) {
@@ -10178,7 +10161,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
                     imports: [AITableTextComponent, KoShape, KoContainer, AITableScrollableGroup],
                     changeDetection: ChangeDetectionStrategy.OnPush
                 }]
-        }] });
+        }], ctorParameters: () => [] });
 
 // TODO: components下的cells组件考虑移出 components ，这些组件都属于
 
@@ -10917,7 +10900,7 @@ class AITableGridSelectionService {
     initialize(aiTable) {
         this.aiTable = aiTable;
     }
-    clearSelection() {
+    clearSelection(options) {
         this.aiTable.selection.set({
             selectedRecords: new Set(),
             selectedFields: new Set(),
@@ -10926,7 +10909,7 @@ class AITableGridSelectionService {
             expandCell: null,
             editingCell: null,
             selectAllState: AITableSelectAllState.none,
-            expandCellInfo: null
+            expandCellInfo: options?.retainExpandCellInfo ? this.aiTable.selection().expandCellInfo : null
         });
     }
     setActiveCell(activeCell) {
@@ -11024,6 +11007,11 @@ class AITableGridSelectionService {
             selectedCells.add(`${startRecordId}:${startFieldId}`);
         }
         else {
+            // 数据的存储设计结构，决定了最后一条就是endCell
+            const lastItem = Array.from(this.aiTable.selection().selectedCells).pop();
+            if (endCell.join(':') === lastItem) {
+                return;
+            }
             const [endRecordId, endFieldId] = endCell;
             const startRowIndex = this.aiTable.context.visibleRowsIndexMap().get(startRecordId);
             const endRowIndex = this.aiTable.context.visibleRowsIndexMap().get(endRecordId);
@@ -11040,8 +11028,11 @@ class AITableGridSelectionService {
             }
         }
         this.clearSelection();
-        this.setActiveCell(activeCell || startCell);
-        this.aiTable.selection().selectedCells = selectedCells;
+        this.aiTable.selection.set({
+            ...this.aiTable.selection(),
+            activeCell: activeCell || startCell,
+            selectedCells: selectedCells
+        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AITableGridSelectionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.10", ngImport: i0, type: AITableGridSelectionService }); }
@@ -12611,7 +12602,7 @@ class AITableGrid extends AITableGridBase {
                 if (expandRecordId !== recordId || expandFieldId !== fieldId) {
                     const field = this.aiTable.fieldsMap()[fieldId];
                     if (field.type === AITableFieldType.text) {
-                        this.aiTableGridSelectionService.clearSelection();
+                        this.aiTableGridSelectionService.clearSelection({ retainExpandCellInfo: true });
                         expandCell(this.aiTable, [recordId, fieldId]);
                     }
                     else {