Merge branch 'master' into feat/pc-ts-conversions-2

This commit is contained in:
Peter Clement 2025-03-12 15:09:24 +00:00 committed by GitHub
commit c2d07438ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 66 additions and 46 deletions

View File

@ -1,6 +1,6 @@
{ {
"$schema": "node_modules/lerna/schemas/lerna-schema.json", "$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "3.5.1", "version": "3.5.2",
"npmClient": "yarn", "npmClient": "yarn",
"concurrency": 20, "concurrency": 20,
"command": { "command": {

View File

@ -25,12 +25,12 @@
noWrap={tooltipWrap} noWrap={tooltipWrap}
> >
<div class="icon" class:newStyles> <div class="icon" class:newStyles>
<!-- svelte-ignore a11y-mouse-events-have-key-events -->
<svg <svg
on:contextmenu on:contextmenu
on:click on:click
on:mouseover on:mouseover
on:mouseleave on:mouseleave
on:focus
class:hoverable class:hoverable
class:disabled class:disabled
class="spectrum-Icon spectrum-Icon--size{size}" class="spectrum-Icon spectrum-Icon--size{size}"

View File

@ -220,7 +220,18 @@
const stepStore = writable({}) const stepStore = writable({})
$: stepState = $stepStore?.[block.id] $: stepState = $stepStore?.[block.id]
$: customStepLayouts($memoBlock, schemaProperties, stepState, fetchedRows) const updateSelectedRow = testData => {
selectedRow = testData?.row
}
$: updateSelectedRow(testData)
$: customStepLayouts(
$memoBlock,
schemaProperties,
stepState,
fetchedRows,
selectedRow
)
const customStepLayouts = block => { const customStepLayouts = block => {
if ( if (
@ -387,32 +398,11 @@
] ]
} }
stepLayouts[block.stepId] = { const getTestDataSelector = () => {
row: { if (!isTestModal) {
schema: schema["row"], return []
//?layout: RowLayoutStepComponent.
content: [
{
type: TableSelector,
title: "Table",
props: {
isTrigger,
value: inputData["row"]?.tableId ?? "",
onChange: e => {
const rowKey = $stepStore?.[block.id]?.rowType || "row"
onChange({
_tableId: e.detail,
meta: {},
[rowKey]: e.detail
? {
tableId: e.detail,
} }
: {}, return [
})
},
disabled: isTestModal,
},
},
{ {
type: CoreSelect, type: CoreSelect,
title: "Row", title: "Row",
@ -456,6 +446,36 @@
noMargin: true, noMargin: true,
}, },
}, },
]
}
stepLayouts[block.stepId] = {
row: {
schema: schema["row"],
//?layout: RowLayoutStepComponent.
content: [
{
type: TableSelector,
title: "Table",
props: {
isTrigger,
value: inputData["row"]?.tableId ?? "",
onChange: e => {
const rowKey = $stepStore?.[block.id]?.rowType || "row"
onChange({
_tableId: e.detail,
meta: {},
[rowKey]: e.detail
? {
tableId: e.detail,
}
: {},
})
},
disabled: isTestModal,
},
},
...getTestDataSelector(),
...getIdConfig(), ...getIdConfig(),
...getRevConfig(), ...getRevConfig(),
...getRowTypeConfig(), ...getRowTypeConfig(),