tntd 1.4.6 → 1.4.7

package/lib/Layout/paaslayout/Header.js

@@ -1,91 +1,85 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = require("react");
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _HeaderActions = _interopRequireDefault(require("../HeaderActions"));
-
-var _AppList = _interopRequireDefault(require("../AppList"));
-
-var _Logo = _interopRequireDefault(require("./Logo"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n    flex: 1;\n    .isInIframe & {\n        display: none;\n    }\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    position: sticky;\n    top: 0;\n    height: ", ";\n    display: flex;\n    color: #fff;\n    background: #fff;\n    z-index: 201;\n    .isInIframe.noAppList &,\n    .isEmptyLayout & {\n        display: none;\n    }\n    .tnt-themeS1 & {\n        background: #323b4a;\n    }\n    padding-right: 20px;\n    box-shadow: 0 1px 10px 0 rgba(0,0,0,0.1);\n    transition: box-shadow .2s cubic-bezier(.4,0,.2,1), -webkit-box-shadow .2s cubic-bezier(.4,0,.2,1);\n\n    .paas-header-actions {\n        li {\n            .tnt-themeS1 & {\n                color: rgba(255,255,255,.85);\n            }\n        }\n    }\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var Header = _styledComponents["default"].div(_templateObject(), function (props) {
-  return "".concat(props.theme.headerHeight, "px");
-});
-
-var Content = _styledComponents["default"].div(_templateObject2());
-
-var _default = function _default(props) {
-  var logo = props.logo,
-      name = props.name,
-      enName = props.enName,
-      language = props.language,
-      selectedAppKey = props.selectedAppKey,
-      appList = props.appList,
-      onLogoClick = props.onLogoClick,
-      onAppChange = props.onAppChange,
-      extraActions = props.extraActions;
-
-  var config = _objectSpread({
-    application: true
-  }, props.config);
-
-  var headerRef = (0, _react.useRef)();
-  return React.createElement(Header, {
-    ref: headerRef
-  }, React.createElement(_Logo["default"], {
-    language: language,
-    logo: logo,
-    name: name,
-    enName: enName,
-    onClick: onLogoClick
-  }), appList && React.createElement(_AppList["default"], {
-    items: appList,
-    selectedKey: selectedAppKey,
-    onChange: onAppChange
-  }), React.createElement(Content, null, props.children), React.createElement(_HeaderActions["default"], _extends({}, props, {
-    config: config,
-    headerRef: headerRef,
-    className: "paas-header-actions"
-  }), extraActions));
+/**
+ * @file Layout header
+ * @author zhangyou
+ */
+import { useRef } from 'react';
+import styled from 'styled-components';
+import Actions from '../HeaderActions';
+import AppList from '../AppList';
+import Logo from './Logo';
+
+const Header = styled.div`
+    position: sticky;
+    top: 0;
+    height: ${props => `${props.theme.headerHeight}px`};
+    display: flex;
+    color: #fff;
+    background: #fff;
+    z-index: 201;
+    .isInIframe.noAppList &,
+    .isEmptyLayout & {
+        display: none;
+    }
+    .tnt-themeS1 & {
+        background: #323b4a;
+    }
+    padding-right: 20px;
+    box-shadow: 0 1px 10px 0 rgba(0,0,0,0.1);
+    transition: box-shadow .2s cubic-bezier(.4,0,.2,1), -webkit-box-shadow .2s cubic-bezier(.4,0,.2,1);
+
+    .paas-header-actions {
+        li {
+            .tnt-themeS1 & {
+                color: rgba(255,255,255,.85);
+            }
+        }
+    }
+`;
+
+const Content = styled.div`
+    flex: 1;
+    .isInIframe & {
+        display: none;
+    }
+`;
+
+export default props => {
+    const { logo, name, enName, language, selectedAppKey, appList, onLogoClick, onAppChange, extraActions } = props;
+    const config = {
+        application: true,
+        ...props.config
+    };
+    const headerRef = useRef();
+
+    return (
+        <Header ref={headerRef}>
+            <Logo
+                language={language}
+                logo={logo}
+                name={name}
+                enName={enName}
+                onClick={onLogoClick}
+            />
+            {
+                appList && (
+                    <AppList
+                        items={appList}
+                        selectedKey={selectedAppKey}
+                        onChange={onAppChange}
+                    />
+                )
+            }
+            <Content>
+                {props.children}
+            </Content>
+            <Actions
+                {...props}
+                config={config}
+                headerRef={headerRef}
+                className="paas-header-actions"
+            >
+                {extraActions}
+            </Actions>
+        </Header>
+    );
 };
-
-exports["default"] = _default;

package/lib/Layout/paaslayout/Logo.js

@@ -1,32 +1,27 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _Logo = _interopRequireDefault(require("../Logo"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    color: #17233d !important;\n    letter-spacing: 0;\n    background: #fff !important;\n    box-shadow: none !important;\n    .isInIframe & {\n        display: none;\n    }\n\n    &:after {\n        display: none;\n    }\n\n    .tnt-themeS1 & {\n        color: rgba(255,255,255,.85) !important;\n        background: #323b4a !important;\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 LogoWrapper = (0, _styledComponents["default"])(_Logo["default"])(_templateObject());
-
-var _default = function _default(props) {
-  return React.createElement(LogoWrapper, props);
-};
-
-exports["default"] = _default;
+/**
+ * @file Logo
+ * @author zhangyou
+ */
+import styled from 'styled-components';
+import Logo from '../Logo';
+
+const LogoWrapper = styled(Logo)`
+    color: #17233d !important;
+    letter-spacing: 0;
+    background: #fff !important;
+    box-shadow: none !important;
+    .isInIframe & {
+        display: none;
+    }
+
+    &:after {
+        display: none;
+    }
+
+    .tnt-themeS1 & {
+        color: rgba(255,255,255,.85) !important;
+        background: #323b4a !important;
+    }
+`;
+
+export default props => <LogoWrapper {...props} />;

package/lib/Layout/paaslayout/SideMenu.js

@@ -1,185 +1,172 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = require("react");
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _Iconfont = _interopRequireDefault(require("../Iconfont"));
-
-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 _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());
-
-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;
-
-  var _useState = (0, _react.useState)(selectedKey),
-      _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 _window$location$path;
-
-    var data = _ref2.data;
-
-    var _ref3 = data || {},
-        path = _ref3.path;
-
-    var formatPath = formatMenuPath || function (path) {
-      return path;
-    };
-
-    if (isNewTabMenu(data)) {
-      openInNewTab(formatPath(data == null ? void 0 : data.path, data));
-      return;
+import { useState, useEffect, Component } from 'react';
+import styled from 'styled-components';
+import cn from 'classnames';
+import Iconfont from '../Iconfont';
+
+const SideMenu = styled.ul`
+    background: #fff;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    .isInIframe & {
+        display: none;
     }
-
-    var routerPrefix = (_window$location$path = window.location.pathname.match(/(^\/[^\/]+)/i)) == null ? void 0 : _window$location$path[1];
-
-    if (window.location.pathname.startsWith(routerPrefix)) {
-      var forwardPath = formatPath(path, data);
-      changeRouter ? changeRouter(forwardPath, data) : window.history.pushState(data, data == null ? void 0 : data.name, forwardPath);
-    } else {
-      window.location.href = formatPath(path, data);
+    
+    & > li {
+        font-size: 14px;
+        letter-spacing: 0;
+        margin-top: 20px;
+        &:first-child {
+            margin-top: 30px;
+        }
+        & > span {
+            line-height: 38px;
+            opacity: 0.4;
+            display: inline-block;
+            width: calc(100% - 20px);
+            color: #17233D;
+            border-bottom: 1px solid #B2BECD;
+            margin-left: 20px;
+        }
     }
-  };
-
-  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);
-      }
+`;
+
+const SubMenu = styled.ul`
+    background: #fff;
+    list-style: none;
+    font-size: 14px;
+    color: #17233D;
+    margin: 10px 0 0;
+    padding: 0;
+    li {
+        position: relative;
+        line-height: 38px;
+        cursor: pointer;
+        padding-left: 20px;
+        & > a {
+            color: #17233D;
+            & > span {
+                padding-left: 10px;
+            }
+        }
+        &.active {
+            background: #EAEDF8;
+            &:before {
+                position: absolute;
+                left: 0;
+                top: 0;
+                content: '';
+                width: 4px;
+                height: 100%;
+                background-color: #4C79FF;
+            }
+        }
     }
+`;
+
+export default props => {
+    const { language, menus = [], formatMenuPath, changeRouter, selectedKey, onBeforeChange, onChange, onSelect } = props;
+    const [activeMenu, setActiveMenu] = useState(selectedKey);
+    const defaultBeforeChange = ({ data }) => !isNewTabMenu(data);
+    const defaultSelect = ({ data }) => {
+        const { path } = data || {};
+        const formatPath = formatMenuPath || (path => path);
+
+        if (isNewTabMenu(data)) {
+            openInNewTab(formatPath(data?.path, data));
+            return;
+        }
 
-    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;
+        const routerPrefix = window.location.pathname.match(/(^\/[^\/]+)/i)?.[1];
 
-    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;
-      return React.createElement("li", {
-        key: code,
-        onClick: function onClick(evt) {
-          return selectMenu({
-            key: code,
-            data: menu,
-            domEvent: evt
-          });
-        },
-        className: (0, _classnames["default"])({
-          active: code === activeMenu
-        })
-      }, React.createElement("a", {
-        href: path,
-        onClick: function onClick(evt) {
-          return evt.preventDefault();
+        if (window.location.pathname.startsWith(routerPrefix)) {
+            const forwardPath = formatPath(path, data);
+            changeRouter ? changeRouter(forwardPath, data) : window.history.pushState(data, data?.name, forwardPath);
+        } else {
+            window.location.href = formatPath(path, data);
         }
-      }, icon instanceof _react.Component ? icon : React.createElement(_Iconfont["default"], {
-        type: icon
-      }), React.createElement("span", null, {
-        cn: menuName,
-        en: enName
-      }[language])));
     };
+    const selectMenu = (param = {}) => {
+        const finalBeforeChange = onBeforeChange || defaultBeforeChange;
+        const finalSelect = onSelect || defaultSelect;
+
+        if (param.key !== activeMenu) {
+            if (finalBeforeChange(param, activeMenu)) {
+                setActiveMenu(param.key);
+                onChange && onChange(param);
+            }
+        }
 
-    if (groupName && children.length) {
-      return React.createElement("li", {
-        key: code
-      }, React.createElement("span", null, {
-        cn: groupName,
-        en: enName
-      }[language]), React.createElement(SubMenu, null, children.map(function (subItem) {
-        return React.createElement(SubMenuItem, {
-          menu: subItem,
-          key: subItem == null ? void 0 : subItem.code
-        });
-      })));
-    }
+        finalSelect(param);
+    };
 
-    return React.createElement(SubMenuItem, {
-      menu: item
-    });
-  };
+    const MenuItem = ({ item }) => {
+        const { code, groupName, enName, children = [] } = item;
+        const SubMenuItem = ({ menu }) => {
+            const { code, menuName, enName, icon, path } = menu;
+
+            return (
+                <li
+                    key={code}
+                    onClick={evt => selectMenu({ key: code, data: menu, domEvent: evt })}
+                    className={cn({ active: code === activeMenu })}
+                >
+                    <a href={path} onClick={evt => evt.preventDefault()}>
+                        {
+                            icon instanceof Component ? icon : (
+                                <Iconfont type={icon} />
+                            )
+                        }
+                        <span>
+                            {
+                                {
+                                    cn: menuName,
+                                    en: enName
+                                }[language]
+                            }
+                        </span>
+                    </a>
+                </li>
+            );
+        };
+
+        if (groupName && children.length) {
+            return (
+                <li key={code}>
+                    <span>
+                        {
+                            {
+                                cn: groupName,
+                                en: enName
+                            }[language]
+                        }
+                    </span>
+                    <SubMenu>
+                        {
+                            children.map(subItem => <SubMenuItem menu={subItem} key={subItem?.code} />)
+                        }
+                    </SubMenu>
+                </li>
+            );
+        }
 
-  (0, _react.useEffect)(function () {
-    setActiveMenu(selectedKey);
-  }, [selectedKey]);
-  return React.createElement(SideMenu, null, menus.map(function (menu) {
-    return React.createElement(MenuItem, {
-      item: menu,
-      key: menu.code
-    });
-  }));
-};
+        return <SubMenuItem menu={item} />;
+    };
 
-exports["default"] = _default;
+    useEffect(() => {
+        setActiveMenu(selectedKey);
+    }, [selectedKey]);
+
+    return (
+        <SideMenu>
+            {
+                menus.map(menu => (
+                    <MenuItem item={menu} key={menu.code} />
+                ))
+            }
+        </SideMenu>
+    );
+};