tntd 3.0.8 → 3.0.9-beta.1

package/es/query-form-v3/Field/fieldsMap.js

@@ -0,0 +1,28 @@
+import CheckboxField from './Checkbox';
+import SelectField from './Select';
+import SelectInput from './SelectInput';
+import DatePicker from '../../date-picker';
+import Input from '../../input';
+import InputNumber from '../../input-number';
+export const defaultFieldWidth = '200px';
+export const getFieldWidth = type => {
+  if (type === 'dateRange') {
+    return '340px';
+  }
+  return {
+    dateRange: '340px',
+    selectInput: '320px'
+  }[type] || defaultFieldWidth;
+};
+export default {
+  string: Input.Search,
+  input: Input.Search,
+  search: Input.Search,
+  inputNumber: InputNumber,
+  number: InputNumber,
+  select: SelectField,
+  checkbox: CheckboxField,
+  date: DatePicker,
+  dateRange: DatePicker.RangePicker,
+  selectInput: SelectInput
+};

package/es/query-form-v3/Field/fieldsMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form-v3/Field/fieldsMap.js"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,YAAY,CAAA;AACtC,OAAO,WAAW,MAAM,UAAU,CAAA;AAClC,OAAO,WAAW,MAAM,eAAe,CAAA;AACvC,OAAO,UAAU,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAA;AAExC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,EAAE;IACpC,IAAI,IAAI,KAAK,WAAW,EAAE;QACxB,OAAO,OAAO,CAAA;KACf;IAED,OAAO,CACL;QACE,SAAS,EAAE,OAAO;QAClB,WAAW,EAAE,OAAO;KACrB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAED,eAAe;IACb,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,KAAK,EAAE,KAAK,CAAC,MAAM;IACnB,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,WAAW,EAAE,WAAW;IACxB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,UAAU,CAAC,WAAW;IACjC,WAAW,EAAE,WAAW;CACzB,CAAA","sourcesContent":["import CheckboxField from './Checkbox'\nimport SelectField from './Select'\nimport SelectInput from './SelectInput'\nimport DatePicker from '../../date-picker'\nimport Input from '../../input'\nimport InputNumber from '../../input-number'\n\nexport const defaultFieldWidth = '200px'\n\nexport const getFieldWidth = (type) => {\n  if (type === 'dateRange') {\n    return '340px'\n  }\n\n  return (\n    {\n      dateRange: '340px',\n      selectInput: '320px',\n    }[type] || defaultFieldWidth\n  )\n}\n\nexport default {\n  string: Input.Search,\n  input: Input.Search,\n  search: Input.Search,\n  inputNumber: InputNumber,\n  number: InputNumber,\n  select: SelectField,\n  checkbox: CheckboxField,\n  date: DatePicker,\n  dateRange: DatePicker.RangePicker,\n  selectInput: SelectInput,\n}\n"]}

package/es/query-form-v3/Field/index.js

