fix

packages/datalib/src/FreeTableGridDisplay.ts

@@ -22,13 +22,14 @@ export class FreeTableGridDisplay extends GridDisplay {
   }
 
   getDisplayColumns(model: FreeTableModel) {
-    return (
+    return _.uniqBy(
       model?.structure?.columns
         ?.map(col => this.getDisplayColumn(col))
         ?.map(col => ({
           ...col,
           isChecked: this.isColumnChecked(col),
-        })) || []
+        })) || [],
+      col => col.uniqueName
     );
   }
 

packages/datalib/src/JslGridDisplay.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { QueryResultColumn } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
@@ -18,7 +19,8 @@ export class JslGridDisplay extends GridDisplay {
     this.filterable = true;
 
     if (structure.columns) {
-      this.columns = structure.columns
+      this.columns = _.uniqBy(
+        structure.columns
           .map(col => ({
             columnName: col.columnName,
             headerText: col.columnName,
@@ -32,7 +34,9 @@ export class JslGridDisplay extends GridDisplay {
           ?.map(col => ({
             ...col,
             isChecked: this.isColumnChecked(col),
-        }));
+          })),
+        col => col.uniqueName
+      );
     }
 
     if (structure.__isDynamicStructure) {

packages/web/src/datagrid/DataGrid.svelte

@@ -80,7 +80,8 @@
 
   export let isDetailView = false;
   export let showReferences = false;
-  export let showMacros;
+  export let showMacros = false;
+  export let expandMacros = false;
   export let freeTableColumn = false;
   export let isDynamicStructure = false;
   export let macroCondition;
@@ -188,7 +189,7 @@
         <ReferenceManager {...$$props} {managerSize} />
       </WidgetColumnBarItem>
 
-      <WidgetColumnBarItem title="Macros" name="macros" skip={!showMacros} collapsed>
+      <WidgetColumnBarItem title="Macros" name="macros" skip={!showMacros} collapsed={!expandMacros}>
         <MacroManager {...$$props} {managerSize} />
       </WidgetColumnBarItem>
     </WidgetColumnBar>

packages/web/src/tabs/FreeTableTab.svelte

@@ -145,6 +145,7 @@
     gridCoreComponent={FreeTableGridCore}
     freeTableColumn
     showMacros
+    expandMacros
     onRunMacro={handleRunMacro}
     isDynamicStructure={$modelState.value?.structure?.__isDynamicStructure}
     {display}