@thefreshop/tb 1.0.5 → 1.0.6
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
CHANGED
|
@@ -48,7 +48,6 @@ const TbProvider = ({ children }) => {
|
|
|
48
48
|
const [errMsg, setErrMsg] = React.useState();
|
|
49
49
|
const [globalpages, setGlobalpages] = React.useState();
|
|
50
50
|
const [menupages, setMenupages] = React.useState();
|
|
51
|
-
const [isBanner, setIsBanner] = React.useState(true);
|
|
52
51
|
const addTabs = (tab) => {
|
|
53
52
|
setCurrentTab(tab);
|
|
54
53
|
if (tabs.find((m) => m.key === tab.key) === undefined) {
|
|
@@ -148,8 +147,6 @@ const TbProvider = ({ children }) => {
|
|
|
148
147
|
setStartpage,
|
|
149
148
|
SetWarning,
|
|
150
149
|
errMsg,
|
|
151
|
-
isBanner,
|
|
152
|
-
setIsBanner,
|
|
153
150
|
setGlobalpages,
|
|
154
151
|
addGlobalTabs,
|
|
155
152
|
setMenupages,
|
|
@@ -475,7 +472,7 @@ const testuser = {
|
|
|
475
472
|
};
|
|
476
473
|
|
|
477
474
|
const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
478
|
-
const { user, startpage, setStartpage, errMsg,
|
|
475
|
+
const { user, startpage, setStartpage, errMsg, setGlobalpages, setMenupages } = useTbState();
|
|
479
476
|
React.useEffect(() => {
|
|
480
477
|
if (setting.startpage) {
|
|
481
478
|
setStartpage(setting.startpage);
|
|
@@ -501,9 +498,6 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
501
498
|
return null;
|
|
502
499
|
}, [setting?.loginpage, startpage]);
|
|
503
500
|
const TOPBANNER = React.useCallback(() => {
|
|
504
|
-
if (top_banner === undefined) {
|
|
505
|
-
setIsBanner(false);
|
|
506
|
-
}
|
|
507
501
|
return top_banner ? top_banner : null;
|
|
508
502
|
}, [top_banner]);
|
|
509
503
|
const ErrWarning = () => {
|
|
@@ -539,8 +533,8 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
539
533
|
};
|
|
540
534
|
return (React.createElement("div", { className: styles$9.main }, errMsg ? (errMsg.isPopup ? (React.createElement(ErrWarning, null)) : null) : setting?.islogin && !user ? (React.createElement(LOGIN, null)) : (React.createElement("div", { className: styles$9.mainframe },
|
|
541
535
|
React.createElement(Top, { setting: setting, top: top }),
|
|
542
|
-
|
|
543
|
-
React.createElement("div", { className: styles$9.centerFrame, style:
|
|
536
|
+
React.createElement(TOPBANNER, null),
|
|
537
|
+
React.createElement("div", { className: styles$9.centerFrame, style: top_banner ? { height: "calc(100vh - 120px)" } : { height: "calc(100vh - 80px)" } },
|
|
544
538
|
React.createElement(Nav, { nav: nav, islogin: setting.islogin ?? false }),
|
|
545
539
|
React.createElement("div", { className: styles$9.contentsFrame },
|
|
546
540
|
React.createElement(Tabs, null),
|