tntd 1.4.6 → 1.4.7

package/lib/Layout/EnterpriseLayout/Avatar.js

@@ -1,174 +1,162 @@
-"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/popover/style");
-
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
-
-require("antd/lib/row/style");
-
-var _row = _interopRequireDefault(require("antd/lib/row"));
-
-require("antd/lib/divider/style");
-
-var _divider = _interopRequireDefault(require("antd/lib/divider"));
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _deleteAllCookies = _interopRequireDefault(require("delete-all-cookies"));
-
-var _lodash = require("lodash");
-
-var _images = _interopRequireDefault(require("../images"));
-
-var _Language = _interopRequireDefault(require("./Language"));
-
-var _Theme = _interopRequireDefault(require("./Theme"));
-
-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 _templateObject3() {
-  var data = _taggedTemplateLiteral(["\n    width: 330px;\n    z-index: 1;\n    background-color: #fff;\n    border-radius: 4px;\n    box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);\n    .isInIframe & {\n        display: none;\n    }\n\n    .user-info-body {\n        padding: 20px 15px;\n        line-height: 16px;\n        list-style: none;\n        margin: 0;\n        .user-info-body-username {\n            margin-top: 0px;\n            font-family: PingFangSC-Regular;\n            font-weight: normal;\n            font-size: 14px;\n            color: ", ";\n            line-height: 14px;\n            overflow: hidden;\n            text-overflow: ellipsis;\n            white-space: nowrap;\n        }\n        .user-info-body-account {\n            margin-top: 0px;\n            font-family: PingFangSC-Regular;\n            font-size: 12px;\n            color: #8B919E;\n            margin-bottom: 14px;\n            line-height: 14px;\n            margin-left: 10px;\n        }\n    }\n    .user-info-footer {\n        border-top: ", ";\n        background-color: #fff;\n        height: 36px;\n        line-height: 36px;\n        padding: 0 15px;\n        font-size: 12px;\n        color:  ", ";\n        a{\n            flex: 1;\n            text-align:center;\n            color:  ", ";\n        }\n    }\n"]);
-
-  _templateObject3 = function _templateObject3() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n    .tnt-layout-personal-popover {\n        .ant-popover-inner-content {\n            padding: 0;\n        }\n    }\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    margin-right: 0;\n    font-size: 0;\n    img {\n        width: 26px;\n        height: 26px;\n        border-radius: 50%;\n        cursor: pointer;\n        .large-size & {\n            width: 32px;\n            height: 32px;\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 Avatar = _styledComponents["default"].li(_templateObject());
-
-var GlobalStyle = (0, _styledComponents.createGlobalStyle)(_templateObject2());
-
-var UserInfoWrapper = _styledComponents["default"].div(_templateObject3(), function (props) {
-  return "".concat(props.theme.primaryTextColor);
-}, function (props) {
-  return "1px solid ".concat(props.theme.dividerColor);
-}, function (props) {
-  return "".concat(props.theme.primaryColor);
-}, function (props) {
-  return "".concat(props.theme.primaryColor);
-});
-
-var UserInfoContent = function UserInfoContent(props) {
-  var userInfo = props.userInfo,
-      _props$config = props.config,
-      config = _props$config === void 0 ? {} : _props$config,
-      onLogout = props.onLogout,
-      _props$onChangePasswo = props.onChangePassword,
-      onChangePassword = _props$onChangePasswo === void 0 ? function () {
-    return true;
-  } : _props$onChangePasswo,
-      _props$onPersonalSett = props.onPersonalSetting,
-      onPersonalSetting = _props$onPersonalSett === void 0 ? function () {
-    return true;
-  } : _props$onPersonalSett,
-      onLanguageChange = props.onLanguageChange,
-      onThemeChange = props.onThemeChange;
-
-  var _ref = config || {},
-      _ref$language = _ref.language,
-      language = _ref$language === void 0 ? true : _ref$language;
-
-  return React.createElement(UserInfoWrapper, {
-    className: "user-info-setting-wrap"
-  }, React.createElement("ul", {
-    className: "user-info-body"
-  }, React.createElement("li", {
-    className: "user-info-body-username"
-  }, userInfo.userName || '暂无昵称', React.createElement("span", {
-    className: "user-info-body-account"
-  }, userInfo.account)), language && React.createElement(_Language["default"], {
-    language: userInfo.lang,
-    onChange: onLanguageChange
-  }), React.createElement(_Theme["default"], {
-    theme: userInfo.theme,
-    onChange: onThemeChange
-  })), React.createElement(_row["default"], {
-    className: "user-info-footer",
-    type: "flex",
-    justify: "space-between",
-    align: "middle"
-  }, React.createElement("a", {
-    onClick: onPersonalSetting,
-    href: "/bridge/userCenter?currentTab=1"
-  }, "\u4E2A\u4EBA\u8BBE\u7F6E"), React.createElement(_divider["default"], {
-    type: "vertical"
-  }), React.createElement("a", {
-    onClick: onChangePassword,
-    href: "/bridge/userCenter?currentTab=2"
-  }, "\u4FEE\u6539\u5BC6\u7801"), React.createElement(_divider["default"], {
-    type: "vertical"
-  }), React.createElement("a", {
-    className: "user-info-footer-signout",
-    onClick: function onClick() {
-      if (onLogout) {
-        onLogout();
-        (0, _deleteAllCookies["default"])(window)();
-      } else {
-        (0, _deleteAllCookies["default"])(window)();
-        window.location.href = "/user/login?callbackUrl=".concat(window.encodeURI(location.href));
-      }
+import styled, { createGlobalStyle } from 'styled-components';
+import { Popover, Row, Divider } from 'antd';
+import deleteAllCookiesFactory from 'delete-all-cookies';
+import { get } from 'lodash';
+import images from '../images';
+import Language from './Language';
+import Theme from './Theme';
+
+const Avatar = styled.li`
+    margin-right: 0;
+    font-size: 0;
+    img {
+        width: 26px;
+        height: 26px;
+        border-radius: 50%;
+        cursor: pointer;
+        .large-size & {
+            width: 32px;
+            height: 32px;
+        }
     }
-  }, "\u9000\u51FA\u767B\u5F55")));
-};
-
-var _default = function _default(props) {
-  var _images$empty2;
+`;
 
-  var _props$userInfo = props.userInfo,
-      userInfo = _props$userInfo === void 0 ? {} : _props$userInfo;
-  var avatar = userInfo.avatar;
-  return React.createElement(Avatar, null, React.createElement(_popover["default"], {
-    popupClassName: "tnt-layout-personal-popover",
-    placement: "bottomRight",
-    title: null,
-    content: React.createElement(UserInfoContent, props),
-    trigger: "click"
-  }, avatar ? React.createElement("img", {
-    src: avatar.indexOf('base64') > 0 ? avatar : (0, _lodash.get)(_images["default"][avatar], 'default', _images["default"][avatar]),
-    onError: function onError(e) {
-      var _images$empty;
+const GlobalStyle = createGlobalStyle`
+    .tnt-layout-personal-popover {
+        .ant-popover-inner-content {
+            padding: 0;
+        }
+    }
+`;
+
+const UserInfoWrapper = styled.div`
+    width: 330px;
+    z-index: 1;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.1);
+    .isInIframe & {
+        display: none;
+    }
 
-      e.target.onerror = null;
-      e.target.src = ((_images$empty = _images["default"].empty) == null ? void 0 : _images$empty["default"]) || _images["default"].empty;
+    .user-info-body {
+        padding: 20px 15px;
+        line-height: 16px;
+        list-style: none;
+        margin: 0;
+        .user-info-body-username {
+            margin-top: 0px;
+            font-family: PingFangSC-Regular;
+            font-weight: normal;
+            font-size: 14px;
+            color: ${props => `${props.theme.primaryTextColor}`};
+            line-height: 14px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .user-info-body-account {
+            margin-top: 0px;
+            font-family: PingFangSC-Regular;
+            font-size: 12px;
+            color: #8B919E;
+            margin-bottom: 14px;
+            line-height: 14px;
+            margin-left: 10px;
+        }
     }
-  }) : React.createElement("img", {
-    src: ((_images$empty2 = _images["default"].empty) == null ? void 0 : _images$empty2["default"]) || _images["default"].empty
-  })), React.createElement(GlobalStyle, null));
+    .user-info-footer {
+        border-top: ${props => `1px solid ${props.theme.dividerColor}`};
+        background-color: #fff;
+        height: 36px;
+        line-height: 36px;
+        padding: 0 15px;
+        font-size: 12px;
+        color:  ${props => `${props.theme.primaryColor}`};
+        a{
+            flex: 1;
+            text-align:center;
+            color:  ${props => `${props.theme.primaryColor}`};
+        }
+    }
+`;
+
+const UserInfoContent = props => {
+    const { userInfo, config={}, onLogout, onChangePassword = () => true, onPersonalSetting = () => true, onLanguageChange, onThemeChange } = props;
+    const {
+        language = true,
+    } = config || {};
+    return (
+        <UserInfoWrapper className="user-info-setting-wrap">
+            <ul className="user-info-body">
+                <li className="user-info-body-username">
+                    {userInfo.userName || '暂无昵称'}
+                    <span className="user-info-body-account">{userInfo.account}</span>
+                </li>
+                {
+                    language &&
+                    <Language
+                        language={userInfo.lang}
+                        onChange={onLanguageChange}
+                    />
+                }
+                <Theme
+                    theme={userInfo.theme}
+                    onChange={onThemeChange}
+                />
+            </ul>
+            <Row className="user-info-footer" type="flex" justify="space-between" align="middle">
+                <a onClick={onPersonalSetting} href="/bridge/userCenter?currentTab=1">个人设置</a>
+                <Divider type="vertical"/>
+                <a onClick={onChangePassword} href="/bridge/userCenter?currentTab=2">修改密码</a>
+                <Divider type="vertical"/>
+                <a
+                    className="user-info-footer-signout"
+                    onClick={() => {
+                        if (onLogout) {
+                            onLogout();
+                            deleteAllCookiesFactory(window)();
+                        } else {
+                            deleteAllCookiesFactory(window)();
+                            window.location.href = `/user/login?callbackUrl=${window.encodeURI(location.href)}`;
+                        }
+                    }}
+                >退出登录</a>
+            </Row>
+        </UserInfoWrapper>
+    );
 };
 
-exports["default"] = _default;
+export default props => {
+    const {
+        userInfo = {}
+    } = props;
+    const { avatar } = userInfo;
+
+    return (
+        <Avatar>
+            <Popover
+                popupClassName="tnt-layout-personal-popover"
+                placement="bottomRight"
+                title={null}
+                content={<UserInfoContent {...props} />}
+                trigger="click"
+            >
+                {
+                    avatar ? (
+                        <img
+                            src={avatar.indexOf('base64') > 0 ? avatar : get(images[avatar], 'default', images[avatar])}
+                            onError={e => {
+                                e.target.onerror = null;
+                                e.target.src = images.empty?.default || images.empty;
+                            }}
+                        />
+                    ) : (
+                        <img src={images.empty?.default || images.empty} />
+                    )
+                }
+            </Popover>
+            <GlobalStyle />
+        </Avatar>
+    );
+};

package/lib/Layout/EnterpriseLayout/Language.js

@@ -1,105 +1,80 @@
-"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 _lodash = require("lodash");
-
-var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-
-var _storage = require("../storage");
-
-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 _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    display:inline-block;\n    padding: 0 10px;\n    height: 32px;\n    line-height: 32px;\n    text-align: center;\n    background: #FFFFFF;\n    border: 1px solid #E1E6EE;\n    border-radius: 2px;\n    font-family: PingFangSC-Regular;\n    color: #17233D;\n    font-size: ", ";\n    cursor: pointer;\n    margin-top: 8px;\n\n    .tnt-icon {\n        font-size: ", ";\n        margin-right: 4px;\n    }\n\n    span {\n        position: relative;\n        font-size: ", ";\n        top: ", ";\n        font-family: auto;\n    }\n\n    .isInIframe & {\n        display: none;\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 languages = [{
-  value: 'cn',
-  name: '中文'
-}, {
-  value: 'en',
-  name: 'EN '
-}];
-var languagesMap = languages.reduce(function (acc, cur) {
-  acc[cur.value] = cur;
-  return acc;
+import { useState } from 'react';
+import styled, { withTheme } from 'styled-components';
+import { get } from 'lodash';
+import Iconfont from '../Iconfont';
+import { setLanguageStore, getLanguageStore } from '../storage';
+
+const languages = [
+    { value: 'cn', name: '中文' },
+    { value: 'en', name: 'EN ' }
+];
+const languagesMap = languages.reduce((acc, cur) => {
+    acc[cur.value] = cur;
+    return acc;
 }, {});
 
-var Language = _styledComponents["default"].li(_templateObject(), function (_ref) {
-  var size = _ref.theme.size;
-  return size === 'large' ? '14px' : '12px';
-}, function (_ref2) {
-  var size = _ref2.theme.size;
-  return size === 'large' ? '24px' : '20px';
-}, function (_ref3) {
-  var size = _ref3.theme.size;
-  return size === 'large' ? '14px' : '12px';
-}, function (_ref4) {
-  var size = _ref4.theme.size;
-  return size === 'large' ? '-3px' : '-2px';
-});
-
-var _default = (0, _styledComponents.withTheme)(function (props) {
-  var onChange = props.onChange;
-
-  var getLanguage = function getLanguage() {
-    var lang = (0, _storage.getLanguageStore)() || props.language;
-
-    if (!languagesMap[lang]) {
-      lang = (0, _lodash.get)(languages, '0.value');
+const Language = styled.li`
+    display:inline-block;
+    padding: 0 10px;
+    height: 32px;
+    line-height: 32px;
+    text-align: center;
+    background: #FFFFFF;
+    border: 1px solid #E1E6EE;
+    border-radius: 2px;
+    font-family: PingFangSC-Regular;
+    color: #17233D;
+    font-size: ${({ theme: { size } }) => size === 'large' ? '14px' : '12px'};
+    cursor: pointer;
+    margin-top: 8px;
+
+    .tnt-icon {
+        font-size: ${({ theme: { size } }) => size === 'large' ? '24px' : '20px'};
+        margin-right: 4px;
     }
 
-    return lang;
-  };
-
-  var _useState = (0, _react.useState)(getLanguage()),
-      _useState2 = _slicedToArray(_useState, 2),
-      _useState2$ = _useState2[0],
-      language = _useState2$ === void 0 ? 'cn' : _useState2$,
-      setLanguage = _useState2[1];
-
-  var switchLanguage = function switchLanguage() {
-    var lang = language === 'cn' ? 'en' : 'cn';
-    setLanguage(lang);
-    (0, _storage.setLanguageStore)(lang);
-    onChange && onChange(lang);
-  };
-
-  return React.createElement(Language, {
-    onClick: switchLanguage
-  }, React.createElement(_Iconfont["default"], {
-    type: "flag-".concat(language)
-  }), React.createElement("span", null, (0, _lodash.get)(languagesMap[language], 'name')));
-});
+    span {
+        position: relative;
+        font-size: ${({ theme: { size } }) => size === 'large' ? '14px' : '12px'};
+        top: ${({ theme: { size } }) => size === 'large' ? '-3px' : '-2px'};
+        font-family: auto;
+    }
 
-exports["default"] = _default;
+    .isInIframe & {
+        display: none;
+    }
+`;
+
+export default withTheme(
+    props => {
+        const {
+            onChange
+        } = props;
+        const getLanguage = () => {
+            let lang = getLanguageStore() || props.language;
+
+            if (!languagesMap[lang]) {
+                lang = get(languages, '0.value');
+            }
+
+            return lang;
+        };
+        const [language = 'cn', setLanguage] = useState(getLanguage());
+        const switchLanguage = () => {
+            const lang = language === 'cn' ? 'en' : 'cn';
+
+            setLanguage(lang);
+            setLanguageStore(lang);
+            onChange && onChange(lang);
+        };
+
+        return (
+            <Language onClick={switchLanguage}>
+                <Iconfont type={`flag-${language}`} />
+                <span>
+                    {get(languagesMap[language], 'name')}
+                </span>
+            </Language>
+        );
+    }
+);