diff --git a/web/src/App.js b/web/src/App.js index d5b95b47..18035989 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -16,7 +16,7 @@ import React, {Component, Suspense, lazy} from "react"; import "./App.less"; import {Helmet} from "react-helmet"; import * as Setting from "./Setting"; -import {setIsTourVisible, setTourLogo} from "./TourConfig"; +import {setOrgIsTourVisible, setTourLogo} from "./TourConfig"; import {StyleProvider, legacyLogicalPropertiesTransformer} from "@ant-design/cssinjs"; import {GithubOutlined, InfoCircleFilled, ShareAltOutlined} from "@ant-design/icons"; import {Alert, Button, ConfigProvider, Drawer, FloatButton, Layout, Result, Tooltip} from "antd"; @@ -249,7 +249,7 @@ class App extends Component { this.setLanguage(account); this.setTheme(Setting.getThemeData(account.organization), Conf.InitThemeAlgorithm); setTourLogo(account.organization.logo); - setIsTourVisible(account.organization.enableTour); + setOrgIsTourVisible(account.organization.enableTour); } else { if (res.data !== "Please login first") { Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); diff --git a/web/src/TourConfig.js b/web/src/TourConfig.js index 7dd490e8..ddc577e4 100644 --- a/web/src/TourConfig.js +++ b/web/src/TourConfig.js @@ -203,9 +203,14 @@ export function getNextUrl(pathName = window.location.pathname) { return TourUrlList[TourUrlList.indexOf(pathName.replace("/", "")) + 1] || ""; } +let orgIsTourVisible = true; + +export function setOrgIsTourVisible(visible) { + orgIsTourVisible = visible; +} + export function setIsTourVisible(visible) { localStorage.setItem("isTourVisible", visible); - window.dispatchEvent(new Event("storageTourChanged")); } export function setTourLogo(tourLogoSrc) { @@ -215,7 +220,7 @@ export function setTourLogo(tourLogoSrc) { } export function getTourVisible() { - return localStorage.getItem("isTourVisible") !== "false"; + return localStorage.getItem("isTourVisible") !== "false" && orgIsTourVisible; } export function getNextButtonChild(nextPathName) {