MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
mike12345567 2021-02-16 16:38:36 +00:00
parent 4ccd46e2a1
commit 258b2138c3
6 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/builderStore/utils.js
View File

@ -3,7 +3,7 @@ import {
AUTO_COLUMN_DISPLAY_NAMES, AUTO_COLUMN_DISPLAY_NAMES,
AUTO_COLUMN_SUB_TYPES, AUTO_COLUMN_SUB_TYPES,
FIELDS, FIELDS,
isAutoColumnUserRelationship isAutoColumnUserRelationship,
} from "../constants/backend" } from "../constants/backend"
export function getAutoColumnInformation(enabled = true) { export function getAutoColumnInformation(enabled = true) {

1
packages/builder/src/components/backend/DataTable/DataTable.svelte
View File

@ -58,5 +58,4 @@
<!-- always have the export last --> <!-- always have the export last -->
<ExportButton view={tableView} /> <ExportButton view={tableView} />
{/if} {/if}
</Table> </Table>

4
packages/builder/src/components/backend/DataTable/Table.svelte
View File

@ -116,7 +116,9 @@
}) })
} }
// sort auto-columns to the end if they are present // sort auto-columns to the end if they are present
columnDefs = result.filter(col => !col.autocolumn).concat(result.filter(col => col.autocolumn)) columnDefs = result
.filter(col => !col.autocolumn)
.concat(result.filter(col => col.autocolumn))
} }
function selectRelationship(row, fieldName) { function selectRelationship(row, fieldName) {

4
packages/builder/src/components/backend/DataTable/TableHeader/TableHeader.svelte
View File

@ -60,9 +60,7 @@
on:mouseleave={() => (hovered = false)}> on:mouseleave={() => (hovered = false)}>
<div> <div>
<div class="col-icon"> <div class="col-icon">
{#if field.autocolumn} {#if field.autocolumn}<i class="auto ri-magic-fill" />{/if}
<i class="auto ri-magic-fill"></i>
{/if}
<span class="column-header-name">{displayName}</span> <span class="column-header-name">{displayName}</span>
</div> </div>
<i class={`${SORT_ICON_MAP[sortDirection]} sort-icon icon`} /> <i class={`${SORT_ICON_MAP[sortDirection]} sort-icon icon`} />

7
packages/builder/src/components/backend/DataTable/buttons/HideAutocolumnButton.svelte
View File

@ -14,12 +14,9 @@
<div bind:this={anchor}> <div bind:this={anchor}>
<TextButton text small on:click={hideOrUnhide}> <TextButton text small on:click={hideOrUnhide}>
{#if hideAutocolumns} {#if hideAutocolumns}
<i class="ri-magic-line"></i> <i class="ri-magic-line" />
Show Auto Columns Show Auto Columns
{:else} {:else}<i class="ri-magic-fill" /> Hide Auto Columns{/if}
<i class="ri-magic-fill"></i>
Hide Auto Columns
{/if}
</TextButton> </TextButton>
</div> </div>

10
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -10,14 +10,8 @@
import { cloneDeep } from "lodash/fp" import { cloneDeep } from "lodash/fp"
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
import { TableNames, UNEDITABLE_USER_FIELDS } from "constants" import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
import { import { FIELDS, AUTO_COLUMN_SUB_TYPES } from "constants/backend"
FIELDS, import { getAutoColumnInformation, buildAutoColumn } from "builderStore/utils"
AUTO_COLUMN_SUB_TYPES,
} from "constants/backend"
import {
getAutoColumnInformation,
buildAutoColumn,
} from "builderStore/utils"
import { notifier } from "builderStore/store/notifications" import { notifier } from "builderStore/store/notifications"
import ValuesList from "components/common/ValuesList.svelte" import ValuesList from "components/common/ValuesList.svelte"
import DatePicker from "components/common/DatePicker.svelte" import DatePicker from "components/common/DatePicker.svelte"