tntd 2.0.13 → 2.0.14

package/lib/tntd-layout/paaslayout/SideMenu.js

@@ -1,58 +1,100 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 = _interopRequireWildcard(require("react"));
+
 var _styledComponents = _interopRequireDefault(require("styled-components"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-var _templateObject, _templateObject2;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+
+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 _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  background: #fff;\n  list-style: none;\n  font-size: 14px;\n  color: #17233d;\n  margin: 10px 0 0;\n  padding: 0;\n  li {\n    position: relative;\n    line-height: 38px;\n    cursor: pointer;\n    padding-left: 20px;\n    & > a {\n      color: #17233d;\n      & > span {\n        padding-left: 10px;\n      }\n    }\n    &.active {\n      background: #eaedf8;\n      &:before {\n        position: absolute;\n        left: 0;\n        top: 0;\n        content: '';\n        width: 4px;\n        height: 100%;\n        background-color: #4c79ff;\n      }\n    }\n  }\n"]);
+
+  _templateObject2 = function _templateObject2() {
+    return data;
+  };
+
+  return data;
+}
+
+function _templateObject() {
+  var data = _taggedTemplateLiteral(["\n  background: #fff;\n  list-style: none;\n  margin: 0;\n  padding: 0;\n  text-rendering: optimizeLegibility;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  .isInIframe & {\n    display: none;\n  }\n\n  & > li {\n    font-size: 14px;\n    letter-spacing: 0;\n    margin-top: 20px;\n    &:first-child {\n      margin-top: 30px;\n    }\n    & > span {\n      line-height: 38px;\n      opacity: 0.4;\n      display: inline-block;\n      width: calc(100% - 20px);\n      color: #17233d;\n      border-bottom: 1px solid #b2becd;\n      margin-left: 20px;\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 SideMenu = _styledComponents["default"].ul(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: #fff;\n  list-style: none;\n  margin: 0;\n  padding: 0;\n  text-rendering: optimizeLegibility;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  .isInIframe & {\n    display: none;\n  }\n\n  & > li {\n    font-size: 14px;\n    letter-spacing: 0;\n    margin-top: 20px;\n    &:first-child {\n      margin-top: 30px;\n    }\n    & > span {\n      line-height: 38px;\n      opacity: 0.4;\n      display: inline-block;\n      width: calc(100% - 20px);\n      color: #17233d;\n      border-bottom: 1px solid #b2becd;\n      margin-left: 20px;\n    }\n  }\n"])));
-var SubMenu = _styledComponents["default"].ul(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  background: #fff;\n  list-style: none;\n  font-size: 14px;\n  color: #17233d;\n  margin: 10px 0 0;\n  padding: 0;\n  li {\n    position: relative;\n    line-height: 38px;\n    cursor: pointer;\n    padding-left: 20px;\n    & > a {\n      color: #17233d;\n      & > span {\n        padding-left: 10px;\n      }\n    }\n    &.active {\n      background: #eaedf8;\n      &:before {\n        position: absolute;\n        left: 0;\n        top: 0;\n        content: '';\n        width: 4px;\n        height: 100%;\n        background-color: #4c79ff;\n      }\n    }\n  }\n"])));
+
+var SideMenu = _styledComponents["default"].ul(_templateObject());
+
+var SubMenu = _styledComponents["default"].ul(_templateObject2());
+
 var _default = function _default(props) {
   var language = props.language,
-    _props$menus = props.menus,
-    menus = _props$menus === void 0 ? [] : _props$menus,
-    formatMenuPath = props.formatMenuPath,
-    changeRouter = props.changeRouter,
-    selectedKey = props.selectedKey,
-    onBeforeChange = props.onBeforeChange,
-    onChange = props.onChange,
-    onSelect = props.onSelect;
+      _props$menus = props.menus,
+      menus = _props$menus === void 0 ? [] : _props$menus,
+      formatMenuPath = props.formatMenuPath,
+      changeRouter = props.changeRouter,
+      selectedKey = props.selectedKey,
+      onBeforeChange = props.onBeforeChange,
+      onChange = props.onChange,
+      onSelect = props.onSelect;
+
   var _useState = (0, _react.useState)(selectedKey),
-    _useState2 = _slicedToArray(_useState, 2),
-    activeMenu = _useState2[0],
-    setActiveMenu = _useState2[1];
+      _useState2 = _slicedToArray(_useState, 2),
+      activeMenu = _useState2[0],
+      setActiveMenu = _useState2[1];
+
   var defaultBeforeChange = function defaultBeforeChange(_ref) {
     var data = _ref.data;
     return !isNewTabMenu(data);
   };
+
   var defaultSelect = function defaultSelect(_ref2) {
     var data = _ref2.data;
+
     var _a;
+
     var _ref3 = data || {},
-      path = _ref3.path;
+        path = _ref3.path;
+
     var formatPath = formatMenuPath || function (path) {
       return path;
     };
+
     if (isNewTabMenu(data)) {
       openInNewTab(formatPath(data === null || data === void 0 ? void 0 : data.path, data));
       return;
     }
+
     var routerPrefix = (_a = window.location.pathname.match(/(^\/[^\/]+)/i)) === null || _a === void 0 ? void 0 : _a[1];
+
     if (window.location.pathname.startsWith(routerPrefix)) {
       var forwardPath = formatPath(path, data);
       changeRouter ? changeRouter(forwardPath, data) : window.history.pushState(data, data === null || data === void 0 ? void 0 : data.name, forwardPath);
@@ -60,32 +102,37 @@ var _default = function _default(props) {
       window.location.href = formatPath(path, data);
     }
   };
+
   var selectMenu = function selectMenu() {
     var param = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var finalBeforeChange = onBeforeChange || defaultBeforeChange;
     var finalSelect = onSelect || defaultSelect;
+
     if (param.key !== activeMenu) {
       if (finalBeforeChange(param, activeMenu)) {
         setActiveMenu(param.key);
         onChange && onChange(param);
       }
     }
+
     finalSelect(param);
   };
+
   var MenuItem = function MenuItem(_ref4) {
     var item = _ref4.item;
     var code = item.code,
-      groupName = item.groupName,
-      enName = item.enName,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children;
+        groupName = item.groupName,
+        enName = item.enName,
+        _item$children = item.children,
+        children = _item$children === void 0 ? [] : _item$children;
+
     var SubMenuItem = function SubMenuItem(_ref5) {
       var menu = _ref5.menu;
       var code = menu.code,
-        menuName = menu.menuName,
-        enName = menu.enName,
-        icon = menu.icon,
-        path = menu.path;
+          menuName = menu.menuName,
+          enName = menu.enName,
+          icon = menu.icon,
+          path = menu.path;
       return _react["default"].createElement("li", {
         key: code,
         onClick: function onClick(evt) {
@@ -110,6 +157,7 @@ var _default = function _default(props) {
         en: enName
       }[language])));
     };
+
     if (groupName && children.length) {
       return _react["default"].createElement("li", {
         key: code
@@ -123,10 +171,12 @@ var _default = function _default(props) {
         });
       })));
     }
+
     return _react["default"].createElement(SubMenuItem, {
       menu: item
     });
   };
