mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-25 08:00:59 +00:00
fix nested objects
This commit is contained in:
@@ -72,6 +72,7 @@
|
||||
properties?: { [name: string]: SchemaProperty }
|
||||
}
|
||||
| undefined
|
||||
lightHeaderFont?: boolean
|
||||
displayHeader?: boolean
|
||||
properties?: { [name: string]: SchemaProperty } | undefined
|
||||
nestedRequired?: string[] | undefined
|
||||
@@ -181,7 +182,8 @@
|
||||
workspace = undefined,
|
||||
actions,
|
||||
innerBottomSnippet,
|
||||
fieldHeaderActions
|
||||
fieldHeaderActions,
|
||||
lightHeaderFont = false
|
||||
}: Props = $props()
|
||||
|
||||
$effect(() => {
|
||||
@@ -599,7 +601,10 @@
|
||||
{simpleTooltip}
|
||||
{lightHeader}
|
||||
{displayType}
|
||||
labelClass={css?.label?.class}
|
||||
labelClass={twMerge(
|
||||
lightHeaderFont ? '!font-normal !text-sm text-tertiary' : '',
|
||||
css?.label?.class
|
||||
)}
|
||||
/>
|
||||
{@render fieldHeaderActions?.()}
|
||||
</div>
|
||||
@@ -735,8 +740,9 @@
|
||||
<Module.default code={JSON.stringify(value, null, 2)} bind:value />
|
||||
{/await}
|
||||
{:else}
|
||||
<div class="py-4 pr-2 pl-6 border rounded-md w-full">
|
||||
<div class="px-2 pt-2 border rounded-md w-full">
|
||||
<SchemaForm
|
||||
lightHeaderFont
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
{disabled}
|
||||
@@ -853,6 +859,7 @@
|
||||
{:else if itemsType?.type === 'object' && itemsType?.properties}
|
||||
<div class="p-8 border rounded-md w-full">
|
||||
<SchemaForm
|
||||
lightHeaderFont
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
{disabled}
|
||||
@@ -1010,9 +1017,10 @@
|
||||
{@const obj = oneOf[objIdx]}
|
||||
{#if obj && obj.properties && Object.keys(obj.properties).length > 0}
|
||||
{#key redraw}
|
||||
<div class="py-4 pr-2 pl-6 border rounded w-full">
|
||||
<div class="px-2 pt-2 border rounded w-full">
|
||||
{#if orderEditable}
|
||||
<SchemaFormDnd
|
||||
lightHeaderFont
|
||||
{nestedClasses}
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
@@ -1047,6 +1055,7 @@
|
||||
/>
|
||||
{:else}
|
||||
<SchemaForm
|
||||
lightHeaderFont
|
||||
{nestedClasses}
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
@@ -1120,9 +1129,10 @@
|
||||
{/if}
|
||||
</div>
|
||||
{:else if properties && Object.keys(properties).length > 0 && inputCat !== 'list'}
|
||||
<div class={hideNested ? 'hidden' : 'py-4 pr-2 pl-6 border rounded-md w-full'}>
|
||||
<div class={hideNested ? 'hidden' : 'px-2 pt-2 border rounded-md w-full'}>
|
||||
{#if orderEditable}
|
||||
<SchemaFormDnd
|
||||
lightHeaderFont
|
||||
{nestedClasses}
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
@@ -1153,6 +1163,7 @@
|
||||
/>
|
||||
{:else}
|
||||
<SchemaForm
|
||||
lightHeaderFont
|
||||
{nestedClasses}
|
||||
{onlyMaskPassword}
|
||||
{disablePortal}
|
||||
@@ -1378,13 +1389,13 @@
|
||||
{/if}
|
||||
|
||||
{#if !compact || (error && error != '')}
|
||||
<div class="text-right text-xs text-red-600 dark:text-red-400">
|
||||
{#if disabled || error === ''}
|
||||
|
||||
{:else}
|
||||
{#if disabled || error === ''}
|
||||
|
||||
{:else}
|
||||
<div class="text-right text-xs text-red-600 dark:text-red-400">
|
||||
{error}
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
{:else if !noMargin}
|
||||
<div class="mb-2"></div>
|
||||
{/if}
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
displayType?: boolean
|
||||
appPath?: string | undefined
|
||||
className?: string
|
||||
lightHeaderFont?: boolean
|
||||
computeS3ForceViewerPolicies?:
|
||||
| (() =>
|
||||
| {
|
||||
@@ -106,6 +107,7 @@
|
||||
displayType = true,
|
||||
appPath = undefined,
|
||||
className = '',
|
||||
lightHeaderFont = false,
|
||||
computeS3ForceViewerPolicies = undefined,
|
||||
workspace = undefined,
|
||||
actions: actions_render = undefined
|
||||
@@ -280,6 +282,7 @@
|
||||
{@const formerProperty = diff[argName].oldSchema}
|
||||
<div class="px-2">
|
||||
<ArgInput
|
||||
{lightHeaderFont}
|
||||
{disablePortal}
|
||||
{resourceTypes}
|
||||
{prettifyHeader}
|
||||
@@ -342,6 +345,7 @@
|
||||
{JSON.stringify(args?.[argName])} -->
|
||||
{#if !hidden[argName]}
|
||||
<ArgInput
|
||||
{lightHeaderFont}
|
||||
on:change={() => {
|
||||
dispatch('change')
|
||||
}}
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
helperScript?: DynamicInput.HelperScript
|
||||
className?: string
|
||||
dndType?: string
|
||||
lightHeaderFont?: boolean
|
||||
}
|
||||
|
||||
let {
|
||||
@@ -44,7 +45,8 @@
|
||||
isValid = $bindable(true),
|
||||
noVariablePicker = false,
|
||||
className = '',
|
||||
dndType = generateRandomString()
|
||||
dndType = generateRandomString(),
|
||||
lightHeaderFont
|
||||
}: Props = $props()
|
||||
|
||||
$effect.pre(() => {
|
||||
@@ -135,6 +137,7 @@
|
||||
{shouldDispatchChanges}
|
||||
bind:isValid
|
||||
{noVariablePicker}
|
||||
{lightHeaderFont}
|
||||
>
|
||||
{#snippet actions()}
|
||||
{#if !disableDnd}
|
||||
|
||||
Reference in New Issue
Block a user