tntd 1.3.59 → 1.3.60

package/components/QueryListScene/List.js

@@ -3,7 +3,7 @@
  * @author you.zhang
  */
 import React, { createRef } from 'react';
-import { findDOMNode } from 'react-dom'; 
+import { findDOMNode } from 'react-dom';
 import cn from 'classnames';
 import { get, pickBy, isEmpty, debounce, throttle } from 'lodash';
 import { Spin } from 'antd';
@@ -91,7 +91,7 @@ export default class QueryList extends React.PureComponent {
     }
 
     onWindowResize = debounce(() => {
-        const {scroll} = this.state;
+        const { scroll } = this.state;
 
         this.setState({
             scroll: {
@@ -102,7 +102,7 @@ export default class QueryList extends React.PureComponent {
     }, 50)
 
     componentDidMount() {
-        const {qlsProps, actions} = this.props;
+        const { qlsProps, actions } = this.props;
 
         this.formData = {
             ...(actions.getFormData() || {}),
@@ -169,7 +169,7 @@ export default class QueryList extends React.PureComponent {
             rowKey,
             actions
         } = this.props;
-        const {pagination} = this.state;
+        const { pagination } = this.state;
         const hasPagination = this.props.pagination !== false;
 
         if (hasPagination) {
@@ -245,30 +245,34 @@ export default class QueryList extends React.PureComponent {
         }, val => val !== undefined);
     }
 
-    onSearch = (values, {callback, showLoading = true} = {}) => {
+    onSearch = (values, { callback, showLoading = true } = {}) => {
         this.formData = {
             ...this.formData,
             ...values
         };
         // this.props.actions.setData('formData', this.formData);
-        return this.fetchData(this.formData, {callback, showLoading});
+        return this.fetchData(this.formData, { callback, showLoading });
     };
 
     onTableChange = (pagination, filters, sorter) => {
         const { actions, localPagination } = this.props;
-
-        this.formData = {
-            ...this.formData,
+        const tableParams = {
             pageSize: pagination.pageSize,
             current: pagination.current,
             filters: isEmpty(filters) ? undefined : filters,
             sorter: isEmpty(sorter) ? undefined : sorter
         };
+        console.log('onTableChange...', actions.getSubmittedFormData(), this.formData);
+
+        Object.assign(this.formData, tableParams);
 
         // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
         // 所以暂时排序有使用者自己处理
         if (!localPagination) {
-            this.fetchData(this.formData);
+            this.fetchData({
+                ...actions.getSubmittedFormData(),
+                ...tableParams
+            });
             return;
         }
 
@@ -292,7 +296,7 @@ export default class QueryList extends React.PureComponent {
             );
         }
     };
-    
+
     onTableBodyScroll = throttle(evt => {
         console.log('onTableBodyScroll', evt.target.scrollTop);
         this.updateIsScrollToBottom(evt.target);
@@ -306,7 +310,7 @@ export default class QueryList extends React.PureComponent {
         };
 
         this.setState({
-            hasScrollToBottom: isScrollToBottom(tableBody) 
-        }); 
+            hasScrollToBottom: isScrollToBottom(tableBody)
+        });
     }
 };

package/lib/BlockHeader/README.md

@@ -0,0 +1,83 @@
+## BlockHeader组件
+### 代码演示
+```jsx
+import React from 'react';
+import ReactDOM from 'react-dom';
+import 'antd/dist/antd.css';
+import {Button, Table} from "antd";
+import BlockHeader from './index';
+
+const Demo = props => {
+
+    return (
+        <div>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+                size='large'
+                extra={<Button>这是extra信息</Button>}
+            />
+            <br/>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+            />
+            <br/>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+                size='small'
+            />
+            <br/>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+                size='large'
+                number={1}
+            />
+            <br/>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+                number={2}
+            />
+            <br/>
+            <BlockHeader 
+                title='这是标题'
+                subTitle='这是描述，相当于副标题'
+                tooltip='test'
+                placement="right"
+                size='small'
+                number={3}
+            />
+            <br/>
+        </div>
+    );
+};
+
+
+ReactDOM.render(
+    <Demo />,
+    document.getElementById('root')
+);
+```
+### API
+#### Handle
+| 属性名称         | 属性说明                    | 类型            | 默认值         | 是否必须 |
+| :----------     | :------------------------- | :------        | :----------   | :------- |
+| title           | 标题                        | String         | -             | 否       |
+| subTitle        | 副标题                      | String         | -             | 否       |
+| number          | 标题前是数字                 | Number         | -             | 否       |
+| size            | 大小，large、default、small  | String         | default       | 否       |
+| extra           | 右边区域内容                 | React node     | -             | 否        |
+

package/lib/BlockHeader/index.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+require("./index.less");
+
+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; }
+
+var _default = function _default(props) {
+  var _ref = props || {},
+      _ref$title = _ref.title,
+      title = _ref$title === void 0 ? '暂无标题' : _ref$title,
+      subTitle = _ref.subTitle,
+      _ref$size = _ref.size,
+      size = _ref$size === void 0 ? 'default' : _ref$size,
+      extra = _ref.extra,
+      number = _ref.number,
+      rest = _objectWithoutProperties(_ref, ["title", "subTitle", "size", "extra", "number"]);
+
+  return React.createElement("div", {
+    className: (0, _classnames["default"])('tntd-block-header', size, {
+      'has-number': number
+    })
+  }, React.createElement("div", {
+    className: "tntd-block-header-title"
+  }, number && React.createElement("i", {
+    "class": "count"
+  }, number <= 9 ? "0".concat(number) : number), React.createElement("h3", null, title), React.createElement("span", null, subTitle)), extra && React.createElement("div", {
+    className: "tntd-block-header-extra"
+  }, extra));
+};
+
+exports["default"] = _default;

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/locale.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.getText = exports.en_US = exports.zh_CN = void 0;
+var zh_CN = {
+  globalNavigation: '全局导航',
+  menuSearch: '菜单搜索',
+  // QueryForm
+  search: '搜索',
+  reset: '重置',
+  moreFiltering: '更多过滤',
+  expand: '展开',
+  collapse: '收起',
+  // user popover
+  personalSettings: '个人设置',
+  changePwd: '修改密码',
+  signOut: '退出'
+};
+exports.zh_CN = zh_CN;
+var en_US = {
+  globalNavigation: 'Global Navigation',
+  menuSearch: 'Menu Search',
+  // QueryForm
+  search: 'Search',
+  reset: 'Reset',
+  moreFiltering: 'More filtering',
+  expand: 'Expand',
+  collapse: 'Collapse',
+  // user popover
+  personalSettings: 'Personal settings',
+  changePwd: 'Change password',
+  signOut: 'Sign out'
+};
+exports.en_US = en_US;
+
+var getText = function getText(key) {
+  var _ref;
+
+  var language = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'cn';
+  return (_ref = {
+    cn: zh_CN,
+    en: en_US
+  }[language] || zh_CN) == null ? void 0 : _ref[key];
+};
+
+exports.getText = getText;
+var _default = {
+  en_US: en_US,
+  zh_CN: zh_CN
+};
+exports["default"] = _default;

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/QueryListScene/Field/SelectInput.js

@@ -0,0 +1,115 @@
+"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/input/style");
+
+var _input = _interopRequireDefault(require("antd/lib/input"));
+
+require("antd/lib/select/style");
+
+var _select = _interopRequireDefault(require("antd/lib/select"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _lodash = require("lodash");
+
+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 _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 _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 _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; }
+
+var Option = _select["default"].Option;
+
+var _default = function _default(props) {
+  var _props$options = props.options,
+      options = _props$options === void 0 ? [] : _props$options,
+      addonBeforeStyle = props.addonBeforeStyle,
+      inputProps = _objectWithoutProperties(props, ["options", "addonBeforeStyle"]);
+
+  var _useState = (0, _react.useState)(options),
+      _useState2 = _slicedToArray(_useState, 2),
+      items = _useState2[0],
+      setItems = _useState2[1];
+
+  var getInitialKey = function getInitialKey() {
+    var key = (0, _lodash.get)(options, '0.value');
+
+    if (inputProps.value) {
+      key = (0, _lodash.get)(Object.keys(inputProps.value), '0') || key;
+    }
+
+    return key;
+  };
+
+  var _useState3 = (0, _react.useState)(getInitialKey()),
+      _useState4 = _slicedToArray(_useState3, 2),
+      key = _useState4[0],
+      setKey = _useState4[1];
+
+  var onKeyChange = function onKeyChange(key) {
+    setKey(key);
+    props.onChange(_defineProperty({}, key, ''));
+  };
+
+  var onChange = function onChange(evt) {
+    props.onChange(_defineProperty({}, key, evt.target.value));
+  };
+
+  var addonBefore = _react["default"].createElement(_select["default"], {
+    value: key,
+    onChange: onKeyChange,
+    style: _objectSpread({
+      width: '120px'
+    }, addonBeforeStyle)
+  }, items.map(function (_ref) {
+    var label = _ref.label,
+        value = _ref.value;
+    return _react["default"].createElement(Option, {
+      key: value,
+      value: value
+    }, label);
+  }));
+
+  var getInputValue = function getInputValue() {
+    return (0, _lodash.get)(inputProps.value, key);
+  };
+
+  (0, _react.useEffect)(function () {
+    setItems(options);
+    setKey(getInitialKey());
+  }, [options, inputProps.value]);
+  return _react["default"].createElement(_input["default"], _extends({}, inputProps, {
+    value: getInputValue(),
+    addonBefore: addonBefore,
+    onChange: onChange
+  }));
+};
+
+exports["default"] = _default;

package/lib/QueryListScene/Field/fieldsMap.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.getFieldWidth = exports.defaultFieldWidth = void 0;
+
+require("antd/lib/date-picker/style");
+
+var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
+
+require("antd/lib/input-number/style");
+
+var _inputNumber = _interopRequireDefault(require("antd/lib/input-number"));
+
+require("antd/lib/input/style");
+
+var _input = _interopRequireDefault(require("antd/lib/input"));
+
+var _select = _interopRequireDefault(require("./select"));
+
+var _SelectInput = _interopRequireDefault(require("./SelectInput"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var defaultFieldWidth = '200px';
+exports.defaultFieldWidth = defaultFieldWidth;
+
+var getFieldWidth = function getFieldWidth(type) {
+  if (type === 'dateRange') {
+    return '340px';
+  }
+
+  return {
+    dateRange: '340px',
+    selectInput: '320px'
+  }[type] || defaultFieldWidth;
+};
+
+exports.getFieldWidth = getFieldWidth;
+var _default = {
+  string: _input["default"],
+  input: _input["default"],
+  search: _input["default"].Search,
+  inputNumber: _inputNumber["default"],
+  number: _inputNumber["default"],
+  select: _select["default"],
+  date: _datePicker["default"],
+  dateRange: _datePicker["default"].RangePicker,
+  selectInput: _SelectInput["default"]
+};
+exports["default"] = _default;