tntd 3.0.0-beta.1 → 3.0.0-beta.10

package/es/query-form/createActions.js

@@ -1,47 +1,47 @@
+import _set from "lodash/set";
+import _get from "lodash/get";
 import EventEmitter from 'eventemitter3';
-import { get, set } from 'lodash';
-export default () => {
-    const eventEmitter = new EventEmitter();
-    const data = {
-        initialValues: {},
-        values: {},
-    };
-    return {
-        setData(key, value) {
-            set(data, key, value);
-        },
-        getData(key) {
-            get(data, key);
-        },
-        setValues(values) {
-            data.values = values;
-            eventEmitter.emit('setValues', values);
-        },
-        getValues() {
-            return data.values;
-        },
-        resetValues() {
-            data.values = Object.assign({}, data.initialValues);
-            eventEmitter.emit('setValues', data.values);
-        },
-        setValue(name, value) {
-            data.values = data.values || {};
-            data.values[name] = value;
-            eventEmitter.emit('setValue', name, value);
-        },
-        getValue(name) {
-            var _a;
-            return (_a = data.values) === null || _a === void 0 ? void 0 : _a[name];
-        },
-        on: (eventName, callback) => {
-            eventEmitter.on(eventName, callback);
-        },
-        emit: (...args) => {
-            eventEmitter.emit(...args);
-        },
-        off: (...args) => {
-            eventEmitter.removeListener(...args);
-        },
-    };
-};
-//# sourceMappingURL=createActions.js.map
+export default (() => {
+  const eventEmitter = new EventEmitter();
+  const data = {
+    initialValues: {},
+    values: {}
+  };
+  return {
+    setData(key, value) {
+      _set(data, key, value);
+    },
+    getData(key) {
+      _get(data, key);
+    },
+    setValues(values) {
+      data.values = values;
+      eventEmitter.emit('setValues', values);
+    },
+    getValues() {
+      return data.values;
+    },
+    resetValues() {
+      data.values = Object.assign({}, data.initialValues);
+      eventEmitter.emit('setValues', data.values);
+    },
+    setValue(name, value) {
+      data.values = data.values || {};
+      data.values[name] = value;
+      eventEmitter.emit('setValue', name, value);
+    },
+    getValue(name) {
+      var _a;
+      return (_a = data.values) === null || _a === void 0 ? void 0 : _a[name];
+    },
+    on: (eventName, callback) => {
+      eventEmitter.on(eventName, callback);
+    },
+    emit: (...args) => {
+      eventEmitter.emit(...args);
+    },
+    off: (...args) => {
+      eventEmitter.removeListener(...args);
+    }
+  };
+});

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';
@@ -11,250 +11,335 @@ import { getLanguage, getText } from '../prev-locale';
 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)
+  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;
+        console.log('search============');
+        (_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));
+        onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
+      }
+    });
+    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
         });
