@thefreshop/tb 1.0.13 → 1.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/index.js +11 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.js +12 -4
- package/dist/esm/index.js.map +1 -1
- package/package.json +1 -1
package/dist/cjs/index.js
CHANGED
|
@@ -559,6 +559,12 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, hashmode = false, }) =
|
|
|
559
559
|
}, [errMsg]);
|
|
560
560
|
const route = () => {
|
|
561
561
|
let route = [];
|
|
562
|
+
if (setting?.islogin) {
|
|
563
|
+
route.push({
|
|
564
|
+
path: "/login",
|
|
565
|
+
element: setting?.loginpage ? setting.loginpage : React.createElement(LoginPage, null),
|
|
566
|
+
});
|
|
567
|
+
}
|
|
562
568
|
nav.menuSet.forEach((item) => {
|
|
563
569
|
item.menuSetting.forEach((sub) => {
|
|
564
570
|
route.push({
|
|
@@ -596,11 +602,11 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, hashmode = false, }) =
|
|
|
596
602
|
},
|
|
597
603
|
]);
|
|
598
604
|
}
|
|
599
|
-
}, [hashmode]);
|
|
605
|
+
}, [hashmode, user]);
|
|
600
606
|
return React.createElement(reactRouter.RouterProvider, { router: router });
|
|
601
607
|
};
|
|
602
608
|
const MainLayout = ({ errMsg, startpage, setting, top_banner, nav, user, top, bottom, }) => {
|
|
603
|
-
|
|
609
|
+
React.useCallback(() => {
|
|
604
610
|
if (startpage)
|
|
605
611
|
return setting?.loginpage ? setting.loginpage : React.createElement(LoginPage, null);
|
|
606
612
|
else
|
|
@@ -640,7 +646,9 @@ const MainLayout = ({ errMsg, startpage, setting, top_banner, nav, user, top, bo
|
|
|
640
646
|
fontSize: "10px",
|
|
641
647
|
} }, errMsg?.err))));
|
|
642
648
|
};
|
|
643
|
-
return (React.createElement("div", { className: styles$9.main }, errMsg ? (errMsg.isPopup ? (React.createElement(ErrWarning, null)) : null) : setting?.islogin && !user ? (React.createElement(
|
|
649
|
+
return (React.createElement("div", { className: styles$9.main }, errMsg ? (errMsg.isPopup ? (React.createElement(ErrWarning, null)) : null) : setting?.islogin && !user ? (React.createElement("div", null,
|
|
650
|
+
React.createElement(reactRouter.Outlet, null),
|
|
651
|
+
React.createElement(reactRouter.Navigate, { to: "/login", replace: true }))) : (React.createElement("div", { className: styles$9.mainframe },
|
|
644
652
|
React.createElement(Top, { setting: setting, top: top }),
|
|
645
653
|
React.createElement(TOPBANNER, null),
|
|
646
654
|
React.createElement("div", { className: styles$9.centerFrame, style: top_banner ? { height: "calc(100vh - 120px)" } : { height: "calc(100vh - 80px)" } },
|