feat: Verwende fetch statt window.location.href für Digitalausgang-Schalteraktionen
This commit is contained in:
@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
|
|||||||
NEXT_PUBLIC_EXPORT_STATIC=false
|
NEXT_PUBLIC_EXPORT_STATIC=false
|
||||||
NEXT_PUBLIC_USE_CGI=false
|
NEXT_PUBLIC_USE_CGI=false
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.6.558
|
NEXT_PUBLIC_APP_VERSION=1.6.559
|
||||||
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
|
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
|
||||||
|
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
|
|||||||
NEXT_PUBLIC_EXPORT_STATIC=true
|
NEXT_PUBLIC_EXPORT_STATIC=true
|
||||||
NEXT_PUBLIC_USE_CGI=true
|
NEXT_PUBLIC_USE_CGI=true
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.6.558
|
NEXT_PUBLIC_APP_VERSION=1.6.559
|
||||||
NEXT_PUBLIC_CPL_MODE=production
|
NEXT_PUBLIC_CPL_MODE=production
|
||||||
@@ -1,3 +1,8 @@
|
|||||||
|
## [1.6.559] – 2025-07-08
|
||||||
|
|
||||||
|
- circle Button
|
||||||
|
|
||||||
|
---
|
||||||
## [1.6.558] – 2025-07-08
|
## [1.6.558] – 2025-07-08
|
||||||
|
|
||||||
- feat: ersetzt Einheit-Select durch Listbox mit littwin-blue Design in AnalogInputsSettingsModal
|
- feat: ersetzt Einheit-Select durch Listbox mit littwin-blue Design in AnalogInputsSettingsModal
|
||||||
|
|||||||
@@ -49,22 +49,22 @@ export default function DigitalOutputsModal({
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (isCPL) {
|
if (isCPL) {
|
||||||
// ✅ Name speichern (DANx=...)
|
|
||||||
const nameEncoded = encodeURIComponent(label.trim());
|
const nameEncoded = encodeURIComponent(label.trim());
|
||||||
const nameUrl = `/CPL?digitalOutputs.html&DAN0${selectedOutput.id}=${nameEncoded}`;
|
const nameUrl = `/CPL?digitalOutputs.html&DAN0${selectedOutput.id}=${nameEncoded}`;
|
||||||
|
|
||||||
// ✅ Status speichern (DASx=...)
|
|
||||||
const statusUrl = `/CPL?digitalOutputs.html&DAS0${selectedOutput.id}=${
|
const statusUrl = `/CPL?digitalOutputs.html&DAS0${selectedOutput.id}=${
|
||||||
status ? 1 : 0
|
status ? 1 : 0
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
// 🟢 Beide nacheinander senden (wichtig bei älteren CPL-Versionen)
|
try {
|
||||||
window.location.href = nameUrl; // Name zuerst (ggf. durch Refresh überschrieben)
|
await fetch(nameUrl, { method: "GET" });
|
||||||
setTimeout(() => {
|
await new Promise((res) => setTimeout(res, 300));
|
||||||
window.location.href = statusUrl;
|
await fetch(statusUrl, { method: "GET" });
|
||||||
}, 300); // kleine Verzögerung (optional)
|
|
||||||
|
|
||||||
// 💡 Modal wird nicht automatisch geschlossen — da Seite neu lädt.
|
closeOutputModal(); // Seite bleibt erhalten
|
||||||
|
} catch (err) {
|
||||||
|
console.error("❌ Fehler bei fetch:", err);
|
||||||
|
setErrorMsg("❌ Fehler beim Speichern.");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// 🧪 Lokaler Entwicklungsmodus
|
// 🧪 Lokaler Entwicklungsmodus
|
||||||
const res = await fetch("/api/cpl/updateDigitalOutputsHandler", {
|
const res = await fetch("/api/cpl/updateDigitalOutputsHandler", {
|
||||||
|
|||||||
@@ -32,9 +32,25 @@ export default function DigitalOutputsWidget({
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (isCPL) {
|
if (isCPL) {
|
||||||
window.location.href = `/CPL?digitalOutputs.html&DAS0${id}=${
|
// Statt redirect:
|
||||||
updatedOutputs[id - 1].status ? 1 : 0
|
// window.location.href = `/CPL?...`;
|
||||||
}`;
|
|
||||||
|
// Verwende fetch:
|
||||||
|
fetch(
|
||||||
|
`/CPL?digitalOutputs.html&DAS0${id}=${
|
||||||
|
updatedOutputs[id - 1].status ? 1 : 0
|
||||||
|
}`,
|
||||||
|
{
|
||||||
|
method: "GET",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.then((res) => {
|
||||||
|
if (!res.ok) throw new Error("Fehler beim Schalten");
|
||||||
|
// Optional: Feedback anzeigen
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error("CPL Fehler:", err);
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
await fetch("/api/cpl/updateDigitalOutputsHandler", {
|
await fetch("/api/cpl/updateDigitalOutputsHandler", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"win_da_state": [
|
"win_da_state": [
|
||||||
1,
|
0,
|
||||||
1,
|
0,
|
||||||
1,
|
1,
|
||||||
1
|
1
|
||||||
],
|
],
|
||||||
"win_da_bezeichnung": [
|
"win_da_bezeichnung": [
|
||||||
"Ausgang1",
|
"DA1",
|
||||||
"Ausgang2",
|
"Ausgang2",
|
||||||
"Ausgang3",
|
"Ausgang3",
|
||||||
"Ausgang4"
|
"Ausgang4"
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.558",
|
"version": "1.6.559",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.558",
|
"version": "1.6.559",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/roboto": "^5.1.0",
|
"@fontsource/roboto": "^5.1.0",
|
||||||
"@headlessui/react": "^2.2.4",
|
"@headlessui/react": "^2.2.4",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.558",
|
"version": "1.6.559",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user