+
   (0, _react.useEffect)(function () {
     setActiveMenu(selectedKey);
   }, [selectedKey]);
@@ -137,4 +187,5 @@ var _default = function _default(props) {
     });
   }));
 };
+
 exports["default"] = _default;

package/lib/tntd-layout/paaslayout/index.js

@@ -1,88 +1,122 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
+
 var _reduce2 = _interopRequireDefault(require("lodash/reduce"));
+
 var _get2 = _interopRequireDefault(require("lodash/get"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _ = require("../../");
+
 var _utils = require("../../utils");
+
 var _HeaderNavs = _interopRequireDefault(require("../HeaderNavs"));
+
 var _Header = _interopRequireDefault(require("./Header"));
+
 var _SideMenu = _interopRequireDefault(require("./SideMenu"));
+
 var _CompactSideMenu = _interopRequireDefault(require("./CompactSideMenu"));
+
 var _storage = require("../storage");
-var _templateObject;
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+
+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 _templateObject() {
+  var data = _taggedTemplateLiteral(["\n  position: relative;\n  height: 100vh;\n  overflow: hidden;\n  & > .ant-layout {\n    flex-direction: row;\n    & > .ant-layout-content {\n      overflow-x: hidden;\n      flex: 1;\n    }\n  }\n  .tnt-layout-sider {\n    overflow-x: hidden;\n    background: #fff !important;\n    box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.1);\n    z-index: 8;\n  }\n  &.isInIframe,\n  &.isEmptyLayout {\n    .tnt-layout-sider {\n      display: none;\n    }\n  }\n  &.tnt-themeS1 .tnt-layout-sider {\n    background: #fff !important;\n  }\n  .tnt-layout-content {\n    background: ", ";\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 Content = _.Layout.Content,
-  Sider = _.Layout.Sider;
-var TNTPaasLayout = (0, _styledComponents["default"])(_.Layout)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  height: 100vh;\n  overflow: hidden;\n  & > .ant-layout {\n    flex-direction: row;\n    & > .ant-layout-content {\n      overflow-x: hidden;\n      flex: 1;\n    }\n  }\n  .tnt-layout-sider {\n    overflow-x: hidden;\n    background: #fff !important;\n    box-shadow: 0 1px 10px 0 rgba(0, 0, 0, 0.1);\n    z-index: 8;\n  }\n  &.isInIframe,\n  &.isEmptyLayout {\n    .tnt-layout-sider {\n      display: none;\n    }\n  }\n  &.tnt-themeS1 .tnt-layout-sider {\n    background: #fff !important;\n  }\n  .tnt-layout-content {\n    background: ", ";\n  }\n"])), function (props) {
+    Sider = _.Layout.Sider;
+var TNTPaasLayout = (0, _styledComponents["default"])(_.Layout)(_templateObject(), function (props) {
   return props.theme.lightBgColor;
 });
+
 var noop = function noop() {
   return true;
 };
+
 var _default = (0, _styledComponents.withTheme)(function (props) {
   var appKey = props.appKey,
-    logo = props.logo,
-    name = props.name,
-    enName = props.enName,
-    isInIframe = props.isInIframe,
-    isEmptyLayout = props.isEmptyLayout,
-    selectedAppKey = props.selectedAppKey,
-    appList = props.appList,
-    _props$config = props.config,
-    config = _props$config === void 0 ? {} : _props$config,
-    extraHeaderActions = props.extraHeaderActions,
-    headerNavs = props.headerNavs,
-    sideMenu = props.sideMenu,
-    selectedMenuKey = props.selectedMenuKey,
-    _props$menuAlignMode = props.menuAlignMode,
-    menuAlignMode = _props$menuAlignMode === void 0 ? 'side' : _props$menuAlignMode,
-    _props$menus = props.menus,
-    menus = _props$menus === void 0 ? [] : _props$menus,
-    formatMenuPath = props.formatMenuPath,
-    changeRouter = props.changeRouter,
-    _props$onLogoClick = props.onLogoClick,
-    onLogoClick = _props$onLogoClick === void 0 ? noop : _props$onLogoClick,
-    _props$onThemeChange = props.onThemeChange,
-    _onThemeChange = _props$onThemeChange === void 0 ? noop : _props$onThemeChange,
-    _props$onLanguageChan = props.onLanguageChange,
-    _onLanguageChange = _props$onLanguageChan === void 0 ? noop : _props$onLanguageChan,
-    _props$onApplicationC = props.onApplicationChange,
-    _onApplicationChange = _props$onApplicationC === void 0 ? noop : _props$onApplicationC,
-    _props$onAppChange = props.onAppChange,
-    onAppChange = _props$onAppChange === void 0 ? noop : _props$onAppChange,
-    onLogout = props.onLogout,
-    _props$onBeforeMenuCh = props.onBeforeMenuChange,
-    onBeforeMenuChange = _props$onBeforeMenuCh === void 0 ? noop : _props$onBeforeMenuCh,
-    _props$onMenuChange = props.onMenuChange,
-    onMenuChange = _props$onMenuChange === void 0 ? noop : _props$onMenuChange,
-    _props$onMenuSelect = props.onMenuSelect,
-    onMenuSelect = _props$onMenuSelect === void 0 ? noop : _props$onMenuSelect,
-    _props$onHeaderNavCha = props.onHeaderNavChange,
-    onHeaderNavChange = _props$onHeaderNavCha === void 0 ? noop : _props$onHeaderNavCha;
+      logo = props.logo,
+      name = props.name,
+      enName = props.enName,
+      isInIframe = props.isInIframe,
+      isEmptyLayout = props.isEmptyLayout,
+      selectedAppKey = props.selectedAppKey,
+      appList = props.appList,
+      _props$config = props.config,
+      config = _props$config === void 0 ? {} : _props$config,
+      extraHeaderActions = props.extraHeaderActions,
+      headerNavs = props.headerNavs,
+      sideMenu = props.sideMenu,
+      selectedMenuKey = props.selectedMenuKey,
+      _props$menuAlignMode = props.menuAlignMode,
+      menuAlignMode = _props$menuAlignMode === void 0 ? 'side' : _props$menuAlignMode,
+      _props$menus = props.menus,
+      menus = _props$menus === void 0 ? [] : _props$menus,
+      formatMenuPath = props.formatMenuPath,
+      changeRouter = props.changeRouter,
+      _props$onLogoClick = props.onLogoClick,
+      onLogoClick = _props$onLogoClick === void 0 ? noop : _props$onLogoClick,
+      _props$onThemeChange = props.onThemeChange,
+      _onThemeChange = _props$onThemeChange === void 0 ? noop : _props$onThemeChange,
+      _props$onLanguageChan = props.onLanguageChange,
+      _onLanguageChange = _props$onLanguageChan === void 0 ? noop : _props$onLanguageChan,
+      _props$onApplicationC = props.onApplicationChange,
+      _onApplicationChange = _props$onApplicationC === void 0 ? noop : _props$onApplicationC,
+      _props$onAppChange = props.onAppChange,
+      onAppChange = _props$onAppChange === void 0 ? noop : _props$onAppChange,
+      onLogout = props.onLogout,
+      _props$onBeforeMenuCh = props.onBeforeMenuChange,
+      onBeforeMenuChange = _props$onBeforeMenuCh === void 0 ? noop : _props$onBeforeMenuCh,
+      _props$onMenuChange = props.onMenuChange,
+      onMenuChange = _props$onMenuChange === void 0 ? noop : _props$onMenuChange,
+      _props$onMenuSelect = props.onMenuSelect,
+      onMenuSelect = _props$onMenuSelect === void 0 ? noop : _props$onMenuSelect,
+      _props$onHeaderNavCha = props.onHeaderNavChange,
+      onHeaderNavChange = _props$onHeaderNavCha === void 0 ? noop : _props$onHeaderNavCha;
+
   var _useState = (0, _react.useState)(props.userInfo || {}),
-    _useState2 = _slicedToArray(_useState, 2),
-    userInfo = _useState2[0],
-    setUserInfo = _useState2[1];
-  var theme = (0, _storage.getThemeStore)() || userInfo.theme || 'themeS2';
-  // theme === 'default' ? 'themeS2' : theme;
+      _useState2 = _slicedToArray(_useState, 2),
+      userInfo = _useState2[0],
+      setUserInfo = _useState2[1];
+
+  var theme = (0, _storage.getThemeStore)() || userInfo.theme || 'themeS2'; // theme === 'default' ? 'themeS2' : theme;
+
   theme = ['default', 'themeS3'].includes(theme) ? 'themeS2' : theme;
   var language = (0, _storage.getLanguageStore)() || userInfo.lang || 'cn';
   var menusMapByApp = menus.reduce(function (acc, menu) {
@@ -90,24 +124,31 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
     var singleGroupMap = subMenus.reduce(function (acc, subMenu) {
       var path = subMenu.path;
       var appKey = !/^http/i.test(path) ? path === null || path === void 0 ? void 0 : path.match(/\/([^\/]+)/)[1] : '';
+
       if (appKey) {
         acc[appKey] = acc[appKey] || Object.assign(Object.assign({}, menu), {
           children: []
         });
         acc[appKey].children.push(subMenu);
       }
+
       return acc;
     }, {});
+
     for (var _appKey in singleGroupMap) {
       acc[_appKey] = acc[_appKey] || [];
+
       acc[_appKey].push(singleGroupMap[_appKey]);
     }
+
     return acc;
   }, {});
+
   var _useState3 = (0, _react.useState)(appKey),
-    _useState4 = _slicedToArray(_useState3, 2),
-    currentAppKey = _useState4[0],
-    setCurrentAppKey = _useState4[1];
+      _useState4 = _slicedToArray(_useState3, 2),
+      currentAppKey = _useState4[0],
+      setCurrentAppKey = _useState4[1];
+
   var apps = (0, _reduce2["default"])(menusMapByApp, function (acc, value, key) {
     acc.push({
       appKey: key,
@@ -118,16 +159,18 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
   var isMenusTop = menuAlignMode === 'top';
   var headerNavMenus = headerNavs;
   var currentSystemMenus = menusMapByApp[currentAppKey] || [];
+
   var _useState5 = (0, _react.useState)((0, _get2["default"])(currentSystemMenus, '0.code')),
-    _useState6 = _slicedToArray(_useState5, 2),
-    currentHeaderNavKey = _useState6[0],
-    setCurrentHeaderNavKey = _useState6[1];
+      _useState6 = _slicedToArray(_useState5, 2),
+      currentHeaderNavKey = _useState6[0],
+      setCurrentHeaderNavKey = _useState6[1];
+
   var sideMenus = isMenusTop ? (0, _get2["default"])(currentSystemMenus.find(function (_ref) {
     var code = _ref.code;
     return currentHeaderNavKey === code;
   }), 'children', []) : currentSystemMenus;
-  var FinalSideMenu = isMenusTop ? _CompactSideMenu["default"] : _SideMenu["default"];
-  // 一级菜单放在顶部(Header里面菜单作为一级导航)
+  var FinalSideMenu = isMenusTop ? _CompactSideMenu["default"] : _SideMenu["default"]; // 一级菜单放在顶部(Header里面菜单作为一级导航)
+
   if (isMenusTop) {
     headerNavMenus = _react["default"].createElement(_HeaderNavs["default"], {
       selectedKey: currentHeaderNavKey,
@@ -143,6 +186,7 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
       }
     });
   }
+
   (0, _react.useEffect)(function () {
     setUserInfo(props.userInfo);
   }, [props.userInfo]);
@@ -189,6 +233,7 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
     },
     onApplicationChange: function onApplicationChange(appKey) {
       setCurrentAppKey(appKey);
+
       _onApplicationChange(appKey);
     },
     onLogout: onLogout
@@ -210,4 +255,5 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
     className: "tnt-layout-content"
   }, props.children)));
 });
+
 exports["default"] = _default;

package/lib/tntd-layout/storage.d.ts

@@ -6,7 +6,7 @@ export function setCurrentOrgStore(currentOrg?: {}): void;
 export function getCurrentOrgStore(): any;
 export function setCurrentOrgTreeStore(currentOrgTree?: any[]): void;
 export function getCurrentOrgTreeStore(): any;
-export function setLanguageStore(lang: any): any;
+export function setLanguageStore(lang: any): void;
 export function getLanguageStore(): any;
 export function setThemeStore(theme: any): void;
 export function getThemeStore(): string | null;

package/lib/tntd-layout/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/tntd-layout/storage.js"],"names":[],"mappings":"AAKO,wCAAkF;AAClF,oDAQN;AAEM,0DAEN;AACM,0CAAsF;AAEtF,0DAEN;AACM,0CAAsF;AAEtF,qEAEN;AACM,8CACoD;AAIpD,iDAA2E;AAC3E,wCAAiE;AAEjE,gDAAqE;AACrE,+CAAyD;AAEzD,yCAGN"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/tntd-layout/storage.js"],"names":[],"mappings":"AAKO,wCAAkF;AAClF,oDAQN;AAEM,0DAEN;AACM,0CAAsF;AAEtF,0DAEN;AACM,0CAAsF;AAEtF,qEAEN;AACM,8CACoD;AAIpD,kDAA2E;AAC3E,wCAAiE;AAEjE,gDAAqE;AACrE,+CAAyD;AAEzD,yCAGN"}

package/lib/tntd-layout/storage.js

@@ -3,69 +3,98 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setThemeStore = exports.setSideMenuStore = exports.setLanguageStore = exports.setCurrentOrgTreeStore = exports.setCurrentOrgStore = exports.setCurrentAppStore = exports.getThemeStore = exports.getSideMenuStore = exports.getLanguageStore = exports.getCurrentOrgTreeStore = exports.getCurrentOrgStore = exports.getCurrentAppStore = exports.clearLoginCookie = void 0;
+exports.clearLoginCookie = exports.getThemeStore = exports.setThemeStore = exports.getLanguageStore = exports.setLanguageStore = exports.getCurrentOrgTreeStore = exports.setCurrentOrgTreeStore = exports.getCurrentOrgStore = exports.setCurrentOrgStore = exports.getCurrentAppStore = exports.setCurrentAppStore = exports.setSideMenuStore = exports.getSideMenuStore = void 0;
+
 var _universalCookie = _interopRequireDefault(require("universal-cookie"));
+
 var _utils = require("../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 var cookies = new _universalCookie["default"]();
+
 var getSideMenuStore = function getSideMenuStore() {
   return (0, _utils.safeParseJSON)(localStorage.getItem('sideMenu'), {});
 };
+
 exports.getSideMenuStore = getSideMenuStore;
+
 var setSideMenuStore = function setSideMenuStore() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   localStorage.setItem('sideMenu', JSON.stringify(Object.assign(Object.assign({}, getSideMenuStore()), params)));
 };
+
 exports.setSideMenuStore = setSideMenuStore;
+
 var setCurrentAppStore = function setCurrentAppStore() {
   var currentApp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   localStorage.setItem('currentApp', JSON.stringify(currentApp));
 };
+
 exports.setCurrentAppStore = setCurrentAppStore;
+
 var getCurrentAppStore = function getCurrentAppStore() {
   return (0, _utils.safeParseJSON)(localStorage.getItem('currentApp'), {});
 };
+
 exports.getCurrentAppStore = getCurrentAppStore;
+
 var setCurrentOrgStore = function setCurrentOrgStore() {
   var currentOrg = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   localStorage.setItem('currentOrg', JSON.stringify(currentOrg));
 };
+
 exports.setCurrentOrgStore = setCurrentOrgStore;
+
 var getCurrentOrgStore = function getCurrentOrgStore() {
   return (0, _utils.safeParseJSON)(localStorage.getItem('currentOrg'), {});
 };
+
 exports.getCurrentOrgStore = getCurrentOrgStore;
+
 var setCurrentOrgTreeStore = function setCurrentOrgTreeStore() {
   var currentOrgTree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   localStorage.setItem('currentOrgTree', JSON.stringify(currentOrgTree));
 };
+
 exports.setCurrentOrgTreeStore = setCurrentOrgTreeStore;
+
 var getCurrentOrgTreeStore = function getCurrentOrgTreeStore() {
   return (0, _utils.safeParseJSON)(localStorage.getItem('currentOrgTree'), []);
-};
-// export const setLanguageStore = (lang) => localStorage.setItem('lang', lang)
+}; // export const setLanguageStore = (lang) => localStorage.setItem('lang', lang)
 // export const getLanguageStore = () => localStorage.getItem('lang')
+
+
 exports.getCurrentOrgTreeStore = getCurrentOrgTreeStore;
+
 var setLanguageStore = function setLanguageStore(lang) {
   return cookies.set('lang', lang, {
     path: '/'
   });
 };
+
 exports.setLanguageStore = setLanguageStore;
+
 var getLanguageStore = function getLanguageStore() {
   return cookies.get('lang', {
     path: '/'
   });
 };
+
 exports.getLanguageStore = getLanguageStore;
+
 var setThemeStore = function setThemeStore(theme) {
   return localStorage.setItem('theme', theme);
 };
+
 exports.setThemeStore = setThemeStore;
+
 var getThemeStore = function getThemeStore() {
   return localStorage.getItem('theme');
 };
+
 exports.getThemeStore = getThemeStore;
+
 var clearLoginCookie = function clearLoginCookie() {
   cookies.remove('_td_token_', {
     path: '/'
@@ -74,4 +103,5 @@ var clearLoginCookie = function clearLoginCookie() {
     path: '/'
   });
 };
+
 exports.clearLoginCookie = clearLoginCookie;