Skip to content

Commit 78dd346

Browse files
author
FalkWolsky
committed
Fixing Table Column Display Selector & Naming
1 parent 6043e8f commit 78dd346

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

client/packages/lowcoder-design/src/icons/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export { ReactComponent as LeftOpen } from "./icon-left-comp-open.svg";
180180
export { ReactComponent as LeftClose } from "./icon-left-comp-close.svg";
181181
export { ReactComponent as MaterialUploadIcon } from "./icon-material-upload.svg";
182182
export { ReactComponent as UndoIcon } from "./icon-undo.svg";
183-
183+
184184
export { ReactComponent as ManualIcon } from "./icon-manual.svg";
185185
export { ReactComponent as WarnIcon } from "./icon-warn.svg";
186186
export { ReactComponent as SyncManualIcon } from "./icon-sync-manual.svg";
@@ -197,7 +197,8 @@ export { ReactComponent as TableUnCheckedIcon } from "./icon-table-boolean-false
197197
export { ReactComponent as FileFolderIcon } from "./icon-editor-folder.svg";
198198
export { ReactComponent as ExpandIcon } from "./icon-expand.svg";
199199
export { ReactComponent as CompressIcon } from "./icon-compress.svg";
200-
export { ReactComponent as TableCellsIcon } from "./icon-table-cells.svg"; // Added By Aqib Mirza
200+
export { ReactComponent as TableCellsIcon } from "./icon-table-cells.svg";
201+
export { ReactComponent as TableColumnVisibilityIcon } from "./remix/layout-column-line.svg";
201202

202203
// Style Props
203204
export { ReactComponent as WidthIcon } from "./icon-width.svg";

client/packages/lowcoder/src/comps/comps/tableComp/tableToolbarComp.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
LinkButton,
2929
pageItemRender,
3030
RefreshIcon,
31-
SettingIcon,
31+
TableColumnVisibilityIcon,
3232
SuspensionBox,
3333
TacoButton,
3434
TacoInput,
@@ -97,14 +97,15 @@ const getStyle = (
9797
}
9898
9999
.column-setting {
100+
width: 20px;
100101
cursor: pointer;
101102
102103
* {
103-
${style.toolbarText !== defaultTheme.textDark ? `stroke: ${style.toolbarText}` : null}
104+
${style.toolbarText && style.toolbarText !== defaultTheme.textDark ? `fill: ${style.toolbarText}` : `fill: #8b8fa3`}
104105
}
105106
106107
&:hover * {
107-
stroke: ${theme?.primary};
108+
fill: ${theme?.primary};
108109
}
109110
}
110111
}
@@ -799,7 +800,7 @@ export function TableToolbar(props: {
799800
visible={settingVisible}
800801
setVisible={setSettingVisible}
801802
content={<ColumnSetting columns={visibleColumns} setVisible={setSettingVisible} />}
802-
Icon={SettingIcon}
803+
Icon={TableColumnVisibilityIcon}
803804
iconClassName="column-setting"
804805
/>
805806
)}

client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ export const en = {
18501850
"showDownload": "Show Download Button",
18511851
"columnSeparator": "Column Separator",
18521852
"columnSeparatorTooltip": "Column Separator (\"delimiter\") in downloaded CSV file. \n\nRecommendations:\n- Comma (,)\n- Semicolon (;)\n- Pipe (|)\n- Tab (\\t)",
1853-
"columnSetting": "Show Column Setting Button",
1853+
"columnSetting": "Show Columns Visibility Button",
18541854
"searchText": "Search Text",
18551855
"searchTextTooltip": "Search and Filter the Data Presented in the Table",
18561856
"showQuickJumper": "Show Quick Jumper",
@@ -1979,9 +1979,9 @@ export const en = {
19791979
"cellColor": "Conditional cell color",
19801980
"cellColorDesc": "Conditionally Set the Cell Color Based on the Cell Value Using CurrentCell. For Example: '{{ currentCell == 3 ? \"green\" : \"red\" }}'",
19811981
"saveChangesNotBind": "No Event Handler Configured for Saving Changes. Please Bind at Least One Event Handler Before Click.",
1982-
"dynamicColumn": "Use Dynamic Column Setting",
1983-
"dynamicColumnConfig": "Column Setting",
1984-
"dynamicColumnConfigDesc": "Dynamic Column Settings. Accepts an Array of Column Names. All Columns Are Visible by Default. Example: [\"id\", \"name\"]",
1982+
"dynamicColumn": "Use Dynamic Column Visibility",
1983+
"dynamicColumnConfig": "Visible Columns",
1984+
"dynamicColumnConfigDesc": "Dynamic Column Visibility. Accepts an Array of Column Names. All Columns Are Visible by Default. Example: [\"id\", \"name\"]",
19851985
"position": "Position",
19861986
"showDataLoadSpinner": "Show Spinner During Data Loading",
19871987
"showValue": "Show Value",

0 commit comments

Comments
 (0)