Merge remote-tracking branch 'origin' into shared

worktile · Jul 25, 2024 · aa18b7b · aa18b7b
2 parents 4ae0bbc + 0392723
commit aa18b7b
Show file tree

Hide file tree

Showing 16 changed files with 223 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.0.3](https://github.com/worktile/ai-table/compare/0.0.2...0.0.3) (2024-07-22)
+
+
+### Features
+
+* support add and extend field #WIK-16038 ([#10](https://github.com/worktile/ai-table/issues/10)) ([74edbbb](https://github.com/worktile/ai-table/commit/74edbbbca3f387454bb22f436eaef0f67367b5e1)), closes [#WIK-16038](https://github.com/worktile/ai-table/issues/WIK-16038)
+
+
+
 ## 0.0.2 (2024-07-16)
 
 

diff --git a/angular.json b/angular.json
@@ -123,5 +123,8 @@
                 }
             }
         }
+    },
+    "cli": {
+      "analytics": false
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ai-table",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "workspaces": [
         "packages/*"
     ],

diff --git a/packages/grid/package.json b/packages/grid/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ai-table/grid",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "peerDependencies": {
         "@angular/common": "^18.0.0",
         "@angular/core": "^18.0.0"

diff --git a/packages/grid/src/core/types/core.ts b/packages/grid/src/core/types/core.ts
@@ -1,5 +1,6 @@
 import { WritableSignal } from '@angular/core';
 import { AITableAction } from './action';
