@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.
|
@@ -15,8 +15,6 @@ export type ProviderType = {
|
|
|
15
15
|
setStartpage: (value: React.ReactNode) => void;
|
|
16
16
|
SetWarning: (value: ErrMsgType) => void;
|
|
17
17
|
errMsg?: ErrMsgType;
|
|
18
|
-
isBanner: boolean;
|
|
19
|
-
setIsBanner: (value: boolean) => void;
|
|
20
18
|
setGlobalpages: (value: tabType[]) => void;
|
|
21
19
|
addGlobalTabs: (key: string) => void;
|
|
22
20
|
setMenupages: (value: navType) => void;
|
package/dist/esm/index.js
CHANGED
|
@@ -28,7 +28,6 @@ const TbProvider = ({ children }) => {
|
|
|
28
28
|
const [errMsg, setErrMsg] = useState();
|
|
29
29
|
const [globalpages, setGlobalpages] = useState();
|
|
30
30
|
const [menupages, setMenupages] = useState();
|
|
31
|
-
const [isBanner, setIsBanner] = useState(true);
|
|
32
31
|
const addTabs = (tab) => {
|
|
33
32
|
setCurrentTab(tab);
|
|
34
33
|
if (tabs.find((m) => m.key === tab.key) === undefined) {
|
|
@@ -128,8 +127,6 @@ const TbProvider = ({ children }) => {
|
|
|
128
127
|
setStartpage,
|
|
129
128
|
SetWarning,
|
|
130
129
|
errMsg,
|
|
131
|
-
isBanner,
|
|
132
|
-
setIsBanner,
|
|
133
130
|
setGlobalpages,
|
|
134
131
|
addGlobalTabs,
|
|
135
132
|
setMenupages,
|
|
@@ -236,7 +233,6 @@ const Nav = ({ nav: { menuSet, openIcon, closeIcon }, islogin }) => {
|
|
|
236
233
|
const userMenu = () => {
|
|
237
234
|
let usermenutable = [];
|
|
238
235
|
if (user?.user_group?.group_key === "master" || islogin === false) {
|
|
239
|
-
console.log(menuSet);
|
|
240
236
|
currentMenu?.menuSetting.forEach((m, index) => {
|
|
241
237
|
usermenutable.push(React__default.createElement(Menu, { key: index, menu_setting: m, openIcon: openIcon, closeIcon: closeIcon, islogin: islogin }));
|
|
242
238
|
});
|
|
@@ -456,7 +452,7 @@ const testuser = {
|
|
|
456
452
|
};
|
|
457
453
|
|
|
458
454
|
const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
459
|
-
const { user, startpage, setStartpage, errMsg,
|
|
455
|
+
const { user, startpage, setStartpage, errMsg, setGlobalpages, setMenupages } = useTbState();
|
|
460
456
|
useEffect(() => {
|
|
461
457
|
if (setting.startpage) {
|
|
462
458
|
setStartpage(setting.startpage);
|
|
@@ -482,9 +478,6 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
482
478
|
return null;
|
|
483
479
|
}, [setting?.loginpage, startpage]);
|
|
484
480
|
const TOPBANNER = useCallback(() => {
|
|
485
|
-
if (top_banner === undefined) {
|
|
486
|
-
setIsBanner(false);
|
|
487
|
-
}
|
|
488
481
|
return top_banner ? top_banner : null;
|
|
489
482
|
}, [top_banner]);
|
|
490
483
|
const ErrWarning = () => {
|
|
@@ -520,8 +513,8 @@ const TbFrame = ({ setting, top, bottom, nav, top_banner, }) => {
|
|
|
520
513
|
};
|
|
521
514
|
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 },
|
|
522
515
|
React__default.createElement(Top, { setting: setting, top: top }),
|
|
523
|
-
|
|
524
|
-
React__default.createElement("div", { className: styles$9.centerFrame, style:
|
|
516
|
+
React__default.createElement(TOPBANNER, null),
|
|
517
|
+
React__default.createElement("div", { className: styles$9.centerFrame, style: top_banner ? { height: "calc(100vh - 120px)" } : { height: "calc(100vh - 80px)" } },
|
|
525
518
|
React__default.createElement(Nav, { nav: nav, islogin: setting.islogin ?? false }),
|
|
526
519
|
React__default.createElement("div", { className: styles$9.contentsFrame },
|
|
527
520
|
React__default.createElement(Tabs, null),
|