@@ -0,0 +1,117 @@
+import _get from "lodash/get";
+import React, { PureComponent } from 'react';
+import fieldsMap, { getFieldWidth } from './fieldsMap';
+import Form from '../../form';
+const FormItem = Form.Item;
+const isInput = type => ['input', 'string', 'search', 'aloneSearch'].includes(type);
+export default class Field extends PureComponent {
+  constructor(props) {
+    super(props);
+    Object.defineProperty(this, "updateValue", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: (name, value) => {
+        if (name === this.props.name) {
+          this.setState({
+            value
+          });
+          this.props.onChange(name, value);
+        }
+      }
+    });
+    Object.defineProperty(this, "onChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: (...args) => {
+        const {
+          name,
+          type = 'input',
+          component,
+          props: fieldProps
+        } = this.props;
+        const {
+          onChange
+        } = fieldProps || {};
+        onChange && onChange(...args);
+        // Input onChange第一个参数为Event对象，取值特殊处理
+        if (!component && isInput(type)) {
+          args[0] = _get(args[0], 'target.value');
+        }
+        this.setState({
+          value: args[0]
+        });
+        this.props.onChange(name, args[0]);
+      }
+    });
+    Object.defineProperty(this, "onFormChange", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: formData => {
+        this.setState({
+          value: _get(formData, this.props.name)
+        });
+      }
+    });
+    this.state = {
+      value: props.initialValue
+    };
+  }
+  render() {
+    var _a;
+    const {
+      type = 'input',
+      title,
+      name,
+      isFieldInDrawer = false,
+      className = '',
+      component,
+      form,
+      props: fieldProps
+    } = this.props;
+    const {
+      value
+    } = this.state;
+    const Field = component || fieldsMap[type];
+    return React.createElement(FormItem, {
+      label: title,
+      className: className
+    }, React.createElement(Field, Object.assign({
+      form: form,
+      value: value
+    }, isInput(type) ? {
+      onPressEnter: evt => {
+        var _a;
+        return form.emit('search', {
+          [name]: (_a = evt === null || evt === void 0 ? void 0 : evt.target) === null || _a === void 0 ? void 0 : _a.value,
+          current: 1
+        });
+      },
+      onSearch: value => form.emit('search', {
+        [name]: value,
+        current: 1
+      })
+    } : {}, fieldProps, {
+      style: Object.assign(Object.assign({}, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style), {
+        width: isFieldInDrawer ? '100%' : ((_a = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style) === null || _a === void 0 ? void 0 : _a.width) || getFieldWidth(type)
+      }),
+      onChange: this.onChange
+    })));
+  }
+  componentDidMount() {
+    const {
+      form
+    } = this.props;
+    form.on('setValue', this.updateValue);
+    form.on('setValues', this.onFormChange);
+  }
+  componentWillUnmount() {
+    const {
+      form
+    } = this.props;
+    form.off('setValue', this.updateValue);
+    form.off('setValues', this.onFormChange);
+  }
+}