+import { AITableSelection } from '../../types';
 
 export enum AITableFieldType {
     // NotSupport = 0,
@@ -57,6 +58,7 @@ export interface AITableField {
 
 export interface AITableRecord {
     id: string;
+    checked?: boolean;
     value: Record<string, any>;
 }
 
@@ -73,6 +75,7 @@ export interface AITable {
     records: WritableSignal<AITableRecords>;
     fields: WritableSignal<AITableFields>;
     actions: AITableAction[];
+    selection: WritableSignal<AITableSelection>;
     onChange: () => void;
     apply: (action: AITableAction) => void;
 }

diff --git a/packages/grid/src/core/utils/common.ts b/packages/grid/src/core/utils/common.ts
@@ -1,13 +1,18 @@
 import { Actions } from '../action';
 import { AITable, AITableAction, AITableFields, AITableRecords } from '../types';
 import { FLUSHING } from './weak-map';
-import { WritableSignal } from '@angular/core';
+import { WritableSignal, signal } from '@angular/core';
 
 export function createAITable(records: WritableSignal<AITableRecords>, fields: WritableSignal<AITableFields>): AITable {
     const aiTable: AITable = {
         records,
         fields,
         actions: [],
+        selection: signal({
+            selectedRecords: new Map(),
+            selectedFields: new Map(),
+            selectedCells: new Map()
+        }),
         onChange: () => {},
         apply: (action: AITableAction) => {
             aiTable.actions.push(action);

diff --git a/packages/grid/src/grid.component.html b/packages/grid/src/grid.component.html
@@ -1,9 +1,14 @@
 <div class="grid-header d-flex">
     <div class="grid-column-checkbox grid-cell">
-        <input type="checkbox" />
+        <label thyCheckbox thyLabelText="" [ngModel]="isSelectedAll" (ngModelChange)="toggleSelectAll($event)"></label>
     </div>
     @for (field of gridData().fields; track field.id) {
-        <div class="grid-cell grid-field" #fieldAction>
+        <div
+            class="grid-cell grid-column-field"
+            #fieldAction
+            [attr.fieldId]="field.id"
+            [ngClass]="{ highlight: aiTable.selection().selectedFields.has(field.id) }"
+        >
             {{ field.name }}
             <a thyAction thyActiveClass="active" thyIcon="more-vertical" [thyDropdown]="fieldMenu" href="javascript:;">
                 <thy-dropdown-menu #fieldMenu>
@@ -18,12 +23,29 @@
 </div>
 <div class="grid-body d-flex">
     @for (record of gridData().records; track record.id; let index = $index) {
-        <div class="grid-row d-flex">
+        <div class="grid-row d-flex" [ngClass]="{ highlight: aiTable.selection().selectedRecords.has(record.id) }">
             <div class="grid-row-index">
-                {{ index + 1 }}
+                <label
+                    [ngClass]="record.checked ? 'checked-box' : 'unchecked-box'"
+                    thyCheckbox
+                    thyLabelText=""
+                    [ngModel]="record.checked"
+                    (ngModelChange)="selectRecord(record.id)"
+                ></label>
+                <span [ngClass]="record.checked ? 'grid-row-no-number' : 'grid-row-number'"> {{ index + 1 }} </span>
             </div>
             @for (field of gridData().fields; track $index) {
-                <div class="grid-cell" [attr.type]="[field.type]" [attr.fieldId]="[field.id]" [attr.recordId]="[record.id]" #cell>
+                <div
+                    class="grid-cell"
+                    [ngClass]="{
+                        highlight: aiTable.selection().selectedCells.has(record.id) || aiTable.selection().selectedFields.has(field.id),
+                        selected: aiTable.selection().selectedCells.get(record.id)?.hasOwnProperty(field.id)
+                    }"
+                    [attr.type]="[field.type]"
+                    [attr.fieldId]="[field.id]"
+                    [attr.recordId]="[record.id]"
+                    #cell
+                >
                     @switch (field.type) {
                         @case (AITableFieldType.SingleSelect) {
                             @if (record.value[field.id] | selectOption: field['options']; as selectedOption) {
@@ -51,6 +73,7 @@
                             {{ record.value[field.id] }}
                         }
                     }
+                    <div class="autofill-container"></div>
                 </div>
             }
             <div class="grid-column-blank"></div>

diff --git a/packages/grid/src/grid.component.ts b/packages/grid/src/grid.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, computed, ElementRef, input, model, OnInit, output, signal, viewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, computed, ElementRef, input, model, NgZone, OnInit, output, signal } from '@angular/core';
 import { CommonModule, NgClass, NgComponentOutlet, NgForOf } from '@angular/common';
 import { SelectOptionPipe } from './pipes/grid';
 import { ThyTag } from 'ngx-tethys/tag';
@@ -25,12 +25,14 @@ import { ThyRate } from 'ngx-tethys/rate';
 import { FormsModule } from '@angular/forms';
 import { ThyFlexibleText } from 'ngx-tethys/flexible-text';
 import { ThyTooltipModule, ThyTooltipService } from 'ngx-tethys/tooltip';
+import { ThyCheckboxModule } from 'ngx-tethys/checkbox';
 import { ThyStopPropagationDirective } from 'ngx-tethys/shared';
 import { FieldMenu } from './components/field-menu/field-menu.component';
 import { ThyAction } from 'ngx-tethys/action';
 import { ThyDropdownDirective, ThyDropdownMenuComponent } from 'ngx-tethys/dropdown';
 import { DefaultFieldMenus } from './constants';
 import { AI_TABLE_GRID_FIELD_SERVICE_MAP, AITableGridFieldService } from './services/field.service';
+import { AITableGridSelectionService } from './services/selection.servive';
 
 @Component({
     selector: 'ai-table-grid',
@@ -59,9 +61,10 @@ import { AI_TABLE_GRID_FIELD_SERVICE_MAP, AITableGridFieldService } from './serv
         FieldMenu,
         ThyAction,
         ThyDropdownDirective,
-        ThyDropdownMenuComponent
+        ThyDropdownMenuComponent,
+        ThyCheckboxModule
     ],
-    providers: [ThyTooltipService, AITableGridEventService, AITableGridFieldService]
+    providers: [ThyTooltipService, AITableGridEventService, AITableGridFieldService, AITableGridSelectionService]
 })
 export class AITableGrid implements OnInit {
     aiRecords = model.required<AITableRecords>();
@@ -80,26 +83,39 @@ export class AITableGrid implements OnInit {
 
     aiTable!: AITable;
 
+    get isSelectedAll() {
+        return this.aiTable.selection().selectedRecords.size === this.aiRecords().length;
+    }
+
     onChange = output<AITableChangeOptions>();
 
     aiTableInitialized = output<AITable>();
 
     fieldMenus!: AITableFieldMenu[];
 
     gridData = computed(() => {
-        return buildGridData(this.aiRecords(), this.aiFields());
+        return buildGridData(this.aiRecords(), this.aiFields(), this.aiTable.selection());
     });
 
     constructor(
         private elementRef: ElementRef,
         private aiTableGridEventService: AITableGridEventService,
-        private aiTableGridFieldService: AITableGridFieldService
+        public aiTableGridSelectionService: AITableGridSelectionService,
+        private aiTableGridFieldService: AITableGridFieldService,
+        private ngZone: NgZone
     ) {}
 
     ngOnInit(): void {
         this.initAITable();
         this.initService();
         this.buildFieldMenus();
+        this.ngZone.runOutsideAngular(() => {
+            this.aiTableGridEventService.mousedownEvent$.pipe(this.takeUntilDestroyed).subscribe((event) => {
+                if ((event as MouseEvent)?.target) {
+                    this.aiTableGridSelectionService.updateSelect(event as MouseEvent);
+                }
+            });
+        });
     }
 
     initAITable() {
@@ -116,6 +132,7 @@ export class AITableGrid implements OnInit {
 
     initService() {
         this.aiTableGridEventService.initialize(this.aiTable, this.aiFieldConfig()?.fieldPropertyEditor);
+        this.aiTableGridSelectionService.initialize(this.aiTable);
         this.aiTableGridEventService.registerEvents(this.elementRef.nativeElement);
         this.aiTableGridFieldService.initAIFieldConfig(this.aiFieldConfig());
         AI_TABLE_GRID_FIELD_SERVICE_MAP.set(this.aiTable, this.aiTableGridFieldService);
@@ -129,6 +146,14 @@ export class AITableGrid implements OnInit {
         Actions.addRecord(this.aiTable, getDefaultRecord(this.aiFields()), [this.aiRecords().length]);
     }
 
+    selectRecord(recordId: string) {
+        this.aiTableGridSelectionService.selectRecord(recordId);
+    }
+
+    toggleSelectAll(checked: boolean) {
+        this.aiTableGridSelectionService.toggleSelectAll(checked);
+    }
+
     addField(gridColumnBlank: HTMLElement) {
         const field = signal(createDefaultField(this.aiTable, AITableFieldType.Text));
         this.aiTableGridFieldService.editFieldProperty(gridColumnBlank, this.aiTable, field, false);

diff --git a/packages/grid/src/pipes/grid.ts b/packages/grid/src/pipes/grid.ts
@@ -1,5 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
-import { AITableSelectOption }  from '../core';;
+import { AITableSelectOption } from '../core';
 
 @Pipe({
     name: 'selectOption',

diff --git a/packages/grid/src/services/event.service.ts b/packages/grid/src/services/event.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Signal } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { fromEvent } from 'rxjs';
+import { fromEvent, Subject } from 'rxjs';
 import { DBL_CLICK_EDIT_TYPE } from '../constants';
 import { getRecordOrField } from '../utils';
 import { AITable, AITableField, AITableFieldType, AITableRecord } from '../core';
@@ -16,6 +16,8 @@ export class AITableGridEventService {
 
     takeUntilDestroyed = takeUntilDestroyed();
 
+    mousedownEvent$ = new Subject<MouseEvent>();
+
     constructor(private thyPopover: ThyPopover) {}
 
     initialize(aiTable: AITable, aiFieldRenderers?: Partial<Record<AITableFieldType, AITableGridCellRenderSchema>>) {
@@ -29,6 +31,12 @@ export class AITableGridEventService {
             .subscribe((event) => {
                 this.dblClick(event as MouseEvent);
             });
+
+        fromEvent<MouseEvent>(element, 'mousedown')
+            .pipe(this.takeUntilDestroyed)
+            .subscribe((event) => {
+                this.mousedownEvent$.next(event as MouseEvent);
+            });
     }
 
     private dblClick(event: MouseEvent) {

diff --git a/packages/grid/src/services/selection.servive.ts b/packages/grid/src/services/selection.servive.ts
@@ -0,0 +1,68 @@
+import { Injectable } from '@angular/core';
+import { AITable } from '../core';
+
+@Injectable()
+export class AITableGridSelectionService {
+    aiTable!: AITable;
+
+    constructor() {}
+
+    initialize(aiTable: AITable) {
+        this.aiTable = aiTable;
+    }
+
+    clearSelection() {
+        this.aiTable.selection.set({
+            selectedRecords: new Map(),
+            selectedFields: new Map(),
+            selectedCells: new Map()
+        });
+    }
+
+    selectCell(recordId: string, fieldId: string) {
+        this.clearSelection();
+        this.aiTable.selection().selectedCells.set(recordId, { [fieldId]: true });
+    }
+
+    selectField(fieldId: string) {
+        this.clearSelection();
+        this.aiTable.selection().selectedFields.set(fieldId, true);
+    }
+
+    selectRecord(recordId: string) {
+        if (this.aiTable.selection().selectedRecords.has(recordId)) {
+            this.aiTable.selection().selectedRecords.delete(recordId);
+        } else {
+            this.aiTable.selection().selectedRecords.set(recordId, true);
+        }
+        this.aiTable.selection.set({
+            selectedRecords: this.aiTable.selection().selectedRecords,
+            selectedFields: new Map(),
+            selectedCells: new Map()
+        });
+    }
+
+    toggleSelectAll(checked: boolean) {
+        this.clearSelection();
+        if (checked) {
+            this.aiTable.records().forEach((item) => {
+                this.selectRecord(item.id);
+            });
+        }
+    }
+
+    updateSelect(event: MouseEvent) {
+        const target = event.target as HTMLElement;
+        const cellDom = target.closest('.grid-cell');
+        const colDom = target.closest('.grid-column-field');
+        if (cellDom) {
+            const fieldId = cellDom.getAttribute('fieldId');
+            const recordId = cellDom.getAttribute('recordId');
+            fieldId && recordId && this.selectCell(recordId, fieldId);
+        }
+        if (colDom) {
+            const fieldId = colDom.getAttribute('fieldId');
+            fieldId && this.selectField(fieldId);
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,5 +123,8 @@ @@
                     }
                 }
             }
+        },
+        "cli": {
+          "analytics": false
         }
     }