@thefreshop/tb 1.0.12 → 1.0.14

package/dist/cjs/types/index.d.ts

@@ -3,13 +3,3 @@ export * from "./searchbox.type";
 export * from "./user.types";
 export * from "./tbframe.types";
 export * from "./provider.types";
-import { tabType } from "./provider.types";
-export interface tbframeType {
-    islogin?: boolean;
-    isgroup?: boolean;
-    isgroupauth?: boolean;
-    startpage?: React.ReactNode;
-    loginpage?: React.ReactNode;
-    logoutComponent?: React.ReactNode;
-    globalpages?: tabType[];
-}

package/dist/cjs/types/provider.types.d.ts

@@ -1,5 +1,5 @@
 import { userType } from "./user.types";
-import { navType } from "./tbframe.types";
+import { navType, tabType } from "./tbframe.types";
 export type ProviderType = {
     topkey: string;
     setTopkey: (value: string) => void;
@@ -21,12 +21,6 @@ export type ProviderType = {
     setMenupages: (value: navType) => void;
     goTabs: (key: string) => void;
 };
-export type tabType = {
-    title: string;
-    key: string;
-    page?: React.ReactNode;
-    noremove?: boolean;
-};
 export type ErrMsgType = {
     err?: string;
     errType?: string;

package/dist/cjs/types/tbframe.types.d.ts

@@ -1,3 +1,12 @@
+export interface tbframeType {
+    islogin?: boolean;
+    isgroup?: boolean;
+    isgroupauth?: boolean;
+    startpage?: React.ReactNode;
+    loginpage?: React.ReactNode;
+    logoutComponent?: React.ReactNode;
+    globalpages?: tabType[];
+}
 export declare const baseAdminDat: TbFrameType;
 export type TbFrameType = {
     admin_account_id: number;
@@ -26,21 +35,25 @@ export type topType = {
 export type bottomType = {
     bottomRight?: React.ReactNode;
 };
-export type menuType = {
+export type tabType = {
     title: string;
-    icon?: React.ReactElement | JSX.Element;
     key: string;
-    children?: menuType[];
     page?: React.ReactNode;
+    noremove?: boolean;
+};
+export type menuType = {
+    tab: tabType;
+    icon?: React.ReactElement | JSX.Element;
+    children?: menuType[];
     hasPage?: boolean;
     defalultOpen?: boolean;
 };
 export type navType = {
-    menuSet: menuSet[];
+    menuSet: menuSetType[];
     openIcon?: React.ReactElement | JSX.Element;
     closeIcon?: React.ReactElement | JSX.Element;
 };
-export type menuSet = {
+export type menuSetType = {
     parentkey?: string;
     menuSetting: menuType[];
 };

package/dist/esm/index.js

@@ -1,9 +1,9 @@
 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, Tree, ConfigProvider, Result, Spin } from 'antd';
+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';
 import moment$1 from 'moment-timezone';
 import require$$1 from 'react-dom';
 import dayjs from 'dayjs';
@@ -116,7 +116,7 @@ const TbProvider = ({ children }) => {
         menupages?.menuSet.forEach((item) => {
             item.menuSetting.forEach((sub) => {
                 sub.children?.forEach((page) => {
-                    if (page.key === key)
+                    if (page.tab.key === key)
                         gotab = page;
                 });
             });
@@ -194,7 +194,7 @@ var styles$9 = {"main":"frame-module_main__3msGf","mainframe":"frame-module_main
 styleInject(css_248z$b);
 
 const topbase = {
-    title: 'title'};
+    title: "title"};
 
 var css_248z$a = ".top-module_topframe__LhKDg{align-items:center;border-bottom:1px solid #aaa;color:#ccc;display:flex;height:80px;justify-content:left;text-align:center}.top-module_top_left__MBLyP{align-items:center;color:#333;display:flex;gap:4px}.top-module_toplogo__lQMPi{background-color:#eee;height:70px}.top-module_top_menu__vOqqG{display:flex;flex-direction:row}.top-module_top_menu_item__pHknH{display:flex;flex-direction:column;width:120px}.top-module_top_menu_item_icon__-Ckvh{font-size:30px}.top-module_top_menu_item_text__SmZnj{font-size:20px}.top-module_menu_nomal__n4Rl-{color:#ccc}.top-module_menu_hover__KmK0A,.top-module_menu_select__w3Jdd{background-color:#fff;color:#333;cursor:pointer}\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRvcC5tb2R1bGUuY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUdJLGtCQUFtQixDQUVuQiw0QkFBNkIsQ0FFN0IsVUFBVyxDQU5YLFlBQWEsQ0FHYixXQUFZLENBRlosb0JBQXFCLENBSXJCLGlCQUVKLENBRUEsNEJBR0ksa0JBQW1CLENBQ25CLFVBQVcsQ0FIWCxZQUFhLENBQ2IsT0FHSixDQUVBLDJCQUVJLHFCQUFzQixDQUR0QixXQUVKLENBRUEsNEJBQ0ksWUFBYSxDQUNiLGtCQUNKLENBQ0EsaUNBQ0ksWUFBYSxDQUNiLHFCQUFzQixDQUN0QixXQUNKLENBRUEsc0NBQ0ksY0FDSixDQUVBLHNDQUNJLGNBQ0osQ0FFQSw4QkFDSSxVQUNKLENBT0EsNkRBQ0kscUJBQXNCLENBQ3RCLFVBQVcsQ0FDWCxjQUNKIiwiZmlsZSI6InRvcC5tb2R1bGUuY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLnRvcGZyYW1lIHtcclxuICAgIGRpc3BsYXk6IGZsZXg7XHJcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGxlZnQ7XHJcbiAgICBhbGlnbi1pdGVtczogY2VudGVyO1xyXG4gICAgaGVpZ2h0OiA4MHB4O1xyXG4gICAgYm9yZGVyLWJvdHRvbTogMXB4IHNvbGlkICNhYWE7XHJcbiAgICB0ZXh0LWFsaWduOiBjZW50ZXI7XHJcbiAgICBjb2xvcjogI2NjYztcclxufVxyXG5cclxuLnRvcF9sZWZ0IHtcclxuICAgIGRpc3BsYXk6IGZsZXg7XHJcbiAgICBnYXA6IDRweDtcclxuICAgIGFsaWduLWl0ZW1zOiBjZW50ZXI7XHJcbiAgICBjb2xvcjogIzMzMztcclxufVxyXG5cclxuLnRvcGxvZ28ge1xyXG4gICAgaGVpZ2h0OiA3MHB4O1xyXG4gICAgYmFja2dyb3VuZC1jb2xvcjogI2VlZTtcclxufVxyXG5cclxuLnRvcF9tZW51IHtcclxuICAgIGRpc3BsYXk6IGZsZXg7XHJcbiAgICBmbGV4LWRpcmVjdGlvbjogcm93O1xyXG59XHJcbi50b3BfbWVudV9pdGVtIHtcclxuICAgIGRpc3BsYXk6IGZsZXg7XHJcbiAgICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xyXG4gICAgd2lkdGg6IDEyMHB4O1xyXG59XHJcblxyXG4udG9wX21lbnVfaXRlbV9pY29uIHtcclxuICAgIGZvbnQtc2l6ZTogMzBweDtcclxufVxyXG5cclxuLnRvcF9tZW51X2l0ZW1fdGV4dCB7XHJcbiAgICBmb250LXNpemU6IDIwcHg7XHJcbn1cclxuXHJcbi5tZW51X25vbWFsIHtcclxuICAgIGNvbG9yOiAjY2NjO1xyXG59XHJcbi5tZW51X2hvdmVyIHtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZmY7XHJcbiAgICBjb2xvcjogIzMzMztcclxuICAgIGN1cnNvcjogcG9pbnRlcjtcclxufVxyXG5cclxuLm1lbnVfc2VsZWN0IHtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZmY7XHJcbiAgICBjb2xvcjogIzMzMztcclxuICAgIGN1cnNvcjogcG9pbnRlcjtcclxufVxyXG4iXX0= */";
 var styles$8 = {"topframe":"top-module_topframe__LhKDg","top_left":"top-module_top_left__MBLyP","toplogo":"top-module_toplogo__lQMPi","top_menu":"top-module_top_menu__vOqqG","top_menu_item":"top-module_top_menu_item__pHknH","top_menu_item_icon":"top-module_top_menu_item_icon__-Ckvh","top_menu_item_text":"top-module_top_menu_item_text__SmZnj","menu_nomal":"top-module_menu_nomal__n4Rl-","menu_hover":"top-module_menu_hover__KmK0A"};
@@ -260,7 +260,7 @@ const Nav = ({ nav: { menuSet, openIcon, closeIcon }, islogin }) => {
         }
         else {
             const userCurrentMenu = currentMenu?.menuSetting.filter((m) => {
-                return user?.user_group?.group_menu_auth.includes(m.key);
+                return user?.user_group?.group_menu_auth.includes(m.tab.key);
             });
             userCurrentMenu?.forEach((m, index) => {
                 usermenutable.push(React__default.createElement(Menu, { key: index, menu_setting: m, openIcon: openIcon, closeIcon: closeIcon, islogin: islogin }));
@@ -270,7 +270,8 @@ const Nav = ({ nav: { menuSet, openIcon, closeIcon }, islogin }) => {
     };
     return React__default.createElement("div", { className: styles$9.naviFrame }, userMenu());
 };
-const Menu = ({ menu_setting: { title, icon, key, children, hasPage, page, defalultOpen }, openIcon, closeIcon, islogin, }) => {
+const Menu = ({ menu_setting: { tab, icon, children, hasPage, defalultOpen }, openIcon, closeIcon, islogin, }) => {
+    const { title, key, page } = tab;
     const [hover, setHover] = useState(false);
     const [subOpen, setSubOpen] = useState(false);
     const { addTabs, currentTab, user } = useTbState();
@@ -291,7 +292,7 @@ const Menu = ({ menu_setting: { title, icon, key, children, hasPage, page, defal
         }
         else {
             const userCurrentMenu = children?.filter((m) => {
-                return user?.user_group?.group_menu_auth.includes(m.key);
+                return user?.user_group?.group_menu_auth.includes(m.tab.key);
             });
             userCurrentMenu?.forEach((m, index) => {
                 usersubmenutable.push(React__default.createElement(SubMenu, { key: index, menu_setting: m }));
@@ -321,7 +322,8 @@ const Menu = ({ menu_setting: { title, icon, key, children, hasPage, page, defal
             React__default.createElement("div", { className: styles$9.nav_open }, children && (subOpen ? React__default.createElement("div", null, openIcon) : React__default.createElement("div", null, closeIcon)))),
         children && subOpen && userSubMenu()));
 };
-const SubMenu = ({ menu_setting: { title, icon, key, page, hasPage } }) => {
+const SubMenu = ({ menu_setting: { tab, icon, hasPage } }) => {
+    const { title, key, page } = tab;
     const [hover, setHover] = useState(false);
     const { addTabs, currentTab } = useTbState();
     const navigate = useNavigate();
@@ -381,11 +383,11 @@ const Tabs = ({ nav: { menuSet, openIcon, closeIcon } }) => {
         // 2-1. 메뉴 페이지에서 찾기
         menuSet.forEach((item) => {
             item.menuSetting.forEach((sub) => {
-                if (sub.key === pathKey)
+                if (sub.tab.key === pathKey)
                     tabInfo = sub;
                 else {
                     sub.children?.forEach((page) => {
-                        if (page.key === pathKey)
+                        if (page.tab.key === pathKey)
                             tabInfo = page;
                     });
                 }
@@ -403,8 +405,7 @@ const Tabs = ({ nav: { menuSet, openIcon, closeIcon } }) => {
     useEffect(() => {
         const pathKey = location.pathname.substring(1); // 맨 앞의 '/' 제거
         findTabs(pathKey);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []); // 이 효과는 컴포넌트가 처음 마운트될 때 한 번만 실행됩니다.
+    }, []);
     return (React__default.createElement("div", { className: styles$6.tabFrame }, tabs?.map((m) => {
         return (React__default.createElement("div", { key: m.key, className: `${styles$6.tab_item} ${currentTab?.key === m.key ? styles$6.tab_select : styles$6.tab_normal}` },
             React__default.createElement("div", { className: styles$6.tab_item_text, onClick: () => {
@@ -538,16 +539,22 @@ 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({
-                    path: "/" + sub.key,
-                    element: sub.page,
+                    path: "/" + sub.tab.key,
+                    element: sub.tab.page,
                 });
                 sub.children?.forEach((page) => {
                     route.push({
-                        path: "/" + page.key,
-                        element: page.page,
+                        path: "/" + page.tab.key,
+                        element: page.tab.page,
                     });
                 });
             });
@@ -575,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
@@ -619,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)" } },
@@ -24231,16 +24240,9 @@ const InputSearch = ({ title, value, disabled = false, onChange, activeEnter, })
 const AuthTable = ({ top, menuSetting }) => {
     const { user } = useTbState();
     const productList = [];
-    const onSelect = (selectedKeys, info) => {
-        console.log("selected", selectedKeys, info);
-    };
-    const onCheck = (checkedKeys, info) => {
-        console.log("onCheck", checkedKeys, info);
-    };
     return (React__default.createElement("div", null,
         React__default.createElement("div", null, "AuthTable123"),
         React__default.createElement("div", null, JSON.stringify(user)),
-        React__default.createElement(Tree, { checkable: true, defaultExpandedKeys: ["0-0-0", "0-0-1"], defaultSelectedKeys: ["0-0-0", "0-0-1"], defaultCheckedKeys: ["0-0-0", "0-0-1"], onSelect: onSelect, onCheck: onCheck, treeData: menuSetting }),
         React__default.createElement(AntBaseTable, { rowKey: "base_product_id", rowName: "base_product_id", columns: columns, dataSource: productList })));
 };
 const columns = [