исправляем баг окна ввода сценариев

This commit is contained in:
Dmitry Borisenko
2022-08-23 02:00:35 +02:00
parent b32a92be0e
commit 7eff0a6a1a
4 changed files with 11 additions and 3 deletions

7
others/inputjson.svelte Normal file
View File

@@ -0,0 +1,7 @@
{#if showWidjetJson}
<Card title="Редактор JSON">
<textarea rows="10" class="text-sm w-full" id="text1"
>{syntaxHighlight(JSON.stringify(layoutJson))}</textarea
>
</Card>
{/if}

View File

@@ -4,7 +4,7 @@
<meta charset='utf-8'> <meta charset='utf-8'>
<meta name='viewport' content='width=device-width,initial-scale=1'> <meta name='viewport' content='width=device-width,initial-scale=1'>
<title>IoT Manager 4.1.5</title> <title>IoT Manager 4.1.6</title>
<link rel='icon' type='image/png' href='/favicon.ico'> <link rel='icon' type='image/png' href='/favicon.ico'>
<link rel='stylesheet' href='/build/bundle.css'> <link rel='stylesheet' href='/build/bundle.css'>

View File

@@ -575,6 +575,7 @@
} }
function saveConfig() { function saveConfig() {
scenarioTxt = scenarioTxt;
wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout())); wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout()));
wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson)); wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson));
wsSendMsg(selectedWs, "/oiranecs|" + scenarioTxt); wsSendMsg(selectedWs, "/oiranecs|" + scenarioTxt);
@@ -1128,7 +1129,7 @@
{/if} {/if}
</Route> </Route>
<Route path="/config"> <Route path="/config">
<ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} bind:scenarioTxt saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} /> <ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} scenarioTxt={scenarioTxt} />
</Route> </Route>
<Route path="/connection"> <Route path="/connection">
<ConnectionPage show={connectionReady} rebootEsp={() => rebootEsp()} ssidClick={() => ssidClick()} saveSett={() => saveSett()} saveMqtt={() => saveMqtt()} settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} /> <ConnectionPage show={connectionReady} rebootEsp={() => rebootEsp()} ssidClick={() => ssidClick()} saveSett={() => saveSett()} saveMqtt={() => saveMqtt()} settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} />

View File

@@ -125,7 +125,7 @@
</Card> </Card>
<Card title="Сценарии"> <Card title="Сценарии">
<textarea rows={height} cols="50" bind:value={scenarioTxt} class="px-2 bg-gray-50 border-2 border-gray-200 rounded text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500 w-full" /> <textarea bind:value={scenarioTxt} rows={height} cols="50" class="px-2 bg-gray-50 border-2 border-gray-200 rounded text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500 w-full" />
</Card> </Card>
</div> </div>
<div class="grd-1col1"> <div class="grd-1col1">