tntd 1.4.1 → 1.4.4

package/lib/Layout/EnterpriseLayout/Header.js

@@ -0,0 +1,113 @@
+"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 _Icon = _interopRequireDefault(require("../../Icon"));
+
+var _AppList = _interopRequireDefault(require("../AppList"));
+
+var _OrgAppList = _interopRequireDefault(require("../OrgAppList"));
+
+var _HeaderActions = _interopRequireDefault(require("./HeaderActions"));
+
+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 _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 _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: relative;\n    z-index: 201;\n    height: ", ";\n    display: flex;\n    color: rgba(255,255,255,.85);\n    background: #fff;\n\n    .hasHeaderTabs & {\n        background: #191D29;\n        .tnt-layout-header-content {\n            display: none;\n        }\n    }\n\n    .tnt-themeS3.hasHeaderTabs &{\n        background: ", "; //#1D4295 !important;\n    }\n\n    .isInIframe.noAppList &,\n    .isEmptyLayout & {\n        display: none;\n    }\n    .tnt-themeS1 & {\n        background: #FFFFFF;\n        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.15);\n    }\n    .tnt-themeS1.compatible & {\n        /* background: #323b4a; */\n    }\n    padding-right: 20px;\n    background: #FFFFFF;\n    box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);\n    .compatible & {\n        box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10);\n    }\n    transition: box-shadow .2s cubic-bezier(.4,0,.2,1), -webkit-box-shadow .2s cubic-bezier(.4,0,.2,1);\n\n    .sidebar-collapsed-controller {\n        text-align: center;\n        width: ", ";\n        line-height: ", ";\n        height: ", ";\n        cursor: pointer;\n        color: ", ";\n        margin-right: 10px;\n\n        & > .tnt-icon {\n            font-size: 16px;\n            .large-size & {\n                font-size: 20px;\n            }\n        }\n\n        i {\n            position: relative;\n            top: -1px;\n            vertical-align: sub;\n        }\n\n        &:hover {\n            background-color: rgba(0,0,0,.06);\n        }\n\n        .tnt-themeS1 & {\n            /* color: rgba(255,255,255,.85); */\n            color: ", ";\n        }\n        .large-size & {\n            font-size: 18px;\n        }\n        .isInIframe & {\n            display: none;\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");
+}, function (props) {
+  return "".concat(props.theme.blueBgColor, " !important");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.headerHeight, "px");
+}, function (props) {
+  return "".concat(props.theme.primaryTextColor);
+}, function (props) {
+  return "".concat(props.theme.primaryTextColor);
+});
+
+var Content = _styledComponents["default"].div(_templateObject2());
+
+var _default = (0, _styledComponents.withTheme)(function (props) {
+  var collapsed = props.collapsed,
+      _props$collapseIconPl = props.collapseIconPlacement,
+      collapseIconPlacement = _props$collapseIconPl === void 0 ? 'right' : _props$collapseIconPl,
+      selectedAppKey = props.selectedAppKey,
+      appList = props.appList,
+      orgAppShow = props.orgAppShow,
+      orgAppList = props.orgAppList,
+      selectedOrgKey = props.selectedOrgKey,
+      orgList = props.orgList,
+      headerTabs = props.headerTabs,
+      onAppChange = props.onAppChange,
+      onOrgChange = props.onOrgChange,
+      onCollapseChange = props.onCollapseChange,
+      extraActions = props.extraActions;
+  var headerRef = (0, _react.useRef)();
+  return React.createElement(Header, {
+    className: "tnt-layout-header",
+    ref: headerRef
+  }, collapseIconPlacement === 'right' && React.createElement("div", {
+    className: "sidebar-collapsed-controller",
+    onClick: onCollapseChange
+  }, React.createElement(_Icon["default"], {
+    type: "menu-".concat(collapsed ? 'unfold' : 'fold')
+  })), headerTabs, orgList && React.createElement(_OrgAppList["default"], {
+    orgAppShow: orgAppShow,
+    selectedOrgKey: selectedOrgKey,
+    orgList: orgList,
+    onOrgChange: onOrgChange,
+    selectedAppKey: selectedAppKey,
+    orgAppList: orgAppList,
+    onAppChange: onAppChange
+  }), appList && !orgList && React.createElement(_AppList["default"], {
+    items: appList,
+    selectedKey: selectedAppKey,
+    onChange: onAppChange
+  }), React.createElement(Content, {
+    className: "tnt-layout-header-content"
+  }, props.children), React.createElement(_HeaderActions["default"], _extends({}, props, {
+    headerRef: headerRef
+  }), extraActions));
+});
+
+exports["default"] = _default;

package/lib/Layout/EnterpriseLayout/HeaderActions.js

@@ -0,0 +1,104 @@
+"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 _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:not(.tnt-themeS1) & {\n            color: rgba(255,255,255,.8);\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,
+      rest = _objectWithoutProperties(props, ["config", "theme", "userInfo", "menus", "apps", "extraActions", "headerRef", "onLanguageChange", "onThemeChange", "onApplicationChange", "onAppChange", "onCollapseChange", "onPersonalSetting", "onChangePassword", "onLogout", "onLogoClick"]);
+
+  return React.createElement(Actions, rest, extraActions, globalNavigation && React.createElement(_GlobalNavigation["default"], {
+    headerRef: headerRef,
+    menus: menus
+  }), application && React.createElement(_Application["default"], {
+    language: userInfo.lang,
+    apps: apps,
+    onChange: onApplicationChange
+  }), avatar && React.createElement(React.Fragment, null, React.createElement(_divider["default"], {
+    type: "vertical"
+  }), React.createElement(_Avatar["default"], {
+    userInfo: userInfo,
+    onThemeChange: onThemeChange,
+    onPersonalSetting: onPersonalSetting,
+    onChangePassword: onChangePassword,
+    onLogout: onLogout,
+    config: {
+      theme: theme,
+      language: language
+    }
+  })));
+});
+
+exports["default"] = _default;

package/lib/QueryForm/index.js

@@ -374,8 +374,9 @@ function (_React$PureComponent) {
           renderActions = _this$props4.renderActions;
       this.updateFieldHeight();
       this.form.on('search', this.search); // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
+      // || renderActions
 
-      if (!showFieldCount && !showExpand || renderActions) {
+      if (!showFieldCount && !showExpand) {
         return;
       }
 

package/lib/Select/index.js

@@ -503,11 +503,9 @@ function (_PureComponent) {
         _this2.addEvent();
       }, 500);
       var arr = this.props.children;
-      var children = this.turnChildren(arr);
+      var children = this.turnChildren(arr); // if (children && children.length > 0) {
 
-      if (children && children.length > 0) {
-        this.formulaWidth();
-      }
+      this.formulaWidth(); // }
     }
   }, {
     key: "componentDidUpdate",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "1.4.1",
+    "version": "1.4.4",
     "description": "ued tnt design",
     "main": "lib/index.js",
     "module": "es/index.js",