@vitrosoftware/common-ui-ts 1.1.53 → 1.1.55

package/dist/controls/TableView/TableView.d.ts

@@ -12,6 +12,7 @@ export interface TableViewProps {
     controller?: string | undefined;
     listCode?: string | undefined;
     eventHandlerList?: TableViewEventHandler[];
+    onCustomAjax?: (grid: any, source: any, data: string, func: (code: any, result: any) => any) => any;
     onInit?: ((grid: TableViewContext, next?: () => any) => any) | undefined;
     onSelect?: ((grid: TableViewContext, row: TableViewRow, deselect: boolean, columnList: string[], test: boolean) => any) | undefined;
     layout?: any;
@@ -21,6 +22,5 @@ export interface TableViewProps {
     cacheVersion?: number | string;
     scope?: string;
     searchCriterionList?: SearchCriterion[];
-    searchParentId?: string;
     readOnly?: boolean;
 }

package/dist/controls/TableView/TableViewConstants.d.ts

@@ -34,7 +34,9 @@ export declare enum EVENT {
     ON_SUGGEST = "OnSuggest",
     ON_VALUE_CHANGED = "OnValueChanged",
     ON_DRAG_OVER = "OnDragOver",
-    ON_DROP = "OnDrop"
+    ON_DROP = "OnDrop",
+    ON_INIT = "OnInit",
+    ON_CUSTOM_AJAX = "OnCustomAjax"
 }
 export declare enum URL {
     LAYOUT = "Layout",

package/dist/controls/TableView/TableViewContext.d.ts

@@ -16,8 +16,9 @@ export interface TableViewContext {
     dragging: boolean;
     filterOneLevel: boolean;
     scope: string;
-    searchCriterionList: SearchCriterion[];
-    parentId: string;
+    setSearchCriterionList(searchCriterionList: SearchCriterion[], searchId: string): void;
+    clearSearchCriterionList(searchId: string): void;
+    getSearchCriterionList(searchId?: string): SearchCriterion[];
     acceptChanges(row?: TableViewRow): void;
     hasGantt(): boolean;
     getRowById(id: string, attr?: string, nofixed?: boolean): TableViewRow;

package/dist/controls/TableView/TreeGridTableViewContextImpl.d.ts

@@ -11,8 +11,7 @@ export declare class TreeGridTableViewContextImpl implements TableViewContext {
     suggestValue: string;
     filterOneLevel: boolean;
     private readonly gridChangesFormat;
-    searchCriterionList: SearchCriterion[];
-    parentId: string;
+    private readonly searchCriterionMap;
     constructor(grid: any);
     get columnList(): any;
     get columnNameList(): any;
@@ -27,6 +26,9 @@ export declare class TreeGridTableViewContextImpl implements TableViewContext {
     set scope(value: string);
     get pageLength(): any;
     get header(): TableViewRow;
+    setSearchCriterionList(searchCriterionList: SearchCriterion[], searchId: string): void;
+    clearSearchCriterionList(searchId: string): void;
+    getSearchCriterionList(searchId?: string): SearchCriterion[];
     acceptChanges(row?: TableViewRow): void;
     addRow(parent: TableViewRow | null, next?: TableViewRow | null, show?: number, id?: string, def?: string): TableViewRow;
     addPage(name: string, xml: string | null, count: number): TableViewRow;

package/dist/index.js

@@ -20503,12 +20503,45 @@ var TreeGridTableViewContextImpl = /*#__PURE__*/function () {
     this.suggestValue = '';
     this.filterOneLevel = false;
     this.gridChangesFormat = 'JSON';
+    this.searchCriterionMap = new Map();
     this.grid = grid;
     this.id = grid.id;
     this.grid.Source.Upload.Format = this.gridChangesFormat;
     tableViewList.set(this.id, this);
   }
   var _proto = TreeGridTableViewContextImpl.prototype;
+  _proto.setSearchCriterionList = function setSearchCriterionList(searchCriterionList, searchId) {
+    if (searchCriterionList && searchCriterionList.length) {
+      this.searchCriterionMap.set(searchId, [].concat(searchCriterionList));
+    } else {
+      this.clearSearchCriterionList(searchId);
+    }
+  };
+  _proto.clearSearchCriterionList = function clearSearchCriterionList(searchId) {
+    if (this.searchCriterionMap.has(searchId)) {
+      this.searchCriterionMap["delete"](searchId);
+    }
+  };
+  _proto.getSearchCriterionList = function getSearchCriterionList(searchId) {
+    var result = [];
+    if (searchId) {
+      if (this.searchCriterionMap.has(searchId)) {
+        var searchCriterionList = this.searchCriterionMap.get(searchId);
+        if (searchCriterionList) {
+          searchCriterionList.forEach(function (searchCriterion) {
+            return result.push(searchCriterion);
+          });
+        }
+      }
+    } else {
+      this.searchCriterionMap.forEach(function (searchCriterionList) {
+        return searchCriterionList.forEach(function (searchCriterion) {
+          return result.push(searchCriterion);
+        });
+      });
+    }
+    return result;
+  };
   _proto.acceptChanges = function acceptChanges(row) {
     this.grid.AcceptChanges(row);
   };
@@ -20790,6 +20823,8 @@ var EVENT$1;
   EVENT["ON_VALUE_CHANGED"] = "OnValueChanged";
   EVENT["ON_DRAG_OVER"] = "OnDragOver";
   EVENT["ON_DROP"] = "OnDrop";
+  EVENT["ON_INIT"] = "OnInit";
+  EVENT["ON_CUSTOM_AJAX"] = "OnCustomAjax";
 })(EVENT$1 || (EVENT$1 = {}));
 var URL;
 (function (URL) {
@@ -20977,10 +21012,10 @@ var TreeGrid = function TreeGrid(props) {
     if (tableView.filterOneLevel) {
       newData = initData(newData, 'FilterOneLevel="1"');
     }
-    if (tableView.searchCriterionList && tableView.searchCriterionList.length && tableView.parentId) {
-      var searchCriterionList = JSON.stringify(tableView.searchCriterionList);
-      var parentId = tableView.parentId;
-      var value = "SearchCriterionList='" + searchCriterionList + "' ParentId=\"" + parentId + "\"";
+    var searchCriterionList = tableView.getSearchCriterionList();
+    if (searchCriterionList && searchCriterionList.length) {
+      var searchCriterionListJson = JSON.stringify(searchCriterionList);
+      var value = "SearchCriterionList='" + searchCriterionListJson + "'";
       newData = initData(data, value);
     }
     return newData;
@@ -20991,10 +21026,6 @@ var TreeGrid = function TreeGrid(props) {
     if (props.filterOneLevel) {
       grid.filterOneLevel = props.filterOneLevel;
     }
-    if (props.searchCriterionList && props.searchParentId) {
-      grid.searchCriterionList = props.searchCriterionList;
-      grid.parentId = props.searchParentId;
-    }
     if (props.eventHandlerList) {
       props.eventHandlerList.forEach(function (eventHandler) {
         grid.setEventHandler(eventHandler);
@@ -21016,6 +21047,9 @@ var TreeGrid = function TreeGrid(props) {
     };
     grid.setEventHandler(onDateSendEventHandler);
   };
+  var onGridInit = function onGridInit(g, reload) {
+    g.scope = props.scope;
+  };
   var createGridUrl = function createGridUrl(dataKey) {
     if (props.layout || props.data) {
       return null;
@@ -21032,6 +21066,15 @@ var TreeGrid = function TreeGrid(props) {
     w$2.TGSetEvent(EVENT$1.ON_LOADED, props.id, function (grid, next) {
       return onGridLoaded(grid, next);
     });
+    w$2.TGSetEvent(EVENT$1.ON_INIT, props.id, function (grid, reload) {
+      return onGridInit(grid);
+    });
+    if (props.onCustomAjax) {
+      var onCustomAjax = props.onCustomAjax;
+      w$2.TGSetEvent(EVENT$1.ON_CUSTOM_AJAX, props.id, function (grid, source, data, func) {
+        return onCustomAjax(grid, source, data, func);
+      });
+    }
     if (props.layout || props.data) {
       w$2.TreeGrid({
         id: props.id,
@@ -21046,8 +21089,7 @@ var TreeGrid = function TreeGrid(props) {
         },
         Debug: props.debug || '',
         Cache: props.cache || CACHE.DEFAULT,
-        CacheVersion: props.cacheVersion,
-        scope: props.scope
+        CacheVersion: props.cacheVersion
       }, "vitro-table-view" + props.id);
     } else {
       w$2.TreeGrid({
@@ -21066,8 +21108,7 @@ var TreeGrid = function TreeGrid(props) {
         },
         Debug: props.debug || '',
         Cache: props.cache || CACHE.DEFAULT,
-        CacheVersion: props.cacheVersion,
-        scope: props.scope
+        CacheVersion: props.cacheVersion
       }, "vitro-table-view" + props.id);
     }
     return function () {