package/es/query-form-v3/Field/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-form-v3/Field/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { PureComponent } from 'react'\nimport { get } from 'lodash'\nimport fieldsMap, { getFieldWidth } from './fieldsMap'\n\nimport Form from '../../form'\n\nconst FormItem = Form.Item\n\nconst isInput = (type) => ['input', 'string', 'search', 'aloneSearch'].includes(type)\n\nexport default class Field extends PureComponent {\n  constructor(props) {\n    super(props)\n\n    this.state = {\n      value: props.initialValue,\n    }\n  }\n\n  render () {\n    const {\n      type = 'input',\n      title,\n      name,\n      isFieldInDrawer = false,\n      className = '',\n      component,\n      form,\n      props: fieldProps,\n    } = this.props\n    const { value } = this.state\n    const Field = component || fieldsMap[type]\n\n    return (\n      <FormItem label={title} className={className}>\n        <Field\n          form={form}\n          value={value}\n          {...(isInput(type)\n            ? {\n              onPressEnter: (evt) =>\n                form.emit('search', { [name]: evt?.target?.value, current: 1 }),\n              onSearch: (value) => form.emit('search', { [name]: value, current: 1 })\n            }\n            : {})}\n          {...fieldProps}\n          style={{\n            ...fieldProps?.style,\n            width: isFieldInDrawer ? '100%' : fieldProps?.style?.width || getFieldWidth(type),\n          }}\n          onChange={this.onChange}\n        />\n      </FormItem>\n    )\n  }\n\n  updateValue = (name, value) => {\n    if (name === this.props.name) {\n      this.setState({ value })\n      this.props.onChange(name, value)\n    }\n  }\n\n  onChange = (...args) => {\n    const { name, type = 'input', component, props: fieldProps } = this.props\n    const { onChange } = fieldProps || {}\n\n    onChange && onChange(...args)\n\n    // Input onChange第一个参数为Event对象，取值特殊处理\n    if (!component && isInput(type)) {\n      args[0] = get(args[0], 'target.value')\n    }\n\n    this.setState({ value: args[0] })\n    this.props.onChange(name, args[0])\n  }\n\n  onFormChange = (formData) => {\n    this.setState({\n      value: get(formData, this.props.name),\n    })\n  }\n\n  componentDidMount () {\n    const { form } = this.props\n\n    form.on('setValue', this.updateValue)\n    form.on('setValues', this.onFormChange)\n  }\n\n  componentWillUnmount () {\n    const { form } = this.props\n\n    form.off('setValue', this.updateValue)\n    form.off('setValues', this.onFormChange)\n  }\n}\n"]}

package/es/query-form-v3/createActions.js

@@ -0,0 +1,47 @@
+import _set from "lodash/set";
+import _get from "lodash/get";
+import EventEmitter from 'eventemitter3';
+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-v3/createActions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createActions.js","sourceRoot":"","sources":["../../src/query-form-v3/createActions.js"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAEjC,eAAe,GAAG,EAAE;IAClB,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAA;IACvC,MAAM,IAAI,GAAG;QACX,aAAa,EAAE,EAAE;QACjB,MAAM,EAAE,EAAE;KACX,CAAA;IAED,OAAO;QACL,OAAO,CAAC,GAAG,EAAE,KAAK;YAChB,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;QACvB,CAAC;QACD,OAAO,CAAC,GAAG;YACT,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAChB,CAAC;QAED,SAAS,CAAC,MAAM;YACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YACpB,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QACxC,CAAC;QACD,SAAS;YACP,OAAO,IAAI,CAAC,MAAM,CAAA;QACpB,CAAC;QACD,WAAW;YACT,IAAI,CAAC,MAAM,qBAAQ,IAAI,CAAC,aAAa,CAAE,CAAA;YACvC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QAC7C,CAAC;QACD,QAAQ,CAAC,IAAI,EAAE,KAAK;YAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAA;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;YACzB,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;QAC5C,CAAC;QACD,QAAQ,CAAC,IAAI;;YACX,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAG,IAAI,CAAC,CAAA;QAC5B,CAAC;QAED,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC1B,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACtC,CAAC;QAED,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;YAChB,YAAY,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;QAC5B,CAAC;QAED,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;YACf,YAAY,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAA;QACtC,CAAC;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import EventEmitter from 'eventemitter3'\nimport { get, set } from 'lodash'\n\nexport default () => {\n  const eventEmitter = new EventEmitter()\n  const data = {\n    initialValues: {},\n    values: {},\n  }\n\n  return {\n    setData(key, value) {\n      set(data, key, value)\n    },\n    getData(key) {\n      get(data, key)\n    },\n\n    setValues(values) {\n      data.values = values\n      eventEmitter.emit('setValues', values)\n    },\n    getValues() {\n      return data.values\n    },\n    resetValues() {\n      data.values = { ...data.initialValues }\n      eventEmitter.emit('setValues', data.values)\n    },\n    setValue(name, value) {\n      data.values = data.values || {}\n      data.values[name] = value\n      eventEmitter.emit('setValue', name, value)\n    },\n    getValue(name) {\n      return data.values?.[name]\n    },\n\n    on: (eventName, callback) => {\n      eventEmitter.on(eventName, callback)\n    },\n\n    emit: (...args) => {\n      eventEmitter.emit(...args)\n    },\n\n    off: (...args) => {\n      eventEmitter.removeListener(...args)\n    },\n  }\n}\n"]}

package/es/query-form-v3/index.js