-        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));
-                onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
-            }
-        });
-        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);
-            }
-        });
-        Object.defineProperty(this, "onCompositionFieldChange", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: (value, deleteKeys, ...rest) => {
-                var _a;
-                const values = this.form.getValues();
-                const newValues = Object.assign(Object.assign({}, values), value);
-                if (deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) {
-                    deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.forEach((key) => {
-                        if (values === null || values === void 0 ? void 0 : values[key]) {
-                            delete newValues[key];
-                        }
-                    });
-                }
-                this.form.setData('values', newValues);
-                const { onChange } = this.props;
-                if (onChange) {
-                    (_a = Object.keys(values)) === null || _a === void 0 ? void 0 : _a.forEach((key) => {
-                        if (JSON.stringify(value[key]) !== JSON.stringify(values[key] || '')) {
-                            const changedInfo = { name: key, value: value[key], preValue: values === null || values === void 0 ? void 0 : values[key] };
-                            onChange(newValues, changedInfo, ...rest);
-                        }
-                    });
-                }
-            }
-        });
-        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 } = props;
-        this.state = {
-            actionWidth: 0,
+        const changedInfo = {
+          name,
+          value,
+          preValue: values === null || values === void 0 ? void 0 : values[name]
         };
-        this.fieldsRef = createRef();
-        this.formBoxRef = createRef();
-        this.actionRef = 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 = 3, drawerProps = {}, size, } = this.props;
-        const extraActions = this.props.extraActions;
-        const { actionWidth } = this.state;
-        const renderFormActions = renderActions ||
-            (() => (React.createElement(React.Fragment, null,
-                showSearch && (React.createElement(Button, { type: "primary", onClick: this.onSearch }, this.getText('search'))),
-                showReset && React.createElement(Button, { onClick: this.onReset }, this.getText('reset')),
-                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: true }) },
-                React.createElement("div", { ref: this.fieldsRef, style: { width: '100%' } }, this.renderFields(children, initialValues, showFieldCount, actionWidth)),
-                React.createElement("div", { ref: this.actionRef, className: `${clsPrefix}-actions` },
-                    renderFormActions(),
-                    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));
+        const {
+          onChange
+        } = this.props;
+        this.form.setData('values', newValues);
+        onChange && onChange(newValues, changedInfo, ...rest);
+      }
+    });
+    Object.defineProperty(this, "onCompositionFieldChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: (value, deleteKeys, ...rest) => {
+        var _a;
+        const values = this.form.getValues();
+        const newValues = Object.assign(Object.assign({}, values), value);
+        if (deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) {
+          deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.forEach(key => {
+            if (values === null || values === void 0 ? void 0 : values[key]) {
+              delete newValues[key];
+            }
+          });
         }
-        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;
+        this.form.setData('values', newValues);
+        const {
+          onChange
+        } = this.props;
+        if (onChange) {
+          (_a = Object.keys(values)) === null || _a === void 0 ? void 0 : _a.forEach(key => {
+            if (JSON.stringify(value[key]) !== JSON.stringify(values[key] || '')) {
+              const changedInfo = {
+                name: key,
+                value: value[key],
+                preValue: values === null || values === void 0 ? void 0 : values[key]
+              };
+              onChange(newValues, changedInfo, ...rest);
             }
-            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;
-        // 获取节点宽度
-        const width = this.actionRef.current.offsetWidth;
-        // 更新state
-        this.setState({ actionWidth: width });
-        this.updateFieldHeight();
-        this.form.on('search', this.search);
-        // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
-        // || renderActions
-        if (!showFieldCount && !showExpand) {
-            return;
+          });
         }
-        if (!showFieldCount) {
-            this.removeResizeListener = this.addResizeListener();
+      }
+    });
+    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
+    } = props;
+    this.state = {
+      actionWidth: 0
+    };
+    this.fieldsRef = createRef();
+    this.formBoxRef = createRef();
+    this.actionRef = createRef();
+    this.form = form || createActions();
+    this.form.setData('initialValues', initialValues);
+    this.form.setData('values', Object.assign({}, initialValues));
+  }
+  render() {
+    const {
+      children,
+      className = '',
+      initialValues = {},
+      renderActions,
+      showSearch = false,
+      showReset = false,
+      showFieldCount = 3,
+      drawerProps = {},
+      size
+    } = this.props;
+    const extraActions = this.props.extraActions;
+    const {
+      actionWidth
+    } = this.state;
+    const renderFormActions = renderActions || (() => React.createElement(React.Fragment, null, showSearch && React.createElement(Button, {
+      type: "primary",
+      onClick: this.onSearch
+    }, this.getText('search')), showReset && React.createElement(Button, {
+      onClick: this.onReset
+    }, this.getText('reset')), 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: true
+      })
+    }, React.createElement("div", {
+      ref: this.fieldsRef,
+      style: {
+        width: '100%'
+      }
+    }, this.renderFields(children, initialValues, showFieldCount, actionWidth)), React.createElement("div", {
+      ref: this.actionRef,
+      className: `${clsPrefix}-actions`
+    }, renderFormActions(), 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);
     }
