@vitrosoftware/common-ui-ts 1.1.54 → 1.1.56

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

@@ -22,6 +22,5 @@ export interface TableViewProps {
     cacheVersion?: number | string;
     scope?: string;
     searchCriterionList?: SearchCriterion[];
-    searchParentId?: string;
     readOnly?: boolean;
 }

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/controls/TreeView/TreeView.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="react" />
 import 'jstree';
 import { TreeViewContext } from './TreeViewContext';
-interface TreeViewProps {
+export interface TreeViewProps {
     id: string;
     getData: (obj: any, cb: any) => any;
     onInit: (jsTreeView: TreeViewContext) => any;
     isCheckboxSelect?: boolean;
     isSaveCheckboxState?: boolean;
+    expandNodeIdList?: string[];
+    selectNodeId?: string;
 }
 export declare const TreeView: (props: TreeViewProps) => JSX.Element;
-export {};

package/dist/controls/TreeView/TreeViewConfig.d.ts

@@ -1,6 +1,6 @@
 import { PLUGIN, CASCADE, NODE_TYPE } from './TreeViewConstants';
 export declare class TreeViewConfig {
-    static getConfig(id: string, checkboxSelect?: boolean, saveChecked?: boolean): {
+    static getConfig(id: string, checkboxSelect?: boolean, saveChecked?: boolean, expandNodeIdList?: string[], selectNodeId?: string): {
         core: {
             check_callback: boolean;
             themes: {

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import commonRu from './locale/common-ru.json';
 export { commonRu, commonEn };
 import { Breadcrumbs } from './controls/Breadcrumbs/Breadcrumbs';
 import { TopLevelMenu } from './controls/TopLevelMenu/TopLevelMenu';
-import { TreeView } from './controls/TreeView/TreeView';
+import { TreeView, TreeViewProps } from './controls/TreeView/TreeView';
 import { TreeViewContext } from './controls/TreeView/TreeViewContext';
 import * as TREE_VIEW from './controls/TreeView/TreeViewConstants';
 import { TableView } from './controls/TableView/TableView';
@@ -73,7 +73,7 @@ import { Tooltip } from './controls/Tooltip/Tooltip';
 import * as TOOLTIP from './controls/Tooltip/TooltipConstants';
 export { Breadcrumbs };
 export { TopLevelMenu };
-export { TreeView, TreeViewContext, TREE_VIEW };
+export { TreeView, TreeViewContext, TREE_VIEW, TreeViewProps };
 export { TableView, TableViewContext, TableViewRow, TableViewCol, TABLE_VIEW };
 export { MicroFrontend };
 export { TelerikUploader, TelerikUploaderContext, TelerikUploaderContextImpl, TelerikUploaderSettings };

package/dist/index.js

@@ -20189,7 +20189,7 @@ var TreeViewConstants = {
 
 var TreeViewConfig = /*#__PURE__*/function () {
   function TreeViewConfig() {}
-  TreeViewConfig.getConfig = function getConfig(id, checkboxSelect, saveChecked) {
+  TreeViewConfig.getConfig = function getConfig(id, checkboxSelect, saveChecked, expandNodeIdList, selectNodeId) {
     return {
       core: {
         check_callback: true,
@@ -20221,6 +20221,18 @@ var TreeViewConfig = /*#__PURE__*/function () {
           if (!saveChecked) {
             delete state.checkbox;
           }
+          if (expandNodeIdList) {
+            if (!state.core) {
+              state.core = {};
+            }
+            state.core.open = expandNodeIdList;
+          }
+          if (selectNodeId) {
+            if (!state.core) {
+              state.core = {};
+            }
+            state.core.selected = [selectNodeId];
+          }
           return state;
         }
       },
@@ -20355,7 +20367,7 @@ var TreeView = function TreeView(props) {
     jsTreeTreeView = _useState[0],
     setJsTreeTreeView = _useState[1];
   var jsTreeRef = React.useRef(null);
-  var config = TreeViewConfig.getConfig(props.id, props.isCheckboxSelect, props.isSaveCheckboxState);
+  var config = TreeViewConfig.getConfig(props.id, props.isCheckboxSelect, props.isSaveCheckboxState, props.expandNodeIdList, props.selectNodeId);
   var jsTreeView;
   React.useEffect(function () {
     config.core.data = props.getData;
@@ -20503,12 +20515,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);
   };
@@ -20979,10 +21024,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;
@@ -20993,10 +21038,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);