tntd 1.4.6 → 1.4.7

package/lib/Layout/GlobalNavigation/index.js

@@ -1,165 +1,117 @@
-"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 _reactDom = _interopRequireDefault(require("react-dom"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _lodash = require("lodash");
-
-var _ActionsContext = _interopRequireDefault(require("../ActionsContext"));
-
-var _utils = require("../utils");
-
-var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-
-var _NavigationPopup = _interopRequireDefault(require("./NavigationPopup"));
-
-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 _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; } }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
-
-function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n    .tnt-navigation-popup {\n        position: absolute;\n        left: 0;\n        top: ", ";\n        width: 100%;\n        height: ", ";\n        background: #FFF;\n        box-shadow: 0 10px 10px -8px rgba(0,0,0,.1) inset,\n                    0 10px 10px -8px rgba(0,0,0,.1);\n        transition: all .15s ease-in-out;\n        overflow: hidden;\n        padding: 20px 16px;\n        box-sizing: border-box;\n        &.hide {\n            height: 0;\n            padding: 0;\n        }\n    }\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    &.active {\n        color: ", " !important;\n    }\n    font-size: ", ";\n    .tnt-icon {\n        font-size: ", ";\n        margin-right: 4px;\n    }\n    span {\n        position: relative;\n        font-size: ", ";\n        top: ", ";\n        font-family: auto;\n        .tnt-themeS1 & {\n            /* color: rgba(255,255,255,.85); */\n        }\n    }\n    .isInIframe & {\n        display: none;\n    }\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
+import { useState, useEffect, useRef, useContext } from 'react';
+import ReactDOM from 'react-dom';
+import cn from 'classnames';
+import styled, { createGlobalStyle, withTheme } from 'styled-components';
+import { uniq } from 'lodash';
+import ActionsContext from '../ActionsContext';
+import { hasLevel3 } from '../utils';
+import Icon from '../Iconfont';
+import NavigationPopup from './NavigationPopup';
+
+const Navigation = styled.li`
+    &.active {
+        color: ${({ theme }) => theme.primaryColor} !important;
+    }
+    font-size: ${({ theme: { size } }) => size === 'large' ? '14px' : '12px'};
+    .tnt-icon {
+        font-size: ${({ theme: { size } }) => size === 'large' ? '22px' : '18px'};
+        margin-right: 4px;
+    }
+    span {
+        position: relative;
+        font-size: ${({ theme: { size } }) => size === 'large' ? '14px' : '12px'};
+        top: ${({ theme: { size } }) => size === 'large' ? '-3px' : '-2px'};
+        font-family: auto;
+        .tnt-themeS1 & {
+            /* color: rgba(255,255,255,.85); */
+        }
+    }
+    .isInIframe & {
+        display: none;
+    }
+`;
 
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+const createPopupContainer = () => {
+    const div = document.createElement('div');
 
-var Navigation = _styledComponents["default"].li(_templateObject(), function (_ref) {
-  var theme = _ref.theme;
-  return theme.primaryColor;
-}, function (_ref2) {
-  var size = _ref2.theme.size;
-  return size === 'large' ? '14px' : '12px';
-}, function (_ref3) {
-  var size = _ref3.theme.size;
-  return size === 'large' ? '22px' : '18px';
-}, function (_ref4) {
-  var size = _ref4.theme.size;
-  return size === 'large' ? '14px' : '12px';
-}, function (_ref5) {
-  var size = _ref5.theme.size;
-  return size === 'large' ? '-3px' : '-2px';
-});
+    div.setAttribute('class', 'tnt-navigation-popup');
 
-var createPopupContainer = function createPopupContainer() {
-  var div = document.createElement('div');
-  div.setAttribute('class', 'tnt-navigation-popup');
-  return div;
+    return div;
 };
 
-var GlobalStyle = (0, _styledComponents.createGlobalStyle)(_templateObject2(), function (props) {
-  return props.theme.size === 'large' ? '60px' : '50px';
-}, function (props) {
-  return props.hasLevel3 ? '560px' : '530px';
-});
-
-var _default = (0, _styledComponents.withTheme)(function (props) {
-  var actions = (0, _react.useContext)(_ActionsContext["default"]);
-  var getText = actions.getText;
-  var headerRef = props.headerRef,
-      menus = props.menus;
-
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
-  var popupRef = (0, _react.useRef)();
-  (0, _react.useEffect)(function () {
-    var _headerRef$current;
-
-    popupRef.current = createPopupContainer();
-    headerRef == null ? void 0 : (_headerRef$current = headerRef.current) == null ? void 0 : _headerRef$current.appendChild(popupRef.current);
-    return function () {
-      var _headerRef$current2;
-
-      headerRef == null ? void 0 : (_headerRef$current2 = headerRef.current) == null ? void 0 : _headerRef$current2.removeChild(popupRef.current);
-    };
-  }, []);
-  (0, _react.useEffect)(function () {
-    var classNames = popupRef.current.getAttribute('class').split(' ');
-
-    if (visible) {
-      _reactDom["default"].render(React.createElement(_NavigationPopup["default"], {
-        actions: actions,
-        theme: props.theme,
-        menus: menus,
-        containerRef: headerRef,
-        popupRef: popupRef,
-        close: function close() {
-          return setVisible(false);
+const GlobalStyle = createGlobalStyle`
+    .tnt-navigation-popup {
+        position: absolute;
+        left: 0;
+        top: ${props => props.theme.size === 'large' ? '60px' : '50px'};
+        width: 100%;
+        height: ${props => props.hasLevel3 ? '560px' : '530px'};
+        background: #FFF;
+        box-shadow: 0 10px 10px -8px rgba(0,0,0,.1) inset,
+                    0 10px 10px -8px rgba(0,0,0,.1);
+        transition: all .15s ease-in-out;
+        overflow: hidden;
+        padding: 20px 16px;
+        box-sizing: border-box;
+        &.hide {
+            height: 0;
+            padding: 0;
         }
-      }), popupRef.current);
-
-      popupRef.current.setAttribute('class', classNames.filter(function (item) {
-        return item !== 'hide';
-      }).join(' '));
-    } else {
-      popupRef.current.setAttribute('class', (0, _lodash.uniq)([].concat(_toConsumableArray(classNames), ['hide'])).join(' '));
     }
-  }, [visible]);
-  return React.createElement(Navigation, {
-    onClick: function onClick(evt) {
-      var _evt$nativeEvent, _evt$nativeEvent2;
-
-      evt.stopPropagation();
-      (_evt$nativeEvent = evt.nativeEvent) == null ? void 0 : _evt$nativeEvent.stopImmediatePropagation();
-      (_evt$nativeEvent2 = evt.nativeEvent) == null ? void 0 : _evt$nativeEvent2.stopPropagation();
-      setVisible(!visible);
-    },
-    className: (0, _classnames["default"])({
-      active: visible
-    })
-  }, React.createElement(_Iconfont["default"], {
-    type: "unordered-list"
-  }), React.createElement("span", null, getText('globalNavigation')), React.createElement(GlobalStyle, {
-    hasLevel3: (0, _utils.hasLevel3)(menus)
-  }));
-});
-
-exports["default"] = _default;
+`;
+
+export default withTheme(
+    props => {
+        const actions = useContext(ActionsContext);
+        const { getText } = actions;
+        const { headerRef, menus } = props;
+        const [visible, setVisible] = useState(false);
+        const popupRef = useRef();
+
+        useEffect(() => {
+            popupRef.current = createPopupContainer();
+            headerRef?.current?.appendChild(popupRef.current);
+
+            return () => {
+                headerRef?.current?.removeChild(popupRef.current);
+            };
+        }, []);
+
+        useEffect(() => {
+            const classNames = popupRef.current.getAttribute('class').split(' ');
+
+            if (visible) {
+                ReactDOM.render(
+                    <NavigationPopup
+                        actions={actions}
+                        theme={props.theme}
+                        menus={menus}
+                        containerRef={headerRef}
+                        popupRef={popupRef}
+                        close={() => setVisible(false)}
+                    />,
+                    popupRef.current
+                );
+                popupRef.current.setAttribute('class', classNames.filter(item => item !== 'hide').join(' '));
+            } else {
+                popupRef.current.setAttribute('class', uniq([...classNames, 'hide']).join(' '));
+            }
+        }, [visible]);
+
+        return (
+            <Navigation
+                onClick={evt => {
+                    evt.stopPropagation();
+                    evt.nativeEvent?.stopImmediatePropagation();
+                    evt.nativeEvent?.stopPropagation();
+                    setVisible(!visible);
+                }}
+                className={cn({ active: visible })}
+            >
+                <Icon type="unordered-list" />
+                <span>{getText('globalNavigation')}</span>
+                <GlobalStyle hasLevel3={hasLevel3(menus)}/>
+            </Navigation>
+        );
+    }
+);

package/lib/Layout/Header.js

@@ -1,116 +1,165 @@
-"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 _HeaderActions = _interopRequireDefault(require("./HeaderActions"));
-
-var _AppList = _interopRequireDefault(require("./AppList"));
-
-var _OrgAppList = _interopRequireDefault(require("./OrgAppList"));
-
-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    .hasHeaderTabs & {\n        // background: #191D29;\n        background: #fff !important;\n        box-shadow: 0px 1px 6px 0px rgba(0,0,0,0.18);\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,
-      orgTreeConfig = props.orgTreeConfig,
-      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,
-    selectedAppKey: selectedAppKey,
-    onOrgChange: onOrgChange,
-    orgTreeConfig: orgTreeConfig,
-    orgAppList: orgAppList,
-    onAppChange: onAppChange,
-    headerTabs: headerTabs
-  }), 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;
+/**
+ * @file Layout header
+ * @author zhangyou
+ */
+import { useRef } from 'react';
+import styled, { withTheme } from 'styled-components';
+import Icon from '../Icon';
+import Actions from './HeaderActions';
+import AppList from './AppList';
+import OrgAppList from './OrgAppList';
+
+const Header = styled.div`
+    position: relative;
+    z-index: 201;
+    height: ${props => `${props.theme.headerHeight}px`};
+    display: flex;
+    color: rgba(255,255,255,.85);
+    background: #fff;
+    .hasHeaderTabs & {
+        // background: #191D29;
+        background: #fff !important;
+        box-shadow: 0px 1px 6px 0px rgba(0,0,0,0.18);
+        .tnt-layout-header-content {
+            display: none;
+        }
+    }
+
+    // .tnt-themeS3.hasHeaderTabs &{
+    //     background: ${props => `${props.theme.blueBgColor} !important`}; //#1D4295 !important;
+    // }
+
+    .isInIframe.noAppList &,
+    .isEmptyLayout & {
+        display: none;
+    }
+    .tnt-themeS1 & {
+        background: #FFFFFF;
+        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.15);
+    }
+    .tnt-themeS1.compatible & {
+        /* background: #323b4a; */
+    }
+    padding-right: 20px;
+    background: #FFFFFF;
+    box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);
+    .compatible & {
+        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);
+    }
+    transition: box-shadow .2s cubic-bezier(.4,0,.2,1), -webkit-box-shadow .2s cubic-bezier(.4,0,.2,1);
+
+    .sidebar-collapsed-controller {
+        text-align: center;
+        width: ${props => `${props.theme.headerHeight}px`};
+        line-height: ${props => `${props.theme.headerHeight}px`};
+        height: ${props => `${props.theme.headerHeight}px`};
+        cursor: pointer;
+        color: ${props => `${props.theme.primaryTextColor}`};
+        margin-right: 10px;
+
+        & > .tnt-icon {
+            font-size: 16px;
+            .large-size & {
+                font-size: 20px;
+            }
+        }
+
+        i {
+            position: relative;
+            top: -1px;
+            vertical-align: sub;
+        }
+
+        &:hover {
+            background-color: rgba(0,0,0,.06);
+        }
+
+        .tnt-themeS1 & {
+            /* color: rgba(255,255,255,.85); */
+            color: ${props => `${props.theme.primaryTextColor}`};
+        }
+        .large-size & {
+            font-size: 18px;
+        }
+        .isInIframe & {
+            display: none;
+        }
+    }
+`;
+
+const Content = styled.div`
+    flex: 1;
+    .isInIframe & {
+        display: none;
+    }
+`;
+
+export default withTheme(
+    props => {
+        const {
+            collapsed,
+            collapseIconPlacement = 'right',
+            selectedAppKey,
+            appList, // 当前机构下的应用列表
+            orgAppShow, // 是否展示应用
+            orgAppList, // 指定机构下的应用列表
+            orgTreeConfig, // 机构tree
+            selectedOrgKey,
+            orgList,
+            headerTabs,
+            onAppChange,
+            onOrgChange,
+            onCollapseChange,
+            extraActions
+        } = props;
+        const headerRef = useRef();
+        return (
+            <Header className="tnt-layout-header" ref={headerRef}>
+                {
+                    collapseIconPlacement === 'right' && (
+                        <div
+                            className="sidebar-collapsed-controller"
+                            onClick={onCollapseChange}
+                        >
+                            <Icon type={`menu-${collapsed ? 'unfold' : 'fold'}`}/>
+                        </div>
+                    )
+                }
+                {headerTabs}
+
+                {/* 展示机构+应用 */}
+                {
+                    orgList && (
+                        <OrgAppList
+                            orgAppShow={orgAppShow}
+                            selectedOrgKey={selectedOrgKey}
+                            orgList = {orgList}
+                            selectedAppKey={selectedAppKey}
+                            onOrgChange={onOrgChange}
+                            orgTreeConfig={orgTreeConfig}
+                            orgAppList={orgAppList}
+                            onAppChange={onAppChange}
+                            headerTabs={headerTabs}
+                        />
+                    )
+                }
+
+                {/* 只展示应用 走老逻辑 */}
+                {
+                    appList &&
+                    !orgList && (
+                        <AppList
+                            items={appList}
+                            selectedKey={selectedAppKey}
+                            onChange={onAppChange}
+                        />
+                    )
+                }
+                <Content className="tnt-layout-header-content">{props.children}</Content>
+                <Actions {...props} headerRef={headerRef}>
+                    {extraActions}
+                </Actions>
+            </Header>
+        );
+    }
+);