@ai-table/grid 0.1.42 → 0.1.44

package/components/cell-editors/date/date-editor.component.d.ts

@@ -4,7 +4,7 @@ import * as i0 from "@angular/core";
 export declare class DateCellEditorComponent extends AbstractEditCellEditor<DateFieldValue> {
     placeholder: string;
     ngOnInit(): void;
-    updateValue(value: number): void;
+    updateValue(timestamp: number): void;
     thyOpenChange(isOpen: Boolean): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<DateCellEditorComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<DateCellEditorComponent, "date-cell-editor", never, {}, {}, never, never, true, never>;

package/components/cell-editors/date/date-editor.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date-editor.component.d.ts","sourceRoot":"","sources":["../../../../../packages/grid/src/components/cell-editors/date/date-editor.component.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAI3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;;AAEjD,qBAyBa,uBAAwB,SAAQ,sBAAsB,CAAC,cAAc,CAAC;IAC/E,WAAW,SAAM;IAER,QAAQ,IAAI,IAAI;IAazB,WAAW,CAAC,KAAK,EAAE,MAAM;IAUzB,aAAa,CAAC,MAAM,EAAE,OAAO;yCA1BpB,uBAAuB;2CAAvB,uBAAuB;CA+BnC"}
+{"version":3,"file":"date-editor.component.d.ts","sourceRoot":"","sources":["../../../../../packages/grid/src/components/cell-editors/date/date-editor.component.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAI3E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;;AAEjD,qBAyBa,uBAAwB,SAAQ,sBAAsB,CAAC,cAAc,CAAC;IAC/E,WAAW,SAAM;IAER,QAAQ,IAAI,IAAI;IAazB,WAAW,CAAC,SAAS,EAAE,MAAM;IAW7B,aAAa,CAAC,MAAM,EAAE,OAAO;yCA3BpB,uBAAuB;2CAAvB,uBAAuB;CAgCnC"}

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

@@ -1731,10 +1731,11 @@ class DateCellEditorComponent extends AbstractEditCellEditor {
         })();
         this.placeholder = getI18nTextByKey(this.aiTable, AITableGridI18nKey.dataPickerPlaceholder);
     }
