mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-04 16:03:06 +00:00
fix rebase issue
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { setContext, untrack } from 'svelte'
|
||||
import { onMount, setContext, untrack } from 'svelte'
|
||||
import { writable } from 'svelte/store'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { twMerge } from 'tailwind-merge'
|
||||
@@ -18,6 +18,7 @@
|
||||
values?: string[] | undefined
|
||||
children?: import('svelte').Snippet<[any]>
|
||||
content?: import('svelte').Snippet
|
||||
id?: string
|
||||
}
|
||||
|
||||
let {
|
||||
@@ -29,9 +30,11 @@
|
||||
hashNavigation = false,
|
||||
values = undefined,
|
||||
children,
|
||||
content
|
||||
content,
|
||||
id
|
||||
}: Props = $props()
|
||||
|
||||
let tabsState: TabsState | undefined = $state(undefined)
|
||||
const selectedStore = writable(selected)
|
||||
|
||||
setContext<TabsContext>('Tabs', {
|
||||
@@ -63,13 +66,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (id) {
|
||||
tabsState = getTabStateContext()
|
||||
const tabState = tabsState?.getSelected(id)
|
||||
if (tabState) {
|
||||
selected = tabState
|
||||
onMount(() => {
|
||||
if (id) {
|
||||
tabsState = getTabStateContext()
|
||||
const tabState = tabsState?.getSelected(id)
|
||||
if (tabState) {
|
||||
selected = tabState
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
$effect(() => {
|
||||
selected && untrack(() => updateSelected())
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { setContext, untrack } from 'svelte'
|
||||
import { onMount, setContext, untrack } from 'svelte'
|
||||
import { writable } from 'svelte/store'
|
||||
import { twMerge } from 'tailwind-merge'
|
||||
import type { TabsContext } from '$lib/components/apps/editor/settingsPanel/inputEditor/tabs.svelte'
|
||||
@@ -16,6 +16,7 @@
|
||||
children?: import('svelte').Snippet<[any]>
|
||||
content?: import('svelte').Snippet
|
||||
onSelectedChange?: (value: string) => void
|
||||
id?: string
|
||||
}
|
||||
|
||||
let {
|
||||
@@ -28,10 +29,12 @@
|
||||
values = undefined,
|
||||
children,
|
||||
content,
|
||||
onSelectedChange
|
||||
onSelectedChange,
|
||||
id
|
||||
}: Props = $props()
|
||||
|
||||
const selectedStore = writable(selected)
|
||||
let tabsState: TabsState | undefined = $state(undefined)
|
||||
|
||||
setContext<TabsContext>('Tabs', {
|
||||
selected: selectedStore,
|
||||
@@ -68,13 +71,15 @@
|
||||
|
||||
let hashValues = $derived(values ? values.map((x) => '#' + x) : undefined)
|
||||
|
||||
if (id) {
|
||||
tabsState = getTabStateContext()
|
||||
const tabState = tabsState?.getSelected(id)
|
||||
if (tabState) {
|
||||
selected = tabState
|
||||
onMount(() => {
|
||||
if (id) {
|
||||
tabsState = getTabStateContext()
|
||||
const tabStateInitial = tabsState?.getSelected(id)
|
||||
if (tabStateInitial) {
|
||||
selected = tabStateInitial
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
<svelte:window onhashchange={hashChange} />
|
||||
|
||||
@@ -180,8 +180,6 @@
|
||||
}
|
||||
|
||||
let forceReload = $state(0)
|
||||
let editorPanelSize = $state(noEditor ? 0 : flowModule.value.type == 'script' ? 30 : 50)
|
||||
let editorSettingsPanelSize = $state(100 - untrack(() => editorPanelSize))
|
||||
|
||||
function onSelectedIdChange() {
|
||||
if (!$flowStateStore?.[$selectedId]?.schema && flowModule) {
|
||||
@@ -208,8 +206,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
let leftPanelSize = $state(0)
|
||||
|
||||
function showDiffMode() {
|
||||
diffMode = true
|
||||
diffEditor?.setOriginal((savedModule?.value as RawScript).content ?? '')
|
||||
@@ -255,13 +251,6 @@
|
||||
let parentLoop = $derived(
|
||||
flowStore.val && flowModule ? checkIfParentLoop(flowStore.val, flowModule.id) : undefined
|
||||
)
|
||||
$effect(() => {
|
||||
if (selected === 'test') {
|
||||
leftPanelSize = 50
|
||||
} else {
|
||||
leftPanelSize = 100
|
||||
}
|
||||
})
|
||||
|
||||
$effect(() => {
|
||||
editor &&
|
||||
|
||||
Reference in New Issue
Block a user