-    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);
+    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;
+    // 获取节点宽度
+    const width = this.actionRef.current.offsetWidth;
+    // 更新state
+    this.setState({
+      actionWidth: width
+    });
+    this.updateFieldHeight();
+    this.form.on('search', this.search);
+    // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
+    // || renderActions
+    if (!showFieldCount && !showExpand) {
+      return;
     }
-    renderFields(children, initialValues, showFieldCount, actionWidth) {
-        const rest = [];
-        const size = React.Children.count(children);
-        let fields = null;
-        if (size <= showFieldCount) {
-            // 过滤器不超过3个
-            fields = React.Children.map(children, (child, index) => {
-                var _a, _b;
-                if (child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right') {
-                    return React.cloneElement(child, {
-                        form: this.form,
-                        initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_b = child.props) === null || _b === void 0 ? void 0 : _b.name],
-                        onChange: this.onFieldChange,
-                    });
-                }
-                return;
-            });
+    if (!showFieldCount) {
+      this.removeResizeListener = this.addResizeListener();
+    }
+  }
+  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);
+  }
+  renderFields(children, initialValues, showFieldCount, actionWidth) {
+    const rest = [];
+    // const size = React.Children.count(children)
+    let size = 0;
+    React.Children.map(children, child => {
+      if (child && child.isGroup !== false) {
+        size++;
+      }
+    });
+    let fields = null;
+    if (size <= showFieldCount) {
+      // 过滤器不超过3个
+      fields = React.Children.map(children, (child, index) => {
+        var _a, _b;
+        if (child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right') {
+          return React.cloneElement(child, {
+            form: this.form,
+            initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_b = child.props) === null || _b === void 0 ? void 0 : _b.name],
+            onChange: this.onFieldChange
+          });
         }
-        else {
-            fields = React.Children.map(children, (child, index) => {
-                var _a, _b;
-                if (child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right') {
-                    const { isGroup = true } = child === null || child === void 0 ? void 0 : child.props;
-                    if (!isGroup) {
-                        return React.cloneElement(child, {
-                            form: this.form,
-                            initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_b = child.props) === null || _b === void 0 ? void 0 : _b.name],
-                            onChange: this.onFieldChange,
-                        });
-                    }
-                    else {
-                        rest.push(child);
-                        console.log('child', index, child);
-                    }
-                }
-                return;
+        return;
+      });
+    } else {
+      fields = React.Children.map(children, (child, index) => {
+        var _a, _b;
+        if (child && ((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.align) !== 'right') {
+          const {
+            isGroup = true
+          } = child === null || child === void 0 ? void 0 : child.props;
+          if (!isGroup) {
+            return React.cloneElement(child, {
+              form: this.form,
+              initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_b = child.props) === null || _b === void 0 ? void 0 : _b.name],
+              onChange: this.onFieldChange
             });
+          } else {
+            rest.push(child);
+          }
         }
-        return (React.createElement("div", { style: { marginRight: actionWidth } },
-            fields,
-            !!(rest === null || rest === void 0 ? void 0 : rest.length) && (React.createElement(Composition, { clsPrefix: clsPrefix, data: rest, initialValues: initialValues, onChange: this.onCompositionFieldChange, form: this.form, style: { marginRight: (fields === null || fields === void 0 ? void 0 : fields.length) > 0 ? 10 - actionWidth : 10 } }))));
+        return;
+      });
     }
+    return React.createElement("div", {
+      style: {
+        marginRight: actionWidth
+      }
+    }, fields, !!(rest === null || rest === void 0 ? void 0 : rest.length) && React.createElement(Composition, {
+      clsPrefix: clsPrefix,
+      fieldItems: rest,
+      initialValues: initialValues,
+      onChange: this.onCompositionFieldChange,
+      form: this.form,
+      style: {
+        marginRight: (fields === null || fields === void 0 ? void 0 : fields.length) > 0 ? 10 - actionWidth : 10
+      }
+    }));
+  }
 }
 QueryForm.Field = Field;
 QueryForm.useForm = useForm;
 QueryForm.createForm = createActions;
-export default QueryForm;
-//# sourceMappingURL=index.js.map
+export default QueryForm;