-    updateValue(value) {
+    updateValue(timestamp) {
+        const value = timestamp ? { timestamp: timestamp } : null;
         this.updateFieldValues.emit([
             {
-                value: { timestamp: value },
+                value,
                 path: [this.record()._id, this.field()._id]
             }
         ]);
@@ -2018,16 +2019,19 @@ function getColumnIndicesSizeMap(aiTable, fields) {
  */
 function getCellHorizontalPosition(options) {
     let { columnWidth, columnIndex, columnCount, depth = 0 } = options;
+    const isGroupAndFirstColumn = depth > 0 && columnIndex === 0;
+    columnWidth = isGroupAndFirstColumn ? columnWidth - AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE : columnWidth;
     depth += 1;
     if (!depth)
         return { width: columnWidth, offset: 0 };
     const firstIndent = columnIndex === 0 && depth;
     const lastIndent = columnIndex === columnCount - 1 && depth === 3;
-    const offset = firstIndent ? (depth - 1) * AI_TABLE_ROW_GROUP_OFFSET + 0.5 : 0;
+    let offset = firstIndent ? (depth - 1) * AI_TABLE_ROW_GROUP_OFFSET + 0.5 : 0;
     const width = lastIndent && !firstIndent ? columnWidth - AI_TABLE_ROW_GROUP_OFFSET : columnWidth - offset;
     return {
         width,
-        offset
+        offset,
+        isGroupAndFirstColumn
     };
 }
 function transformToCellText(cellValue, options) {
@@ -2282,12 +2286,15 @@ function getPlaceHolderCellsConfigs(options) {
             }
             // 当前行的 Y 轴偏移量，并根据列宽和列索引获取单元格的水平位置（宽度和偏移量）
             const y = coordinate.getRowOffset(rowIndex) + AI_TABLE_OFFSET * 2;
-            const { width, offset } = getCellHorizontalPosition({
+            let { width, offset, isGroupAndFirstColumn } = getCellHorizontalPosition({
                 columnWidth,
                 columnIndex,
                 columnCount,
                 depth
             });
+            if (isGroupAndFirstColumn) {
+                offset += AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE;
+            }
             const height = rowHeight - AI_TABLE_OFFSET * 4;
             configs.unshift({
                 key: `placeholder-cell-${fieldId}-${recordId}`,
@@ -5457,11 +5464,17 @@ const createActiveCellBorder = (config) => {
                 const y = coordinate.getRowOffset(rowIndex);
                 const columnWidth = coordinate.getColumnWidth(columnIndex);
                 const isFrozenColumn = columnIndex < frozenColumnCount;
-                const { offset, width } = getCellHorizontalPosition({
+                const row = aiTable.context?.linearRows()[rowIndex];
+                const depth = row?.depth ?? 0;
+                let { offset, width, isGroupAndFirstColumn } = getCellHorizontalPosition({
                     columnWidth,
                     columnIndex,
-                    columnCount: totalColumnCount
+                    columnCount: totalColumnCount,
+                    depth
                 });
+                if (isGroupAndFirstColumn) {
+                    offset += AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE;
+                }
                 const currentConfig = {
                     x: x + offset + AI_TABLE_OFFSET,
                     y: y + AI_TABLE_OFFSET,
@@ -6202,13 +6215,13 @@ class CellDrawer extends Drawer {
         }
     }
     renderCellCheckbox(render, ctx) {
-        const { x, y, field, columnWidth, transformValue, isCoverCell } = render;
+        const { x, y, field, columnWidth, transformValue, isCoverCell, isGroupFirstRender } = render;
         if (isCoverCell) {
             return;
         }
         const isChecked = !isEmpty(transformValue) && !!transformValue;
         const checkboxSize = AI_TABLE_ICON_COMMON_SIZE;
-        const checkboxX = x + (columnWidth - checkboxSize) / 2;
+        const checkboxX = isGroupFirstRender ? x + AI_TABLE_CELL_PADDING : x + (columnWidth - checkboxSize) / 2;
         const checkboxY = y + (AI_TABLE_ROW_BLANK_HEIGHT - checkboxSize) / 2;
         this.path({
             x: checkboxX,
@@ -6219,7 +6232,7 @@ class CellDrawer extends Drawer {
         });
     }
     renderCellText(render, ctx) {
-        const { x, y, transformValue, field, columnWidth, style } = render;
+        const { x, y, transformValue, field, columnWidth, style, isGroupFirstRender } = render;
         if (isUndefinedOrNull(transformValue)) {
             return;
         }
@@ -6273,7 +6286,7 @@ class CellDrawer extends Drawer {
                 lineHeight: DEFAULT_TEXT_LINE_HEIGHT,
                 textAlign,
                 verticalAlign: DEFAULT_TEXT_VERTICAL_ALIGN_MIDDLE,
-                fillStyle: fieldType === AITableFieldType.link ? Colors.primary : color,
+                fillStyle: fieldType === AITableFieldType.link && !isGroupFirstRender ? Colors.primary : color,
                 fontWeight,
                 textDecoration,
                 fieldType,
@@ -6995,12 +7008,13 @@ class GroupLayout extends Layout {
             });
         }
         const iconContainerWidth = AI_TABLE_ICON_COMMON_SIZE + AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE;
-        if (!isEmpty(groupValue)) {
+        if (!isEmpty(groupValue) || field.type === AITableFieldType.checkbox) {
             cellDrawer.initStyle(field, style);
             cellDrawer.renderCell({
                 ...render,
                 x: render.x + iconContainerWidth,
-                columnWidth: render.columnWidth - iconContainerWidth
+                columnWidth: render.columnWidth - iconContainerWidth,
+                isGroupFirstRender: true
             }, this.ctx, columnWidth);
         }
         else {
@@ -7141,10 +7155,9 @@ const createCells = (config) => {
                         isHoverRow: isHoverRecord(isHover, targetName),
                         isCheckedRow: isSelectedRecord(recordId, aiTable)
                     });
-                    const isGroupAndFirstColumn = depth > 0 && columnIndex === 0;
-                    const { width, offset } = getCellHorizontalPosition({
+                    const { width, offset, isGroupAndFirstColumn } = getCellHorizontalPosition({
                         columnIndex,
-                        columnWidth: isGroupAndFirstColumn ? columnWidth - AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE : columnWidth,
+                        columnWidth,
                         columnCount,
                         depth
                     });
@@ -7213,12 +7226,15 @@ const createCells = (config) => {
                         frozenColumnCount,
                         xIsScroll
                     });
-                    const { width, offset } = getCellHorizontalPosition({
+                    let { width, offset, isGroupAndFirstColumn } = getCellHorizontalPosition({
                         columnIndex,
                         columnWidth,
                         columnCount,
                         depth
                     });
+                    if (isGroupAndFirstColumn) {
+                        width += AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE;
+                    }
                     const realX = x + offset + AI_TABLE_OFFSET;
                     const realY = y + AI_TABLE_OFFSET;
                     const style = { fontWeight: DEFAULT_FONT_STYLE };
@@ -8969,10 +8985,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.10", ngImpo
 const createGroupCells = (config) => {
     const { coordinate, rowStartIndex, rowStopIndex, columnStartIndex, columnStopIndex, aiTable, actions, readonly } = config;
     const linearRows = aiTable.context?.linearRows();
-    const { columnCount } = coordinate;
+    const { rowCount, columnCount } = coordinate;
     const groups = [];
     for (let rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) {
-        if (rowIndex > columnCount - 1)
+        if (rowIndex > rowCount - 1)
             break;
         if (rowIndex < 0)
             continue;
@@ -9745,10 +9761,9 @@ class AITableCoverCellEntry {
             const x = coordinate.getColumnOffset(columnIndex) + AI_TABLE_OFFSET;
             const columnWidth = coordinate.getColumnWidth(columnIndex);
             const y = coordinate.getRowOffset(rowIndex) + AI_TABLE_OFFSET;
-            const isGroupAndFirstColumn = depth > 0 && columnIndex === 0;
-            const { width, offset } = getCellHorizontalPosition({
+            const { width, offset, isGroupAndFirstColumn } = getCellHorizontalPosition({
                 columnIndex,
-                columnWidth: isGroupAndFirstColumn ? columnWidth - AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE : columnWidth,
+                columnWidth,
                 columnCount,
                 depth
             });
@@ -11889,11 +11904,18 @@ class AITableGridEventService {
         const originX = coordinate.getColumnOffset(columnIndex);
         const originY = coordinate.getRowOffset(rowIndex);
         const columnWidth = coordinate.getColumnWidth(columnIndex);
-        const { width: originWidth, offset: originOffset } = getCellHorizontalPosition({
+        const row = aiTable.context?.linearRows()[rowIndex];
+        const depth = row?.depth ?? 0;
+        const isGroupAndFirstColumn = depth > 0 && columnIndex === 0;
+        let { width: originWidth, offset: originOffset } = getCellHorizontalPosition({
             columnWidth,
             columnIndex,
-            columnCount
+            columnCount,
+            depth
         });
+        if (isGroupAndFirstColumn) {
+            originOffset += AI_TABLE_FIELD_HEAD_ICON_GAP_SIZE;
+        }
         const originRect = container.getBoundingClientRect();
         const isFrozenColumn = AITable.isFrozenColumn(aiTable, columnIndex);
         const scrollLeft = isFrozenColumn ? 0 : scrollState().scrollLeft;
@@ -12781,6 +12803,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 +12832,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 +12884,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 +12896,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() {
@@ -12985,8 +13018,9 @@ class AITableGrid extends AITableGridBase {
             const scrollTop = this.aiTable.context.scrollState().scrollTop;
             const rowIndices = this.toolTipRowIndices();
             return rowIndices.map((rowIndex) => {
+                const offset = this.coordinate().getRowOffset(rowIndex);
                 return {
-                    top: rowIndex * AI_TABLE_ROW_HEIGHT - scrollTop,
+                    top: offset - scrollTop - AI_TABLE_FIELD_HEAD_HEIGHT,
                     left: 0
                 };
             });
@@ -13244,7 +13278,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}`);
                     }