tntd 1.3.50 → 1.3.54

package/lib/BlockHeader/index.less

@@ -0,0 +1,141 @@
+.tntd-block-header {
+    @font-face {
+        font-family:'OswaldLight';
+        font-display: swap;
+        src:url('./fonts/OswaldLight.ttf');
+    }
+    & {
+        height: 32px;
+        line-height: 32px;
+        clear: both;
+    }
+    &.has-number{
+        .tntd-block-header-title {
+            h3 {
+                margin-left: 0;
+            }
+            &::before {
+                display: none;
+            }
+        }
+        &.small {
+            .count {
+                font-size: 20px;
+                margin-right: 12px;
+                &::before {
+                    width: 20px;
+                    height: 15px;
+                    top: 44%;
+                    left: 60%;
+                }
+            }
+        }
+        &.large {
+            .count {
+                font-size: 24px;
+                margin-right: 12px;
+                &::before {
+                    width: 24px;
+                    height: 15px;
+                    left: 56%;
+                }
+            }
+        }
+        .count {
+            position: relative;
+            top: -1px;
+            color: #0089ff;
+            font-size: 22px;
+            font-style: normal;
+            margin-right: 12px;
+            position: relative;
+            vertical-align: top;
+            font-weight: 500;
+            font-family: "OswaldLight" !important;
+            letter-spacing: 2px;
+        }
+        .count::before {
+            position: absolute;
+            display: block;
+            content: "";
+            width: 22px;
+            height: 15px;
+            border-top: 1px solid #0089ff;
+            background-color: #fff;
+            top: 47%;
+            left: 52%;
+            transform: rotate(-45deg);
+            -webkit-transform: rotate(-45deg);
+        }
+    }
+    &.small {
+        & {
+            height: 28px;
+            line-height: 28px;
+        }
+        .tntd-block-header-title {
+            h3 {
+                font-size: 14px;
+            }
+            &::before {
+                height: 14px;
+                top: 7px;
+            }
+        }
+    }
+    &.large {
+        & {
+            height: 36px;
+            line-height: 36px;
+        }
+        .tntd-block-header-title {
+            h3 {
+                font-size: 18px;
+            }
+            &::before {
+                height: 18px;
+                top: 9px;
+            }
+        }
+    }
+    .tntd-block-header-title {
+        & {
+            position: relative;
+            float: left;
+        }
+        h3 {
+            font-size: 16px;
+            color: #17233D;
+            font-weight: normal;
+            margin: 0;
+            margin-right: 10px;
+            margin-left: 10px;
+            display: inline-block;
+        }
+        span {
+            position: relative;
+            top: 1px;
+            font-size: 12px;
+            color:#8b919e;
+            margin-right: 10px;
+            line-height: 1;
+        }
+        &::before {
+            position: absolute;
+            left: 0;
+            top: 8px;
+            background-color: #126BFB;
+            content: "";
+            width: 3px;
+            height: 16px;
+            margin-right: 8px;
+        }
+    }
+    .tntd-block-header-extra {
+        & {
+            position: relative;
+            float: right;
+            margin-left: 8px;
+        }
+    }
+}

package/lib/Layout/Avatar.js

