tntd 1.4.10 → 1.4.12

package/components/Ellipsis/index.js

@@ -14,7 +14,8 @@ import './index.less';
 const tolerance = 0; // In px. Depends on the font you are using
 
 const isEllipsisActive = (e) => {
-    return e.offsetWidth + tolerance < e.scrollWidth || e.offsetHeight < e.scrollHeight;
+    return e.getBoundingClientRect().width + tolerance < e.scrollWidth || e.offsetHeight < e.scrollHeight;
+    // return e.offsetWidth + tolerance < e.scrollWidth || e.offsetHeight < e.scrollHeight;
 };
 
 export default props => {

package/components/Layout/AppList.js

@@ -4,7 +4,7 @@ import { Dropdown, Menu, Input, Select, TreeSelect } from 'antd';
 import { get } from 'lodash';
 import Icon from '../Icon';
 import { getCurrentAppStore, setCurrentAppStore } from './storage';
-import { traverseTree } from './utils';
+import { traverseTree } from '../utils';
 
 const { Option } = Select;
 const MenuList = styled(Menu)`

package/components/Layout/GlobalNavigation/NavigationPopup.js

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
 import cn from 'classnames';
 import styled from 'styled-components';
 import { debounce } from 'lodash';
-import { traverseTree, hasLevel3 } from '../utils';
+import { traverseTree, hasLevel3 } from '../../utils';
 import Icon from '../Iconfont';
 import { getText } from '../../locale';
 
@@ -169,7 +169,7 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
 
         return menus?.reduce((acc, cur) => {
             const column = Math.max(1, ~~((containerRef.current.clientWidth - 32) / 210));
-    
+
             if (!acc.length) {
                 acc.push([cur]);
             } else {
@@ -183,7 +183,7 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
                 const findMinHeightGroup = groups => {
                     let minHeight = Infinity;
                     let index = 0;
-    
+
                     for (let i = 0; i < groups.length; i++) {
                         const height = calcColumnHeight(groups[i]);
                         if (height < minHeight) {
@@ -191,10 +191,10 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
                             minHeight = height;
                         }
                     }
-    
+
                     return groups[index];
                 };
-    
+
                 if (acc.length >= column) {
                     const minHeightGroup = findMinHeightGroup(acc);
                     minHeightGroup?.push(cur);
@@ -206,7 +206,7 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
                     }
                 }
             }
-    
+
             return acc;
         }, []);
     };
@@ -299,7 +299,7 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
                         {
                             menus?.map(menu => (
                                 <li
-                                    className={cn({ active: menu.code === activeTopMenu?.code})}
+                                    className={cn({ active: menu.code === activeTopMenu?.code })}
                                     onClick={() => onSelectAppTab(menu)}
                                 >
                                     {menu?.[language === 'cn' ? 'groupName' : 'enName']}
@@ -322,7 +322,7 @@ export default ({ theme, menus = [], close, actions, popupRef, containerRef }) =
                                                 (group.children || []).map(menu => (
                                                     <MenuItem
                                                         key={menu.code}
-                                                        className={cn({ active: selectedMenuKey === menu.code})}
+                                                        className={cn({ active: selectedMenuKey === menu.code })}
                                                         theme={theme}
                                                         onClick={() => onMenuClick(menu)}
                                                     >

package/components/Layout/GlobalNavigation/index.js

@@ -4,7 +4,7 @@ import cn from 'classnames';
 import styled, { createGlobalStyle, withTheme } from 'styled-components';
 import { uniq } from 'lodash';
 import ActionsContext from '../ActionsContext';
-import { hasLevel3 } from '../utils';
+import { hasLevel3 } from '../../utils';
 import Icon from '../Iconfont';
 import NavigationPopup from './NavigationPopup';
 
@@ -110,7 +110,7 @@ export default withTheme(
             >
                 <Icon type="unordered-list" />
                 <span>{getText('globalNavigation')}</span>
-                <GlobalStyle hasLevel3={hasLevel3(menus)}/>
+                <GlobalStyle hasLevel3={hasLevel3(menus)} />
             </Navigation>
         );
     }

package/components/Layout/OrgAppList.js

@@ -2,15 +2,14 @@ import { useState, useEffect } from 'react';
 import styled, { withTheme, createGlobalStyle } from 'styled-components';
 import { Input, Select, TreeSelect } from 'antd';
 import { get } from 'lodash';
-import { getCurrentAppStore, setCurrentAppStore, getCurrentOrgStore, setCurrentOrgStore, getCurrentOrgTreeStore,setCurrentOrgTreeStore  } from './storage';
-import { traverseTree } from './utils';
+import { getCurrentAppStore, setCurrentAppStore, getCurrentOrgStore, setCurrentOrgStore, getCurrentOrgTreeStore, setCurrentOrgTreeStore } from './storage';
+import { traverseTree } from '../utils';
 
-const { Group:InputGroup } = Input;
-const { TreeNode } = TreeSelect;
+const { Group: InputGroup } = Input;
 const { Option } = Select;
 
 // 机构+应用UI
-const OrgAppsInputGroup= styled(InputGroup)`
+const OrgAppsInputGroup = styled(InputGroup)`
     display: inline-block !important;
     width:auto !important;
     min-width: 260px;
@@ -259,14 +258,14 @@ export default withTheme(
                 return find;
             };
             const current = findByKey(selectedKey || get(currentStore, 'key'));
-            if(type){
+            if (type) {
                 return current;
             }
             return current || dataList[0];
         };
         // 初始化数据函数机构树
         const getInitialSelectedTree = (selecteds, dataList) => {
-            if(selecteds.length){
+            if (selecteds.length) {
                 return selecteds;
             } else {
                 const temp = dataList.map(res => {
@@ -290,7 +289,7 @@ export default withTheme(
 
         // 机构树
         const [selectedOrgTree, setSelectedOrgTree] = useState(getInitialSelectedTree(
-            getCurrentOrgTreeStore(), 
+            getCurrentOrgTreeStore(),
             orgListFormatData
         ));
 
@@ -303,7 +302,7 @@ export default withTheme(
         ));
 
         // org变化事件
-        const changeOrg = (org={}) => {
+        const changeOrg = (org = {}) => {
             setSelectedOrg(org);
             setCurrentOrgStore({
                 name: org?.name,
@@ -314,7 +313,7 @@ export default withTheme(
         };
 
         const changeOrgTree = (val = []) => {
-            if (!val.length){
+            if (!val.length) {
                 val = orgListFormatData.map(res => {
                     return {
                         label: res.title,
@@ -357,16 +356,16 @@ export default withTheme(
         }, [orgList, selectedOrgKey, selectedAppKey, orgAppList]);
 
         // 如果是多签页的模式 则居右对齐
-        let [treeSelectPosition,selectPosition] = [{},{}];
-        if(headerTabs){
+        let [treeSelectPosition, selectPosition] = [{}, {}];
+        if (headerTabs) {
             treeSelectPosition = {
-                dropdownPopupAlign:{
+                dropdownPopupAlign: {
                     points: ['tr', 'br']
                 }
             };
 
             selectPosition = {
-                dropdownAlign:{
+                dropdownAlign: {
                     points: ['tr', 'br']
                 }
             };
@@ -402,7 +401,7 @@ export default withTheme(
             };
         }
 
-        if(!orgAppShow){
+        if (!orgAppShow) {
             return (
                 <>
                     <AppTreeSelect

package/components/Layout/SideMenu.js

@@ -3,7 +3,7 @@ import styled, { withTheme } from 'styled-components';
 import { Menu } from 'antd';
 import { get } from 'lodash';
 import ActionsContext from './ActionsContext';
-import { getSelectedMenuInfo, isGroupMenu, isNewTabMenu, openInNewTab, traverseTree } from './utils';
+import { getSelectedMenuInfo, isGroupMenu, isNewTabMenu, openInNewTab, traverseTree } from '../utils';
 import { setSideMenuStore } from './storage';
 import Iconfont from './Iconfont';
 
@@ -420,7 +420,7 @@ export default withTheme(
                                                         {
                                                             menu?.children?.map(({ code, ...menu }) => (
                                                                 <MenuItem key={code}>
-                                                                    <MenuLink {...menu} style={{ paddingLeft: '24px' }}/>
+                                                                    <MenuLink {...menu} style={{ paddingLeft: '24px' }} />
                                                                 </MenuItem>
                                                             ))
                                                         }

package/components/Layout/index.js

@@ -4,9 +4,8 @@ import EnterpriseLayout from './EnterpriseLayout';
 import PaasLayout from './paaslayout';
 import HeaderNavs from './HeaderNavs';
 import HeaderTabs from './HeaderTabs';
-import getCheckAuth from './checkAuth';
 import AuthContext from '../AuthContext';
-import { safeParseJSON, findMenuInfoByPath } from './utils';
+import { safeParseJSON, findMenuInfoByPath, getCheckAuth } from '../utils';
 import ActionsContext from './ActionsContext';
 import createActions from './createActions';
 import { getLanguageStore } from './storage';
@@ -20,7 +19,7 @@ export const HeaderActionItem = props => (
 export * from './HeaderNavs';
 
 
-const TNTLayout = ({ type, config, ...props }) => {
+const TNTLayout = ({ type, config, showMenuInIframe = false, ...props }) => {
     const headerHeight = props.size === 'large' ? 60 : 50;
     const theme = {
         size: props.size,
@@ -37,7 +36,7 @@ const TNTLayout = ({ type, config, ...props }) => {
         lightBgColor: '#F1F2F5',
         blueBgColor: '#1D4295' // 默认的蓝色主题
     };
-    const isInIframe = self !== top;
+    const isInIframe = showMenuInIframe ? false : (self !== top && !window.navigator.userAgent.includes('mo-fang-app'));
     // 前期拼写错误，导致需要兼容处理
     const extraHeaderActions = props.extraHeaderActions || props.extralHeaderActions;
     const extendMap = typeof props.extendMap === 'string' ? safeParseJSON(props.extendMap, {}) : props.extendMap;
@@ -87,7 +86,7 @@ const TNTLayout = ({ type, config, ...props }) => {
                         />
                     }
                     {
-                        (!type || !['paas','enterprise'].includes(type)) &&
+                        (!type || !['paas', 'enterprise'].includes(type)) &&
                         <Layout
                             menuAlignMode={menuAlignMode}
                             config={config}

package/components/Layout/paaslayout/CompactSideMenu.js

@@ -1,7 +1,7 @@
 import { useState, useEffect, Component } from 'react';
 import styled from 'styled-components';
 import cn from 'classnames';
-import { isNewTabMenu, openInNewTab } from '../utils';
+import { isNewTabMenu, openInNewTab } from '../../utils';
 import Iconfont from '../Iconfont';
 
 const SideMenu = styled.ul`

package/components/Layout/paaslayout/index.js

@@ -3,7 +3,7 @@ import styled, { withTheme } from 'styled-components';
 import cn from 'classnames';
 import { Layout } from 'antd';
 import { get, reduce, isUndefined } from 'lodash';
-import { getSelectedMenuInfo } from '../utils';
+import { getSelectedMenuInfo } from '../../utils';
 import HeaderNavs from '../HeaderNavs';
 import Header from './Header';
 import SideMenu from './SideMenu';
@@ -76,7 +76,7 @@ export default withTheme(
         const [userInfo, setUserInfo] = useState(props.userInfo || {});
         let theme = getThemeStore() || userInfo.theme || 'themeS2';
         // theme === 'default' ? 'themeS2' : theme;
-        theme = ['default','themeS3'].includes(theme) ? 'themeS2' : theme;
+        theme = ['default', 'themeS3'].includes(theme) ? 'themeS2' : theme;
 
         const language = getLanguageStore() || userInfo.lang || 'cn';
         const menusMapByApp = menus.reduce((acc, menu) => {

package/components/Layout/storage.js

@@ -1,4 +1,4 @@
-import { safeParseJSON } from './utils';
+import { safeParseJSON } from '../utils';
 
 export const getSideMenuStore = () => safeParseJSON(localStorage.getItem('sideMenu'), {});
 export const setSideMenuStore = (params = {}) => {

package/components/index.js

@@ -17,3 +17,4 @@ export { default as Img } from './Img';
 export { default as Title } from './Title';
 export { default as Ellipsis } from './Ellipsis';
 export { default as ArrayInput } from './ArrayInput';
+export * from './utils';

package/components/{Layout → utils}/checkAuth.js

@@ -1,6 +1,6 @@
 import { get } from 'lodash';
 
-export default menus => {
+export const getCheckAuth = menus => {
     const getAuthMap = (menus = [], authMap = {}) => {
         return menus.reduce(
             (acc, { code, groupName, functionList, children }) => {
@@ -23,3 +23,5 @@ export default menus => {
 
     return (menuCode, funCode) => !!get(authMap, `${menuCode}${funCode ? `.${funCode}` : ''}`);
 };
+
+export default getCheckAuth;

package/components/utils/findMenuInfoByPath.js

@@ -0,0 +1,39 @@
+import { traverseTree, isGroupMenu } from '.';
+
+
+export const findMenuInfoByPath = (menuTree, path, matchFunc) => {
+    let menu;
+    let subMenu;
+    let matchedSubMenu;
+    let parentMenus;
+
+    if (path) {
+        traverseTree(menuTree, (menu, pnode, pnodes) => {
+            if (!isGroupMenu(menu)) {
+                if (menu?.path === path) {
+                    subMenu = menu;
+                    menu = pnode;
+                    parentMenus = pnodes;
+                    return false;
+                }
+
+                if (!matchedSubMenu && matchFunc && matchFunc(menu)) {
+                    matchedSubMenu = menu;
+                    menu = pnode;
+                    parentMenus = pnodes;
+                }
+            }
+        });
+
+        return {
+            subMenu,
+            matchedSubMenu,
+            menu,
+            parentMenus
+        };
+    }
+
+    return { subMenu, menu, parentMenus };
+};
+
+export default findMenuInfoByPath;

package/components/{Layout/utils.js → utils/index.js}

@@ -1,3 +1,6 @@
+export * from './checkAuth';
+export * from './findMenuInfoByPath';
+
 export const isGroupMenu = menu => menu?.children && !menu?.path;
 
 export const getSelectedMenuInfo = (selectedKey, menus = []) => {
@@ -32,41 +35,6 @@ export const getSelectedMenuInfo = (selectedKey, menus = []) => {
     };
 };
 
-export const findMenuInfoByPath = (menuTree, path, matchFunc) => {
-    let menu;
-    let subMenu;
-    let matchedSubMenu;
-    let parentMenus;
-
-    if (path) {
-        traverseTree(menuTree, (menu, pnode, pnodes) => {
-            if (!isGroupMenu(menu)) {
-                if (menu?.path === path) {
-                    subMenu = menu;
-                    menu = pnode;
-                    parentMenus = pnodes;
-                    return false;
-                }
-
-                if (!matchedSubMenu && matchFunc &&  matchFunc(menu)) {
-                    matchedSubMenu = menu;
-                    menu = pnode;
-                    parentMenus = pnodes; 
-                }
-            }
-        });
-
-        return {
-            subMenu,
-            matchedSubMenu,
-            menu,
-            parentMenus
-        };
-    }
-
-    return { subMenu, menu, parentMenus };
-};
-
 export const hasLevel3 = menus => {
     return menus?.some(
         menu => menu?.children?.some(item => item?.children?.length)