@thefreshop/tb 1.0.13 → 1.0.14

package/dist/esm/index.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import React__default, { createContext, useState, useEffect, useContext, useCallback, useMemo, useRef, forwardRef, useImperativeHandle, memo } from 'react';
-import { useNavigate, useLocation, Outlet, createHashRouter, createBrowserRouter, RouterProvider } from 'react-router';
+import { useNavigate, useLocation, Outlet, createHashRouter, createBrowserRouter, RouterProvider, Navigate } from 'react-router';
 import Editor from '@monaco-editor/react';
 import { DownOutlined, UpOutlined, DoubleRightOutlined, DoubleLeftOutlined, LoadingOutlined, ReloadOutlined, SearchOutlined, UploadOutlined, ExclamationCircleOutlined, RedoOutlined, TagOutlined } from '@ant-design/icons';
 import { Typography, Row, Col, Space, Button, Input, Tag, Image as Image$1, Tooltip, Upload, Form, Select, DatePicker, Switch, InputNumber, Flex, Modal, Table, List, Card, Checkbox, ConfigProvider, Result, Spin } from 'antd';
@@ -539,6 +539,12 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, hashmode = false, }) =
     }, [errMsg]);
     const route = () => {
         let route = [];
+        if (setting?.islogin) {
+            route.push({
+                path: "/login",
+                element: setting?.loginpage ? setting.loginpage : React__default.createElement(LoginPage, null),
+            });
+        }
         nav.menuSet.forEach((item) => {
             item.menuSetting.forEach((sub) => {
                 route.push({
@@ -576,11 +582,11 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, hashmode = false, }) =
                 },
             ]);
         }
-    }, [hashmode]);
+    }, [hashmode, user]);
     return React__default.createElement(RouterProvider, { router: router });
 };
 const MainLayout = ({ errMsg, startpage, setting, top_banner, nav, user, top, bottom, }) => {
-    const LOGIN = useCallback(() => {
+    useCallback(() => {
         if (startpage)
             return setting?.loginpage ? setting.loginpage : React__default.createElement(LoginPage, null);
         else
@@ -620,7 +626,9 @@ const MainLayout = ({ errMsg, startpage, setting, top_banner, nav, user, top, bo
                         fontSize: "10px",
                     } }, errMsg?.err))));
     };
-    return (React__default.createElement("div", { className: styles$9.main }, errMsg ? (errMsg.isPopup ? (React__default.createElement(ErrWarning, null)) : null) : setting?.islogin && !user ? (React__default.createElement(LOGIN, null)) : (React__default.createElement("div", { className: styles$9.mainframe },
+    return (React__default.createElement("div", { className: styles$9.main }, errMsg ? (errMsg.isPopup ? (React__default.createElement(ErrWarning, null)) : null) : setting?.islogin && !user ? (React__default.createElement("div", null,
+        React__default.createElement(Outlet, null),
+        React__default.createElement(Navigate, { to: "/login", replace: true }))) : (React__default.createElement("div", { className: styles$9.mainframe },
         React__default.createElement(Top, { setting: setting, top: top }),
         React__default.createElement(TOPBANNER, null),
         React__default.createElement("div", { className: styles$9.centerFrame, style: top_banner ? { height: "calc(100vh - 120px)" } : { height: "calc(100vh - 80px)" } },