ados-rcm 1.0.329 → 1.0.330

package/dist/AModule/AComponents/ATable/ATable.d.ts

@@ -5,6 +5,7 @@ import { IItem } from '../../AUtils/objF';
 import { IABaseProps } from '../ABase/ABase';
 import { Resources } from '../AResource/AResource';
 import { TActionRef, TIdx, TPromisable } from '../ATypes/ATypes';
+import { IDateRange } from '../ADatePicker/ADateRangePicker';
 export interface IATableTHProps<T extends IItem> {
     /**
      * defKey : TIdx
@@ -117,12 +118,6 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the String filter
          */
         type: 'String';
-        /**
-         * defKey? : keyof T | ''
-         *
-         * Description : defKey of the String filter
-         */
-        defKey: keyof T | '';
         /**
          * value : string = ''
          *
@@ -130,11 +125,11 @@ export interface IATableFilter<T extends IItem> {
          */
         value?: string;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['String']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['String']) => any
          *
          * Description : predicate of the String filter
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['String']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['String']) => any;
         /**
          * placeholder? : string
          *
@@ -155,12 +150,6 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the Select filter
          */
         type: 'Select';
-        /**
-         * defKey : keyof T | ''
-         *
-         * Description : defKey of the Select filter
-         */
-        defKey: keyof T | '';
         /**
          * value : string | number | null = null
          *
@@ -188,11 +177,11 @@ export interface IATableFilter<T extends IItem> {
             option: string | number | null;
         }) => React.ReactNode;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Select']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['Select']) => any
          *
          * Description : predicate of the Select filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Select']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['Select']) => any;
     };
     Date: {
         /**
@@ -201,12 +190,6 @@ export interface IATableFilter<T extends IItem> {
          * Description : type of the Date filter
          */
         type: 'Date';
-        /**
-         * defKey : keyof T | ''
-         *
-         * Description : defKey of the Date filter
-         */
-        defKey: keyof T;
         /**
          * value : Date = new Date()
          *
@@ -226,11 +209,11 @@ export interface IATableFilter<T extends IItem> {
          */
         maxDate?: Date;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Date']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['Date']) => any
          *
          * Description : predicate of the Date filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['Date']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['Date']) => any;
     };
     DateRange: {
         /**
@@ -240,23 +223,11 @@ export interface IATableFilter<T extends IItem> {
          */
         type: 'DateRange';
         /**
-         * defKey : keyof T | ''
-         *
-         * Description : defKey of the DateRange filter
-         */
-        defKey: keyof T | '';
-        /**
-         * sDate : Date = new Date()
+         * value : IDateRange
          *
-         * Description : sDate of the DateRange filter
+         * Description : value of the DateRange filter
          */
-        sDate?: Date;
-        /**
-         * eDate : Date = new Date()
-         *
-         * Description : eDate of the DateRange filter
-         */
-        eDate?: Date;
+        value?: IDateRange;
         /**
          * minDate? : Date
          *
@@ -270,33 +241,18 @@ export interface IATableFilter<T extends IItem> {
          */
         maxDate?: Date;
         /**
-         * predicate? : (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['DateRange']) => any
+         * predicate? : (item: T, defs: TATableDefs<T>, filterKey: keyof T | string, filter: IATableFilter<T>['DateRange']) => any
          *
          * Description : predicate of the DateRange filter. if not provided, it will have default predicate.
          */
-        predicate?: (item: T, defs: TATableDefs<T>, filter: IATableFilter<T>['DateRange']) => any;
+        predicate?: (item: T, defs: TATableDefs<T>, filterKey: keyof T, filter: IATableFilter<T>['DateRange']) => any;
     };
 }
 export type TATableSomeFilter<T extends IItem> = IATableFilter<T>[TATableFilterType];
 export type TATableFilteration<T extends IItem> = {
-    /**
-     * type : 'And' | 'Or'
-     *
-     * Description : type of the filteration
-     */
-    type: 'And' | 'Or';
-    /**
-     * style? : React.CSSProperties
-     *
-     * Description : width of the String filter
-     */
-    style?: React.CSSProperties;
-    /**
-     * filters : TATableSomeFilter<T>[]
-     *
-     * Description : filters of the filteration
-     */
-    filters: TATableSomeFilter<T>[];
+    [key in keyof T]?: TATableSomeFilter<T>;
+} & {
+    [key: string]: TATableSomeFilter<T>;
 };
 export type TATableSortF<T extends IItem> = (a: T, b: T) => number;
 export interface IATableSortation<T extends IItem> {