tntd 3.0.29 → 3.0.30-beta.1

package/es/query-form/Field/SelectInput.js

@@ -17,9 +17,11 @@ export default (props => {
   const {
       options = [],
       addonBeforeStyle,
-      selectProps
+      selectProps,
+      form,
+      close
     } = props,
-    inputProps = __rest(props, ["options", "addonBeforeStyle", "selectProps"]);
+    inputProps = __rest(props, ["options", "addonBeforeStyle", "selectProps", "form", "close"]);
   const [items, setItems] = useState(options);
   const getInitialKey = () => {
     let key = _get(options, '0.value');
@@ -61,9 +63,25 @@ export default (props => {
     setItems(options);
     setKey(getInitialKey());
   }, [options, inputProps.value]);
-  return React.createElement(Input, Object.assign({}, inputProps, {
-    value: getInputValue(),
+  return React.createElement(Input.Search, Object.assign({
     addonBefore: addonBefore,
+    onPressEnter: evt => {
+      var _a;
+      form.emit('search', {
+        [key]: (_a = evt === null || evt === void 0 ? void 0 : evt.target) === null || _a === void 0 ? void 0 : _a.value,
+        current: 1
+      });
+      close && close();
+    },
+    onSearch: value => {
+      form.emit('search', {
+        [key]: value,
+        current: 1
+      });
+      close && close();
+    }
+  }, inputProps, {
+    value: getInputValue(),
     onChange: onChange
   }));
 });

package/es/query-form/Field/SelectInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectInput.js","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE5B,OAAO,MAAM,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,MAAM,aAAa,CAAA;AAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;AAEzB,eAAe,CAAC,KAAK,EAAE,EAAE;IACvB,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,gBAAgB,EAAE,WAAW,KAAmB,KAAK,EAApB,UAAU,UAAK,KAAK,EAArE,8CAA6D,CAAQ,CAAA;IAC3E,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAEjC,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,CAAA;SACrD;QAED,OAAO,GAAG,CAAA;IACZ,CAAC,CAAA;IACD,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAA;IAC/C,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,CAAC,CAAA;QACX,KAAK,CAAC,QAAQ,CAAC;YACb,CAAC,GAAG,CAAC,EAAE,EAAE;SACV,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,EAAE;QACvB,KAAK,CAAC,QAAQ,CAAC;YACb,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,CAClB,oBAAC,MAAM,kBACL,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,WAAW,EACrB,KAAK,kBACH,KAAK,EAAE,OAAO,IACX,gBAAgB,GAErB,wBAAwB,EAAE,KAAK,IAC3B,CAAC,WAAW,IAAE,EAAE,CAAC,GAEpB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC/B,oBAAC,MAAM,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,IAC7B,KAAK,CACC,CACV,CAAC,CACK,CACV,CAAA;IACD,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,OAAO,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,OAAO,CAAC,CAAA;QACjB,MAAM,CAAC,aAAa,EAAE,CAAC,CAAA;IACzB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;IAE/B,OAAO,CACL,oBAAC,KAAK,oBAAK,UAAU,IAAE,KAAK,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,IAAI,CAChG,CAAA;AACH,CAAC,CAAA","sourcesContent":["import React, { useState, useEffect } from 'react'\nimport { get } from 'lodash'\n\nimport Select from '../../select'\nimport Input from '../../input'\n\nconst { Option } = Select\n\nexport default (props) => {\n  const { options = [], addonBeforeStyle, selectProps,...inputProps } = props\n  const [items, setItems] = useState(options)\n  const getInitialKey = () => {\n    let key = get(options, '0.value')\n\n    if (inputProps.value) {\n      key = get(Object.keys(inputProps.value), '0') || key\n    }\n\n    return key\n  }\n  const [key, setKey] = useState(getInitialKey())\n  const onKeyChange = (key) => {\n    setKey(key)\n    props.onChange({\n      [key]: '',\n    })\n  }\n  const onChange = (evt) => {\n    props.onChange({\n      [key]: evt.target.value,\n    })\n  }\n  const addonBefore = (\n    <Select\n      value={key}\n      onChange={onKeyChange}\n      style={{\n        width: '120px',\n        ...addonBeforeStyle,\n      }}\n      dropdownMatchSelectWidth={false}\n      {...(selectProps||{})}\n    >\n      {items.map(({ label, value }) => (\n        <Option key={value} value={value}>\n          {label}\n        </Option>\n      ))}\n    </Select>\n  )\n  const getInputValue = () => {\n    return get(inputProps.value, key)\n  }\n\n  useEffect(() => {\n    setItems(options)\n    setKey(getInitialKey())\n  }, [options, inputProps.value])\n\n  return (\n    <Input {...inputProps} value={getInputValue()} addonBefore={addonBefore} onChange={onChange} />\n  )\n}\n"]}
+{"version":3,"file":"SelectInput.js","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useState, useEffect } from 'react'\nimport { get } from 'lodash'\nimport Select from '../../select'\nimport Input from '../../input'\n\nconst { Option } = Select\n\nexport default (props) => {\n  const { options = [], addonBeforeStyle, selectProps, form, close, ...inputProps } = props\n  const [items, setItems] = useState(options)\n  const getInitialKey = () => {\n    let key = get(options, '0.value')\n\n    if (inputProps.value) {\n      key = get(Object.keys(inputProps.value), '0') || key\n    }\n\n    return key\n  }\n  const [key, setKey] = useState(getInitialKey())\n  const onKeyChange = (key) => {\n    setKey(key)\n    props.onChange({\n      [key]: '',\n    })\n  }\n  const onChange = (evt) => {\n    props.onChange({\n      [key]: evt.target.value,\n    })\n  }\n  const addonBefore = (\n    <Select\n      value={key}\n      onChange={onKeyChange}\n      style={{\n        width: '120px',\n        ...addonBeforeStyle,\n      }}\n      dropdownMatchSelectWidth={false}\n      {...(selectProps || {})}\n    >\n      {items.map(({ label, value }) => (\n        <Option key={value} value={value}>\n          {label}\n        </Option>\n      ))}\n    </Select>\n  )\n  const getInputValue = () => {\n    return get(inputProps.value, key)\n  }\n\n  useEffect(() => {\n    setItems(options)\n    setKey(getInitialKey())\n  }, [options, inputProps.value])\n\n  return (\n    <Input.Search\n      addonBefore={addonBefore}\n      onPressEnter={(evt) => {\n        form.emit('search', { [key]: evt?.target?.value, current: 1 })\n        close && close()\n      }}\n      onSearch={(value) => {\n        form.emit('search', { [key]: value, current: 1 })\n        close && close()\n      }}\n      {...inputProps}\n      value={getInputValue()}\n      onChange={onChange}\n    />\n  )\n}\n"]}

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

@@ -15,8 +15,8 @@ export const getFieldWidth = type => {
   }[type] || defaultFieldWidth;
 };
 export default {
-  string: Input,
-  input: Input,
+  string: Input.Search,
+  input: Input.Search,
   search: Input.Search,
   inputNumber: InputNumber,
   number: InputNumber,

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

@@ -1 +1 @@
-{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form/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;IACb,KAAK,EAAE,KAAK;IACZ,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,\n  input: Input,\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"]}
+{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form/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/Field/index.js

@@ -79,6 +79,7 @@ export default class Field extends PureComponent {
       label: title,
       className: className
     }, React.createElement(Field, Object.assign({
+      form: form,
       value: value
     }, isInput(type) ? {
       onPressEnter: evt => {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-form/Field/index.js"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAC5B,OAAO,SAAS,EAAE,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEtD,OAAO,IAAI,MAAM,YAAY,CAAA;AAE7B,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;AAE1B,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAErF,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,aAAa;IAC9C,YAAY,KAAK;QACf,KAAK,CAAC,KAAK,CAAC,CAAA;QA2Cd;;;;mBAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBAC5B,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;oBAC5B,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;oBACxB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;iBACjC;YACH,CAAC;WAAA;QAED;;;;mBAAW,CAAC,GAAG,IAAI,EAAE,EAAE;gBACrB,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACzE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;gBAErC,QAAQ,IAAI,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAA;gBAE7B,qCAAqC;gBACrC,IAAI,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC/B,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;iBACvC;gBAED,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YACpC,CAAC;WAAA;QAED;;;;mBAAe,CAAC,QAAQ,EAAE,EAAE;gBAC1B,IAAI,CAAC,QAAQ,CAAC;oBACZ,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;iBACtC,CAAC,CAAA;YACJ,CAAC;WAAA;QAnEC,IAAI,CAAC,KAAK,GAAG;YACX,KAAK,EAAE,KAAK,CAAC,YAAY;SAC1B,CAAA;IACH,CAAC;IAED,MAAM;;QACJ,MAAM,EACJ,IAAI,GAAG,OAAO,EACd,KAAK,EACL,IAAI,EACJ,eAAe,GAAG,KAAK,EACvB,SAAS,GAAG,EAAE,EACd,SAAS,EACT,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,IAAI,CAAC,KAAK,CAAA;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC5B,MAAM,KAAK,GAAG,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,CAAA;QAE1C,OAAO,CACL,oBAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;YAC1C,oBAAC,KAAK,kBACJ,KAAK,EAAE,KAAK,IACR,CAAC,OAAO,CAAC,IAAI,CAAC;gBAChB,CAAC,CAAC;oBACA,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,WACpB,OAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA,EAAA;oBACjE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;iBACxE;gBACD,CAAC,CAAC,EAAE,CAAC,EACH,UAAU,IACd,KAAK,kCACA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,KACpB,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,0CAAE,KAAK,KAAI,aAAa,CAAC,IAAI,CAAC,KAEnF,QAAQ,EAAE,IAAI,CAAC,QAAQ,IACvB,CACO,CACZ,CAAA;IACH,CAAC;IA8BD,iBAAiB;QACf,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE3B,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACrC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IACzC,CAAC;IAED,oBAAoB;QAClB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE3B,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACtC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC1C,CAAC;CACF","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          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"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-form/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/index.js

@@ -1,353 +1,190 @@
-import _debounce from "lodash/debounce";
-import classnames from 'classnames';
-import React, { createRef } from 'react';
-import createActions from './createActions';
-import Field from './Field';
-import useForm from './useForm';
-import Badge from '../badge';
+import React, { useMemo, useRef, useEffect, useState } from 'react';
+import cn from 'classnames';
+import Composition from './Field/Composition';
 import Button from '../button';
-import Drawer from '../drawer';
 import Form from '../form';
 import { getLanguage, getText } from '../prev-locale';
-import Icon from '../tntd-icon';
+import createActions from './createActions';
+import Field from './Field';
+import useForm from './useForm';
 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);
-      }
-    });
-    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
-            });
-          }
-        }
-      }
-    });
-    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);
-        }
-      }
+function QueryForm({
+  form,
+  className = '',
+  initialValues: _initialValues,
+  language,
+  onSearch,
+  onReset,
+  setFormData,
+  hasOnChange,
+  onChange,
+  renderActions,
+  extraActions,
+  children,
+  showSearch = false,
+  showReset = false,
+  showFieldCount = 3,
+  minGroupCount = 3,
+  // 最小聚合个数
+  compositionShowReset = true,
+  inline
+}) {
+  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 {
-      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, _b;
-      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[(_b = child.props) === null || _b === void 0 ? void 0 : _b.name],
-        onChange: this.onFieldChange
+    formRef.current.setData('values', newValues);
+    onChange && onChange(newValues, changedInfo, ...rest);
+  };
+  const _onCompositionFieldChange = (value, deleteKeys, needSearch, isReset) => {
+    const values = formRef.current.getValues();
+    const newValues = Object.assign(Object.assign({}, values), value);
+    const changeKeys = Object.keys(newValues);
+    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]) || (values === null || values === void 0 ? void 0 : values[key]) === 0 || (values === null || values === void 0 ? void 0 : values[key]) === false) {
+          delete newValues[key];
+        }
       });
