Version 1.6.200
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
"use client"; // /components/modules/kue705FO/charts/ChartSwitcher.tsx
|
"use client"; // /components/modules/kue705FO/charts/ChartSwitcher.tsx
|
||||||
|
import dynamic from "next/dynamic";
|
||||||
|
|
||||||
import React, { useState, useEffect } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import ReactModal from "react-modal";
|
import ReactModal from "react-modal";
|
||||||
import LoopChartActionBar from "./LoopMeasurementChart/LoopChartActionBar";
|
import LoopChartActionBar from "./LoopMeasurementChart/LoopChartActionBar";
|
||||||
import TDRChartActionBar from "./TDRChart/TDRChartActionBar";
|
import TDRChartActionBar from "./TDRChart/TDRChartActionBar";
|
||||||
import LoopMeasurementChart from "./LoopMeasurementChart/LoopMeasurementChart";
|
|
||||||
import TDRChart from "./TDRChart/TDRChart";
|
import TDRChart from "./TDRChart/TDRChart";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
import { AppDispatch } from "../../../../../redux/store";
|
import { AppDispatch } from "../../../../../redux/store";
|
||||||
@@ -31,6 +31,10 @@ const ChartSwitcher: React.FC<ChartSwitcherProps> = ({
|
|||||||
onClose,
|
onClose,
|
||||||
slotIndex,
|
slotIndex,
|
||||||
}) => {
|
}) => {
|
||||||
|
const LoopMeasurementChart = dynamic(
|
||||||
|
() => import("./LoopMeasurementChart/LoopMeasurementChart.client"),
|
||||||
|
{ ssr: false }
|
||||||
|
);
|
||||||
const dispatch = useDispatch<AppDispatch>();
|
const dispatch = useDispatch<AppDispatch>();
|
||||||
const chartTitle = useSelector(
|
const chartTitle = useSelector(
|
||||||
(state: RootState) => state.loopChartType.chartTitle
|
(state: RootState) => state.loopChartType.chartTitle
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ const LoopMeasurementChart = () => {
|
|||||||
zoom: {
|
zoom: {
|
||||||
pan: {
|
pan: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
mode: "x",
|
mode: "x" as const,
|
||||||
},
|
},
|
||||||
zoom: {
|
zoom: {
|
||||||
wheel: {
|
wheel: {
|
||||||
@@ -107,7 +107,7 @@ const LoopMeasurementChart = () => {
|
|||||||
pinch: {
|
pinch: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
},
|
},
|
||||||
mode: "x",
|
mode: "x" as const,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -115,10 +115,10 @@ const LoopMeasurementChart = () => {
|
|||||||
x: {
|
x: {
|
||||||
type: "time" as const,
|
type: "time" as const,
|
||||||
time: {
|
time: {
|
||||||
unit: "day",
|
unit: "day" as const,
|
||||||
tooltipFormat: "dd.MM.yyyy HH:mm",
|
tooltipFormat: "dd.MM.yyyy HH:mm",
|
||||||
displayFormats: {
|
displayFormats: {
|
||||||
day: "dd.MM", // z. B. 02.04
|
day: "dd.MM",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
title: {
|
title: {
|
||||||
@@ -6,5 +6,5 @@
|
|||||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||||
|
|
||||||
*/
|
*/
|
||||||
const webVersion = "1.6.199";
|
const webVersion = "1.6.200";
|
||||||
export default webVersion;
|
export default webVersion;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { fetchAllTDMDataFromServer } from "../../services/fetchAllTDMData";
|
|||||||
export const fetchAllTDMData = createAsyncThunk(
|
export const fetchAllTDMData = createAsyncThunk(
|
||||||
"tdmChart/fetchAllTDMData",
|
"tdmChart/fetchAllTDMData",
|
||||||
async (_, { getState, rejectWithValue }) => {
|
async (_, { getState, rejectWithValue }) => {
|
||||||
const currentData = (getState() as RootState).tdmChart.data;
|
const currentData = (getState() as RootState).tdmChartSlice.data;
|
||||||
const newData = await fetchAllTDMDataFromServer();
|
const newData = await fetchAllTDMDataFromServer();
|
||||||
|
|
||||||
if (newData.every((entry) => !entry)) {
|
if (newData.every((entry) => !entry)) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const fetchAllTDRChartData = createAsyncThunk(
|
|||||||
"tdrChart/fetchAllTDRChartData",
|
"tdrChart/fetchAllTDRChartData",
|
||||||
async (_, { getState, rejectWithValue }) => {
|
async (_, { getState, rejectWithValue }) => {
|
||||||
const state = getState() as RootState;
|
const state = getState() as RootState;
|
||||||
const currentData = state.tdrChart.data;
|
const currentData = state.tdrChartSlice.data;
|
||||||
|
|
||||||
const newData = await fetchAllTDRChartDataFromServer(); // ✅ Service aufrufen
|
const newData = await fetchAllTDRChartDataFromServer(); // ✅ Service aufrufen
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
setOpcUaEncryption,
|
setOpcUaEncryption,
|
||||||
setOpcUaActiveClientCount,
|
setOpcUaActiveClientCount,
|
||||||
setOpcUaNodesetName,
|
setOpcUaNodesetName,
|
||||||
setOpcUaUsers,
|
//setOpcUaUsers,
|
||||||
} from "../slices/opcuaSettingsSlice";
|
} from "../slices/opcuaSettingsSlice";
|
||||||
|
|
||||||
export const fetchOpcUaSettingsThunk = createAsyncThunk(
|
export const fetchOpcUaSettingsThunk = createAsyncThunk(
|
||||||
@@ -19,6 +19,6 @@ export const fetchOpcUaSettingsThunk = createAsyncThunk(
|
|||||||
dispatch(setOpcUaEncryption(data.encryption));
|
dispatch(setOpcUaEncryption(data.encryption));
|
||||||
dispatch(setOpcUaActiveClientCount(data.clientCount));
|
dispatch(setOpcUaActiveClientCount(data.clientCount));
|
||||||
dispatch(setOpcUaNodesetName(data.nodesetName));
|
dispatch(setOpcUaNodesetName(data.nodesetName));
|
||||||
dispatch(setOpcUaUsers(data.users));
|
//dispatch(setOpcUaUsers(data.users));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user