tntd 1.4.6 → 1.4.7

package/lib/Layout/Application.js

@@ -1,137 +1,121 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-require("antd/lib/popover/style");
-
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
-
-var _react = require("react");
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _lodash = require("lodash");
-
-var _logoIcon = require("@tntx/logo-icon");
-
-var _Iconfont = _interopRequireDefault(require("./Iconfont"));
-
-var _images = require("./images");
-
-var _this = void 0;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-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 _templateObject4() {
-  var data = _taggedTemplateLiteral(["\n    background-color: #fff;\n    border-radius: 4px;\n    z-index: 1;\n"]);
-
-  _templateObject4 = function _templateObject4() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject3() {
-  var data = _taggedTemplateLiteral(["\n    position: relative;\n    width: 88px;\n    padding: 8px 0;\n    cursor: pointer;\n    display: inline-block;\n    text-align: center;\n    &:hover, &.active {\n        background: #eee;\n    }\n    &.active:after {\n        position: absolute;\n        width: 0;\n        height: 0;\n        border-width: 5px 10px 0 0;\n        border-color: #333;\n        border-style: solid;\n        z-index: 9;\n    }\n    img {\n        width: 44px;\n        height: 44px;\n        margin-bottom: 6px;\n    }\n    div {\n        line-height: 20px;\n        white-space: nowrap;\n        text-overflow: ellipsis;\n        overflow: hidden;\n    }\n"]);
-
-  _templateObject3 = function _templateObject3() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n    list-style: none;\n    width: 264px;\n    margin: 0;\n    padding: 0;\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    margin-left: 20px;\n    font-size: 20px;\n    cursor: pointer;\n    .tnt-icon {\n        color: #17233d99;\n        .tnt-themeS1 & {\n            color: rgba(255,255,255,.85);\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 App = _styledComponents["default"].li(_templateObject());
-
-var AppList = _styledComponents["default"].ul(_templateObject2());
-
-var AppItem = _styledComponents["default"].li(_templateObject3());
-
-var AppContentWrapper = _styledComponents["default"].div(_templateObject4());
-
-var AppContent = function AppContent(props) {
-  var language = props.language,
-      apps = props.apps,
-      onChange = props.onChange;
-
-  var _useState = (0, _react.useState)(props.appKey),
-      _useState2 = _slicedToArray(_useState, 2),
-      appKey = _useState2[0],
-      setAppKey = _useState2[1];
-
-  var changeApp = function changeApp(appKey) {
-    setAppKey(appKey);
-    onChange && onChange(appKey);
-  };
-
-  return React.createElement(AppContentWrapper, null, React.createElement(AppList, null, apps.sort(function (a, b) {
-    return (0, _lodash.get)(_logoIcon.systemMap, "".concat(a.appKey, ".sort"), 1) - (0, _lodash.get)(_logoIcon.systemMap, "".concat(b.appKey, ".sort"), 1);
-  }).map(function (_ref) {
-    var key = _ref.appKey;
-    return React.createElement(AppItem, {
-      key: key,
-      className: (0, _classnames["default"])({
-        active: appKey === key
-      }),
-      onClick: changeApp.bind(_this, key)
-    }, React.createElement("img", {
-      src: (0, _lodash.get)(_logoIcon.systemMap, "".concat(key, ".logo"), _images.defaultLogo),
-      onError: function onError(e) {
-        e.target.onerror = null;
-        e.target.src = _images.defaultLogo;
-      }
-    }), React.createElement("div", null, (0, _lodash.get)(_logoIcon.systemMap, "".concat(key, ".").concat({
-      cn: 'name',
-      en: 'enName'
-    }[language || 'cn']), key)));
-  })));
-};
-
-var _default = function _default(props) {
-  return React.createElement(App, null, React.createElement(_popover["default"], {
-    placement: "bottomRight",
-    title: null,
-    content: React.createElement(AppContent, props),
-    trigger: "click"
-  }, React.createElement(_Iconfont["default"], {
-    type: "application"
-  })));
+import { useState } from 'react';
+import styled from 'styled-components';
+import cn from 'classnames';
+import { Popover } from 'antd';
+import { get } from 'lodash';
+import { systemMap as applicationsMap } from '@tntx/logo-icon';
+import Iconfont from './Iconfont';
+import { defaultLogo } from './images';
+
+const App = styled.li`
+    margin-left: 20px;
+    font-size: 20px;
+    cursor: pointer;
+    .tnt-icon {
+        color: #17233d99;
+        .tnt-themeS1 & {
+            color: rgba(255,255,255,.85);
+        }
+    }
+`;
+
+const AppList = styled.ul`
+    list-style: none;
+    width: 264px;
+    margin: 0;
+    padding: 0;
+`;
+
+const AppItem = styled.li`
+    position: relative;
+    width: 88px;
+    padding: 8px 0;
+    cursor: pointer;
+    display: inline-block;
+    text-align: center;
+    &:hover, &.active {
+        background: #eee;
+    }
+    &.active:after {
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-width: 5px 10px 0 0;
+        border-color: #333;
+        border-style: solid;
+        z-index: 9;
+    }
+    img {
+        width: 44px;
+        height: 44px;
+        margin-bottom: 6px;
+    }
+    div {
+        line-height: 20px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+    }
+`;
+
+const AppContentWrapper = styled.div`
+    background-color: #fff;
+    border-radius: 4px;
+    z-index: 1;
+`;
+
+const AppContent = props => {
+    const { language, apps, onChange } = props;
+    const [appKey, setAppKey] = useState(props.appKey);
+    const changeApp = appKey => {
+        setAppKey(appKey);
+        onChange && onChange(appKey);
+    };
+
+    return (
+        <AppContentWrapper>
+            <AppList>
+                {
+                    apps.sort(
+                        (a, b) => get(applicationsMap, `${a.appKey}.sort`, 1) - get(applicationsMap, `${b.appKey}.sort`, 1)
+                    ).map(({ appKey: key }) => (
+                        <AppItem
+                            key={key}
+                            className={cn({ active: appKey === key })}
+                            onClick={changeApp.bind(this, key)}
+                        >
+                            <img
+                                src={get(applicationsMap, `${key}.logo`, defaultLogo)}
+                                onError={e => {
+                                    e.target.onerror = null;
+                                    e.target.src = defaultLogo;
+                                }}
+                            />
+                            <div>
+                                {
+                                    get(applicationsMap, `${key}.${{
+                                        cn: 'name',
+                                        en: 'enName'
+                                    }[language || 'cn']}`, key)
+                                }
+                            </div>
+                        </AppItem>
+                    ))
+                }
+            </AppList>
+        </AppContentWrapper>
+    );
 };
 
-exports["default"] = _default;
+export default props => (
+    <App>
+        <Popover
+            placement="bottomRight"
+            title={null}
+            content={<AppContent {...props} />}
+            trigger="click"
+        >
+            <Iconfont type="application" />
+        </Popover>
+    </App>
+);

package/lib/Layout/Avatar.js

@@ -1,144 +1,144 @@
-"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/button/style");
-
-var _button = _interopRequireDefault(require("antd/lib/button"));
-
-var _react = require("react");
-
-var _styledComponents = _interopRequireWildcard(require("styled-components"));
-
-var _deleteAllCookies = _interopRequireDefault(require("delete-all-cookies"));
-
-var _lodash = require("lodash");
-
-var _images = _interopRequireDefault(require("./images"));
-
-var _ActionsContext = _interopRequireDefault(require("./ActionsContext"));
-
-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    min-width: 235px;\n    z-index: 1;\n    background-color: #fff;\n    border-radius: 4px;\n\n    .isInIframe & {\n        display: none;\n    }\n    \n    .user-info-body {\n        padding: 30px 20px 20px 24px;\n        line-height: 16px;\n        .user-info-body-username {\n            margin-top: 0px;\n            font-size: 16px;\n            color: #333;\n            font-weight: normal;\n            margin-bottom: 10px;\n            line-height: 16px;\n        }\n        .user-info-body-account {\n            margin-top: 0px;\n            color: #666;\n            margin-bottom: 14px;\n            line-height: 16px;\n        }\n        a {\n            margin-right: 16px;\n        }\n    }\n    .user-info-footer {\n        border-top: 1px solid #ccc;\n        background-color: #f5f5f5;\n        padding: 8px 20px;\n        text-align: right;\n        .user-info-footer-signout:hover {\n            box-shadow: 0 2px 8px rgba(0, 0, 0, .1);\n            border-color: #d9d9d9;\n            color: rgba(0, 0, 0, 0.65);\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());
-
-var UserInfoContent = function UserInfoContent(props) {
-  var userInfo = props.userInfo,
-      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;
-
-  var _useContext = (0, _react.useContext)(_ActionsContext["default"]),
-      getText = _useContext.getText;
-
-  return React.createElement(UserInfoWrapper, {
-    className: "user-info-setting-wrap"
-  }, React.createElement("div", {
-    className: "user-info-body"
-  }, React.createElement("p", {
-    className: "user-info-body-username"
-  }, userInfo.userName || '暂无昵称'), React.createElement("p", {
-    className: "user-info-body-account"
-  }, userInfo.account), React.createElement("a", {
-    onClick: onPersonalSetting,
-    href: "/bridge/userCenter?currentTab=1"
-  }, getText('personalSettings')), React.createElement("a", {
-    onClick: onChangePassword,
-    href: "/bridge/userCenter?currentTab=2"
-  }, getText('changePwd'))), React.createElement("div", {
-    className: "user-info-footer"
-  }, React.createElement(_button["default"], {
-    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 { useContext } from 'react';
+import styled, { createGlobalStyle } from 'styled-components';
+import { Popover, Button } from 'antd';
+import deleteAllCookiesFactory from 'delete-all-cookies';
+import { get } from 'lodash';
+import images from './images';
+import ActionsContext from './ActionsContext';
+
+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;
+        }
     }
-  }, React.createElement("a", null, getText('signOut')))));
-};
+`;
 
-var _default = function _default(props) {
-  var _images$empty2;
+const GlobalStyle = createGlobalStyle`
+    .tnt-layout-personal-popover {
+        .ant-popover-inner-content {
+            padding: 0;
+        }
+    }
+`;
 
-  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 UserInfoWrapper = styled.div`
+    min-width: 235px;
+    z-index: 1;
+    background-color: #fff;
+    border-radius: 4px;
 
-      e.target.onerror = null;
-      e.target.src = ((_images$empty = _images["default"].empty) == null ? void 0 : _images$empty["default"]) || _images["default"].empty;
+    .isInIframe & {
+        display: none;
+    }
+    
+    .user-info-body {
+        padding: 30px 20px 20px 24px;
+        line-height: 16px;
+        .user-info-body-username {
+            margin-top: 0px;
+            font-size: 16px;
+            color: #333;
+            font-weight: normal;
+            margin-bottom: 10px;
+            line-height: 16px;
+        }
+        .user-info-body-account {
+            margin-top: 0px;
+            color: #666;
+            margin-bottom: 14px;
+            line-height: 16px;
+        }
+        a {
+            margin-right: 16px;
+        }
     }
-  }) : 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: 1px solid #ccc;
+        background-color: #f5f5f5;
+        padding: 8px 20px;
+        text-align: right;
+        .user-info-footer-signout:hover {
+            box-shadow: 0 2px 8px rgba(0, 0, 0, .1);
+            border-color: #d9d9d9;
+            color: rgba(0, 0, 0, 0.65);
+        }
+    }
+`;
+
+const UserInfoContent = props => {
+    const { userInfo, onLogout, onChangePassword = () => true, onPersonalSetting = () => true } = props;
+    const { getText } = useContext(ActionsContext);
+
+    return (
+        <UserInfoWrapper className="user-info-setting-wrap">
+            <div className="user-info-body">
+                <p className="user-info-body-username">
+                    {userInfo.userName || '暂无昵称'}
+                </p>
+                <p className="user-info-body-account">
+                    {userInfo.account}
+                </p>
+                <a onClick={onPersonalSetting} href="/bridge/userCenter?currentTab=1">{getText('personalSettings')}</a>
+                <a onClick={onChangePassword} href="/bridge/userCenter?currentTab=2">{getText('changePwd')}</a>
+            </div>
+            <div className="user-info-footer">
+                <Button
+                    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>{getText('signOut')}</a>
+                </Button>
+            </div>
+        </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>
+    );
+};