mirror of
https://github.com/IoTManagerProject/IoTManagerWeb.git
synced 2026-03-30 03:49:17 +03:00
рабочий вариант promise
This commit is contained in:
@@ -36,8 +36,6 @@
|
|||||||
//let myip = document.location.hostname;
|
//let myip = document.location.hostname;
|
||||||
let myip = "192.168.88.235";
|
let myip = "192.168.88.235";
|
||||||
|
|
||||||
function promiseResolve() {}
|
|
||||||
|
|
||||||
//Flags
|
//Flags
|
||||||
let showInput = false;
|
let showInput = false;
|
||||||
let showModalFlag = false;
|
let showModalFlag = false;
|
||||||
@@ -809,6 +807,25 @@
|
|||||||
errorsJson[alarmKey] = 0;
|
errorsJson[alarmKey] = 0;
|
||||||
wsSendMsg(selectedWs, '/rorre|{"' + alarmKey + '":0}');
|
wsSendMsg(selectedWs, '/rorre|{"' + alarmKey + '":0}');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//*******************************************************awaiting********************************************************************/
|
||||||
|
|
||||||
|
let promiseResolve;
|
||||||
|
let myPromise = 0;
|
||||||
|
|
||||||
|
async function connect() {
|
||||||
|
console.log("connect start");
|
||||||
|
saveSettings();
|
||||||
|
return new Promise(function (resolve, reject) {
|
||||||
|
setTimeout(() => reject(), 10000);
|
||||||
|
promiseResolve = resolve;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function activate() {
|
||||||
|
myPromise = connect();
|
||||||
|
}
|
||||||
|
|
||||||
//*******************************************************initialisation********************************************************************/
|
//*******************************************************initialisation********************************************************************/
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
console.log("[i]", "mounted");
|
console.log("[i]", "mounted");
|
||||||
@@ -890,7 +907,7 @@
|
|||||||
<ConfigPage configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} />
|
<ConfigPage configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="/connection">
|
<Route path="/connection">
|
||||||
<ConnectionPage settingsJson={settingsJson} errorsJson={errorsJson} promiseResolve={() => promiseResolve()} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} />
|
<ConnectionPage settingsJson={settingsJson} errorsJson={errorsJson} myPromise={myPromise} activate={() => activate()} ssidJson={ssidJson} rebootEsp={() => rebootEsp()} ssidDropdownClick={() => ssidDropdownClick()} saveSettings={() => saveSettings()} mqttConnect={() => mqttConnect()} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="/system">
|
<Route path="/system">
|
||||||
<SystemPage settingsJson={settingsJson} errorsJson={errorsJson} rebootEsp={() => rebootEsp()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} version={version} />
|
<SystemPage settingsJson={settingsJson} errorsJson={errorsJson} rebootEsp={() => rebootEsp()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} version={version} />
|
||||||
|
|||||||
@@ -3,30 +3,12 @@
|
|||||||
import Alarm from "../components/Alarm.svelte";
|
import Alarm from "../components/Alarm.svelte";
|
||||||
|
|
||||||
export let settingsJson;
|
export let settingsJson;
|
||||||
//export let settingsJsonParced;
|
|
||||||
export let errorsJson;
|
export let errorsJson;
|
||||||
export let errorsJsonParced;
|
|
||||||
export let ssidJson;
|
export let ssidJson;
|
||||||
//export let ssidJsonParced;
|
|
||||||
|
|
||||||
export let promiseResolve = () => {};
|
export let myPromise;
|
||||||
|
|
||||||
async function connect() {
|
export let activate = () => {};
|
||||||
console.log("connect start");
|
|
||||||
errorsJsonParced = false;
|
|
||||||
saveSettings();
|
|
||||||
console.log("errorsJsonParced:", errorsJsonParced);
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
//установим таймаут на 1 секунду, если пройдет секнда и не будет resolve() то система выдаст ошибку
|
|
||||||
setTimeout(() => reject(), 20000);
|
|
||||||
promiseResolve = resolve;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let myPromise = 0; //connect();
|
|
||||||
|
|
||||||
let promise = 0;
|
|
||||||
let next = () => new Promise((resolve) => setTimeout(() => resolve(), 1000));
|
|
||||||
|
|
||||||
export let ssidDropdownClick = () => {};
|
export let ssidDropdownClick = () => {};
|
||||||
export let saveSettings = () => {};
|
export let saveSettings = () => {};
|
||||||
@@ -36,7 +18,7 @@
|
|||||||
|
|
||||||
{#await myPromise}
|
{#await myPromise}
|
||||||
<p>Connecting...</p>
|
<p>Connecting...</p>
|
||||||
<button class="btn-lg" on:click={() => promiseResolve()}>resolve</button>
|
<!--<button class="btn-lg" on:click={() => promiseResolve()}>resolve</button>-->
|
||||||
{:then}
|
{:then}
|
||||||
<div class="grd-2col1">
|
<div class="grd-2col1">
|
||||||
<Card title="Подключение к WiFi">
|
<Card title="Подключение к WiFi">
|
||||||
@@ -92,7 +74,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<button class="btn-lg" on:click={() => (myPromise = connect())}>try</button>
|
<button class="btn-lg" on:click={() => activate()}>try</button>
|
||||||
<button class="btn-lg" on:click={() => saveSettings()}>{"Сохранить"}</button>
|
<button class="btn-lg" on:click={() => saveSettings()}>{"Сохранить"}</button>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user