tntd 1.4.6 → 1.4.7

package/lib/Layout/HeaderActions.js

@@ -1,133 +1,136 @@
-"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 _Language = _interopRequireDefault(require("./Language"));
-
-var _Theme = _interopRequireDefault(require("./Theme"));
-
-var _CompatibleLanguage = _interopRequireDefault(require("./CompatibleLanguage"));
-
-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 &{\n            color: #455064;\n        }\n        // \u5220\u9664\u8272\u7CFB\u533A\u5206 \u7EDF\u4E00\u8272\u8C03\n        // .hasHeaderTabs:not(.tnt-themeS1) & {\n        //     color: rgba(255,255,255,.8);\n        // }\n        .hasHeaderTabs:not(.tnt-themeS1) & {\n            color: #455064 !important;\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,
-      AvatarCustom = props.AvatarCustom,
-      rest = _objectWithoutProperties(props, ["config", "theme", "userInfo", "menus", "apps", "extraActions", "headerRef", "onLanguageChange", "onThemeChange", "onApplicationChange", "onAppChange", "onCollapseChange", "onPersonalSetting", "onChangePassword", "onLogout", "onLogoClick", "AvatarCustom"]);
+import styled, { withTheme } from "styled-components";
+import { Divider } from "antd";
+import GlobalNavigation from "./GlobalNavigation";
+import Language from "./Language";
+import Theme from "./Theme";
+import LanguageTheme from "./CompatibleLanguage";
+import Application from "./Application";
+import Avatar from "./Avatar";
+
+const Actions = styled.ul`
+    list-style: none;
+    display: inline-block;
+    line-height: ${(props) => `${props.theme.headerHeight}px`};
+    margin: 0 0 0 20px;
+    .hasHeaderTabs & {
+        margin: 0;
+    }
+    padding: 0;
+    white-space: nowrap;
 
-  return React.createElement(Actions, rest, extraActions, globalNavigation && React.createElement(_GlobalNavigation["default"], {
-    headerRef: headerRef,
-    menus: menus
-  }), !AvatarCustom && (!compatible ? React.createElement(React.Fragment, null, language && React.createElement(_Language["default"], {
-    language: userInfo.lang,
-    onChange: onLanguageChange
-  }), theme && React.createElement(_Theme["default"], {
-    theme: userInfo.theme,
-    onChange: onThemeChange
-  })) : React.createElement(_CompatibleLanguage["default"], {
-    config: props.config,
-    language: userInfo.lang,
-    theme: userInfo.theme,
-    onLanguageChange: onLanguageChange,
-    onThemeChange: onThemeChange
-  })), application && React.createElement(_Application["default"], {
-    language: userInfo.lang,
-    apps: apps,
-    onChange: onApplicationChange
-  }), avatar && React.createElement(React.Fragment, null, React.createElement(_divider["default"], {
-    type: "vertical"
-  }), AvatarCustom ? React.createElement(AvatarCustom, {
-    userInfo: userInfo,
-    onPersonalSetting: onPersonalSetting,
-    onChangePassword: onChangePassword,
-    onLogout: onLogout,
-    onThemeChange: onThemeChange,
-    config: {
-      theme: theme,
-      language: language
+    .isInIframe & {
+        display: none;
     }
-  }) : React.createElement(_Avatar["default"], {
-    userInfo: userInfo,
-    onPersonalSetting: onPersonalSetting,
-    onChangePassword: onChangePassword,
-    onLogout: onLogout,
-    onThemeChange: onThemeChange,
-    config: {
-      theme: theme,
-      language: language
+
+    & > li {
+        height: 100%;
+        display: inline-block;
+        vertical-align: top;
+        cursor: pointer;
+        font-size: 20px;
+        margin: 0 7.5px;
+        color: ${(props) => `${props.theme.headerActionsColor}`};
+        .large-size & {
+            margin: 0 10px;
+        }
+        .tnt-themeS1 & {
+            /* color: rgba(255,255,255,.85); */
+        }
+        &:last-of-type {
+            margin-right: 0;
+        }
+        .hasHeaderTabs & {
+            color: #455064;
+        }
+        // 删除色系区分 统一色调
+        // .hasHeaderTabs:not(.tnt-themeS1) & {
+        //     color: rgba(255,255,255,.8);
+        // }
+        .hasHeaderTabs:not(.tnt-themeS1) & {
+            color: #455064 !important;
+        }
     }
-  })));
+`;
+
+export default withTheme((props) => {
+    const {
+        config: {
+            theme = true,
+            avatar = true,
+            language = true,
+            application = false,
+            globalNavigation = false,
+        } = {},
+        theme: { compatible },
+        userInfo = {},
+        menus,
+        apps,
+        extraActions,
+        headerRef,
+        onLanguageChange,
+        onThemeChange,
+        onApplicationChange,
+        onAppChange,
+        onCollapseChange,
+        onPersonalSetting,
+        onChangePassword,
+        onLogout,
+        onLogoClick,
+        AvatarCustom,
+        ...rest
+    } = props;
+
+    return (
+        <Actions {...rest}>
+            {extraActions}
+            {globalNavigation && <GlobalNavigation headerRef={headerRef} menus={menus} />}
+            {!compatible ? (
+                <>
+                    {language && <Language language={userInfo.lang} onChange={onLanguageChange} />}
+                    {theme && <Theme theme={userInfo.theme} onChange={onThemeChange} />}
+                </>
+            ) : (
+                <LanguageTheme
+                    config={props.config}
+                    language={userInfo.lang}
+                    theme={userInfo.theme}
+                    onLanguageChange={onLanguageChange}
+                    onThemeChange={onThemeChange}
+                />
+            )}
+            {application && (
+                <Application language={userInfo.lang} apps={apps} onChange={onApplicationChange} />
+            )}
+            {avatar && (
+                <>
+                    <Divider type="vertical" />
+                    {AvatarCustom ? (
+                        <AvatarCustom
+                            userInfo={userInfo}
+                            onPersonalSetting={onPersonalSetting}
+                            onChangePassword={onChangePassword}
+                            onLogout={onLogout}
+                            onThemeChange={onThemeChange}
+                            config={{
+                                theme,
+                                language,
+                            }}
+                        />
+                    ) : (
+                        <Avatar
+                            userInfo={userInfo}
+                            onPersonalSetting={onPersonalSetting}
+                            onChangePassword={onChangePassword}
+                            onLogout={onLogout}
+                            onThemeChange={onThemeChange}
+                            config={{
+                                theme,
+                                language,
+                            }}
+                        />
+                    )}
+                </>
+            )}
+        </Actions>
+    );
 });
-
-exports["default"] = _default;

package/lib/Layout/HeaderNavs.js

@@ -1,116 +1,93 @@
-"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"] = exports.HeaderNavs = void 0;
-
-var _react = require("react");
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _lodash = require("lodash");
-
-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 _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 _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 _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n    position: relative;\n    margin: 0;\n    padding: 0 20px;\n    cursor: pointer;\n    display: inline-block;\n    line-height: ", ";\n    transition: background-color .5;\n\n    a {\n        font-size: 14px;\n        color: ", ";\n        text-rendering: optimizeLegibility;\n        -webkit-font-smoothing: antialiased;\n        -moz-osx-font-smoothing: grayscale;\n        .tnt-themeS1 & {\n            color: rgba(255,255,255,.8);\n        }\n    }\n\n    &:hover, &.active {\n        a {\n            color: ", ";\n            .tnt-themeS1 & {\n                color: #418AFF;\n            }\n        }\n    }\n    &.active {\n        &:after {\n            position: absolute;\n            left: 0;\n            bottom: 0;\n            width: 100%;\n            height: 3px;\n            background: ", ";\n            display: inline-block;\n            content: \"\";\n            .tnt-themeS1 & {\n                background: #418AFF;\n            }\n        }\n    }\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    margin: 0;\n    padding: 0;\n    list-style: none;\n    text-align: right;\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 Navs = _styledComponents["default"].ul(_templateObject());
-
-var NavItem = _styledComponents["default"].li(_templateObject2(), function (props) {
-  return props.theme.size === 'large' ? '60px' : '50px';
-}, function (props) {
-  return props.theme.secondaryTextColor;
-}, function (props) {
-  return props.theme.primaryColor;
-}, function (props) {
-  return props.theme.primaryColor;
-});
-
-var HeaderNavs = (0, _styledComponents.withTheme)(function (_ref) {
-  var theme = _ref.theme,
-      _ref$navs = _ref.navs,
-      navs = _ref$navs === void 0 ? [] : _ref$navs,
-      onChange = _ref.onChange,
-      onSelect = _ref.onSelect,
-      props = _objectWithoutProperties(_ref, ["theme", "navs", "onChange", "onSelect"]);
-
-  var _useState = (0, _react.useState)(props.selectedKey || (0, _lodash.get)(navs, '0.key')),
-      _useState2 = _slicedToArray(_useState, 2),
-      selectedKey = _useState2[0],
-      setSelectedKey = _useState2[1];
-
-  var onClickNav = function onClickNav(nav) {
-    setSelectedKey(nav.key);
-    onSelect && onSelect(nav);
+import { useState, useEffect } from 'react';
+import styled, { withTheme } from 'styled-components';
+import cn from 'classnames';
+import { get } from 'lodash';
+
+const Navs = styled.ul`
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    text-align: right;
+`;
+const NavItem = styled.li`
+    position: relative;
+    margin: 0;
+    padding: 0 20px;
+    cursor: pointer;
+    display: inline-block;
+    line-height: ${props => props.theme.size === 'large' ? '60px' : '50px'};
+    transition: background-color .5;
+
+    a {
+        font-size: 14px;
+        color: ${props => props.theme.secondaryTextColor};
+        text-rendering: optimizeLegibility;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        .tnt-themeS1 & {
+            color: rgba(255,255,255,.8);
+        }
+    }
 
-    if (selectedKey !== nav.key) {
-      onChange && onChange(nav);
-      setSelectedKey(nav.key);
+    &:hover, &.active {
+        a {
+            color: ${props => props.theme.primaryColor};
+            .tnt-themeS1 & {
+                color: #418AFF;
+            }
+        }
+    }
+    &.active {
+        &:after {
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            width: 100%;
+            height: 3px;
+            background: ${props => props.theme.primaryColor};
+            display: inline-block;
+            content: "";
+            .tnt-themeS1 & {
+                background: #418AFF;
+            }
+        }
+    }
+`;
+
+export const HeaderNavs = withTheme(
+    ({ theme, navs = [], onChange, onSelect, ...props }) => {
+        const [selectedKey, setSelectedKey] = useState(props.selectedKey || get(navs, '0.key'));
+        const onClickNav = nav => {
+            setSelectedKey(nav.key);
+            onSelect && onSelect(nav);
+    
+            if (selectedKey !== nav.key) {
+                onChange && onChange(nav);
+                setSelectedKey(nav.key);
+            }
+        };
+    
+        useEffect(() => {
+            setSelectedKey(props.selectedKey || get(navs, '0.key'));
+        }, [navs, props.selectedKey]);
+    
+        return (
+            <Navs {...props}>
+                {
+                    navs.map(nav => (
+                        <NavItem
+                            key={nav.key}
+                            theme={theme}
+                            className={cn({ active: selectedKey === nav.key })}
+                            onClick={() => onClickNav(nav)}
+                        >
+                            <a href={nav.key} onClick={evt => evt.preventDefault()}>{nav.name}</a>
+                        </NavItem>
+                    ))
+                }
+            </Navs>
+        );
     }
-  };
+);
 
-  (0, _react.useEffect)(function () {
-    setSelectedKey(props.selectedKey || (0, _lodash.get)(navs, '0.key'));
-  }, [navs, props.selectedKey]);
-  return React.createElement(Navs, props, navs.map(function (nav) {
-    return React.createElement(NavItem, {
-      key: nav.key,
-      theme: theme,
-      className: (0, _classnames["default"])({
-        active: selectedKey === nav.key
-      }),
-      onClick: function onClick() {
-        return onClickNav(nav);
-      }
-    }, React.createElement("a", {
-      href: nav.key,
-      onClick: function onClick(evt) {
-        return evt.preventDefault();
-      }
-    }, nav.name));
-  }));
-});
-exports.HeaderNavs = HeaderNavs;
-var _default = HeaderNavs;
-exports["default"] = _default;
+export default HeaderNavs;