@@ -0,0 +1,172 @@
+import React, { useMemo, useRef, useEffect, useState } from 'react';
+import cn from 'classnames';
+import createActions from './createActions';
+import Field from './Field';
+import Composition from './Field/Composition';
+import useForm from './useForm';
+import Button from '../button';
+import Form from '../form';
+import { getLanguage, getText } from '../prev-locale';
+import './index.less';
+const clsPrefix = 'tnt-queryform';
+function QueryForm({
+  form,
+  className = '',
+  initialValues: _initialValues,
+  language,
+  onSearch,
+  onReset,
+  onChange,
+  renderActions,
+  extraActions,
+  children,
+  showSearch = false,
+  showReset = false,
+  showFieldCount = 3,
+  minGroupCount = 3 // 最小聚合个数
+}) {
+  const [initialValues, setInitialValues] = useState(_initialValues || {});
+  const formRef = useRef(form || createActions());
+  useEffect(() => {
+    const _search = (params = {}) => {
+      onSearch(Object.assign(Object.assign({}, formRef.current.getValues()), params));
+    };
+    formRef.current.setData('initialValues', initialValues);
+    formRef.current.setData('values', initialValues);
+    formRef.current.on('search', _search);
+    return () => {
+      formRef.current.off('search', _search);
+    };
+  }, []);
+  const _getText = key => {
+    return getText(key, language || getLanguage());
+  };
+  const _onSearch = () => {
+    onSearch === null || onSearch === void 0 ? void 0 : onSearch(formRef.current.getValues());
+  };
+  const _onReset = () => {
+    formRef.current.setValues(Object.assign({}, initialValues));
+    onReset === null || onReset === void 0 ? void 0 : onReset(initialValues);
+    setInitialValues(Object.assign({}, initialValues));
+  };
+  const _onFieldChange = (name, value, ...rest) => {
+    const values = formRef.current.getValues();
+    const newValues = Object.assign(Object.assign({}, values), {
+      [name]: value
+    });
+    const changedInfo = {
+      name,
+      value,
+      preValue: values === null || values === void 0 ? void 0 : values[name]
+    };
+    formRef.current.setData('values', newValues);
+    onChange && onChange(newValues, changedInfo, ...rest);
+  };
+  const _onCompositionFieldChange = (value, deleteKeys, ...rest) => {
+    var _a;
+    const values = formRef.current.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];
+        }
+      });
+    }
+    formRef.current.setData('values', newValues);
+    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);
+        }
+      });
+    }
+  };
+  const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {
+    var _a;
+    let groupFields = [];
+    let outFields = [];
+    let otherFields = [];
+    const rightChildren = [];
+    const compositionInitValues = {};
+    React.Children.map(children, child => {
+      var _a, _b;
+      if (child) {
+        if (((_a = child.props) === null || _a === void 0 ? void 0 : _a.align) === 'right') {
+          rightChildren.push(child);
+          return;
+        } else if (((_b = child.props) === null || _b === void 0 ? void 0 : _b.isGroup) === false) {
+          outFields.push(child);
+        } else {
+          groupFields.push(child);
+        }
+        otherFields.push(child);
+      }
+    });
+    if (groupFields.length <= minGroupCount) {
+      groupFields = [];
+      outFields = otherFields;
+    } else {
+      // 初始值
+      for (let i = 0; i < groupFields.length; i++) {
+        const name = (_a = groupFields[i].props) === null || _a === void 0 ? void 0 : _a.name;
+        if (initialValues[name] !== undefined) {
+          compositionInitValues[name] = initialValues[name];
+        }
+      }
+    }
+    return [groupFields, outFields, rightChildren, compositionInitValues];
+  }, [children, minGroupCount, initialValues]);
+  const isGroupMode = groupFields.length > 0;
+  const hasOutField = outFields.length > 0;
+  const showExtra = rightChildren.length > 0 || extraActions;
+  return React.createElement("div", {
+    className: cn(clsPrefix, {
+      [className]: className
+    })
+  }, React.createElement(Form, {
+    layout: "inline"
+  }, React.createElement("div", {
+    className: `${clsPrefix}-top`
+  }, React.createElement("div", {
+    className: `${clsPrefix}-top-body`
+  }, hasOutField ? outFields.map((child, i) => {
+    var _a;
+    return React.cloneElement(child, {
+      form: formRef.current,
+      initialValue: initialValues === null || initialValues === void 0 ? void 0 : initialValues[(_a = child.props) === null || _a === void 0 ? void 0 : _a.name],
+      onChange: _onFieldChange,
+      key: i
+    });
+  }) : isGroupMode ? React.createElement(Composition, {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current
+  }) : null, renderActions ? renderActions() : React.createElement(React.Fragment, null, showSearch && React.createElement(Button, {
+    type: "primary",
+    onClick: _onSearch
+  }, _getText('search')), showReset && React.createElement(Button, {
+    onClick: _onReset
+  }, _getText('reset')))), showExtra && React.createElement("div", {
+    className: `${clsPrefix}-extra`
+  }, rightChildren, extraActions)), isGroupMode && hasOutField && React.createElement("div", {
+    className: `${clsPrefix}-bottom`
+  }, React.createElement(Composition, {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current
+  }))));
+}
+QueryForm.Field = Field;
+QueryForm.useForm = useForm;
+QueryForm.createForm = createActions;
+export default QueryForm;

