@ai-table/grid 0.1.42 → 0.1.43

package/components/drag/drag.component.d.ts

@@ -36,7 +36,7 @@ export declare class AITableDragComponent implements OnInit, OnDestroy {
     private movingColumn;
     private movingColumnWidth;
     private movingRecord;
-    private setDragData;
+    private setMovingRecordDragData;
     private handleDragEnd;
     private clearDragState;
     private calculateDragWidth;

package/components/drag/drag.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drag.component.d.ts","sourceRoot":"","sources":["../../../../packages/grid/src/components/drag/drag.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,UAAU,EAIV,SAAS,EACT,MAAM,EAIT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAiB,WAAW,EAAY,MAAM,iBAAiB,CAAC;;AAiBvE,qBAQa,oBAAqB,YAAW,MAAM,EAAE,SAAS;IAC1D,aAAa,2EAAgD;IAE7D,WAAW,2EAAgD;IAE3D,OAAO,wDAAyB;IAEhC,OAAO,CAAC,uBAAuB,CAAmC;IAElE,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,uBAAuB,CAA0C;IAEzE,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC,CAAmC;IAEtE,OAAO,CAAC,IAAI,CAAe;IAE3B,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,WAAW,CAA4B;IAE/C,OAAO,CAAC,sBAAsB,CAA4C;IAE1E,OAAO,CAAC,kBAAkB,CAAyC;IAEnE,OAAO,CAAC,WAAW,CAAiC;IAEpD,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,gBAAgB,CAAa;IAErC,OAAO,CAAC,iBAAiB,CAAkB;IAE3C,OAAO,CAAC,cAAc,CAAa;IAEnC,OAAO,CAAC,eAAe,CAAa;IAEpC,OAAO,CAAC,oBAAoB,CAAC,CAAc;IAE3C,OAAO,CAAC,sBAAsB,CAAa;IAE3C,OAAO,CAAC,kBAAkB,CAAC,CAAc;IAEzC,OAAO,CAAC,oBAAoB,CAAa;IAEzC,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,eAAe,CAAC,CAAa;;IAMrC,QAAQ;IAKR,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,mBAAmB;IA8C3B,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,UAAU;IA8BlB,OAAO,CAAC,YAAY;IAsJpB,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,YAAY;IAmFpB,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,kBAAkB;IAI1B,WAAW;yCA5eF,oBAAoB;2CAApB,oBAAoB;CAufhC"}
+{"version":3,"file":"drag.component.d.ts","sourceRoot":"","sources":["../../../../packages/grid/src/components/drag/drag.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,UAAU,EAIV,SAAS,EACT,MAAM,EAIT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAiB,WAAW,EAAY,MAAM,iBAAiB,CAAC;;AAiBvE,qBAQa,oBAAqB,YAAW,MAAM,EAAE,SAAS;IAC1D,aAAa,2EAAgD;IAE7D,WAAW,2EAAgD;IAE3D,OAAO,wDAAyB;IAEhC,OAAO,CAAC,uBAAuB,CAAmC;IAElE,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,uBAAuB,CAA0C;IAEzE,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC,CAAmC;IAEtE,OAAO,CAAC,IAAI,CAAe;IAE3B,OAAO,CAAC,aAAa,CAAe;IAEpC,OAAO,CAAC,WAAW,CAA4B;IAE/C,OAAO,CAAC,sBAAsB,CAA4C;IAE1E,OAAO,CAAC,kBAAkB,CAAyC;IAEnE,OAAO,CAAC,WAAW,CAAiC;IAEpD,OAAO,CAAC,KAAK,CAAiB;IAE9B,OAAO,CAAC,gBAAgB,CAAa;IAErC,OAAO,CAAC,iBAAiB,CAAkB;IAE3C,OAAO,CAAC,cAAc,CAAa;IAEnC,OAAO,CAAC,eAAe,CAAa;IAEpC,OAAO,CAAC,oBAAoB,CAAC,CAAc;IAE3C,OAAO,CAAC,sBAAsB,CAAa;IAE3C,OAAO,CAAC,kBAAkB,CAAC,CAAc;IAEzC,OAAO,CAAC,oBAAoB,CAAa;IAEzC,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,eAAe,CAAC,CAAa;;IAMrC,QAAQ;IAKR,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,mBAAmB;IA8C3B,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,UAAU;IA8BlB,OAAO,CAAC,YAAY;IAsJpB,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,YAAY;IAwFpB,OAAO,CAAC,uBAAuB;IAoB/B,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,kBAAkB;IAI1B,WAAW;yCAtfF,oBAAoB;2CAApB,oBAAoB;CAigBhC"}

package/fesm2022/ai-table-grid.mjs

@@ -12781,6 +12781,7 @@ class AITableDragComponent {
         const aiTable = this.aiTableGridEventService.aiTable;
         const scroll = { x: 0, y: this.verticalBarElement?.scrollTop || 0 };
         const coordinate = drag.coordinate;
+        const linearRows = aiTable.context.linearRows();
         const visibleRowIndexMap = aiTable.context.visibleRowsIndexMap();
         const sourceRowId = drag.sourceIds.values().next().value;
         const sourceRowIndex = visibleRowIndexMap.get(sourceRowId) || 0;
@@ -12809,16 +12810,20 @@ class AITableDragComponent {
                     this.setAuxiliaryLineStyles({
                         top: `${nextColumnStartY - scrollPosition.y}px`
                     });
-                    this.setDragData(DragType.record, drag.sourceIds, targetRowIndex + 1);
+                    this.setMovingRecordDragData(DragType.record, drag.sourceIds, targetRowIndex + 1);
                     return;
                 }
-                this.setAuxiliaryLineStyles({
-                    width: `calc(100% - ${AI_TABLE_ROW_DRAG_ICON_WIDTH}px)`,
-                    height: `${lineHeight}px`,
-                    top: `${lineTop}px`,
-                    left: `${AI_TABLE_ROW_DRAG_ICON_WIDTH}px`
-                });
-                this.setDragData(DragType.record, drag.sourceIds, targetRowIndex);
+                const currentLinearRow = linearRows[targetRowIndex];
+                const rowType = currentLinearRow.type;
+                if (rowType === AITableRowType.record || rowType === AITableRowType.add) {
+                    this.setAuxiliaryLineStyles({
+                        width: `calc(100% - ${AI_TABLE_ROW_DRAG_ICON_WIDTH}px)`,
+                        height: `${lineHeight}px`,
+                        top: `${lineTop}px`,
+                        left: `${AI_TABLE_ROW_DRAG_ICON_WIDTH}px`
+                    });
+                    this.setMovingRecordDragData(DragType.record, drag.sourceIds, targetRowIndex);
+                }
             }
             else {
                 this.resetAuxiliaryLine();
@@ -12857,7 +12862,7 @@ class AITableDragComponent {
             }
         });
     }