@@ -15,6 +15,8 @@ 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"));
@@ -23,6 +25,8 @@ 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; }
@@ -78,6 +82,10 @@ var UserInfoContent = function UserInfoContent(props) {
       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", {
@@ -89,10 +97,10 @@ var UserInfoContent = function UserInfoContent(props) {
   }, userInfo.account), React.createElement("a", {
     onClick: onPersonalSetting,
     href: "/bridge/userCenter?currentTab=1"
-  }, "\u4E2A\u4EBA\u8BBE\u7F6E"), React.createElement("a", {
+  }, getText('personalSettings')), React.createElement("a", {
     onClick: onChangePassword,
     href: "/bridge/userCenter?currentTab=2"
-  }, "\u4FEE\u6539\u5BC6\u7801")), React.createElement("div", {
+  }, getText('changePwd'))), React.createElement("div", {
     className: "user-info-footer"
   }, React.createElement(_button["default"], {
     className: "user-info-footer-signout",
@@ -105,7 +113,7 @@ var UserInfoContent = function UserInfoContent(props) {
         window.location.href = "/user/login?callbackUrl=".concat(window.encodeURI(location.href));
       }
     }
-  }, React.createElement("a", null, "\u9000\u51FA"))));
+  }, React.createElement("a", null, getText('signOut')))));
 };
 
 var _default = function _default(props) {

package/lib/Layout/GlobalNavigation/NavigationPopup.js

@@ -17,6 +17,8 @@ var _utils = require("../utils");
 
 var _Iconfont = _interopRequireDefault(require("../Iconfont"));
 
+var _locale = require("../../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
@@ -177,6 +179,7 @@ var _default = function _default(_ref2) {
       searchValue = _useState4[0],
       setSearchValue = _useState4[1];
 
+  var language = actions == null ? void 0 : actions.getLanguage();
   var isLevel3 = (0, _utils.hasLevel3)(menus);
 
   var _useState5 = (0, _react.useState)(isLevel3 ? menus == null ? void 0 : menus[0] : null),
@@ -359,7 +362,7 @@ var _default = function _default(_ref2) {
   }, React.createElement(_Iconfont["default"], {
     type: "search"
   }), React.createElement("input", {
-    placeholder: "\u83DC\u5355\u641C\u7D22",
+    placeholder: actions == null ? void 0 : actions.getText('menuSearch'),
     value: searchValue,
     onChange: onSearchChange,
     onFocus: function onFocus() {
@@ -385,7 +388,7 @@ var _default = function _default(_ref2) {
       onClick: function onClick() {
         return onSelectAppTab(menu);
       }
-    }, menu == null ? void 0 : menu.groupName);
+    }, menu == null ? void 0 : menu[language === 'cn' ? 'groupName' : 'enName']);
   })), React.createElement(GroupMenus, {
     theme: theme,
     isLevel3: isLevel3
@@ -393,7 +396,7 @@ var _default = function _default(_ref2) {
     return React.createElement("div", null, groups == null ? void 0 : groups.map(function (group) {
       return React.createElement(GroupMenuItem, {
         theme: theme
-      }, React.createElement("h5", null, group.groupName), React.createElement(MenuList, null, (group.children || []).map(function (menu) {
+      }, React.createElement("h5", null, group == null ? void 0 : group[language === 'cn' ? 'groupName' : 'enName']), React.createElement(MenuList, null, (group.children || []).map(function (menu) {
         return React.createElement(MenuItem, {
           key: menu.code,
           className: (0, _classnames["default"])({
@@ -408,7 +411,7 @@ var _default = function _default(_ref2) {
           onClick: function onClick(evt) {
             return evt.preventDefault();
           }
-        }, menu.menuName));
+        }, menu == null ? void 0 : menu[language === 'cn' ? 'menuName' : 'enName']));
       })));
     }));
   })));

package/lib/Layout/GlobalNavigation/index.js

@@ -100,6 +100,7 @@ var GlobalStyle = (0, _styledComponents.createGlobalStyle)(_templateObject2(), f
 
 var _default = (0, _styledComponents.withTheme)(function (props) {
   var actions = (0, _react.useContext)(_ActionsContext["default"]);
+  var getText = actions.getText;
   var headerRef = props.headerRef,
       menus = props.menus;
 
@@ -156,7 +157,7 @@ var _default = (0, _styledComponents.withTheme)(function (props) {
     })
   }, React.createElement(_Iconfont["default"], {
     type: "unordered-list"
-  }), React.createElement("span", null, "\u5168\u5C40\u5BFC\u822A"), React.createElement(GlobalStyle, {
+  }), React.createElement("span", null, getText('globalNavigation')), React.createElement(GlobalStyle, {
     hasLevel3: (0, _utils.hasLevel3)(menus)
   }));
 });

package/lib/Layout/README.md

