@thefreshop/tb 1.0.4 → 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,
|
|
@@ -256,7 +253,6 @@ const Nav = ({ nav: { menuSet, openIcon, closeIcon }, islogin }) => {
|
|
|
256
253
|
const userMenu = () => {
|
|
257
254
|
let usermenutable = [];
|
|
258
255
|
if (user?.user_group?.group_key === "master" || islogin === false) {
|
|
259
|
-
console.log(menuSet);
|
|
260
256
|
currentMenu?.menuSetting.forEach((m, index) => {
|
|
261
257
|
usermenutable.push(React.createElement(Menu, { key: index, menu_setting: m, openIcon: openIcon, closeIcon: closeIcon, islogin: islogin }));
|
|
262
258
|
});
|
|
@@ -476,7 +472,7 @@ const testuser = {
|
|
|
476
472
|
};
|
|
477
473
|
|
|
478
474
|
const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
479
|
-
const { user, startpage, setStartpage, errMsg,
|
|
475
|
+
const { user, startpage, setStartpage, errMsg, setGlobalpages, setMenupages } = useTbState();
|
|
480
476
|
React.useEffect(() => {
|
|
481
477
|
if (setting.startpage) {
|
|
482
478
|
setStartpage(setting.startpage);
|
|
@@ -502,9 +498,6 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
502
498
|
return null;
|
|
503
499
|
}, [setting?.loginpage, startpage]);
|
|
504
500
|
const TOPBANNER = React.useCallback(() => {
|
|
505
|
-
if (top_banner === undefined) {
|
|
506
|
-
setIsBanner(false);
|
|
507
|
-
}
|
|
508
501
|
return top_banner ? top_banner : null;
|
|
509
502
|
}, [top_banner]);
|
|
510
503
|
const ErrWarning = () => {
|
|
@@ -540,8 +533,8 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
540
533
|
};
|
|
541
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 },
|
|
542
535
|
React.createElement(Top, { setting: setting, top: top }),
|
|
543
|
-
|
|
544
|
-
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)" } },
|
|
545
538
|
React.createElement(Nav, { nav: nav, islogin: setting.islogin ?? false }),
|
|
546
539
|
React.createElement("div", { className: styles$9.contentsFrame },
|
|
547
540
|
React.createElement(Tabs, null),
|