tntd 1.4.10 → 1.4.12

package/es/Ellipsis/index.js

@@ -32,7 +32,7 @@ import './index.less';
 var tolerance = 0; // In px. Depends on the font you are using
 
 var isEllipsisActive = function 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 (function (props) {

package/es/Layout/AppList.js

@@ -66,7 +66,7 @@ import styled, { withTheme } from 'styled-components';
 import { get } from 'lodash';
 import Icon from '../Icon';
 import { getCurrentAppStore, setCurrentAppStore } from './storage';
-import { traverseTree } from './utils';
+import { traverseTree } from '../utils';
 var Option = _Select.Option;
 var MenuList = styled(_Menu)(_templateObject()); // 新版UI
 

package/es/Layout/GlobalNavigation/NavigationPopup.js

@@ -82,7 +82,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';
 var SearchArea = styled.div(_templateObject(), function (props) {

package/es/Layout/GlobalNavigation/index.js

@@ -42,7 +42,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';
 var Navigation = styled.li(_templateObject(), function (_ref) {

package/es/Layout/OrgAppList.js

@@ -1,7 +1,7 @@
-import "antd/lib/select/style";
-import _Select from "antd/lib/select";
 import "antd/lib/tree-select/style";
 import _TreeSelect from "antd/lib/tree-select";
+import "antd/lib/select/style";
+import _Select from "antd/lib/select";
 import "antd/lib/input/style";
 import _Input from "antd/lib/input";
 
@@ -57,9 +57,8 @@ import { useState, useEffect } from 'react';
 import styled, { withTheme, createGlobalStyle } from 'styled-components';
 import { get } from 'lodash';
 import { getCurrentAppStore, setCurrentAppStore, getCurrentOrgStore, setCurrentOrgStore, getCurrentOrgTreeStore, setCurrentOrgTreeStore } from './storage';
-import { traverseTree } from './utils';
+import { traverseTree } from '../utils';
 var InputGroup = _Input.Group;
-var TreeNode = _TreeSelect.TreeNode;
 var Option = _Select.Option; // 机构+应用UI
 
 var OrgAppsInputGroup = styled(InputGroup)(_templateObject(), function (props) {

package/es/Layout/SideMenu.js

@@ -47,7 +47,7 @@ import { useState, useEffect, useContext } from 'react';
 import styled, { withTheme } from 'styled-components';
 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';
 var color = 'rgba(255,255,255,.85)';

package/es/Layout/index.js

@@ -10,9 +10,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';
@@ -24,7 +23,9 @@ export * from './HeaderNavs';
 var TNTLayout = function TNTLayout(_ref) {
   var type = _ref.type,
       config = _ref.config,
-      props = _objectWithoutProperties(_ref, ["type", "config"]);
+      _ref$showMenuInIframe = _ref.showMenuInIframe,
+      showMenuInIframe = _ref$showMenuInIframe === void 0 ? false : _ref$showMenuInIframe,
+      props = _objectWithoutProperties(_ref, ["type", "config", "showMenuInIframe"]);
 
   var headerHeight = props.size === 'large' ? 60 : 50;
   var theme = {
@@ -47,7 +48,7 @@ var TNTLayout = function TNTLayout(_ref) {
     blueBgColor: '#1D4295' // 默认的蓝色主题
 
   };
-  var isInIframe = self !== top; // 前期拼写错误，导致需要兼容处理
+  var isInIframe = showMenuInIframe ? false : self !== top && !window.navigator.userAgent.includes('mo-fang-app'); // 前期拼写错误，导致需要兼容处理
 
   var extraHeaderActions = props.extraHeaderActions || props.extralHeaderActions;
   var extendMap = typeof props.extendMap === 'string' ? safeParseJSON(props.extendMap, {}) : props.extendMap;

package/es/Layout/paaslayout/CompactSideMenu.js

@@ -31,7 +31,7 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 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';
 var SideMenu = styled.ul(_templateObject());
 var SubMenu = styled.ul(_templateObject2());

package/es/Layout/paaslayout/index.js

@@ -31,7 +31,7 @@ import { useState, useEffect } from 'react';
 import styled, { withTheme } from 'styled-components';
 import cn from 'classnames';
 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';

package/es/Layout/storage.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { safeParseJSON } from './utils';
+import { safeParseJSON } from '../utils';
 export var getSideMenuStore = function getSideMenuStore() {
   return safeParseJSON(localStorage.getItem('sideMenu'), {});
 };

package/es/index.js

@@ -16,4 +16,5 @@ export { default as Select } from './Select';
 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 { default as ArrayInput } from './ArrayInput';
+export * from './utils';

package/es/utils/checkAuth.js

@@ -0,0 +1,30 @@
+import { get } from 'lodash';
+export var getCheckAuth = function getCheckAuth(menus) {
+  var getAuthMap = function getAuthMap() {
+    var menus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var authMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    return menus.reduce(function (acc, _ref) {
+      var code = _ref.code,
+          groupName = _ref.groupName,
+          functionList = _ref.functionList,
+          children = _ref.children;
+
+      if (groupName) {
+        return getAuthMap(children, acc);
+      } else {
+        acc[code] = acc[code] || {};
+        acc[code] = (functionList || []).reduce(function (acc, curFunc) {
+          acc[curFunc.code] = curFunc.hasPermission;
+          return acc;
+        }, acc[code]);
+        return acc;
+      }
+    }, authMap);
+  };
+
+  var authMap = getAuthMap(menus);
+  return function (menuCode, funCode) {
+    return !!get(authMap, "".concat(menuCode).concat(funCode ? ".".concat(funCode) : ''));
+  };
+};
+export default getCheckAuth;

package/es/utils/findMenuInfoByPath.js

@@ -0,0 +1,41 @@
+import { traverseTree, isGroupMenu } from '.';
+export var findMenuInfoByPath = function findMenuInfoByPath(menuTree, path, matchFunc) {
+  var menu;
+  var subMenu;
+  var matchedSubMenu;
+  var parentMenus;
+
+  if (path) {
+    traverseTree(menuTree, function (menu, pnode, pnodes) {
+      if (!isGroupMenu(menu)) {
+        var _menu;
+
+        if (((_menu = menu) == null ? void 0 : _menu.path) === path) {
+          subMenu = menu;
+          menu = pnode;
+          parentMenus = pnodes;
+          return false;
+        }
+
+        if (!matchedSubMenu && matchFunc && matchFunc(menu)) {
+          matchedSubMenu = menu;
+          menu = pnode;
+          parentMenus = pnodes;
+        }
+      }
+    });
+    return {
+      subMenu: subMenu,
+      matchedSubMenu: matchedSubMenu,
+      menu: menu,
+      parentMenus: parentMenus
+    };
+  }
+
+  return {
+    subMenu: subMenu,
+    menu: menu,
+    parentMenus: parentMenus
+  };
+};
+export default findMenuInfoByPath;

package/es/utils/index.js

@@ -0,0 +1,99 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+
+export * from './checkAuth';
+export * from './findMenuInfoByPath';
+export var isGroupMenu = function isGroupMenu(menu) {
+  return (menu == null ? void 0 : menu.children) && !(menu == null ? void 0 : menu.path);
+};
+export var getSelectedMenuInfo = function getSelectedMenuInfo(selectedKey) {
+  var menus = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var subMenu;
+  var menu;
+  var parentMenus = [];
+
+  if (selectedKey) {
+    traverseTree(menus, function (node, pnode, pnodes) {
+      if (!isGroupMenu(node) && node.code === selectedKey) {
+        subMenu = node;
+        menu = pnode;
+        parentMenus = pnodes;
+        return false;
+      }
+    });
+  } else {
+    // 默认找到第一个菜单项
+    traverseTree(menus, function (node, pnode, pnodes) {
+      if (!isGroupMenu(node)) {
+        subMenu = node;
+        menu = pnode;
+        parentMenus = pnodes;
+        return false;
+      }
+    });
+  }
+
+  return {
+    subMenu: subMenu,
+    menu: menu,
+    parentMenus: parentMenus
+  };
+};
+export var hasLevel3 = function hasLevel3(menus) {
+  return menus == null ? void 0 : menus.some(function (menu) {
+    var _menu$children;
+
+    return menu == null ? void 0 : (_menu$children = menu.children) == null ? void 0 : _menu$children.some(function (item) {
+      var _item$children;
+
+      return item == null ? void 0 : (_item$children = item.children) == null ? void 0 : _item$children.length;
+    });
+  });
+};
+export var isNewTabMenu = function isNewTabMenu(menu) {
+  var _ref = menu || {},
+      target = _ref.target,
+      path = _ref.path;
+
+  return target === '_blank' || /^http/i.test(path) && /blankType=newTarget/.test(path);
+};
+export var openInNewTab = function openInNewTab(path) {
+  window.open(path, '_blank');
+};
+export var traverseTree = function traverseTree(treeData, callback, pnode) {
+  var pnodes = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  (treeData || []).every(function (node, index) {
+    var result;
+
+    if (callback) {
+      result = callback(node, pnode, (pnodes == null ? void 0 : pnodes.length) ? pnodes : [pnode].filter(function (item) {
+        return !!item;
+      }), index);
+    } // 回调函数返回false则终止遍历
+
+
+    if (result !== false) {
+      node && traverseTree(node.children || [], callback, node, [node].concat(_toConsumableArray(pnodes)));
+    }
+
+    return result !== false;
+  });
+  return treeData;
+};
+export var safeParseJSON = function safeParseJSON(str, defaultObj) {
+  var result;
+
+  try {
+    result = JSON.parse(str);
+  } catch (err) {
+    console.warn('json parse error:', err);
+    result = typeof defaultObj === 'undefined' ? str : defaultObj;
+  }
+
+  return result || defaultObj;
+};

package/lib/Ellipsis/index.js

@@ -44,7 +44,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var tolerance = 0; // In px. Depends on the font you are using
 
 var isEllipsisActive = function 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;
 };
 
 var _default = function _default(props) {

package/lib/Layout/AppList.js

@@ -37,7 +37,7 @@ var _Icon = _interopRequireDefault(require("../Icon"));
 
 var _storage = require("./storage");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 var _this = void 0;
 

package/lib/Layout/EnterpriseLayout/Header.js

@@ -0,0 +1,113 @@
+"use strict";
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = require("react");
+
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
+
+var _Icon = _interopRequireDefault(require("../../Icon"));
+
+var _AppList = _interopRequireDefault(require("../AppList"));
+
+var _OrgAppList = _interopRequireDefault(require("../OrgAppList"));
+
+var _HeaderActions = _interopRequireDefault(require("./HeaderActions"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _templateObject2() {
+  var data = _taggedTemplateLiteral(["\n    flex: 1;\n    .isInIframe & {\n        display: none;\n    }\n"]);
+
+  _templateObject2 = function _templateObject2() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject() {
+  var data = _taggedTemplateLiteral(["\n    position: relative;\n    z-index: 201;\n    height: ", ";\n    display: flex;\n    color: rgba(255,255,255,.85);\n    background: #fff;\n\n    .hasHeaderTabs & {\n        background: #191D29;\n        .tnt-layout-header-content {\n            display: none;\n        }\n    }\n\n    .tnt-themeS3.hasHeaderTabs &{\n        background: ", "; //#1D4295 !important;\n    }\n\n    .isInIframe.noAppList &,\n    .isEmptyLayout & {\n        display: none;\n    }\n    .tnt-themeS1 & {\n        background: #FFFFFF;\n        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.15);\n    }\n    .tnt-themeS1.compatible & {\n        /* background: #323b4a; */\n    }\n    padding-right: 20px;\n    background: #FFFFFF;\n    box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);\n    .compatible & {\n        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);\n    }\n    transition: box-shadow .2s cubic-bezier(.4,0,.2,1), -webkit-box-shadow .2s cubic-bezier(.4,0,.2,1);\n\n    .sidebar-collapsed-controller {\n        text-align: center;\n        width: ", ";\n        line-height: ", ";\n        height: ", ";\n        cursor: pointer;\n        color: ", ";\n        margin-right: 10px;\n\n        & > .tnt-icon {\n            font-size: 16px;\n            .large-size & {\n                font-size: 20px;\n            }\n        }\n\n        i {\n            position: relative;\n            top: -1px;\n            vertical-align: sub;\n        }\n\n        &:hover {\n            background-color: rgba(0,0,0,.06);\n        }\n\n        .tnt-themeS1 & {\n            /* color: rgba(255,255,255,.85); */\n            color: ", ";\n        }\n        .large-size & {\n            font-size: 18px;\n        }\n        .isInIframe & {\n            display: none;\n        }\n    }\n"]);
+
+  _templateObject = function _templateObject() {
+    return data;
+  };
+
+  return data;
+}
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+var Header = _styledComponents["default"].div(_templateObject(), function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.blueBgColor, " !important");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.primaryTextColor);
+}, function (props) {
+  return "".concat(props.theme.primaryTextColor);
+});
+
+var Content = _styledComponents["default"].div(_templateObject2());
+
+var _default = (0, _styledComponents.withTheme)(function (props) {
+  var collapsed = props.collapsed,
+      _props$collapseIconPl = props.collapseIconPlacement,
+      collapseIconPlacement = _props$collapseIconPl === void 0 ? 'right' : _props$collapseIconPl,
+      selectedAppKey = props.selectedAppKey,
+      appList = props.appList,
+      orgAppShow = props.orgAppShow,
+      orgAppList = props.orgAppList,
+      selectedOrgKey = props.selectedOrgKey,
+      orgList = props.orgList,
+      headerTabs = props.headerTabs,
+      onAppChange = props.onAppChange,
+      onOrgChange = props.onOrgChange,
+      onCollapseChange = props.onCollapseChange,
+      extraActions = props.extraActions;
+  var headerRef = (0, _react.useRef)();
+  return React.createElement(Header, {
+    className: "tnt-layout-header",
+    ref: headerRef
+  }, collapseIconPlacement === 'right' && React.createElement("div", {
+    className: "sidebar-collapsed-controller",
+    onClick: onCollapseChange
+  }, React.createElement(_Icon["default"], {
+    type: "menu-".concat(collapsed ? 'unfold' : 'fold')
+  })), headerTabs, orgList && React.createElement(_OrgAppList["default"], {
+    orgAppShow: orgAppShow,
+    selectedOrgKey: selectedOrgKey,
+    orgList: orgList,
+    onOrgChange: onOrgChange,
+    selectedAppKey: selectedAppKey,
+    orgAppList: orgAppList,
+    onAppChange: onAppChange
+  }), appList && !orgList && React.createElement(_AppList["default"], {
+    items: appList,
+    selectedKey: selectedAppKey,
+    onChange: onAppChange
+  }), React.createElement(Content, {
+    className: "tnt-layout-header-content"
+  }, props.children), React.createElement(_HeaderActions["default"], _extends({}, props, {
+    headerRef: headerRef
+  }), extraActions));
+});
+
+exports["default"] = _default;

package/lib/Layout/EnterpriseLayout/HeaderActions.js

@@ -0,0 +1,104 @@
+"use strict";
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+require("antd/lib/divider/style");
+
+var _divider = _interopRequireDefault(require("antd/lib/divider"));
+
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
+
+var _GlobalNavigation = _interopRequireDefault(require("../GlobalNavigation"));
+
+var _Application = _interopRequireDefault(require("../Application"));
+
+var _Avatar = _interopRequireDefault(require("./Avatar"));
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function _templateObject() {
+  var data = _taggedTemplateLiteral(["\n    list-style: none;\n    display: inline-block;\n    line-height: ", ";\n    margin: 0 0 0 20px;\n    .hasHeaderTabs & {\n        margin: 0;\n    }\n    padding: 0;\n    white-space: nowrap;\n\n    .isInIframe & {\n        display: none;\n    }\n\n    & > li {\n        height: 100%;\n        display: inline-block;\n        vertical-align: top;\n        cursor: pointer;\n        font-size: 20px;\n        margin: 0 7.5px;\n        color: ", ";\n        .large-size & {\n            margin: 0 10px;\n        }\n        .tnt-themeS1 & {\n            /* color: rgba(255,255,255,.85); */\n        }\n        &:last-of-type {\n            margin-right: 0;\n        }\n        .hasHeaderTabs:not(.tnt-themeS1) & {\n            color: rgba(255,255,255,.8);\n        }\n    }\n"]);
+
+  _templateObject = function _templateObject() {
+    return data;
+  };
+
+  return data;
+}
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+var Actions = _styledComponents["default"].ul(_templateObject(), function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.headerActionsColor);
+});
+
+var _default = (0, _styledComponents.withTheme)(function (props) {
+  var _props$config = props.config;
+  _props$config = _props$config === void 0 ? {} : _props$config;
+
+  var _props$config$theme = _props$config.theme,
+      theme = _props$config$theme === void 0 ? true : _props$config$theme,
+      _props$config$avatar = _props$config.avatar,
+      avatar = _props$config$avatar === void 0 ? true : _props$config$avatar,
+      _props$config$languag = _props$config.language,
+      language = _props$config$languag === void 0 ? true : _props$config$languag,
+      _props$config$applica = _props$config.application,
+      application = _props$config$applica === void 0 ? false : _props$config$applica,
+      _props$config$globalN = _props$config.globalNavigation,
+      globalNavigation = _props$config$globalN === void 0 ? false : _props$config$globalN,
+      compatible = props.theme.compatible,
+      _props$userInfo = props.userInfo,
+      userInfo = _props$userInfo === void 0 ? {} : _props$userInfo,
+      menus = props.menus,
+      apps = props.apps,
+      extraActions = props.extraActions,
+      headerRef = props.headerRef,
+      onLanguageChange = props.onLanguageChange,
+      onThemeChange = props.onThemeChange,
+      onApplicationChange = props.onApplicationChange,
+      onAppChange = props.onAppChange,
+      onCollapseChange = props.onCollapseChange,
+      onPersonalSetting = props.onPersonalSetting,
+      onChangePassword = props.onChangePassword,
+      onLogout = props.onLogout,
+      onLogoClick = props.onLogoClick,
+      rest = _objectWithoutProperties(props, ["config", "theme", "userInfo", "menus", "apps", "extraActions", "headerRef", "onLanguageChange", "onThemeChange", "onApplicationChange", "onAppChange", "onCollapseChange", "onPersonalSetting", "onChangePassword", "onLogout", "onLogoClick"]);
+
+  return React.createElement(Actions, rest, extraActions, globalNavigation && React.createElement(_GlobalNavigation["default"], {
+    headerRef: headerRef,
+    menus: menus
+  }), application && React.createElement(_Application["default"], {
+    language: userInfo.lang,
+    apps: apps,
+    onChange: onApplicationChange
+  }), avatar && React.createElement(React.Fragment, null, React.createElement(_divider["default"], {
+    type: "vertical"
+  }), React.createElement(_Avatar["default"], {
+    userInfo: userInfo,
+    onThemeChange: onThemeChange,
+    onPersonalSetting: onPersonalSetting,
+    onChangePassword: onChangePassword,
+    onLogout: onLogout,
+    config: {
+      theme: theme,
+      language: language
+    }
+  })));
+});
+
+exports["default"] = _default;

package/lib/Layout/GlobalNavigation/NavigationPopup.js

@@ -13,7 +13,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _lodash = require("lodash");
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 

package/lib/Layout/GlobalNavigation/index.js

@@ -19,7 +19,7 @@ var _lodash = require("lodash");
 
 var _ActionsContext = _interopRequireDefault(require("../ActionsContext"));
 
-var _utils = require("../utils");
+var _utils = require("../../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 

package/lib/Layout/OrgAppList.js

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/select/style");
-
-var _select = _interopRequireDefault(require("antd/lib/select"));
-
 require("antd/lib/tree-select/style");
 
 var _treeSelect = _interopRequireDefault(require("antd/lib/tree-select"));
 
+require("antd/lib/select/style");
+
+var _select = _interopRequireDefault(require("antd/lib/select"));
+
 require("antd/lib/input/style");
 
 var _input = _interopRequireDefault(require("antd/lib/input"));
@@ -27,7 +27,7 @@ var _lodash = require("lodash");
 
 var _storage = require("./storage");
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
@@ -84,7 +84,6 @@ function _templateObject() {
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
 var InputGroup = _input["default"].Group;
-var TreeNode = _treeSelect["default"].TreeNode;
 var Option = _select["default"].Option; // 机构+应用UI
 
 var OrgAppsInputGroup = (0, _styledComponents["default"])(InputGroup)(_templateObject(), function (props) {

package/lib/Layout/SideMenu.js

@@ -19,7 +19,7 @@ var _lodash = require("lodash");
 
 var _ActionsContext = _interopRequireDefault(require("./ActionsContext"));
 
-var _utils = require("./utils");
+var _utils = require("../utils");
 
 var _storage = require("./storage");