feat: optimzie code

worktile · Jul 30, 2024 · f414ba6 · f414ba6
1 parent 8041a09
commit f414ba6
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 26 deletions.
diff --git a/packages/grid/src/components/field-menu/field-menu.component.ts b/packages/grid/src/components/field-menu/field-menu.component.ts
@@ -1,5 +1,5 @@
 import { Component, ChangeDetectionStrategy, Input, ElementRef, signal, Signal } from '@angular/core';
-import { AITableFieldMenu } from '../../types/field';
+import { AITableFieldMenuItem } from '../../types/field';
 import { AITable, AITableField } from '../../core';
 import {
     ThyDropdownMenuItemDirective,
@@ -30,11 +30,11 @@ export class FieldMenu {
 
     @Input({ required: true }) aiTable!: AITable;
 
-    @Input({ required: true }) fieldMenus!: AITableFieldMenu[];
+    @Input({ required: true }) fieldMenus!: AITableFieldMenuItem[];
 
     @Input() origin!: HTMLElement | ElementRef<any>;
 
-    execute(menu: AITableFieldMenu) {
+    execute(menu: AITableFieldMenuItem) {
         const field = getRecordOrField(this.aiTable.fields, this.fieldId) as Signal<AITableField>;
         menu.exec && menu.exec(this.aiTable, field, this.origin);
     }

diff --git a/packages/grid/src/constants/field.ts b/packages/grid/src/constants/field.ts
@@ -1,5 +1,5 @@
 import { AITable, AITableField } from '../core';
-import { AITableFieldMenu } from '../types/field';
+import { AITableFieldMenuItem } from '../types/field';
 import { AI_TABLE_GRID_FIELD_SERVICE_MAP } from '../services/field.service';
 import { ElementRef, signal, Signal, WritableSignal } from '@angular/core';
 
@@ -18,4 +18,4 @@ export const EditFieldPropertyItem = {
     }
 };
 
-export const DefaultFieldMenus: AITableFieldMenu[] = [EditFieldPropertyItem];
+export const DefaultFieldMenus: AITableFieldMenuItem[] = [EditFieldPropertyItem];
diff --git a/packages/grid/src/core/action/field.ts b/packages/grid/src/core/action/field.ts
@@ -11,22 +11,22 @@ export function addField(aiTable: AITable, field: AITableField, path: AIFieldPat
 }
 
 export function setField(aiTable: AITable, value: Partial<AITableField>, path: AIFieldPath) {
-    const node = AITableQueries.getField(aiTable, path);
-    if (node) {
-        const field: Partial<AITableField> = {};
+    const field = AITableQueries.getField(aiTable, path);
+    if (field) {
+        const oldField: Partial<AITableField> = {};
         const newField: Partial<AITableField> = {};
         for (const k in value) {
-            if (node[k] !== value[k]) {
-                if (node.hasOwnProperty(k)) {
-                    field[k] = node[k];
+            if (field[k] !== value[k]) {
+                if (field.hasOwnProperty(k)) {
+                    oldField[k] = field[k];
                 }
                 newField[k] = value[k];
             }
         }
 
         const operation: SetFieldAction = {
             type: ActionName.SetField,
-            field,
+            field: oldField,
             newField,
             path
         };
@@ -35,7 +35,6 @@ export function setField(aiTable: AITable, value: Partial<AITableField>, path: A
     }
 }
 
-
 export const FieldActions = {
     addField,
     setField

diff --git a/packages/grid/src/core/action/record.ts b/packages/grid/src/core/action/record.ts
@@ -2,11 +2,11 @@ import { ActionName, AddRecordAction, AIRecordPath, UpdateFieldValueAction, AITa
 import { AITableQueries } from '../utils';
 
 export function updateFieldValue(aiTable: AITable, value: any, path: AIFieldValuePath) {
-    const node = AITableQueries.getFieldValue(aiTable, path);
-    if (node !== value) {
+    const field = AITableQueries.getFieldValue(aiTable, path);
+    if (field !== value) {
         const operation: UpdateFieldValueAction = {
             type: ActionName.UpdateFieldValue,
-            fieldValue: node,
+            fieldValue: field,
             newFieldValue: value,
             path
         };

diff --git a/packages/grid/src/core/utils/queries.ts b/packages/grid/src/core/utils/queries.ts
@@ -18,13 +18,16 @@ export const AITableQueries = {
     },
     getFieldValue(aiTable: AITable, path: [number, number]): any {
         if (!aiTable) {
-            throw new Error(`aiTable does not exist [${path}]`);
+            throw new Error(`aiTable does not exist`);
         }
         if (!aiTable.records()) {
-            throw new Error(`aiTable has no records [${path}]`);
+            throw new Error(`aiTable has no records`);
         }
         if (!aiTable.fields()) {
-            throw new Error(`aiTable has no fields [${path}]`);
+            throw new Error(`aiTable has no fields`);
+        }
+        if (!path) {
+            throw new Error(`path does not exist as path [${path}]`);
         }
 
         const field = aiTable.fields()[path[1]];
@@ -36,7 +39,10 @@ export const AITableQueries = {
 
     getField(aiTable: AITable, path: AIFieldPath): AITableField {
         if (!aiTable) {
-            throw new Error(`aiTable does not exist [${path}]`);
+            throw new Error(`aiTable does not exist`);
+        }
+        if (!path) {
+            throw new Error(`path does not exist as path [${path}]`);
         }
         return aiTable.fields()[path[0]];
     }

diff --git a/packages/grid/src/grid.component.ts b/packages/grid/src/grid.component.ts
@@ -5,7 +5,7 @@ import { ThyTag } from 'ngx-tethys/tag';
 import { ThyPopoverModule } from 'ngx-tethys/popover';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { buildGridData } from './utils';
-import { AIFieldConfig, AITableFieldMenu, AITableRowHeight } from './types';
+import { AIFieldConfig, AITableFieldMenuItem, AITableRowHeight } from './types';
 import {
     Actions,
     createAITable,
@@ -94,7 +94,7 @@ export class AITableGrid implements OnInit {
 
     aiTableInitialized = output<AITable>();
 
-    fieldMenus!: AITableFieldMenu[];
+    fieldMenus!: AITableFieldMenuItem[];
 
     gridData = computed(() => {
         return buildGridData(this.aiRecords(), this.aiFields(), this.aiTable.selection());

diff --git a/packages/grid/src/types/field.ts b/packages/grid/src/types/field.ts
@@ -1,7 +1,7 @@
-import { ElementRef, Signal, WritableSignal } from '@angular/core';
+import { ElementRef, Signal } from '@angular/core';
 import { AITable, AITableField } from '../core';
 
-export interface AITableFieldMenu {
+export interface AITableFieldMenuItem {
     id: string;
     name?: string;
     icon?: string;

diff --git a/packages/grid/src/types/grid.ts b/packages/grid/src/types/grid.ts
@@ -1,5 +1,5 @@
 import { AITableField, AITableFieldType, AITableRecord } from '../core';
-import { AITableFieldMenu } from './field';
+import { AITableFieldMenuItem } from './field';
 
 export enum AITableRowHeight {
     Short = 1,
@@ -26,5 +26,5 @@ export interface AITableSelection {
 export interface AIFieldConfig {
     fieldRenderers?: Partial<Record<AITableFieldType, AITableGridCellRenderSchema>>;
     fieldPropertyEditor?: any;
-    fieldMenus?: AITableFieldMenu[];
+    fieldMenus?: AITableFieldMenuItem[];
 }