From 6f71c9d7b5b8421469c2e6399f7d20de4eb9288d Mon Sep 17 00:00:00 2001 From: Arne Gudermann Date: Fri, 4 Apr 2025 14:33:44 +0200 Subject: [PATCH 1/2] Add exit script --- src/extensions/scriptor/ScriptorRunner.vue | 7 ++++++- src/extensions/scriptor/components/Status.vue | 6 +++++- src/extensions/scriptor/store/scriptor.js | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/extensions/scriptor/ScriptorRunner.vue b/src/extensions/scriptor/ScriptorRunner.vue index 339d520..ffab1ef 100644 --- a/src/extensions/scriptor/ScriptorRunner.vue +++ b/src/extensions/scriptor/ScriptorRunner.vue @@ -33,7 +33,7 @@ id="dialog-delete" :open="state.opened" :label="current['rel']['name']" - @sl-after-hide="state.opened=false" + @sl-after-hide="exitScriptor" >
@@ -109,6 +109,11 @@ const messagewrapper = ref(null) state.opened = true scriptorAction.value.executeScript() } + function exitScriptor() + { + state.opened = false + scriptorAction.value.exitScript() + } watch( () => state.scriptor?.messages.length, diff --git a/src/extensions/scriptor/components/Status.vue b/src/extensions/scriptor/components/Status.vue index 220d172..96d9be0 100644 --- a/src/extensions/scriptor/components/Status.vue +++ b/src/extensions/scriptor/components/Status.vue @@ -45,7 +45,11 @@ const state = reactive({ async function executeScript() { await scriptorStore.execute(state.scriptor.scriptCode, props.id) } +async function exitScript() +{ + await scriptorStore.exitScript() +} function reset() { scriptorStore.state.instances[props.id].messages = [] scriptorStore.state.instances[props.id].internalMessages = [] @@ -53,7 +57,7 @@ function reset() { } defineExpose({ - reset, executeScript,state + reset, executeScript,exitScript,state }) diff --git a/src/extensions/scriptor/store/scriptor.js b/src/extensions/scriptor/store/scriptor.js index d576da1..3b666ad 100644 --- a/src/extensions/scriptor/store/scriptor.js +++ b/src/extensions/scriptor/store/scriptor.js @@ -132,7 +132,11 @@ export const useScriptorStore = defineStore("scriptorStore", () => { }) } } - + async function exitScript() + { + console.log("exit programm") + sendResult("exit","__exit__") + } async function execute(code, id = null, context = {}) { let currentId = createNewInstance(id) // create needed Instance Object state.currentInstance = currentId @@ -320,6 +324,7 @@ export const useScriptorStore = defineStore("scriptorStore", () => { state, progress, execute, + exitScript, sendResult, createNewInstance, fetchScriptorVersions From 08fbfc30c40529fd79dfea33dbba4cb92243a0e0 Mon Sep 17 00:00:00 2001 From: agudermann <47318461+ArneGudermann@users.noreply.github.com> Date: Tue, 8 Apr 2025 10:40:25 +0200 Subject: [PATCH 2/2] Update src/extensions/scriptor/store/scriptor.js --- src/extensions/scriptor/store/scriptor.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/extensions/scriptor/store/scriptor.js b/src/extensions/scriptor/store/scriptor.js index 3b666ad..305c616 100644 --- a/src/extensions/scriptor/store/scriptor.js +++ b/src/extensions/scriptor/store/scriptor.js @@ -134,7 +134,6 @@ export const useScriptorStore = defineStore("scriptorStore", () => { } async function exitScript() { - console.log("exit programm") sendResult("exit","__exit__") } async function execute(code, id = null, context = {}) {