@@ -262,7 +262,8 @@ ReactDOM.render(
         enName="Private Cloud"
         config={{
             globalNavigation: true,
-            theme:true
+            theme:true,
+            language: true
         }}
         appList={[
             { key: 'movie', name: '电影图谱', children: [{ key: 'movie1', name: 'subitem' }] },

package/lib/Layout/createActions.js

@@ -7,11 +7,14 @@ exports["default"] = void 0;
 
 var _eventemitter = _interopRequireDefault(require("eventemitter3"));
 
+var _locale = require("../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _default = function _default() {
+var _default = function _default(params) {
   var eventEmitter = new _eventemitter["default"]();
   var data = {
+    language: (params == null ? void 0 : params.language) || 'cn',
     selectedMenuKey: null
   };
   return {
@@ -24,6 +27,16 @@ var _default = function _default() {
     getSelectedMenuKey: function getSelectedMenuKey() {
       return data.selectedMenuKey;
     },
+    getLanguage: function getLanguage() {
+      return data.language;
+    },
+    setLanguage: function setLanguage(language) {
+      return data.language = language;
+    },
+    getText: function getText(key) {
+      var language = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : data.language;
+      return (0, _locale.getText)(key, language);
+    },
     on: function on(eventName, callback) {
       eventEmitter.on(eventName, callback);
     },

package/lib/Layout/index.js

@@ -43,6 +43,8 @@ var _ActionsContext = _interopRequireDefault(require("./ActionsContext"));
 
 var _createActions = _interopRequireDefault(require("./createActions"));
 
+var _storage = require("./storage");
+
 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; }
@@ -103,7 +105,16 @@ var TNTLayout = function TNTLayout(_ref) {
       _ref2$themeSwitch = _ref2.themeSwitch,
       themeSwitch = _ref2$themeSwitch === void 0 ? true : _ref2$themeSwitch;
 
-  var userInfo = props.userInfo || {}; // layout上的指定的属性优先级会高于extendMap中的属性
+  var userInfo = props.userInfo || {};
+  var actionsContextValue = (0, _createActions["default"])({
+    language: (0, _storage.getLanguageStore)() || userInfo.lang || 'cn'
+  });
+
+  var onLanguageChange = function onLanguageChange(language) {
+    actionsContextValue.setLanguage(language);
+    props == null ? void 0 : props.onLanguageChange(language);
+  }; // layout上的指定的属性优先级会高于extendMap中的属性
+
 
   type = type || displayType;
   config = Object.assign({
@@ -117,28 +128,31 @@ var TNTLayout = function TNTLayout(_ref) {
   }, React.createElement(_AuthContext["default"].Provider, {
     value: (0, _checkAuth["default"])(props.menus)
   }, React.createElement(_ActionsContext["default"].Provider, {
-    value: (0, _createActions["default"])()
+    value: actionsContextValue
   }, type === 'paas' && React.createElement(_paaslayout["default"], _extends({
     menuAlignMode: menuAlignMode,
     config: config
   }, props, {
     extraHeaderActions: extraHeaderActions,
     isInIframe: isInIframe,
-    userInfo: userInfo
+    userInfo: userInfo,
+    onLanguageChange: onLanguageChange
   })), type === 'enterprise' && React.createElement(_EnterpriseLayout["default"], _extends({
     menuAlignMode: menuAlignMode,
     config: config
   }, props, {
     extraHeaderActions: extraHeaderActions,
     isInIframe: isInIframe,
-    userInfo: userInfo
+    userInfo: userInfo,
+    onLanguageChange: onLanguageChange
   })), (!type || !['paas', 'enterprise'].includes(type)) && React.createElement(_Layout["default"], _extends({
     menuAlignMode: menuAlignMode,
     config: config
   }, props, {
     extraHeaderActions: extraHeaderActions,
     isInIframe: isInIframe,
-    userInfo: userInfo
+    userInfo: userInfo,
+    onLanguageChange: onLanguageChange
   })))));
 };
 

package/lib/Layout/paaslayout/index.less

@@ -0,0 +1,75 @@
+
+
+        .side-menu-section {
+            &:first-child {
+                h2 {
+                    padding-top: 0;
+                }
+            }
+            &.only-one-submenu {
+                margin-bottom: 0;
+            }
+            h2 {
+                font-size: 14px;
+                color: #17233D;
+                height: 40px;
+                line-height: 40px;
+                font-weight:  normal;
+                padding-left: 17px;
+                margin: 0;
+                .tnt-icon {
+                    margin-right: 7px;
+                }
+            }
+            .side-menu-list {
+                margin-bottom: 0;
+                .side-menu-item {
+                    & {
+                        position: relative;
+                        cursor: pointer;
+                        height: 30px;
+                        line-height: 30px;
+                        opacity: 0.8;
+                        font-size: 14px;
+                        color: #17233D;
+                        letter-spacing: 0;
+                    }
+                    a {
+                        padding-left: 42px;
+                        & {
+                            color: #666;
+                            text-decoration: none;
+                            display: block;
+                            transition: none;
+                            height: 30px;
+                            line-height: 30px;
+                        }
+                        &:hover {
+                            color: #323232;
+                            background: #f5f5f5;
+                        }
+                        i {
+                            padding-left: 20px;
+                            font-size: 20px;
+                            margin-right: 15px;
+                            vertical-align: sub;
+                        }
+                    }
+                    &.active {
+                        &:before {
+                            position: absolute;
+                            content: "";
+                            left: 0;
+                            top: 0;
+                            width: 3px;
+                            height: 100%;
+                            background: @primary-color;
+                        }
+                        a {
+                            background: rgba(18,107,251,0.10);
+                            color: @primary-color;
+                        }
+                    }
+                }
+            }
+        }

package/lib/Layout/utils.js

@@ -121,8 +121,8 @@ var isNewTabMenu = function isNewTabMenu(menu) {
 
 exports.isNewTabMenu = isNewTabMenu;
 
-var openInNewTab = function openInNewTab(menu) {
-  window.open(menu == null ? void 0 : menu.path, '_blank');
+var openInNewTab = function openInNewTab(path) {
+  window.open(path, '_blank');
 };
 
 exports.openInNewTab = openInNewTab;

package/lib/Page/Box.js

@@ -29,7 +29,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var Box = function Box(_ref) {
   var inLayout = _ref.inLayout,
-      clsPrefix = _ref.clsPrefix,
+      _ref$clsPrefix = _ref.clsPrefix,
+      clsPrefix = _ref$clsPrefix === void 0 ? 'tnt-page' : _ref$clsPrefix,
       children = _ref.children,
       _ref$noPadding = _ref.noPadding,
       noPadding = _ref$noPadding === void 0 ? false : _ref$noPadding,
@@ -73,8 +74,8 @@ var Box = function Box(_ref) {
     className: "".concat(clsPrefix, "-box-card"),
     bordered: bordered,
     bodyStyle: _objectSpread({}, bodyStyle, {
-      overflow: 'auto',
-      height: inLayout ? 'auto' : cardBodyHeight
+      // overflow: 'auto',
+      height: inLayout ? "calc(100% - ".concat(headerHeight, ")") : cardBodyHeight
     }),
     size: size,
     headStyle: headStyle

package/lib/Page/README.md

@@ -67,8 +67,8 @@ const Demo = (props) => {
       <h3>第三种场景， 无标题栏</h3>
 
       <Page height="400px">
-        <Box title='分组列表' extra={<Button type="primary" size="small">添加</Button>}>第一列</Box>
-        <Box mode="white" title='菜单列表' extra={<Button type="primary" size="small">添加</Button>}>第二列</Box>
+        <Box title='分组列表' extra={<Button type="primary" size='small'>添加</Button>}>第一列</Box>
+        <Box mode="white" title='菜单列表' extra={<Button type="primary" size='small'>添加</Button>}>第二列</Box>
         <Box title="系统列表">第三列</Box>
         <Box title="功能注册">第四列</Box>
       </Page>
@@ -86,7 +86,13 @@ const Demo = (props) => {
             // extra={right}
             inLayout
         >
-            <Box title="系统列表" width={320}>第三列</Box>
+            <Box 
+                title="系统列表" 
+                width={320}
+                mode='white'
+            >
+                第三列
+            </Box>
             <Box title="功能注册">
                 第四列<br/>
                 第四列<br/>
@@ -114,7 +120,14 @@ const Demo = (props) => {
                 第四列<br/>
                 第四列<br/>
                 第四列<br/>
-                第四列<br/>
+                第四列end
+            </Box>
+             <Box 
+                title="系统列表" 
+                width={200}
+                mode='white'
+            >
+                第三列
             </Box>
         </Page>
       </Layout>
@@ -154,7 +167,6 @@ ReactDOM.render(<Demo />, document.getElementById('root'))
 
 
 
-
 #### Page.Box
 
 描述：Page.Box包裹了antd库中的Card组件，Box属性都会透传到Card组件。