package/es/query-form-v3/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-form-v3/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useMemo, useRef, useEffect, useState } from 'react'\nimport cn from 'classnames'\nimport createActions from './createActions'\nimport Field from './Field'\nimport Composition from './Field/Composition'\nimport useForm from './useForm'\nimport Button from '../button'\nimport Form from '../form'\nimport { getLanguage, getText } from '../prev-locale'\n\nimport './index.less'\n\nconst clsPrefix = 'tnt-queryform'\n\nfunction QueryForm({\n  form,\n  className = '',\n  initialValues: _initialValues,\n  language,\n  onSearch,\n  onReset,\n  onChange,\n  renderActions,\n  extraActions,\n  children,\n  showSearch = false,\n  showReset = false,\n  showFieldCount = 3,\n  minGroupCount = 3, // 最小聚合个数\n}) {\n  const [initialValues, setInitialValues] = useState(_initialValues || {})\n  const formRef = useRef(form || createActions())\n\n  useEffect(() => {\n    const _search = (params = {}) => {\n      onSearch({\n        ...formRef.current.getValues(),\n        ...params,\n      })\n    }\n    formRef.current.setData('initialValues', initialValues)\n    formRef.current.setData('values', initialValues)\n    formRef.current.on('search', _search)\n    return () => {\n      formRef.current.off('search', _search)\n    }\n  }, [])\n\n  const _getText = (key) => {\n    return getText(key, language || getLanguage())\n  }\n  const _onSearch = () => {\n    onSearch?.(formRef.current.getValues())\n  }\n\n  const _onReset = () => {\n    formRef.current.setValues({ ...initialValues })\n    onReset?.(initialValues)\n    setInitialValues({ ...initialValues })\n  }\n\n  const _onFieldChange = (name, value, ...rest) => {\n    const values = formRef.current.getValues()\n    const newValues = {\n      ...values,\n      [name]: value,\n    }\n    const changedInfo = { name, value, preValue: values?.[name] }\n    formRef.current.setData('values', newValues)\n    onChange && onChange(newValues, changedInfo, ...rest)\n  }\n\n  const _onCompositionFieldChange = (value, deleteKeys, ...rest) => {\n    const values = formRef.current.getValues()\n    const newValues = {\n      ...values,\n      ...value,\n    }\n    if (deleteKeys?.length) {\n      deleteKeys?.forEach((key) => {\n        if (values?.[key]) {\n          delete newValues[key]\n        }\n      })\n    }\n    formRef.current.setData('values', newValues)\n    if (onChange) {\n      Object.keys(values)?.forEach((key) => {\n        if (JSON.stringify(value[key]) !== JSON.stringify(values[key] || '')) {\n          const changedInfo = { name: key, value: value[key], preValue: values?.[key] }\n          onChange(newValues, changedInfo, ...rest)\n        }\n      })\n    }\n  }\n\n  const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {\n    let groupFields = []\n    let outFields = []\n    let otherFields = []\n    const rightChildren = []\n    const compositionInitValues = {}\n    React.Children.map(children, (child) => {\n      if (child) {\n        if (child.props?.align === 'right') {\n          rightChildren.push(child)\n          return\n        } else if (child.props?.isGroup === false) {\n          outFields.push(child)\n        } else {\n          groupFields.push(child)\n        }\n        otherFields.push(child)\n      }\n    })\n    if (groupFields.length <= minGroupCount) {\n      groupFields = []\n      outFields = otherFields\n    } else {\n      // 初始值\n      for (let i = 0; i < groupFields.length; i++) {\n        const name = groupFields[i].props?.name\n        if (initialValues[name] !== undefined) {\n          compositionInitValues[name] = initialValues[name]\n        }\n      }\n    }\n    return [groupFields, outFields, rightChildren, compositionInitValues]\n  }, [children, minGroupCount, initialValues])\n\n  const isGroupMode = groupFields.length > 0\n  const hasOutField = outFields.length > 0\n  const showExtra = rightChildren.length > 0 || extraActions\n\n  return (\n    <div className={cn(clsPrefix, { [className]: className })}>\n      <Form layout=\"inline\">\n        <div className={`${clsPrefix}-top`}>\n          <div className={`${clsPrefix}-top-body`}>\n            {hasOutField ? (\n              outFields.map((child, i) =>\n                React.cloneElement(child, {\n                  form: formRef.current,\n                  initialValue: initialValues?.[child.props?.name],\n                  onChange: _onFieldChange,\n                  key: i,\n                })\n              )\n            ) : isGroupMode ? (\n              <Composition\n                clsPrefix={clsPrefix}\n                fieldItems={groupFields}\n                initialValues={compositionInitValues}\n                onChange={_onCompositionFieldChange}\n                form={formRef.current}\n              />\n            ) : null}\n\n            {renderActions ? (\n              renderActions()\n            ) : (\n              <>\n                {showSearch && (\n                  <Button type=\"primary\" onClick={_onSearch}>\n                    {_getText('search')}\n                  </Button>\n                )}\n                {showReset && <Button onClick={_onReset}>{_getText('reset')}</Button>}\n              </>\n            )}\n          </div>\n          {showExtra && (\n            <div className={`${clsPrefix}-extra`}>\n              {rightChildren}\n              {extraActions}\n            </div>\n          )}\n        </div>\n        {isGroupMode && hasOutField && (\n          <div className={`${clsPrefix}-bottom`}>\n            <Composition\n              clsPrefix={clsPrefix}\n              fieldItems={groupFields}\n              initialValues={compositionInitValues}\n              onChange={_onCompositionFieldChange}\n              form={formRef.current}\n            />\n          </div>\n        )}\n      </Form>\n    </div>\n  )\n}\n\nQueryForm.Field = Field\nQueryForm.useForm = useForm\nQueryForm.createForm = createActions\n\nexport default QueryForm\n"]}

package/es/query-form-v3/index.less

@@ -0,0 +1,90 @@
+.tnt-queryform {
+  &-top {
+    display: flex;
+    &-body {
+      flex: 1;
+      .ant-btn {
+        margin-right: 10px;
+      }
+    }
+  }
+
+  &-extra {
+    & > * {
+      margin-left: 10px;
+    }
+  }
+
+  .ant-form {
+    // margin-bottom: @margin-sm;
+    &.ant-form-inline {
+      flex-wrap: unset;
+      position: relative;
+    }
+
+    &.ant-form-inline .ant-form-item {
+      margin-right: 10px;
+      margin-bottom: @margin-sm;
+      display: inline-block;
+    }
+
+    .ant-form-item-control {
+      // min-width: 160px;
+      line-height: unset;
+      .ant-calendar-picker-input {
+        padding: 0 @padding-sm;
+      }
+      .ant-form-item-children {
+        & > .ant-input,
+        & > .ant-input-affix-wrapper {
+          width: 160px;
+          // width: 200px;
+        }
+      }
+    }
+  }
+
+  &-drawer {
+    margin-top: @margin-xxl;
+    &.large-size {
+      margin-top: 60px;
+    }
+
+    &.ant-drawer.ant-drawer-open {
+      .ant-drawer-mask {
+        opacity: 0;
+        background: unset;
+      }
+    }
+    .ant-drawer-body {
+      .ant-form-item {
+        display: block;
+        margin-right: 0;
+        margin-bottom: @margin-md;
+        width: 100%;
+      }
+      .ant-form-item-label {
+        display: block;
+        text-align: left;
+        line-height: 22px;
+        margin-bottom: 10px;
+      }
+      .ant-form-item-control-wrapper,
+      .ant-form-item-control,
+      .ant-calendar-picker,
+      .ant-input {
+        min-width: 100%;
+        width: 100%;
+      }
+
+      & > .ant-btn {
+        display: block;
+        width: 100%;
+        margin-bottom: 10px;
+        &.ant-btn-primary {
+          margin-top: @margin-md;
+        }
+      }
+    }
+  }
+}

package/es/query-form-v3/useForm.js

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

package/es/query-form-v3/useForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../src/query-form-v3/useForm.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAE3C,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC,CAAA;IAEpC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACvB,CAAC","sourcesContent":["import { useRef } from 'react'\nimport createActions from './createActions'\n\nexport default function useForm() {\n  const form = useRef(createActions())\n\n  return [form.current]\n}\n"]}

package/es/query-list-scene/QueryForm.js

@@ -8,8 +8,10 @@ var __rest = this && this.__rest || function (s, e) {
 };
 import React from 'react';
 import classnames from 'classnames';
-import Form from '../query-form';
+import FormV2 from '../query-form';
+import FormV3 from '../query-form-v3';
 const clsPrefix = 'tnt-querylistscene-queryform';
+const Form = !!localStorage.getItem('query-form') ? FormV3 : FormV2;
 export default class QueryForm extends React.PureComponent {
   constructor(props) {
     super(props);

package/es/query-list-scene/QueryForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,UAAU,MAAM,YAAY,CAAA;AACnC,OAAO,IAAI,MAAM,eAAe,CAAA;AAEhC,MAAM,SAAS,GAAG,8BAA8B,CAAA;AAEhD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,KAAK,CAAC,aAAa;IACxD,YAAY,KAAK;QACf,KAAK,CAAC,KAAK,CAAC,CAAA;QA0Cd;;;;mBAAW,CAAC,SAAS,EAAE,EAAE;gBACvB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACxC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;gBACpC,MAAM,MAAM,iDAAQ,MAAM,GAAK,CAAC,SAAS,IAAI,EAAE,CAAC,KAAE,OAAO,EAAE,CAAC,GAAE,CAAA;gBAE9D,gCAAgC;gBAChC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;gBACnC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC1B,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAA;oBAC5B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBAChC,CAAC,CAAC,CAAA;YACJ,CAAC;WAAA;QAED;;;;mBAAU,GAAG,EAAE;gBACb,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAEtD,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;gBAEzC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,aAAa,CAAC,CAAA;gBACxB,IAAI,CAAC,QAAQ,EAAE,CAAA;YACjB,CAAC;WAAA;QAED;;;;mBAAW,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,EAAE;gBAC7C,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAExC,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;gBACrC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,CAAA;YAC7C,CAAC;WAAA;QAED;;;;mBAAc,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE;gBACjC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAC9B,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;gBACjC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACzB,UAAU,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAA;YAC/B,CAAC;WAAA;QAED;;;;mBAAgB,CAAC,UAAU,EAAE,EAAE;gBAC7B,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBAE7C,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;gBAC9C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;YACzB,CAAC;WAAA;QAlFC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;QAE/B,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAA;QAErC,OAAO,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QAC3C,OAAO,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IACjD,CAAC;IAED,MAAM;QACJ,MAAM,KAA0E,IAAI,CAAC,KAAK,EAApF,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,OAAyB,EAApB,KAAK,cAArE,qEAAuE,CAAa,CAAA;QAE1F,OAAO,CACL,oBAAC,IAAI,oBACC,KAAK,IACT,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC;YAC3C,sBAAsB;YACtB,YAAY,EAAE,YAAY,IAAI,aAAa,EAC3C,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,OAAO,EAAE,IAAI,CAAC,OAAO,IACrB,CACH,CAAA;IACH,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAEpE,IAAI,QAAQ,CAAC,MAAM,IAAI,MAAM,EAAE;YAC7B,OAAO,CAAC,WAAW,iCAEZ,aAAa,GACb,OAAO,CAAC,WAAW,EAAE,GAE1B,KAAK,CACN,CAAA;SACF;aAAM;YACL,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;SAC3C;IACH,CAAC;IA6CD,oBAAoB;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE9B,OAAO,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACvD,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IAC7D,CAAC;CACF;AAED,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA","sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport Form from '../query-form'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\nexport default class QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, ...props } = this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      actions.setFormData(\n        {\n          ...initialValues,\n          ...actions.getFormData(),\n        },\n        false\n      )\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues, onReset, actions } = this.props\n\n    actions.setFormData(initialValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo, ...rest) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo, ...rest)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Form.Field\n"]}
+{"version":3,"file":"QueryForm.js","sourceRoot":"","sources":["../../src/query-list-scene/QueryForm.js"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport classnames from 'classnames'\nimport FormV2 from '../query-form'\nimport FormV3 from '../query-form-v3'\n\nconst clsPrefix = 'tnt-querylistscene-queryform'\n\nconst Form = !!localStorage.getItem('query-form') ? FormV3 : FormV2\n\nexport default class QueryForm extends React.PureComponent {\n  constructor(props) {\n    super(props)\n    const { actions, form } = props\n\n    this.form = form || Form.createForm()\n\n    actions.on('setFormData', this.setFormData)\n    actions.on('resetFormData', this.resetFormData)\n  }\n\n  render() {\n    const { className, actions, extraActions, extralActions, qlsProps, ...props } = this.props\n\n    return (\n      <Form\n        {...props}\n        form={this.form}\n        className={classnames(clsPrefix, className)}\n        // 前期拼写错误，导致需要兼容错误的api\n        extraActions={extraActions || extralActions}\n        onChange={this.onChange}\n        onSearch={this.onSearch}\n        onReset={this.onReset}\n      />\n    )\n  }\n\n  componentDidMount() {\n    const { initialValues = {}, actions, qlsProps, memory } = this.props\n\n    if (qlsProps.memory || memory) {\n      actions.setFormData(\n        {\n          ...initialValues,\n          ...actions.getFormData(),\n        },\n        false\n      )\n    } else {\n      actions.setData('formData', initialValues)\n    }\n  }\n\n  onSearch = (searchObj) => {\n    const { onSearch, actions } = this.props\n    const values = actions.getFormData()\n    const params = { ...values, ...(searchObj || {}), current: 1 }\n\n    // memory 与 url解析setForm时 监听事件异步\n    actions.setData('formData', values)\n    Promise.resolve().then(() => {\n      onSearch && onSearch(params)\n      actions.emit('search', params)\n    })\n  }\n\n  onReset = () => {\n    const { initialValues, onReset, actions } = this.props\n\n    actions.setFormData(initialValues, false)\n\n    onReset?.(initialValues)\n    this.onSearch()\n  }\n\n  onChange = (newValues, changedInfo, ...rest) => {\n    const { onChange, actions } = this.props\n\n    actions.setFormData(newValues, false)\n    onChange?.(newValues, changedInfo, ...rest)\n  }\n\n  setFormData = (data, needSearch) => {\n    const { actions } = this.props\n    actions.setData('formData', data)\n    this.form.setValues(data)\n    needSearch && this.onSearch()\n  }\n\n  resetFormData = (needSearch) => {\n    const { initialValues, actions } = this.props\n\n    actions.setFormData(initialValues, needSearch)\n    this.form.resetValues()\n  }\n\n  componentWillUnmount() {\n    const { actions } = this.props\n\n    actions.removeListener('setFormData', this.setFormData)\n    actions.removeListener('resetFormData', this.resetFormData)\n  }\n}\n\nQueryForm.Field = Form.Field\n"]}