-    })), 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) {
+    formRef.current.setData('values', newValues);
+    if (isReset) {
       return;
+    } else if ((deleteKeys === null || deleteKeys === void 0 ? void 0 : deleteKeys.length) === 1) {
+      // 删除一点要搜索
+      setFormData === null || setFormData === void 0 ? void 0 : setFormData(newValues);
+    } else if (needSearch && !hasOnChange) {
+      formRef.current.emit('search', Object.assign(Object.assign({}, newValues), {
+        current: 1
+      }));
+    } else if (onChange) {
+      changeKeys.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);
+        }
+      });
     }
-    if (!showFieldCount) {
-      if (current && this.isFieldsWidthOverflow()) {
-        this.setState({
-          showMore: true
-        });
+  };
+  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);
       }
-      this.removeResizeListener = this.addResizeListener();
+    });
+    if (groupFields.length <= minGroupCount) {
+      groupFields = [];
+      outFields = otherFields;
     } else {
-      this.updateDrawerFieldsValueCount();
-      this.form.on('setValues', this.updateDrawerFieldsValueCount);
-      this.form.on('setValue', this.updateDrawerFieldsValueCount);
+      // 初始值
+      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];
+        }
+      }
     }
-  }
-  componentWillUnmount() {
+    return [groupFields, outFields, rightChildren, Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined];
+  }, [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, {
+      [`${clsPrefix}-inline`]: inline
+    })
+  }, React.createElement(Form, {
+    layout: "inline"
+  }, React.createElement("div", {
+    className: `${clsPrefix}-top`
+  }, React.createElement("div", {
+    className: `${clsPrefix}-top-body`
+  }, outFields.map((child, i) => {
     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 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 && (!hasOutField || inline) && React.createElement(Composition, {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    _onReset: _onReset,
+    _onSearch: _onSearch,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current,
+    compositionShowReset: compositionShowReset
+  }), 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 && !inline && React.createElement("div", {
+    className: `${clsPrefix}-bottom`
+  }, React.createElement(Composition, {
+    clsPrefix: clsPrefix,
+    fieldItems: groupFields,
+    initialValues: compositionInitValues,
+    _onReset: _onReset,
+    _onSearch: _onSearch,
+    onChange: _onCompositionFieldChange,
+    form: formRef.current,
+    compositionShowReset: compositionShowReset
+  }))));
 }
 QueryForm.Field = Field;
 QueryForm.useForm = useForm;