Merge branch 'cheeks-fixes' of github.com:Budibase/budibase into cheeks-fixes
This commit is contained in:
commit
e26d5096ae
3 changed files with 17 additions and 15 deletions
|
@ -481,6 +481,7 @@ const getSelectedRowsBindings = asset => {
|
||||||
block._id + "-table"
|
block._id + "-table"
|
||||||
)}.${makePropSafe("selectedRows")}`,
|
)}.${makePropSafe("selectedRows")}`,
|
||||||
readableBinding: `${block._instanceName}.Selected rows`,
|
readableBinding: `${block._instanceName}.Selected rows`,
|
||||||
|
category: "Selected rows",
|
||||||
}))
|
}))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -1004,7 +1005,10 @@ const bindingReplacement = (
|
||||||
* {{ literal [componentId] }}
|
* {{ literal [componentId] }}
|
||||||
*/
|
*/
|
||||||
const extractLiteralHandlebarsID = value => {
|
const extractLiteralHandlebarsID = value => {
|
||||||
return value?.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1]
|
if (!value || typeof value !== "string") {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
return value.match(/{{\s*literal\s*\[+([^\]]+)].*}}/)?.[1]
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
const { getValidOperatorsForType } = LuceneUtils
|
const { getValidOperatorsForType } = LuceneUtils
|
||||||
const KeyedFieldRegex = /\d[0-9]*:/g
|
const KeyedFieldRegex = /\d[0-9]*:/g
|
||||||
const behaviourOptions = [
|
const behaviourOptions = [
|
||||||
{ value: "and", label: "Match all of the following filters" },
|
{ value: "and", label: "Match all filters" },
|
||||||
{ value: "or", label: "Match any of the following filters" },
|
{ value: "or", label: "Match any filter" },
|
||||||
]
|
]
|
||||||
|
|
||||||
let rawFilters
|
let rawFilters
|
||||||
|
@ -173,15 +173,9 @@
|
||||||
<DrawerContent>
|
<DrawerContent>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<Layout noPadding>
|
<Layout noPadding>
|
||||||
<Body size="S">
|
{#if !rawFilters?.length}
|
||||||
{#if !rawFilters?.length}
|
<Body size="S">Add your first filter expression.</Body>
|
||||||
Add your first filter expression.
|
{:else}
|
||||||
{:else}
|
|
||||||
Results are filtered to only those which match all of the following
|
|
||||||
constraints.
|
|
||||||
{/if}
|
|
||||||
</Body>
|
|
||||||
{#if rawFilters?.length}
|
|
||||||
<div class="fields">
|
<div class="fields">
|
||||||
<Select
|
<Select
|
||||||
label="Behaviour"
|
label="Behaviour"
|
||||||
|
@ -300,7 +294,7 @@
|
||||||
column-gap: var(--spacing-l);
|
column-gap: var(--spacing-l);
|
||||||
row-gap: var(--spacing-s);
|
row-gap: var(--spacing-s);
|
||||||
align-items: center;
|
align-items: center;
|
||||||
grid-template-columns: 1fr 170px 120px 1fr 16px 16px;
|
grid-template-columns: minmax(150px, 1fr) 170px 120px minmax(150px, 1fr) 16px 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter-label {
|
.filter-label {
|
||||||
|
|
|
@ -282,12 +282,16 @@
|
||||||
gap: var(--spacing-l);
|
gap: var(--spacing-l);
|
||||||
display: grid;
|
display: grid;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
grid-template-columns: auto 160px auto 1fr 130px 130px 1fr auto auto;
|
grid-template-columns:
|
||||||
|
auto 150px auto minmax(140px, 1fr) 120px 100px minmax(140px, 1fr)
|
||||||
|
auto auto;
|
||||||
border-radius: var(--border-radius-s);
|
border-radius: var(--border-radius-s);
|
||||||
transition: background-color ease-in-out 130ms;
|
transition: background-color ease-in-out 130ms;
|
||||||
}
|
}
|
||||||
.condition.update {
|
.condition.update {
|
||||||
grid-template-columns: auto 160px 1fr auto 1fr auto 1fr 130px 130px 1fr auto auto;
|
grid-template-columns:
|
||||||
|
auto 150px minmax(140px, 1fr) auto minmax(140px, 1fr) auto
|
||||||
|
minmax(140px, 1fr) 120px 100px minmax(140px, 1fr) auto auto;
|
||||||
}
|
}
|
||||||
.condition:hover {
|
.condition:hover {
|
||||||
background-color: var(--spectrum-global-color-gray-100);
|
background-color: var(--spectrum-global-color-gray-100);
|
||||||
|
|
Loading…
Reference in a new issue