tntd 2.0.11 → 2.0.12

package/es/query-form/index.js

@@ -1,5 +1,5 @@
+import _debounce from "lodash/debounce";
 import classnames from 'classnames';
-import { debounce } from 'lodash';
 import React, { createRef } from 'react';
 import createActions from './createActions';
 import Field from './Field';
@@ -12,264 +12,376 @@ import { getLanguage, getText } from '../prev-locale';
 import Icon from '../tntd-icon';
 import './index.less';
 const clsPrefix = 'tnt-queryform';
+
 class QueryForm extends React.PureComponent {
-    constructor(props) {
-        super(props);
-        Object.defineProperty(this, "onWindowResize", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: debounce(() => {
-                const { current } = this.fieldsRef;
-                if (current) {
-                    setTimeout(() => {
-                        this.setState({
-                            showMore: this.isFieldsWidthOverflow(),
-                        });
-                    }, 25);
-                }
-            }, 50)
-        });
-        Object.defineProperty(this, "search", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (params) => {
-                this.props.onSearch(Object.assign(Object.assign({}, this.form.getValues()), params));
-            }
-        });
-        Object.defineProperty(this, "onSearch", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                var _a, _b;
-                (_b = (_a = this.props).onSearch) === null || _b === void 0 ? void 0 : _b.call(_a, this.form.getValues());
-            }
-        });
-        Object.defineProperty(this, "onReset", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                const { initialValues, onReset } = this.props;
-                this.form.setValues(Object.assign({}, initialValues));
-                this.updateDrawerFieldsValueCount();
-                onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
-            }
-        });
-        Object.defineProperty(this, "onToggleExpand", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                var _a, _b;
-                this.setState({
-                    expanded: !this.state.expanded,
-                });
-                (_b = (_a = this.props).onToggleExpand) === null || _b === void 0 ? void 0 : _b.call(_a, !this.state.expanded);
-            }
-        });
-        Object.defineProperty(this, "onShowDrawer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                this.setState({ drawerVisible: true });
-            }
-        });
-        Object.defineProperty(this, "onFieldChange", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (name, value, ...rest) => {
-                const values = this.form.getValues();
-                const newValues = Object.assign(Object.assign({}, values), { [name]: value });
-                const changedInfo = { name, value, preValue: values === null || values === void 0 ? void 0 : values[name] };
-                const { onChange } = this.props;
-                this.form.setData('values', newValues);
-                onChange && onChange(newValues, changedInfo, ...rest);
-                this.updateDrawerFieldsValueCount(newValues);
-            }
+  constructor(props) {
+    super(props);
+    Object.defineProperty(this, "onWindowResize", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: _debounce(() => {
+        const {
+          current
+        } = this.fieldsRef;
+
+        if (current) {
+          setTimeout(() => {
+            this.setState({
+              showMore: this.isFieldsWidthOverflow()
+            });
+          }, 25);
+        }
+      }, 50)
+    });
+    Object.defineProperty(this, "search", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: params => {
+        this.props.onSearch(Object.assign(Object.assign({}, this.form.getValues()), params));
+      }
+    });
+    Object.defineProperty(this, "onSearch", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        var _a, _b;
+
+        (_b = (_a = this.props).onSearch) === null || _b === void 0 ? void 0 : _b.call(_a, this.form.getValues());
+      }
+    });
+    Object.defineProperty(this, "onReset", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        const {
+          initialValues,
+          onReset
+        } = this.props;
+        this.form.setValues(Object.assign({}, initialValues));
+        this.updateDrawerFieldsValueCount();
+        onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
+      }
+    });
+    Object.defineProperty(this, "onToggleExpand", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        var _a, _b;
+
+        this.setState({
+          expanded: !this.state.expanded
         });
-        Object.defineProperty(this, "updateDrawerFieldsValueCount", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                const values = this.form.getValues();
-                const { showFieldCount, children } = this.props;
-                if (showFieldCount) {
-                    const drawerFieldsValueCount = children.reduce((acc, cur, index) => {
-                        var _a;
-                        if (index >= showFieldCount && (values === null || values === void 0 ? void 0 : values[(_a = cur === null || cur === void 0 ? void 0 : cur.props) === null || _a === void 0 ? void 0 : _a.name])) {
-                            acc++;
-                        }
-                        return acc;
-                    }, 0);
-                    if (drawerFieldsValueCount !== this.state.drawerFieldsValueCount) {
-                        this.setState({
-                            drawerFieldsValueCount,
-                        });
-                    }
-                }
-            }
+        (_b = (_a = this.props).onToggleExpand) === null || _b === void 0 ? void 0 : _b.call(_a, !this.state.expanded);
+      }
+    });
+    Object.defineProperty(this, "onShowDrawer", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        this.setState({
+          drawerVisible: true
         });
-        Object.defineProperty(this, "addResizeListener", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: () => {
-                if ('ResizeObserver' in window) {
-                    const { current } = this.fieldsRef;
-                    if (current) {
-                        const observer = new ResizeObserver(this.onWindowResize);
-                        observer.observe(current);
-                        return () => observer.disconnect();
-                    }
-                }
-                else {
-                    window.addEventListener('resize', this.onWindowResize);
-                    return () => window.removeEventListener('resize', this.onWindowResize);
-                }
-            }
+      }
+    });
+    Object.defineProperty(this, "onFieldChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: (name, value, ...rest) => {
+        const values = this.form.getValues();
+        const newValues = Object.assign(Object.assign({}, values), {
+          [name]: value
         });
-        const { form, initialValues, showExpand = true, renderActions, defaultExpanded } = props;
-        this.state = {
-            showMore: false,
-            expanded: defaultExpanded || !showExpand || renderActions ? true : false,
-            drawerVisible: false,
-            drawerFieldsValueCount: 0,
+        const changedInfo = {
+          name,
+          value,
+          preValue: values === null || values === void 0 ? void 0 : values[name]
         };
-        this.fieldsRef = createRef();
-        this.formBoxRef = createRef();
-        this.form = form || createActions();
-        this.form.setData('initialValues', initialValues);
-        this.form.setData('values', Object.assign({}, initialValues));
-    }
-    render() {
-        const { children, className = '', initialValues = {}, renderActions, showSearch = true, showReset = true, showFieldCount, drawerProps = {}, size, } = this.props;
-        const extraActions = this.props.extraActions;
-        const { expanded, showMore, drawerVisible, drawerFieldsValueCount } = this.state;
-        const renderFormActions = renderActions ||
-            (() => (React.createElement(React.Fragment, null,
-                showFieldCount && (React.createElement(Badge, { count: drawerFieldsValueCount },
-                    React.createElement(Button, { onClick: this.onShowDrawer },
-                        React.createElement(Icon, { type: "filter" }),
-                        this.getText('moreFiltering')))),
-                showSearch && (React.createElement(Button, { type: "primary", onClick: this.onSearch }, this.getText('search'))),
-                showReset && React.createElement(Button, { onClick: this.onReset }, this.getText('reset')),
-                showMore && !showFieldCount && (React.createElement(Button, { className: "expand-link", type: "link", onClick: this.onToggleExpand }, this.getText(expanded ? 'collapse' : 'expand'))),
-                React.Children.map(children, (child) => { var _a; return child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) === 'right' && React.cloneElement(child); }))));
-        return (React.createElement("div", { ref: this.formBoxRef, className: classnames(clsPrefix, { [className]: className }) },
-            React.createElement(Form, { layout: "inline", className: classnames({ expanded: !showMore || expanded, showMore }) },
-                React.createElement("div", { ref: this.fieldsRef }, React.Children.map(children, (child, index) => {
-                    var _a;
-                    return child &&
-                        ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right' &&
-                        (!showFieldCount || showFieldCount > index) &&
-                        React.cloneElement(child, {
-                            form: this.form,
-                            initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[child.props.name],
-                            onChange: this.onFieldChange,
-                        });
-                })),
-                React.createElement("div", { className: `${clsPrefix}-actions` }, renderFormActions()),
-                showFieldCount && (React.createElement(Drawer, Object.assign({ title: this.getText('moreFiltering'), visible: drawerVisible, onClose: () => this.setState({ drawerVisible: false }), width: 300, size: size, getContainer: false }, drawerProps, { className: classnames(`${clsPrefix}-drawer`, {
-                        'large-size': size === 'large',
-                        [className]: className,
-                    }) }),
-                    React.Children.map(children, (child, index) => child &&
-                        index >= showFieldCount &&
-                        React.cloneElement(child, {
-                            form: this.form,
-                            isFieldInDrawer: true,
-                            initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[child.props.name],
-                            onChange: this.onFieldChange,
-                            onSearch: this.onSearch,
-                        })),
-                    React.createElement(Button, { type: "primary", onClick: this.onSearch }, this.getText('search')),
-                    React.createElement(Button, { onClick: this.onReset }, this.getText('reset'))))),
-            extraActions && React.createElement("div", { className: `${clsPrefix}-extra` }, extraActions)));
-    }
-    getText(key) {
-        return getText(key, this.props.language || getLanguage());
-    }
-    isFieldsWidthOverflow() {
-        const { current } = this.fieldsRef;
-        if (current) {
-            return (parseFloat(window.getComputedStyle(current).width, 10) <
-                [].reduce.call(current.children, (acc, cur) => {
-                    const { margin, width } = window.getComputedStyle(cur);
-                    const marginArray = margin.split(' ').map((str) => parseFloat(str, 10));
-                    acc += parseFloat(width, 10) + marginArray[1];
-                    return acc;
-                }, 0));
-        }
-        return false;
-    }
-    updateFieldHeight() {
-        var _a, _b, _c;
-        const { formBoxRef, fieldsRef } = this;
-        const getFieldHeight = () => {
+        const {
+          onChange
+        } = this.props;
+        this.form.setData('values', newValues);
+        onChange && onChange(newValues, changedInfo, ...rest);
+        this.updateDrawerFieldsValueCount(newValues);
+      }
+    });
+    Object.defineProperty(this, "updateDrawerFieldsValueCount", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        const values = this.form.getValues();
+        const {
+          showFieldCount,
+          children
+        } = this.props;
+
+        if (showFieldCount) {
+          const drawerFieldsValueCount = children.reduce((acc, cur, index) => {
             var _a;
-            const { current } = fieldsRef;
-            let height = '32px';
-            if (current && ((_a = current.children) === null || _a === void 0 ? void 0 : _a[0])) {
-                height = window.getComputedStyle(current.children[0]).height;
+
+            if (index >= showFieldCount && (values === null || values === void 0 ? void 0 : values[(_a = cur === null || cur === void 0 ? void 0 : cur.props) === null || _a === void 0 ? void 0 : _a.name])) {
+              acc++;
             }
-            return height;
-        };
-        const queryFormActionsDom = (_a = formBoxRef === null || formBoxRef === void 0 ? void 0 : formBoxRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(`.${clsPrefix}-actions`);
-        const queryFormExtraDom = (_b = formBoxRef === null || formBoxRef === void 0 ? void 0 : formBoxRef.current) === null || _b === void 0 ? void 0 : _b.querySelector(`.${clsPrefix}-extra`);
-        const formItemsDomList = (_c = fieldsRef === null || fieldsRef === void 0 ? void 0 : fieldsRef.current) === null || _c === void 0 ? void 0 : _c.querySelectorAll('.ant-form-item-control');
-        const fieldHeight = getFieldHeight();
-        fieldsRef.current.style.height = fieldHeight;
-        [queryFormActionsDom, queryFormExtraDom].forEach((item) => {
-            item &&
-                Object.assign(item.style, {
-                    height: fieldHeight,
-                    lineHeight: fieldHeight,
-                });
-        });
-        [].forEach.call(formItemsDomList, (item) => {
-            item.style.lineHeight = fieldHeight;
-        });
-    }
-    componentDidMount() {
-        const { current } = this.fieldsRef;
-        const { showFieldCount, showExpand = true } = this.props;
-        this.updateFieldHeight();
-        this.form.on('search', this.search);
-        // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
-        // || renderActions
-        if (!showFieldCount && !showExpand) {
-            return;
+
+            return acc;
+          }, 0);
+
+          if (drawerFieldsValueCount !== this.state.drawerFieldsValueCount) {
+            this.setState({
+              drawerFieldsValueCount
+            });
+          }
         }
-        if (!showFieldCount) {
-            if (current && this.isFieldsWidthOverflow()) {
-                this.setState({
-                    showMore: true,
-                });
-            }
-            this.removeResizeListener = this.addResizeListener();
-        }
-        else {
-            this.updateDrawerFieldsValueCount();
-            this.form.on('setValues', this.updateDrawerFieldsValueCount);
-            this.form.on('setValue', this.updateDrawerFieldsValueCount);
+      }
+    });
+    Object.defineProperty(this, "addResizeListener", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: () => {
+        if ('ResizeObserver' in window) {
+          const {
+            current
+          } = this.fieldsRef;
+
+          if (current) {
+            const observer = new ResizeObserver(this.onWindowResize);
+            observer.observe(current);
+            return () => observer.disconnect();
+          }
+        } else {
+          window.addEventListener('resize', this.onWindowResize);
+          return () => window.removeEventListener('resize', this.onWindowResize);
         }
+      }
+    });
+    const {
+      form,
+      initialValues,
+      showExpand = true,
+      renderActions,
+      defaultExpanded
+    } = props;
+    this.state = {
+      showMore: false,
+      expanded: defaultExpanded || !showExpand || renderActions ? true : false,
+      drawerVisible: false,
+      drawerFieldsValueCount: 0
+    };
+    this.fieldsRef = createRef();
+    this.formBoxRef = createRef();
+    this.form = form || createActions();
+    this.form.setData('initialValues', initialValues);
+    this.form.setData('values', Object.assign({}, initialValues));
+  }
+
+  render() {
+    const {
+      children,
+      className = '',
+      initialValues = {},
+      renderActions,
+      showSearch = true,
+      showReset = true,
+      showFieldCount,
+      drawerProps = {},
+      size
+    } = this.props;
+    const extraActions = this.props.extraActions;
+    const {
+      expanded,
+      showMore,
+      drawerVisible,
+      drawerFieldsValueCount
+    } = this.state;
+
+    const renderFormActions = renderActions || (() => React.createElement(React.Fragment, null, showFieldCount && React.createElement(Badge, {
+      count: drawerFieldsValueCount
+    }, React.createElement(Button, {
+      onClick: this.onShowDrawer
+    }, React.createElement(Icon, {
+      type: "filter"
+    }), this.getText('moreFiltering'))), showSearch && React.createElement(Button, {
+      type: "primary",
+      onClick: this.onSearch
+    }, this.getText('search')), showReset && React.createElement(Button, {
+      onClick: this.onReset
+    }, this.getText('reset')), showMore && !showFieldCount && React.createElement(Button, {
+      className: "expand-link",
+      type: "link",
+      onClick: this.onToggleExpand
+    }, this.getText(expanded ? 'collapse' : 'expand')), React.Children.map(children, child => {
+      var _a;
+
+      return child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) === 'right' && React.cloneElement(child);
+    })));
+
+    return React.createElement("div", {
+      ref: this.formBoxRef,
+      className: classnames(clsPrefix, {
+        [className]: className
+      })
+    }, React.createElement(Form, {
+      layout: "inline",
+      className: classnames({
+        expanded: !showMore || expanded,
+        showMore
+      })
+    }, React.createElement("div", {
+      ref: this.fieldsRef
+    }, React.Children.map(children, (child, index) => {
+      var _a;
+
+      return child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right' && (!showFieldCount || showFieldCount > index) && React.cloneElement(child, {
+        form: this.form,
+        initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[child.props.name],
+        onChange: this.onFieldChange
+      });
+    })), React.createElement("div", {
+      className: `${clsPrefix}-actions`
+    }, renderFormActions()), showFieldCount && React.createElement(Drawer, Object.assign({
+      title: this.getText('moreFiltering'),
+      visible: drawerVisible,
+      onClose: () => this.setState({
+        drawerVisible: false
+      }),
+      width: 300,
+      size: size,
+      getContainer: false
+    }, drawerProps, {
+      className: classnames(`${clsPrefix}-drawer`, {
+        'large-size': size === 'large',
+        [className]: className
+      })
+    }), React.Children.map(children, (child, index) => child && index >= showFieldCount && React.cloneElement(child, {
+      form: this.form,
+      isFieldInDrawer: true,
+      initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[child.props.name],
+      onChange: this.onFieldChange,
+      onSearch: this.onSearch
+    })), React.createElement(Button, {
+      type: "primary",
+      onClick: this.onSearch
+    }, this.getText('search')), React.createElement(Button, {
+      onClick: this.onReset
+    }, this.getText('reset')))), extraActions && React.createElement("div", {
+      className: `${clsPrefix}-extra`
+    }, extraActions));
+  }
+
+  getText(key) {
+    return getText(key, this.props.language || getLanguage());
+  }
+
+  isFieldsWidthOverflow() {
+    const {
+      current
+    } = this.fieldsRef;
+
+    if (current) {
+      return parseFloat(window.getComputedStyle(current).width, 10) < [].reduce.call(current.children, (acc, cur) => {
+        const {
+          margin,
+          width
+        } = window.getComputedStyle(cur);
+        const marginArray = margin.split(' ').map(str => parseFloat(str, 10));
+        acc += parseFloat(width, 10) + marginArray[1];
+        return acc;
+      }, 0);
+    }
+
+    return false;
+  }
+
+  updateFieldHeight() {
+    var _a, _b, _c;
+
+    const {
+      formBoxRef,
+      fieldsRef
+    } = this;
+
+    const getFieldHeight = () => {
+      var _a;
+
+      const {
+        current
+      } = fieldsRef;
+      let height = '32px';
+
+      if (current && ((_a = current.children) === null || _a === void 0 ? void 0 : _a[0])) {
+        height = window.getComputedStyle(current.children[0]).height;
+      }
+
+      return height;
+    };
+
+    const queryFormActionsDom = (_a = formBoxRef === null || formBoxRef === void 0 ? void 0 : formBoxRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(`.${clsPrefix}-actions`);
+    const queryFormExtraDom = (_b = formBoxRef === null || formBoxRef === void 0 ? void 0 : formBoxRef.current) === null || _b === void 0 ? void 0 : _b.querySelector(`.${clsPrefix}-extra`);
+    const formItemsDomList = (_c = fieldsRef === null || fieldsRef === void 0 ? void 0 : fieldsRef.current) === null || _c === void 0 ? void 0 : _c.querySelectorAll('.ant-form-item-control');
+    const fieldHeight = getFieldHeight();
+    fieldsRef.current.style.height = fieldHeight;
+    [queryFormActionsDom, queryFormExtraDom].forEach(item => {
+      item && Object.assign(item.style, {
+        height: fieldHeight,
+        lineHeight: fieldHeight
+      });
+    });
+    [].forEach.call(formItemsDomList, item => {
+      item.style.lineHeight = fieldHeight;
+    });
+  }
+
+  componentDidMount() {
+    const {
+      current
+    } = this.fieldsRef;
+    const {
+      showFieldCount,
+      showExpand = true
+    } = this.props;
+    this.updateFieldHeight();
+    this.form.on('search', this.search); // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
+    // || renderActions
+
+    if (!showFieldCount && !showExpand) {
+      return;
     }
-    componentWillUnmount() {
-        var _a;
-        (_a = this.removeResizeListener) === null || _a === void 0 ? void 0 : _a.call(this);
-        this.form.off('setValues', this.updateDrawerFieldsValueCount);
-        this.form.off('setValue', this.updateDrawerFieldsValueCount);
-        this.form.off('search', this.search);
+
+    if (!showFieldCount) {
+      if (current && this.isFieldsWidthOverflow()) {
+        this.setState({
+          showMore: true
+        });
+      }
+
+      this.removeResizeListener = this.addResizeListener();
+    } else {
+      this.updateDrawerFieldsValueCount();
+      this.form.on('setValues', this.updateDrawerFieldsValueCount);
+      this.form.on('setValue', this.updateDrawerFieldsValueCount);
     }
+  }
+
+  componentWillUnmount() {
+    var _a;
+
+    (_a = this.removeResizeListener) === null || _a === void 0 ? void 0 : _a.call(this);
+    this.form.off('setValues', this.updateDrawerFieldsValueCount);
+    this.form.off('setValue', this.updateDrawerFieldsValueCount);
+    this.form.off('search', this.search);
+  }
+
 }
+
 QueryForm.Field = Field;
 QueryForm.useForm = useForm;
 QueryForm.createForm = createActions;
-export default QueryForm;
-//# sourceMappingURL=index.js.map
+export default QueryForm;

package/es/query-form/useForm.js

@@ -1,7 +1,6 @@
 import { useRef } from 'react';
 import createActions from './createActions';
 export default function useForm() {
-    const form = useRef(createActions());
-    return [form.current];
-}
-//# sourceMappingURL=useForm.js.map
+  const form = useRef(createActions());
+  return [form.current];
+}