vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-10 04:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove accordion from table/grid config

Browse Source
This commit is contained in:
jeffvli
2025-12-26 15:16:51 -08:00
parent 88b9124185
commit 781df3ab06
2 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/shared/components/grid-config.tsx
+1 -20
View File
@@ -24,7 +24,6 @@ import {
useSettingsStore, useSettingsStore,
useSettingsStoreActions, useSettingsStoreActions,
} from '/@/renderer/store'; } from '/@/renderer/store';
import { Accordion } from '/@/shared/components/accordion/accordion';
import { ActionIcon, ActionIconGroup } from '/@/shared/components/action-icon/action-icon'; import { ActionIcon, ActionIconGroup } from '/@/shared/components/action-icon/action-icon';
import { Badge } from '/@/shared/components/badge/badge'; import { Badge } from '/@/shared/components/badge/badge';
import { Checkbox } from '/@/shared/components/checkbox/checkbox'; import { Checkbox } from '/@/shared/components/checkbox/checkbox';
@@ -284,25 +283,7 @@ export const GridConfig = ({
return ( return (
<> <>
<Accordion <ListConfigTable options={options} />
styles={{
control: { padding: '0' },
item: { border: 'none' },
}}
>
<Accordion.Item value="grid">
<Accordion.Control>
<Text size="sm">
{t('table.config.general.advancedSettings', {
postProcess: 'sentenceCase',
})}
</Text>
</Accordion.Control>
<Accordion.Panel>
<ListConfigTable options={options} />
</Accordion.Panel>
</Accordion.Item>
</Accordion>
<Divider /> <Divider />
<GridRowConfig <GridRowConfig
data={gridRowsData} data={gridRowsData}
src/renderer/features/shared/components/table-config.tsx
+6 -25
View File
@@ -22,7 +22,6 @@ import {
ListConfigTable, ListConfigTable,
} from '/@/renderer/features/shared/components/list-config-menu'; } from '/@/renderer/features/shared/components/list-config-menu';
import { ItemListSettings, useSettingsStore, useSettingsStoreActions } from '/@/renderer/store'; import { ItemListSettings, useSettingsStore, useSettingsStoreActions } from '/@/renderer/store';
import { Accordion } from '/@/shared/components/accordion/accordion';
import { ActionIcon, ActionIconGroup } from '/@/shared/components/action-icon/action-icon'; import { ActionIcon, ActionIconGroup } from '/@/shared/components/action-icon/action-icon';
import { Badge } from '/@/shared/components/badge/badge'; import { Badge } from '/@/shared/components/badge/badge';
import { Checkbox } from '/@/shared/components/checkbox/checkbox'; import { Checkbox } from '/@/shared/components/checkbox/checkbox';
@@ -249,25 +248,7 @@ export const TableConfig = ({
return ( return (
<> <>
<Accordion <ListConfigTable options={advancedSettings} />
styles={{
control: { padding: '0' },
item: { border: 'none' },
}}
>
<Accordion.Item value="table">
<Accordion.Control>
<Text size="sm">
{t('table.config.general.advancedSettings', {
postProcess: 'sentenceCase',
})}
</Text>
</Accordion.Control>
<Accordion.Panel>
<ListConfigTable options={advancedSettings} />
</Accordion.Panel>
</Accordion.Item>
</Accordion>
<Divider /> <Divider />
<TableColumnConfig <TableColumnConfig
data={tableColumnsData} data={tableColumnsData}
@@ -724,7 +705,7 @@ const TableColumnItem = memo(
postProcess: 'sentenceCase', postProcess: 'sentenceCase',
}), }),
}} }}
variant={item.pinned === 'left' ? 'outline' : 'subtle'} variant={item.pinned === 'left' ? 'filled' : 'subtle'}
/> />
<ActionIcon <ActionIcon
icon="arrowRightToLine" icon="arrowRightToLine"
@@ -736,7 +717,7 @@ const TableColumnItem = memo(
postProcess: 'sentenceCase', postProcess: 'sentenceCase',
}), }),
}} }}
variant={item.pinned === 'right' ? 'outline' : 'subtle'} variant={item.pinned === 'right' ? 'filled' : 'subtle'}
/> />
</ActionIconGroup> </ActionIconGroup>
<ActionIconGroup className={styles.group}> <ActionIconGroup className={styles.group}>
@@ -750,7 +731,7 @@ const TableColumnItem = memo(
postProcess: 'sentenceCase', postProcess: 'sentenceCase',
}), }),
}} }}
variant={item.align === 'start' ? 'outline' : 'subtle'} variant={item.align === 'start' ? 'filled' : 'subtle'}
/> />
<ActionIcon <ActionIcon
icon="alignCenter" icon="alignCenter"
@@ -762,7 +743,7 @@ const TableColumnItem = memo(
postProcess: 'sentenceCase', postProcess: 'sentenceCase',
}), }),
}} }}
variant={item.align === 'center' ? 'outline' : 'subtle'} variant={item.align === 'center' ? 'filled' : 'subtle'}
/> />
<ActionIcon <ActionIcon
icon="alignRight" icon="alignRight"
@@ -774,7 +755,7 @@ const TableColumnItem = memo(
postProcess: 'sentenceCase', postProcess: 'sentenceCase',
}), }),
}} }}
variant={item.align === 'end' ? 'outline' : 'subtle'} variant={item.align === 'end' ? 'filled' : 'subtle'}
/> />
</ActionIconGroup> </ActionIconGroup>
<NumberInput <NumberInput