-    setDragData(type, sourceIds, targetIndex) {
+    setMovingRecordDragData(type, sourceIds, targetIndex) {
         const aiTable = this.aiTableGridEventService.aiTable;
         const linearRows = aiTable.context.linearRows();
         this.draggedData = {
@@ -12869,7 +12874,13 @@ class AITableDragComponent {
             this.draggedData.beforeRecordId = linearRows[0]._id;
         }
         else {
-            this.draggedData.afterRecordId = linearRows[targetIndex - 1]._id;
+            const targetLinearRow = linearRows[targetIndex - 1];
+            if (targetLinearRow.type === AITableRowType.group) {
+                this.draggedData.beforeRecordId = linearRows[targetIndex]._id;
+            }
+            else {
+                this.draggedData.afterRecordId = targetLinearRow._id;
+            }
         }
     }
     handleDragEnd() {
@@ -13244,7 +13255,7 @@ class AITableGrid extends AITableGridBase {
         if (keywords) {
             const references = this.aiReferences();
             this.aiTable.gridData().records.forEach((record) => {
-                this.aiTable.fields().forEach((field) => {
+                this.aiTable.gridData().fields.forEach((field) => {
                     if (isCellMatchKeywords(this.aiTable, field, record._id, keywords, references)) {
                         matchedCells.add(`${record._id}:${field._id}`);
                     }