First integration for ag-grid#19

BBj-Plugins · Nov 17, 2018 · a544ae4 · a544ae4
1 parent b3e34ec
commit a544ae4
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 221 deletions.
diff --git a/BBjGridExWidget.bbj b/BBjGridExWidget.bbj
diff --git a/Demo/Enterprise/AggregationDemo.bbj b/Demo/Enterprise/AggregationDemo.bbj
@@ -1,4 +1,5 @@
 use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidget
+use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidgetColumnsToolpanel
 use com.basiscomponents.bc.SqlQueryBC
 use java.sql.Types
 use com.google.gson.JsonObject
@@ -59,7 +60,7 @@ setupGrid:
 
     grid! = new BBjGridExWidget(wnd!,100,0,40,800,560)
 
-    grid!.setSuppressValues(0)
+    cast(BBjGridExWidgetColumnsToolpanel,grid!.getSidebar().getToolpanels().get("columns")).setSuppressValues(0)
     grid!.setShowToolPanel(1)
     grid!.setGroupIncludeFooter(1)
     grid!.setGroupIncludeTotalFooter(1)

diff --git a/Demo/Enterprise/ContextMenuDemo.bbj b/Demo/Enterprise/ContextMenuDemo.bbj
@@ -48,7 +48,6 @@ fillGrid:
     rem predefined items
     menu!.addItem(BBjGridContextMenuItem.AUTO_SIZE_ALL())
     menu!.addItem(BBjGridContextMenuItem.RESET_COLUMNS())
-    menu!.addItem(BBjGridContextMenuItem.TOOLPANEL())
     menu!.addItem(BBjGridContextMenuItem.EXPORT())
 
     rem custom item

diff --git a/Demo/Enterprise/GroupingDemo.bbj b/Demo/Enterprise/GroupingDemo.bbj
@@ -1,4 +1,5 @@
 use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidget
+use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidgetColumnsToolpanel
 use com.basiscomponents.bc.SqlQueryBC
 use java.sql.Types
 use com.google.gson.JsonObject
@@ -61,7 +62,7 @@ setupGrid:
 
     grid! = new BBjGridExWidget(wnd!,100,0,40,800,560)
 
-    grid!.setSuppressValues(0)
+    cast(BBjGridExWidgetColumnsToolpanel,grid!.getSidebar().getToolpanels().get("columns")).setSuppressValues(0)
     rem grid!.setEnableValue(1)
 
     grid!.setShowToolPanel(1)

diff --git a/Demo/Enterprise/ToolPanelDemo.bbj b/Demo/Enterprise/ToolPanelDemo.bbj
@@ -1,4 +1,5 @@
 use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidget
+use ::BBjGridExWidget/BBjGridExWidget.bbj::BBjGridExWidgetColumnsToolpanel
 use com.basiscomponents.bc.SqlQueryBC
 use java.sql.Types
 use com.google.gson.JsonObject
@@ -25,10 +26,11 @@ wnd! = BBjAPI().openSysGui("X0").addWindow(10,10,800,600,"BBj Grid Ex Demo")
 grid! = new BBjGridExWidget(wnd!,100,0,0,800,600)
 grid!.setShowToolPanel(1)
 grid!.setEnableRowGroup(1)
-grid!.setSuppressValues(1)
 grid!.setFunctionsReadOnly(0)
 grid!.setRowGroupPanelShow(grid!.GRID_GROUPPANEL_SHOW_VISIBLE())
 
+cast(BBjGridExWidgetColumnsToolpanel,grid!.getSidebar().getToolpanels().get("columns")).setSuppressValues(1)
+
 musicTypeStyle! = new JsonObject()
 musicTypeStyle!.addProperty("background","gold")
 grid!.addStyle(".music-type",musicTypeStyle!)

diff --git a/js/dist/bbj-grid-widget.min.js b/js/dist/bbj-grid-widget.min.js
diff --git a/js/dist/report.html b/js/dist/report.html
diff --git a/js/src/init.js b/js/src/init.js
@@ -1,10 +1,10 @@
 /*
-* This file is part of the grid project
-* (c) Basis Europe <eu@Basis.AgGridComponents.com>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
+ * This file is part of the grid project
+ * (c) Basis Europe <eu@Basis.AgGridComponents.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 export function gw_getSupportedColumnTypes() {
 
@@ -150,36 +150,18 @@ export function gw_init(container, license, data, defaultOptions = {}) {
     onRowValueChanged: gw_onRowEditingsEvent,
     onCellClicked: gw_onCellClickEvent,
     onCellDoubleClicked: gw_onCellClickEvent,
-  
+
     getRowNodeId: gw_getRowNodeId,
 
     rememberGroupStateWhenNewData: true,
     getContextMenuItems: gw_getContextMenu,
     popupParent: gw_getDocument().body,
-    allowContextMenuWithControlKey:true,
-    sideBar:'columns'
-    // sideBar: {
-    //   toolPanels: [{
-    //       id: 'columns',
-    //       labelDefault: 'Columns',
-    //       labelKey: 'columns',
-    //       iconKey: 'columns',
-    //       toolPanel: 'agColumnsToolPanel',
-    //       toolPanelParams: {
-    //           suppressRowGroups: true,
-    //           suppressValues: true,
-    //           suppressPivots: true,
-    //           suppressPivotMode: true,
-    //           suppressSideButtons: true,
-    //           suppressColumnFilter: true,
-    //           suppressColumnSelectAll: true,
-    //           suppressColumnExpandAll: true
-    //       }
-    //   }],
-    //   defaultToolPanel: 'columns'
-    // },
+    allowContextMenuWithControlKey: true
   });
 
+  options.sideBar = JSON.parse(options.sideBar);
+  options.sideBar.toolPanels = JSON.parse(options.sideBar.toolPanels);
+
   if (
     options.hasOwnProperty('__isTree') &&
     true === options.__isTree
@@ -202,7 +184,7 @@ export function gw_init(container, license, data, defaultOptions = {}) {
     //override numbers group and decimal separators
     if (def.hasOwnProperty('type') && 'basic-number' === def.type) {
       if (gw_meta && gw_meta.hasOwnProperty(field)) {
-        if (!gw_meta[field].hasOwnProperty('RENDERER_GROUP_SEPARATOR')){
+        if (!gw_meta[field].hasOwnProperty('RENDERER_GROUP_SEPARATOR')) {
           def['RENDERER_GROUP_SEPARATOR'] = defaultOptions.__numberGroupSep;
         }
         if (!gw_meta[field].hasOwnProperty('RENDERER_DECIMAL_SEPARATOR'))
@@ -250,7 +232,7 @@ export function gw_init(container, license, data, defaultOptions = {}) {
   }
 
   gw_groupColumns(JSON.parse(options.__columnsGroup), options.columnDefs);
-  
+
   return new agGrid.Grid(container, options);
 }
 
@@ -278,4 +260,4 @@ export function gw_setData(json, options, license) {
         break;
     }
   }
-}
+}