tntd 3.0.40-beta.6 → 3.0.40-beta.8

package/lib/query-form/Field/Composition/ValueTag.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValueTag.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/ValueTag.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useState } from 'react'\nimport { find, cloneDeep } from 'lodash'\nimport Popover from '../../../popover'\nimport Tag from '../../../tag'\nimport fieldsMap from '../fieldsMap'\nimport SelectInput from './SelectInput'\nimport SelectOpt from './Select'\nimport { getLabel, isInput } from './utils'\nimport './FieldPopover.less'\n\nexport default function ValueTag({\n  item,\n  fieldItems,\n  locale,\n  onDelete,\n  value,\n  onChange,\n  clsPrefix,\n  form,\n  handleTag,\n}) {\n  const [visible, setVisible] = useState()\n\n  const propItem = find(fieldItems, (it) => it.props.name === item.key)?.props || {}\n  const {\n    name,\n    propsTitle,\n    title,\n    type = 'input',\n    className,\n    component,\n    props: fieldProps,\n    closable = true,\n  } = propItem\n\n  const handleVisibleChange = (visible) => {\n    setVisible(visible)\n  }\n\n  const close = () => {\n    setVisible(false)\n  }\n\n  const onFieldChange = (...args) => {\n    const copyValue = cloneDeep(value)\n    const index = copyValue.findIndex((v) => v.key === name)\n    copyValue[index].value = args[0]\n    if (['date', 'checkbox'].includes(type) || (type === 'dateRange' && args[1]?.[1])) {\n      close()\n    }\n    onChange(copyValue, false, args[0] !== undefined, type !== 'selectInput')\n    fieldProps?.onChange && fieldProps.onChange(copyValue[index].value)\n  }\n\n  const onSelectChange = (v, isMultiple) => {\n    const copyValue = cloneDeep(value || [])\n    let index = copyValue.findIndex((v) => v.key === name)\n    if (isMultiple) {\n      if (!copyValue[index]?.value?.length) {\n        copyValue[index].value = [v?.value]\n      } else {\n        if (copyValue[index].value?.indexOf(v.value) > -1) {\n          copyValue[index].value = copyValue[index].value.filter((val) => val !== v.value)\n        } else {\n          copyValue[index].value.push(v.value)\n        }\n      }\n    } else {\n      copyValue[index].value = v?.value\n      close()\n    }\n    onChange(copyValue, false, true)\n    fieldProps?.onChange && fieldProps.onChange(copyValue[index].value)\n  }\n\n  const renderSecondOptions = () => {\n    const isSelectInput = type === 'selectInput'\n    const Field = isSelectInput ? SelectInput : component || fieldsMap[type] || (() => null)\n    return (\n      <div onClick={(e) => e.stopPropagation()} className={className}>\n        <label>{propsTitle || title || name}</label>\n        {type === 'select' ? (\n          <SelectOpt\n            {...fieldProps}\n            propItem={propItem}\n            onChange={onSelectChange}\n            value={item?.value}\n            showEmpty\n          />\n        ) : (\n          <div\n            className={`${clsPrefix}-field-popover-content`}\n            onClick={(e) => e.stopPropagation()}\n          >\n            <Field\n              form={form}\n              value={item?.value}\n              {...fieldProps}\n              style={{\n                ...fieldProps?.style,\n                width: fieldProps?.style?.width || (isSelectInput ? '361px' : '250px'),\n              }}\n              close={close}\n              onChange={onFieldChange}\n              name={name}\n            />\n          </div>\n        )}\n      </div>\n    )\n  }\n\n  const _isInput = isInput(type) && !component\n\n  if (item?.value === undefined) {\n    return null\n  }\n\n  return (\n    <Popover\n      trigger=\"click\"\n      visible={visible && !_isInput}\n      onVisibleChange={handleVisibleChange}\n      overlayClassName={`${clsPrefix}-field-popover`}\n      content={renderSecondOptions()}\n      placement=\"bottomLeft\"\n    >\n      <Tag\n        closable={!(closable === false || fieldProps?.allowClear === false)}\n        onClick={(e) => {\n          e.preventDefault()\n          e.stopPropagation()\n          if (!_isInput) {\n            setVisible(true)\n          } else {\n            handleTag(cloneDeep(item))\n          }\n        }}\n        onClose={(e) => onDelete(item.key, e)}\n        ellipsisOptions={{ widthLimit: '140px' }}\n      >\n        {getLabel(item, fieldItems, locale)}\n      </Tag>\n    </Popover>\n  )\n}\n"]}
+{"version":3,"file":"ValueTag.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/ValueTag.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useState } from 'react'\nimport { find, cloneDeep } from 'lodash'\nimport Popover from '../../../popover'\nimport Tag from '../../../tag'\nimport fieldsMap from '../fieldsMap'\nimport SelectInput from './SelectInput'\nimport SelectOpt from './Select'\nimport { getLabel, isInput } from './utils'\nimport './FieldPopover.less'\n\nexport default function ValueTag({\n  item,\n  fieldItems,\n  locale,\n  onDelete,\n  value,\n  onChange,\n  clsPrefix,\n  form,\n  handleTag,\n}) {\n  const [visible, setVisible] = useState()\n\n  const propItem = find(fieldItems, (it) => it.props?.name === item.key)?.props || {}\n  const {\n    name,\n    propsTitle,\n    title,\n    type = 'input',\n    className,\n    component,\n    props: fieldProps,\n    closable = true,\n  } = propItem\n\n  const handleVisibleChange = (visible) => {\n    setVisible(visible)\n  }\n\n  const close = () => {\n    setVisible(false)\n  }\n\n  const onFieldChange = (...args) => {\n    const copyValue = cloneDeep(value)\n    const index = copyValue.findIndex((v) => v.key === name)\n    copyValue[index].value = args[0]\n    if (['date', 'checkbox'].includes(type) || (type === 'dateRange' && args[1]?.[1])) {\n      close()\n    }\n    onChange(copyValue, false, args[0] !== undefined, type !== 'selectInput')\n    fieldProps?.onChange && fieldProps.onChange(copyValue[index].value)\n  }\n\n  const onSelectChange = (v, isMultiple) => {\n    const copyValue = cloneDeep(value || [])\n    let index = copyValue.findIndex((v) => v.key === name)\n    if (isMultiple) {\n      if (!copyValue[index]?.value?.length) {\n        copyValue[index].value = [v?.value]\n      } else {\n        if (copyValue[index].value?.indexOf(v.value) > -1) {\n          copyValue[index].value = copyValue[index].value.filter((val) => val !== v.value)\n        } else {\n          copyValue[index].value.push(v.value)\n        }\n      }\n    } else {\n      copyValue[index].value = v?.value\n      close()\n    }\n    onChange(copyValue, false, true)\n    fieldProps?.onChange && fieldProps.onChange(copyValue[index].value)\n  }\n\n  const renderSecondOptions = () => {\n    const isSelectInput = type === 'selectInput'\n    const Field = isSelectInput ? SelectInput : component || fieldsMap[type] || (() => null)\n    return (\n      <div onClick={(e) => e.stopPropagation()} className={className}>\n        <label>{propsTitle || title || name}</label>\n        {type === 'select' ? (\n          <SelectOpt\n            {...fieldProps}\n            propItem={propItem}\n            onChange={onSelectChange}\n            value={item?.value}\n            showEmpty\n          />\n        ) : (\n          <div\n            className={`${clsPrefix}-field-popover-content`}\n            onClick={(e) => e.stopPropagation()}\n          >\n            <Field\n              form={form}\n              value={item?.value}\n              {...fieldProps}\n              style={{\n                ...fieldProps?.style,\n                width: fieldProps?.style?.width || (isSelectInput ? '361px' : '250px'),\n              }}\n              close={close}\n              onChange={onFieldChange}\n              name={name}\n            />\n          </div>\n        )}\n      </div>\n    )\n  }\n\n  const _isInput = isInput(type) && !component\n\n  if (item?.value === undefined) {\n    return null\n  }\n\n  return (\n    <Popover\n      trigger=\"click\"\n      visible={visible && !_isInput}\n      onVisibleChange={handleVisibleChange}\n      overlayClassName={`${clsPrefix}-field-popover`}\n      content={renderSecondOptions()}\n      placement=\"bottomLeft\"\n    >\n      <Tag\n        closable={!(closable === false || fieldProps?.allowClear === false)}\n        onClick={(e) => {\n          e.preventDefault()\n          e.stopPropagation()\n          if (!_isInput) {\n            setVisible(true)\n          } else {\n            handleTag(cloneDeep(item))\n          }\n        }}\n        onClose={(e) => onDelete(item.key, e)}\n        ellipsisOptions={{ widthLimit: '140px' }}\n      >\n        {getLabel(item, fieldItems, locale)}\n      </Tag>\n    </Popover>\n  )\n}\n"]}

package/lib/query-form/Field/Composition/index.d.ts

@@ -4,6 +4,8 @@ declare var _default: React.ForwardRefExoticComponent<{
     onChange: any;
     form: any;
     compositionShowReset: any;
+    defaultSearchField: any;
+    defaultSearchPlaceholder: any;
     clsPrefix: any;
     _onReset: any;
     _onSearch: any;

package/lib/query-form/Field/Composition/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _find2 = _interopRequireDefault(require("lodash/find"));
 var _react = _interopRequireWildcard(require("react"));
 var _LocaleReceiver = _interopRequireDefault(require("antd/lib/locale-provider/LocaleReceiver"));
@@ -136,13 +137,11 @@ function _arrayWithHoles(r) {
 }
 /**
  * @param value: [{
-    key: 'key1',
+      key: 'key1',
       value: 'value1',
-      label: 'key1:value1'
     }, {
       key: 'key2',
-      value: ['value2', 'value3'],
-      label: 'key1:value2|value3'
+      value: ['value2', 'value3']
     }]
  * @param {*} ref
  * @returns
@@ -154,6 +153,8 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     onChange = _ref.onChange,
     form = _ref.form,
     compositionShowReset = _ref.compositionShowReset,
+    defaultSearchField = _ref.defaultSearchField,
+    defaultSearchPlaceholder = _ref.defaultSearchPlaceholder,
     clsPrefix = _ref.clsPrefix,
     _onReset = _ref._onReset,
     _onSearch = _ref._onSearch;
@@ -248,8 +249,11 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     e.stopPropagation();
     var inputValue = ((_a = searchText === null || searchText === void 0 ? void 0 : searchText.match(/[^:]+:(.*)/)) === null || _a === void 0 ? void 0 : _a[1]) || null;
     if (tempItem && inputValue) {
-      // tempItem.label = searchText
-      tempItem.value = inputValue; // 得到输入值
+      if ((0, _isObject2["default"])(tempItem.value)) {
+        tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
+      } else {
+        tempItem.value = inputValue; // 得到输入值
+      }
       if (!(value === null || value === void 0 ? void 0 : value.find(function (v) {
         return v.key === tempItem.key;
       }))) {
@@ -263,8 +267,8 @@ var CompositionInput = function CompositionInput(_ref, ref) {
         setValue(_newValue);
         onChange((0, _utils.parseArrayToObject)(_newValue));
       }
-      e.target.value = inputValue;
-      form.emit('search', _defineProperty(_defineProperty({}, tempItem.key, inputValue), "current", 1));
+      e.target.value = tempItem.value;
+      form.emit('search', _defineProperty(_defineProperty({}, tempItem.key, tempItem.value), "current", 1));
       setTempItem();
       setSearchText('');
     } else {
@@ -329,25 +333,37 @@ var CompositionInput = function CompositionInput(_ref, ref) {
   var onPressEnter = function onPressEnter(e) {
     var _a;
     var inputValue = ((_a = searchText === null || searchText === void 0 ? void 0 : searchText.match(/[^:]+:(.*)/)) === null || _a === void 0 ? void 0 : _a[1]) || null;
+    var fieldValue;
     if (tempItem && inputValue) {
       setVisible(false);
-      // tempItem.label = searchText
-      tempItem.value = inputValue; // 得到输入值
+      if ((0, _isObject2["default"])(tempItem.value)) {
+        tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
+      } else {
+        tempItem.value = inputValue; // 得到输入值
+      }
+      fieldValue = tempItem;
+    } else if (defaultSearchField) {
+      fieldValue = {
+        key: defaultSearchField,
+        value: searchText
+      };
+    }
+    if (fieldValue) {
       if (!(value === null || value === void 0 ? void 0 : value.find(function (v) {
-        return v.key === tempItem.key;
+        return v.key === fieldValue.key;
       }))) {
-        var newValue = [].concat(_toConsumableArray(value), [tempItem]);
+        var newValue = [].concat(_toConsumableArray(value), [fieldValue]);
         setValue(newValue);
         onChange((0, _utils.parseArrayToObject)(newValue));
       } else {
         var _newValue2 = value.map(function (v) {
-          return v.key === tempItem.key ? tempItem : v;
+          return v.key === fieldValue.key ? fieldValue : v;
         });
         setValue(_newValue2);
         onChange((0, _utils.parseArrayToObject)(_newValue2));
       }
-      e.target.value = inputValue;
-      form.emit('search', _defineProperty(_defineProperty({}, tempItem.key, inputValue), "current", 1));
+      e.target.value = fieldValue.value;
+      form.emit('search', _defineProperty(_defineProperty({}, fieldValue.key, fieldValue.value), "current", 1));
       (props === null || props === void 0 ? void 0 : props.onPressEnter) && props.onPressEnter(e);
     }
     setTempItem();
@@ -400,7 +416,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
       ref: inputRef,
       value: searchText,
       className: "inputClass",
-      placeholder: !(value === null || value === void 0 ? void 0 : value.length) ? locale.placeholder : undefined
+      placeholder: defaultSearchPlaceholder || (!(value === null || value === void 0 ? void 0 : value.length) ? locale.placeholder : undefined)
     }, props, {
       onPressEnter: onPressEnter,
       onChange: onInputChange

package/lib/query-form/Field/Composition/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, {\n  useEffect,\n  useState,\n  useRef,\n  useImperativeHandle,\n  forwardRef,\n  useCallback,\n} from 'react'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport { find } from 'lodash'\nimport Icon from '../../../icon'\nimport Input from '../../../input'\nimport FieldPopover from './FieldPopover'\nimport ValueTag from './ValueTag'\nimport { parseArrayToObject, parseObjectToArray, getLabel } from './utils'\nimport './index.less'\n\n/**\n * @param value: [{\n    key: 'key1',\n      value: 'value1',\n      label: 'key1:value1'\n    }, {\n      key: 'key2',\n      value: ['value2', 'value3'],\n      label: 'key1:value2|value3'\n    }]\n * @param {*} ref \n * @returns \n */\nconst regex = /^.+:.*$/\nconst CompositionInput = (\n  {\n    fieldItems,\n    initialValues,\n    onChange,\n    form,\n    compositionShowReset,\n    clsPrefix,\n    _onReset,\n    _onSearch,\n  },\n  ref\n) => {\n  const prefix = `${clsPrefix}-composition-input`\n  const [value, setValue] = useState(parseObjectToArray(initialValues, fieldItems))\n  const [tempItem, setTempItem] = useState()\n  const [searchText, setSearchText] = useState('')\n  const [visible, setVisible] = useState(false)\n  const [fieldItem, setFieldItem] = useState(undefined)\n  const fieldItemsRef = useRef(fieldItems)\n  const _fieldItem = fieldItem\n    ? find(fieldItems, (f) => f.props?.name === fieldItem.name)?.props || fieldItem\n    : {}\n  const { props } = fieldItem || {}\n\n  const inputRef = useRef(null)\n  const widthRef = useRef(null)\n  const fieldRef = useRef(null)\n  const eventRef = useRef(false)\n\n  fieldItemsRef.current = fieldItems\n\n  const updateValues = useCallback((obj) => {\n    const newValueArr = parseObjectToArray(obj, fieldItemsRef.current)\n    setValue(newValueArr)\n  }, [])\n\n  const updateValue = useCallback((name, value) => {\n    updateValues({ [name]: value })\n  }, [])\n\n  if (!eventRef.current) {\n    eventRef.current = true\n    form.on('setValue', updateValue)\n    form.on('setValues', updateValues)\n  }\n\n  useEffect(() => {\n    return () => {\n      form.off('setValue', updateValue)\n      form.off('setValues', updateValues)\n    }\n  }, [])\n\n  const handleFocus = (e) => {\n    e.preventDefault()\n    setTimeout(() => {\n      inputRef?.current?.focus()\n    }, 10)\n    if (!visible && !regex.test(searchText)) {\n      setVisible(true)\n    }\n  }\n\n  useImperativeHandle(ref, () => ({\n    changeVal: () => {\n      return value\n    },\n  }))\n\n  const onClear = (e) => {\n    e.stopPropagation()\n    const initKeys = Object.keys(initialValues || {})\n    const deleteKeys = value?.filter(({ key }) => !initKeys.includes(key)).map(({ key }) => key)\n    setValue(parseObjectToArray(initialValues || {}, fieldItems))\n    onChange({ ...(initialValues || {}) }, deleteKeys, false, true)\n    // 清除其他数据\n    setSearchText('')\n    setTempItem()\n    _onReset()\n  }\n\n  const doSearch = (e) => {\n    e.stopPropagation()\n    const inputValue = searchText?.match(/[^:]+:(.*)/)?.[1] || null\n    if (tempItem && inputValue) {\n      // tempItem.label = searchText\n      tempItem.value = inputValue // 得到输入值\n      if (!value?.find((v) => v.key === tempItem.key)) {\n        const newValue = [...value, tempItem]\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      } else {\n        const newValue = value.map((v) => (v.key === tempItem.key ? tempItem : v))\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      }\n      e.target.value = inputValue\n      form.emit('search', { [tempItem.key]: inputValue, current: 1 })\n      setTempItem()\n      setSearchText('')\n    } else {\n      _onSearch()\n    }\n  }\n\n  const onDelete = (key, e) => {\n    e.preventDefault()\n    if (value.length > 0) {\n      const newValue = value.filter((v) => v.key !== key)\n      setValue(newValue)\n      const deleteKeys = [key]\n      onChange(parseArrayToObject(newValue), deleteKeys, true)\n      // 删除的时候也触发Field的onChange --  泳建提的需求\n      const fieldProps = find(fieldItems, (it) => it.props?.name === key)?.props\n      fieldProps?.props?.onChange && fieldProps.props.onChange(undefined)\n    }\n  }\n\n  const focusInput = (value) => {\n    inputRef?.current?.focus()\n    setSearchText(getLabel(value, fieldItems))\n    setTempItem(value)\n    setTimeout(() => {\n      inputRef?.current?.focus()\n    }, 10)\n  }\n\n  const handleFieldChange = (value, isInput, hasValue, needSearch = true) => {\n    if (isInput) {\n      focusInput(value)\n      return\n    }\n    setValue(value)\n    setSearchText('')\n    setTempItem()\n    if (hasValue) onChange(parseArrayToObject(value), undefined, needSearch)\n  }\n\n  // 输入框事件方法\n  const onInputChange = (e) => {\n    const value = e.target.value\n    if (tempItem) {\n      if (regex.test(value)) {\n        // 有输入值\n        setSearchText(value)\n      } else {\n        // 没有输入值, 清空选择的属性类型重新显示属性列表\n        setSearchText('')\n        setTempItem()\n      }\n    } else {\n      setSearchText(value)\n    }\n  }\n\n  const onPressEnter = (e) => {\n    const inputValue = searchText?.match(/[^:]+:(.*)/)?.[1] || null\n    if (tempItem && inputValue) {\n      setVisible(false)\n      // tempItem.label = searchText\n      tempItem.value = inputValue // 得到输入值\n      if (!value?.find((v) => v.key === tempItem.key)) {\n        const newValue = [...value, tempItem]\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      } else {\n        const newValue = value.map((v) => (v.key === tempItem.key ? tempItem : v))\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      }\n      e.target.value = inputValue\n      form.emit('search', { [tempItem.key]: inputValue, current: 1 })\n      props?.onPressEnter && props.onPressEnter(e)\n    }\n    setTempItem()\n    setSearchText('')\n  }\n\n  return (\n    <LocaleReceiver componentName=\"QueryForm\">\n      {(locale) => {\n        return (\n          <div className={prefix} onClick={handleFocus}>\n            <span className={`${prefix}-width`} ref={widthRef}>\n              {searchText}\n            </span>\n            <ul className={`${prefix}-items`}>\n              {value &&\n                value.map((item, index) => (\n                  <li key={item.key} className={`${prefix}-items-item`}>\n                    <ValueTag\n                      onChange={handleFieldChange}\n                      value={value}\n                      item={item}\n                      fieldItems={fieldItems}\n                      locale={locale}\n                      onDelete={onDelete}\n                      handleTag={focusInput}\n                      clsPrefix={clsPrefix}\n                      form={form}\n                    />\n                  </li>\n                ))}\n              <li className={`${prefix}-items-input`}>\n                <FieldPopover\n                  ref={fieldRef}\n                  onChange={handleFieldChange}\n                  clsPrefix={clsPrefix}\n                  fieldItems={fieldItems}\n                  propItem={_fieldItem}\n                  setFieldItem={setFieldItem}\n                  form={form}\n                  regex={regex}\n                  visible={visible}\n                  value={value}\n                  setVisible={setVisible}\n                  searchText={searchText}\n                  locale={locale}\n                  placement=\"bottomLeft\"\n                >\n                  <Input\n                    ref={inputRef}\n                    value={searchText}\n                    className=\"inputClass\"\n                    placeholder={!value?.length ? locale.placeholder : undefined}\n                    {...props}\n                    onPressEnter={onPressEnter}\n                    onChange={onInputChange}\n                  />\n                </FieldPopover>\n              </li>\n            </ul>\n            <div className={`${prefix}-prefix`}>\n              <Icon type=\"filter\" />\n            </div>\n            {compositionShowReset && (\n              <div className={`${prefix}-clear`}>\n                <Icon onClick={onClear} type=\"close-circle\" theme=\"filled\" />\n              </div>\n            )}\n            <div className={`${prefix}-search`} onClick={doSearch}>\n              <Icon type=\"search\" />\n            </div>\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n}\nexport default forwardRef(CompositionInput)\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAOc;AACd,4FAAmE;AACnE,mCAAuC;AACvC,yDAAgC;AAChC,2DAAkC;AAClC,kEAAyC;AACzC,0DAAiC;AACjC,mCAA0E;AAC1E,wBAAqB;AAErB;;;;;;;;;;GAUG;AACH,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,gBAAgB,GAAG,CACvB,EACE,UAAU,EACV,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EACxB,SAAS,EACT,QAAQ,EACR,SAAS,GACV,EACD,GAAG,EACH,EAAE;;IACF,MAAM,MAAM,GAAG,GAAG,SAAS,oBAAoB,CAAA;IAC/C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,IAAA,0BAAkB,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAA;IACjF,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,GAAE,CAAA;IAC1C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAC,EAAE,CAAC,CAAA;IAChD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,SAAS,CAAC,CAAA;IACrD,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC,UAAU,CAAC,CAAA;IACxC,MAAM,UAAU,GAAG,SAAS;QAC1B,CAAC,CAAC,CAAA,MAAA,IAAA,aAAI,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,KAAK,0CAAE,IAAI,MAAK,SAAS,CAAC,IAAI,CAAA,EAAA,CAAC,0CAAE,KAAK,KAAI,SAAS;QAC/E,CAAC,CAAC,EAAE,CAAA;IACN,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,IAAI,EAAE,CAAA;IAEjC,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAA;IAC7B,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAA;IAC7B,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAA;IAC7B,MAAM,QAAQ,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAA;IAE9B,aAAa,CAAC,OAAO,GAAG,UAAU,CAAA;IAElC,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,CAAC,GAAG,EAAE,EAAE;QACvC,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;QAClE,QAAQ,CAAC,WAAW,CAAC,CAAA;IACvB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC9C,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IACjC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;QACrB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAA;QACvB,IAAI,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QAChC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;KACnC;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;YACjC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;QACrC,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,EAAE;QACxB,CAAC,CAAC,cAAc,EAAE,CAAA;QAClB,UAAU,CAAC,GAAG,EAAE;;YACd,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA;QAC5B,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACvC,UAAU,CAAC,IAAI,CAAC,CAAA;SACjB;IACH,CAAC,CAAA;IAED,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9B,SAAS,EAAE,GAAG,EAAE;YACd,OAAO,KAAK,CAAA;QACd,CAAC;KACF,CAAC,CAAC,CAAA;IAEH,MAAM,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE;QACpB,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;QACjD,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAAA;QAC5F,QAAQ,CAAC,IAAA,0BAAkB,EAAC,aAAa,IAAI,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;QAC7D,QAAQ,mBAAM,CAAC,aAAa,IAAI,EAAE,CAAC,GAAI,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QAC/D,SAAS;QACT,aAAa,CAAC,EAAE,CAAC,CAAA;QACjB,WAAW,EAAE,CAAA;QACb,QAAQ,EAAE,CAAA;IACZ,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,EAAE;;QACrB,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,MAAM,UAAU,GAAG,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,YAAY,CAAC,0CAAG,CAAC,CAAC,KAAI,IAAI,CAAA;QAC/D,IAAI,QAAQ,IAAI,UAAU,EAAE;YAC1B,IAAI,IAAA,iBAAQ,EAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC5B,QAAQ,CAAC,KAAK,GAAG;oBACf,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU;iBAC7C,CAAA;aACF;iBAAM;gBACL,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAA,CAAC,QAAQ;aACrC;YACD,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAA,EAAE;gBAC/C,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,EAAE,QAAQ,CAAC,CAAA;gBACrC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAClB,QAAQ,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAA;aACvC;iBAAM;gBACL,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC1E,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAClB,QAAQ,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAA;aACvC;YACD,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;YAC/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;YACnE,WAAW,EAAE,CAAA;YACb,aAAa,CAAC,EAAE,CAAC,CAAA;SAClB;aAAM;YACL,SAAS,EAAE,CAAA;SACZ;IACH,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;;QAC1B,CAAC,CAAC,cAAc,EAAE,CAAA;QAClB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;YACnD,QAAQ,CAAC,QAAQ,CAAC,CAAA;YAClB,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,CAAA;YACxB,QAAQ,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,CAAA;YACxD,oCAAoC;YACpC,MAAM,UAAU,GAAG,MAAA,IAAA,aAAI,EAAC,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,EAAE,CAAC,KAAK,0CAAE,IAAI,MAAK,GAAG,CAAA,EAAA,CAAC,0CAAE,KAAK,CAAA;YAC1E,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,0CAAE,QAAQ,KAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;SACpE;IACH,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,EAAE;;QAC3B,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA;QAC1B,aAAa,CAAC,IAAA,gBAAQ,EAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAA;QAC1C,WAAW,CAAC,KAAK,CAAC,CAAA;QAClB,UAAU,CAAC,GAAG,EAAE;;YACd,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,KAAK,EAAE,CAAA;QAC5B,CAAC,EAAE,EAAE,CAAC,CAAA;IACR,CAAC,CAAA;IAED,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,IAAI,EAAE,EAAE;QACxE,IAAI,OAAO,EAAE;YACX,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,OAAM;SACP;QACD,QAAQ,CAAC,KAAK,CAAC,CAAA;QACf,aAAa,CAAC,EAAE,CAAC,CAAA;QACjB,WAAW,EAAE,CAAA;QACb,IAAI,QAAQ;YAAE,QAAQ,CAAC,IAAA,0BAAkB,EAAC,KAAK,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC1E,CAAC,CAAA;IAED,UAAU;IACV,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;QAC5B,IAAI,QAAQ,EAAE;YACZ,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACrB,OAAO;gBACP,aAAa,CAAC,KAAK,CAAC,CAAA;aACrB;iBAAM;gBACL,2BAA2B;gBAC3B,aAAa,CAAC,EAAE,CAAC,CAAA;gBACjB,WAAW,EAAE,CAAA;aACd;SACF;aAAM;YACL,aAAa,CAAC,KAAK,CAAC,CAAA;SACrB;IACH,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE;;QACzB,MAAM,UAAU,GAAG,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,YAAY,CAAC,0CAAG,CAAC,CAAC,KAAI,IAAI,CAAA;QAC/D,IAAI,UAAU,CAAA;QACd,IAAI,QAAQ,IAAI,UAAU,EAAE;YAC1B,UAAU,CAAC,KAAK,CAAC,CAAA;YACjB,IAAI,IAAA,iBAAQ,EAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC5B,QAAQ,CAAC,KAAK,GAAG;oBACf,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU;iBAC7C,CAAA;aACF;iBAAM;gBACL,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAA,CAAC,QAAQ;aACrC;YACD,UAAU,GAAG,QAAQ,CAAA;SACtB;aAAM,IAAI,kBAAkB,EAAE;YAC7B,UAAU,GAAG,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;SAC5D;QACD,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC,CAAA,EAAE;gBACjD,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,EAAE,UAAU,CAAC,CAAA;gBACvC,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAClB,QAAQ,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAA;aACvC;iBAAM;gBACL,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC9E,QAAQ,CAAC,QAAQ,CAAC,CAAA;gBAClB,QAAQ,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAC,CAAA;aACvC;YACD,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;YACjC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;YACvE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,KAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;SAC7C;QACD,WAAW,EAAE,CAAA;QACb,aAAa,CAAC,EAAE,CAAC,CAAA;IACnB,CAAC,CAAA;IACD,OAAO,CACL,8BAAC,wBAAc,IAAC,aAAa,EAAC,WAAW,IACtC,CAAC,MAAM,EAAE,EAAE;QACV,OAAO,CACL,uCAAK,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;YAC1C,wCAAM,SAAS,EAAE,GAAG,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAC9C,UAAU,CACN;YACP,sCAAI,SAAS,EAAE,GAAG,MAAM,QAAQ;gBAC7B,KAAK;oBACJ,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CACzB,sCAAI,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa;wBAClD,8BAAC,kBAAQ,IACP,QAAQ,EAAE,iBAAiB,EAC3B,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,UAAU,EACrB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,GACV,CACC,CACN,CAAC;gBACJ,sCAAI,SAAS,EAAE,GAAG,MAAM,cAAc;oBACpC,8BAAC,sBAAY,IACX,GAAG,EAAE,QAAQ,EACb,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,SAAS,EAAC,YAAY;wBAEtB,8BAAC,eAAK,kBACJ,GAAG,EAAE,QAAQ,EACb,KAAK,EAAE,UAAU,EACjB,SAAS,EAAC,YAAY,EACtB,WAAW,EACT,wBAAwB,IAAI,CAAC,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,IAE3E,KAAK,IACT,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,aAAa,IACvB,CACW,CACZ,CACF;YACL,uCAAK,SAAS,EAAE,GAAG,MAAM,SAAS;gBAChC,8BAAC,cAAI,IAAC,IAAI,EAAC,QAAQ,GAAG,CAClB;YACL,oBAAoB,IAAI,CACvB,uCAAK,SAAS,EAAE,GAAG,MAAM,QAAQ;gBAC/B,8BAAC,cAAI,IAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAC,cAAc,EAAC,KAAK,EAAC,QAAQ,GAAG,CACzD,CACP;YACD,uCAAK,SAAS,EAAE,GAAG,MAAM,SAAS,EAAE,OAAO,EAAE,QAAQ;gBACnD,8BAAC,cAAI,IAAC,IAAI,EAAC,QAAQ,GAAG,CAClB,CACF,CACP,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAA;AACD,kBAAe,IAAA,kBAAU,EAAC,gBAAgB,CAAC,CAAA","sourcesContent":["import React, {\n  useEffect,\n  useState,\n  useRef,\n  useImperativeHandle,\n  forwardRef,\n  useCallback,\n} from 'react'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport { find, isObject } from 'lodash'\nimport Icon from '../../../icon'\nimport Input from '../../../input'\nimport FieldPopover from './FieldPopover'\nimport ValueTag from './ValueTag'\nimport { parseArrayToObject, parseObjectToArray, getLabel } from './utils'\nimport './index.less'\n\n/**\n * @param value: [{\n      key: 'key1',\n      value: 'value1',\n    }, {\n      key: 'key2',\n      value: ['value2', 'value3']\n    }]\n * @param {*} ref \n * @returns \n */\nconst regex = /^.+:.*$/\nconst CompositionInput = (\n  {\n    fieldItems,\n    initialValues,\n    onChange,\n    form,\n    compositionShowReset,\n    defaultSearchField,\n    defaultSearchPlaceholder,\n    clsPrefix,\n    _onReset,\n    _onSearch,\n  },\n  ref\n) => {\n  const prefix = `${clsPrefix}-composition-input`\n  const [value, setValue] = useState(parseObjectToArray(initialValues, fieldItems))\n  const [tempItem, setTempItem] = useState()\n  const [searchText, setSearchText] = useState('')\n  const [visible, setVisible] = useState(false)\n  const [fieldItem, setFieldItem] = useState(undefined)\n  const fieldItemsRef = useRef(fieldItems)\n  const _fieldItem = fieldItem\n    ? find(fieldItems, (f) => f.props?.name === fieldItem.name)?.props || fieldItem\n    : {}\n  const { props } = fieldItem || {}\n\n  const inputRef = useRef(null)\n  const widthRef = useRef(null)\n  const fieldRef = useRef(null)\n  const eventRef = useRef(false)\n\n  fieldItemsRef.current = fieldItems\n\n  const updateValues = useCallback((obj) => {\n    const newValueArr = parseObjectToArray(obj, fieldItemsRef.current)\n    setValue(newValueArr)\n  }, [])\n\n  const updateValue = useCallback((name, value) => {\n    updateValues({ [name]: value })\n  }, [])\n\n  if (!eventRef.current) {\n    eventRef.current = true\n    form.on('setValue', updateValue)\n    form.on('setValues', updateValues)\n  }\n\n  useEffect(() => {\n    return () => {\n      form.off('setValue', updateValue)\n      form.off('setValues', updateValues)\n    }\n  }, [])\n\n  const handleFocus = (e) => {\n    e.preventDefault()\n    setTimeout(() => {\n      inputRef?.current?.focus()\n    }, 10)\n    if (!visible && !regex.test(searchText)) {\n      setVisible(true)\n    }\n  }\n\n  useImperativeHandle(ref, () => ({\n    changeVal: () => {\n      return value\n    },\n  }))\n\n  const onClear = (e) => {\n    e.stopPropagation()\n    const initKeys = Object.keys(initialValues || {})\n    const deleteKeys = value?.filter(({ key }) => !initKeys.includes(key)).map(({ key }) => key)\n    setValue(parseObjectToArray(initialValues || {}, fieldItems))\n    onChange({ ...(initialValues || {}) }, deleteKeys, false, true)\n    // 清除其他数据\n    setSearchText('')\n    setTempItem()\n    _onReset()\n  }\n\n  const doSearch = (e) => {\n    e.stopPropagation()\n    const inputValue = searchText?.match(/[^:]+:(.*)/)?.[1] || null\n    if (tempItem && inputValue) {\n      if (isObject(tempItem.value)) {\n        tempItem.value = {\n          [Object.keys(tempItem.value)[0]]: inputValue,\n        }\n      } else {\n        tempItem.value = inputValue // 得到输入值\n      }\n      if (!value?.find((v) => v.key === tempItem.key)) {\n        const newValue = [...value, tempItem]\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      } else {\n        const newValue = value.map((v) => (v.key === tempItem.key ? tempItem : v))\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      }\n      e.target.value = tempItem.value\n      form.emit('search', { [tempItem.key]: tempItem.value, current: 1 })\n      setTempItem()\n      setSearchText('')\n    } else {\n      _onSearch()\n    }\n  }\n\n  const onDelete = (key, e) => {\n    e.preventDefault()\n    if (value.length > 0) {\n      const newValue = value.filter((v) => v.key !== key)\n      setValue(newValue)\n      const deleteKeys = [key]\n      onChange(parseArrayToObject(newValue), deleteKeys, true)\n      // 删除的时候也触发Field的onChange --  泳建提的需求\n      const fieldProps = find(fieldItems, (it) => it.props?.name === key)?.props\n      fieldProps?.props?.onChange && fieldProps.props.onChange(undefined)\n    }\n  }\n\n  const focusInput = (value) => {\n    inputRef?.current?.focus()\n    setSearchText(getLabel(value, fieldItems))\n    setTempItem(value)\n    setTimeout(() => {\n      inputRef?.current?.focus()\n    }, 10)\n  }\n\n  const handleFieldChange = (value, isInput, hasValue, needSearch = true) => {\n    if (isInput) {\n      focusInput(value)\n      return\n    }\n    setValue(value)\n    setSearchText('')\n    setTempItem()\n    if (hasValue) onChange(parseArrayToObject(value), undefined, needSearch)\n  }\n\n  // 输入框事件方法\n  const onInputChange = (e) => {\n    const value = e.target.value\n    if (tempItem) {\n      if (regex.test(value)) {\n        // 有输入值\n        setSearchText(value)\n      } else {\n        // 没有输入值, 清空选择的属性类型重新显示属性列表\n        setSearchText('')\n        setTempItem()\n      }\n    } else {\n      setSearchText(value)\n    }\n  }\n\n  const onPressEnter = (e) => {\n    const inputValue = searchText?.match(/[^:]+:(.*)/)?.[1] || null\n    let fieldValue\n    if (tempItem && inputValue) {\n      setVisible(false)\n      if (isObject(tempItem.value)) {\n        tempItem.value = {\n          [Object.keys(tempItem.value)[0]]: inputValue,\n        }\n      } else {\n        tempItem.value = inputValue // 得到输入值\n      }\n      fieldValue = tempItem\n    } else if (defaultSearchField) {\n      fieldValue = { key: defaultSearchField, value: searchText }\n    }\n    if (fieldValue) {\n      if (!value?.find((v) => v.key === fieldValue.key)) {\n        const newValue = [...value, fieldValue]\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      } else {\n        const newValue = value.map((v) => (v.key === fieldValue.key ? fieldValue : v))\n        setValue(newValue)\n        onChange(parseArrayToObject(newValue))\n      }\n      e.target.value = fieldValue.value\n      form.emit('search', { [fieldValue.key]: fieldValue.value, current: 1 })\n      props?.onPressEnter && props.onPressEnter(e)\n    }\n    setTempItem()\n    setSearchText('')\n  }\n  return (\n    <LocaleReceiver componentName=\"QueryForm\">\n      {(locale) => {\n        return (\n          <div className={prefix} onClick={handleFocus}>\n            <span className={`${prefix}-width`} ref={widthRef}>\n              {searchText}\n            </span>\n            <ul className={`${prefix}-items`}>\n              {value &&\n                value.map((item, index) => (\n                  <li key={item.key} className={`${prefix}-items-item`}>\n                    <ValueTag\n                      onChange={handleFieldChange}\n                      value={value}\n                      item={item}\n                      fieldItems={fieldItems}\n                      locale={locale}\n                      onDelete={onDelete}\n                      handleTag={focusInput}\n                      clsPrefix={clsPrefix}\n                      form={form}\n                    />\n                  </li>\n                ))}\n              <li className={`${prefix}-items-input`}>\n                <FieldPopover\n                  ref={fieldRef}\n                  onChange={handleFieldChange}\n                  clsPrefix={clsPrefix}\n                  fieldItems={fieldItems}\n                  propItem={_fieldItem}\n                  setFieldItem={setFieldItem}\n                  form={form}\n                  regex={regex}\n                  visible={visible}\n                  value={value}\n                  setVisible={setVisible}\n                  searchText={searchText}\n                  locale={locale}\n                  placement=\"bottomLeft\"\n                >\n                  <Input\n                    ref={inputRef}\n                    value={searchText}\n                    className=\"inputClass\"\n                    placeholder={\n                      defaultSearchPlaceholder || (!value?.length ? locale.placeholder : undefined)\n                    }\n                    {...props}\n                    onPressEnter={onPressEnter}\n                    onChange={onInputChange}\n                  />\n                </FieldPopover>\n              </li>\n            </ul>\n            <div className={`${prefix}-prefix`}>\n              <Icon type=\"filter\" />\n            </div>\n            {compositionShowReset && (\n              <div className={`${prefix}-clear`}>\n                <Icon onClick={onClear} type=\"close-circle\" theme=\"filled\" />\n              </div>\n            )}\n            <div className={`${prefix}-search`} onClick={doSearch}>\n              <Icon type=\"search\" />\n            </div>\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n}\nexport default forwardRef(CompositionInput)\n"]}

package/lib/query-form/Field/Composition/utils.d.ts

@@ -8,7 +8,7 @@ export function getLabelByValue({ value, options, fieldNames, }: {
     } | undefined;
 }): any;
 export function formatLabel(reactDom: any): any;
-export function parseObjectToArray(value: any, data: any): (false | {
+export function parseObjectToArray(value: any, data: any): ({
     key: string;
     value: any;
 } | null)[];

package/lib/query-form/Field/Composition/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/utils.js"],"names":[],"mappings":"AAIA,kEAGC;AAED;;;;;;;QAyBC;AAED,gDAWC;AAED;;;YAgCC;AAED,oDAKC;AAED;;;kDAwCC;AAEM,4CAC+E"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/utils.js"],"names":[],"mappings":"AAIA,kEAGC;AAED;;;;;;;QAyBC;AAED,gDAWC;AAED;;;YAgBC;AAED,oDAKC;AAED;;;kDAyDC;AAEM,4CAC6F"}

package/lib/query-form/Field/Composition/utils.js

@@ -63,10 +63,9 @@ function formatLabel(reactDom) {
 function parseObjectToArray(value, data) {
   var _a, _b;
   return (_b = (_a = Object.keys(value || {})) === null || _a === void 0 ? void 0 : _a.map(function (key) {
-    var _a;
     var target = data === null || data === void 0 ? void 0 : data.find(function (item) {
-      var _a;
-      return ((_a = item.props) === null || _a === void 0 ? void 0 : _a.name) === key;
+      var _a, _b;
+      return ((_a = item.props) === null || _a === void 0 ? void 0 : _a.name) === key || ((_b = item.props) === null || _b === void 0 ? void 0 : _b.pName) === key;
     });
     if (!target) return null;
     var dataItem = (target === null || target === void 0 ? void 0 : target.props) || {};
@@ -74,26 +73,9 @@ function parseObjectToArray(value, data) {
       _ref2$type = _ref2.type,
       type = _ref2$type === void 0 ? 'input' : _ref2$type,
       component = _ref2.component,
-      setLabel = _ref2.setLabel,
-      fieldProps = _ref2.props;
-    var _ref3 = fieldProps || {},
-      options = _ref3.options;
-    if (!type && component) {
-      if (!setLabel) {
-        console.error('自定义组件需要传入setLabel()方法');
-      }
-    } else if (options) {
-      if (type === 'selectInput') {
-        var selectKey = (_a = Object.keys(value[key] || {})) === null || _a === void 0 ? void 0 : _a[0];
-        if (!selectKey) {
-          // 17. inputSelect组件，初始值{},展示undefined:undefined
-          return false;
-        }
-        return {
-          key: key,
-          value: value[key]
-        };
-      }
+      setLabel = _ref2.setLabel;
+    if (!type && component && !setLabel) {
+      console.error('自定义组件需要传入setLabel()方法');
     }
     return {
       key: key,
@@ -109,49 +91,68 @@ function parseArrayToObject(value) {
     return acc;
   }, {});
 }
-function getLabel(_ref4, data, locale) {
-  var key = _ref4.key,
-    value = _ref4.value;
-  var _a, _b, _c;
+function getLabel(_ref3, data, locale) {
+  var key = _ref3.key,
+    value = _ref3.value;
+  var _a, _b, _c, _d;
+  var otherTarget = data === null || data === void 0 ? void 0 : data.find(function (item) {
+    var _a;
+    return ((_a = item.props) === null || _a === void 0 ? void 0 : _a.pName) === key;
+  });
+  if (otherTarget) {
+    // otherInput
+    var selectKey = (_a = Object.keys(value || {})) === null || _a === void 0 ? void 0 : _a[0];
+    if (!selectKey) {
+      // 17. inputSelect组件，初始值{},展示undefined:undefined
+      return false;
+    }
+    var otherTargetObj = data.find(function (item) {
+      return item.props.pName === key && item.props.cName === selectKey;
+    });
+    if (!otherTargetObj) {
+      return false;
+    }
+    return otherTargetObj.props.title + ':' + (value[selectKey] || '');
+  }
   var target = data === null || data === void 0 ? void 0 : data.find(function (item) {
     var _a;
     return ((_a = item.props) === null || _a === void 0 ? void 0 : _a.name) === key;
   });
   if (!target) return null;
   var dataItem = (target === null || target === void 0 ? void 0 : target.props) || {};
-  var _ref5 = dataItem || {},
-    _ref5$type = _ref5.type,
-    type = _ref5$type === void 0 ? 'input' : _ref5$type,
-    setLabel = _ref5.setLabel,
-    fieldProps = _ref5.props,
-    propsTitle = _ref5.propsTitle,
-    title = _ref5.title,
-    name = _ref5.name;
+  var _ref4 = dataItem || {},
+    _ref4$type = _ref4.type,
+    type = _ref4$type === void 0 ? 'input' : _ref4$type,
+    setLabel = _ref4.setLabel,
+    fieldProps = _ref4.props,
+    propsTitle = _ref4.propsTitle,
+    title = _ref4.title,
+    name = _ref4.name;
   var _propsTitle = propsTitle || title || name;
-  var _ref6 = fieldProps || {},
-    options = _ref6.options,
-    format = _ref6.format;
+  var _ref5 = fieldProps || {},
+    options = _ref5.options,
+    format = _ref5.format;
   var labelValue = value;
   if (setLabel) {
     // setLabel: 对于自定义组件，无法控制label的显示，可以通过setLabel方法控制
     labelValue = setLabel(value);
   } else if (options) {
     if (type === 'selectInput') {
-      var selectKey = (_a = Object.keys(value || {})) === null || _a === void 0 ? void 0 : _a[0];
-      if (!selectKey) {
+      var _selectKey = (_b = Object.keys(value || {})) === null || _b === void 0 ? void 0 : _b[0];
+      if (!_selectKey) {
         // 17. inputSelect组件，初始值{},展示undefined:undefined
         return false;
       }
-      var inputValue = value[selectKey];
-      var selectLabel = (_b = options === null || options === void 0 ? void 0 : options.find(function (v) {
-        return v.value === selectKey;
-      })) === null || _b === void 0 ? void 0 : _b.label;
+      var inputValue = value[_selectKey];
+      var selectLabel = (_c = options === null || options === void 0 ? void 0 : options.find(function (v) {
+        return v.value === _selectKey;
+      })) === null || _c === void 0 ? void 0 : _c.label;
       return selectLabel + ':' + inputValue;
     }
     labelValue = getLabelByValue({
       value: value,
       options: options,
-      fieldNames: ((_c = dataItem === null || dataItem === void 0 ? void 0 : dataItem.props) === null || _c === void 0 ? void 0 : _c.fieldNames) || {
+      fieldNames: ((_d = dataItem === null || dataItem === void 0 ? void 0 : dataItem.props) === null || _d === void 0 ? void 0 : _d.fieldNames) || {
         label: 'label',
         value: 'value'
       }
@@ -168,5 +169,5 @@ function getLabel(_ref4, data, locale) {
   return _propsTitle + ':' + (labelValue === undefined ? '' : labelValue);
 }
 var isInput = exports.isInput = function isInput(type) {
-  return ['input', 'string', 'search', 'aloneSearch', 'number', 'inputNumber'].includes(type);
+  return ['input', 'string', 'search', 'aloneSearch', 'number', 'inputNumber', 'otherInput'].includes(type);
 };

package/lib/query-form/Field/Composition/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/utils.js"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport { isArray, isString, flatten } from 'lodash'\nimport moment from 'moment'\n\nexport function highlightSubstring(str, substring) {\n  const highlighted = `<span class=\"tnt-highlight\">${substring}</span>`\n  return str.replace(new RegExp(substring, 'g'), highlighted)\n}\n\nexport function getLabelByValue({\n  value,\n  options,\n  fieldNames = {\n    label: 'label',\n    value: 'value',\n  },\n}) {\n  const getLabel = (value) => {\n    const target = options?.find((item) => {\n      const valueKey = fieldNames?.value\n      const itemValue = item instanceof Object ? item[valueKey] : item\n      return itemValue === value\n    })\n    if (target) {\n      return target instanceof Object ? target?.[fieldNames?.label] : target\n    } else {\n      return value\n    }\n  }\n  if (isArray(value)) {\n    return value.map(getLabel).join(' | ')\n  } else {\n    return getLabel(value)\n  }\n}\n\nexport function formatLabel(reactDom) {\n  return flatten(\n    React.Children.map(reactDom.props.children, (child) => {\n      if (React.isValidElement(child)) {\n        return formatLabel(child)\n      } else if (isString(child)) {\n        return child\n      }\n      return ''\n    })\n  ).join('')\n}\n\nexport function parseObjectToArray(value, data) {\n  return Object.keys(value || {})\n    ?.map((key) => {\n      const target = data?.find((item) => item.props?.name === key)\n      if (!target) return null\n      const dataItem = target?.props || {}\n      const { type = 'input', component, setLabel, props: fieldProps } = dataItem || {}\n      const { options } = fieldProps || {}\n\n      if (!type && component) {\n        if (!setLabel) {\n          console.error('自定义组件需要传入setLabel()方法')\n        }\n      } else if (options) {\n        if (type === 'selectInput') {\n          const selectKey = Object.keys(value[key] || {})?.[0]\n          if (!selectKey) {\n            // 17. inputSelect组件，初始值{},展示undefined:undefined\n            return false\n          }\n          return {\n            key,\n            value: value[key],\n          }\n        }\n      }\n      return {\n        key,\n        value: value[key],\n      }\n    })\n    ?.filter((item) => !!item)\n}\n\nexport function parseArrayToObject(value) {\n  return value?.reduce((acc, v) => {\n    acc[v.key] = v.value\n    return acc\n  }, {})\n}\n\nexport function getLabel({ key, value }, data, locale) {\n  const target = data?.find((item) => item.props?.name === key)\n  if (!target) return null\n  const dataItem = target?.props || {}\n  const { type = 'input', setLabel, props: fieldProps, propsTitle, title, name } = dataItem || {}\n  const _propsTitle = propsTitle || title || name\n  const { options, format } = fieldProps || {}\n  let labelValue = value\n  if (setLabel) {\n    // setLabel: 对于自定义组件，无法控制label的显示，可以通过setLabel方法控制\n    labelValue = setLabel(value)\n  } else if (options) {\n    if (type === 'selectInput') {\n      const selectKey = Object.keys(value || {})?.[0]\n      if (!selectKey) {\n        // 17. inputSelect组件，初始值{},展示undefined:undefined\n        return false\n      }\n      const inputValue = value[selectKey]\n      const selectLabel = options?.find((v) => v.value === selectKey)?.label\n      return selectLabel + ':' + inputValue\n    }\n    labelValue = getLabelByValue({\n      value,\n      options,\n      fieldNames: dataItem?.props?.fieldNames || {\n        label: 'label',\n        value: 'value',\n      },\n    })\n  } else if (type === 'checkbox') {\n    labelValue = value ? locale.yes : locale.no\n  } else if (type === 'dateRange' && format) {\n    if (value?.length) {\n      labelValue = [moment(value?.[0]).format(format), moment(value?.[1]).format(format)].join('~')\n    }\n  } else if (type === 'date' && format) {\n    labelValue = value ? moment(value).format(format) : undefined\n  }\n  return _propsTitle + ':' + (labelValue === undefined ? '' : labelValue)\n}\n\nexport const isInput = (type) =>\n  ['input', 'string', 'search', 'aloneSearch', 'number', 'inputNumber'].includes(type)\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/query-form/Field/Composition/utils.js"],"names":[],"mappings":"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","sourcesContent":["import React from 'react'\nimport { isArray, isString, flatten } from 'lodash'\nimport moment from 'moment'\n\nexport function highlightSubstring(str, substring) {\n  const highlighted = `<span class=\"tnt-highlight\">${substring}</span>`\n  return str.replace(new RegExp(substring, 'g'), highlighted)\n}\n\nexport function getLabelByValue({\n  value,\n  options,\n  fieldNames = {\n    label: 'label',\n    value: 'value',\n  },\n}) {\n  const getLabel = (value) => {\n    const target = options?.find((item) => {\n      const valueKey = fieldNames?.value\n      const itemValue = item instanceof Object ? item[valueKey] : item\n      return itemValue === value\n    })\n    if (target) {\n      return target instanceof Object ? target?.[fieldNames?.label] : target\n    } else {\n      return value\n    }\n  }\n  if (isArray(value)) {\n    return value.map(getLabel).join(' | ')\n  } else {\n    return getLabel(value)\n  }\n}\n\nexport function formatLabel(reactDom) {\n  return flatten(\n    React.Children.map(reactDom.props.children, (child) => {\n      if (React.isValidElement(child)) {\n        return formatLabel(child)\n      } else if (isString(child)) {\n        return child\n      }\n      return ''\n    })\n  ).join('')\n}\n\nexport function parseObjectToArray(value, data) {\n  return Object.keys(value || {})\n    ?.map((key) => {\n      const target = data?.find((item) => item.props?.name === key || item.props?.pName === key)\n      if (!target) return null\n      const dataItem = target?.props || {}\n      const { type = 'input', component, setLabel } = dataItem || {}\n      if (!type && component && !setLabel) {\n        console.error('自定义组件需要传入setLabel()方法')\n      }\n      return {\n        key,\n        value: value[key],\n      }\n    })\n    ?.filter((item) => !!item)\n}\n\nexport function parseArrayToObject(value) {\n  return value?.reduce((acc, v) => {\n    acc[v.key] = v.value\n    return acc\n  }, {})\n}\n\nexport function getLabel({ key, value }, data, locale) {\n  const otherTarget = data?.find((item) => item.props?.pName === key)\n  if (otherTarget) {\n    // otherInput\n    const selectKey = Object.keys(value || {})?.[0]\n    if (!selectKey) {\n      // 17. inputSelect组件，初始值{},展示undefined:undefined\n      return false\n    }\n    const otherTargetObj = data.find(\n      (item) => item.props.pName === key && item.props.cName === selectKey\n    )\n    if (!otherTargetObj) {\n      return false\n    }\n    return otherTargetObj.props.title + ':' + (value[selectKey] || '')\n  }\n\n  const target = data?.find((item) => item.props?.name === key)\n  if (!target) return null\n  const dataItem = target?.props || {}\n  const { type = 'input', setLabel, props: fieldProps, propsTitle, title, name } = dataItem || {}\n  const _propsTitle = propsTitle || title || name\n  const { options, format } = fieldProps || {}\n  let labelValue = value\n  if (setLabel) {\n    // setLabel: 对于自定义组件，无法控制label的显示，可以通过setLabel方法控制\n    labelValue = setLabel(value)\n  } else if (options) {\n    if (type === 'selectInput') {\n      const selectKey = Object.keys(value || {})?.[0]\n      if (!selectKey) {\n        // 17. inputSelect组件，初始值{},展示undefined:undefined\n        return false\n      }\n      const inputValue = value[selectKey]\n      const selectLabel = options?.find((v) => v.value === selectKey)?.label\n      return selectLabel + ':' + inputValue\n    }\n    labelValue = getLabelByValue({\n      value,\n      options,\n      fieldNames: dataItem?.props?.fieldNames || {\n        label: 'label',\n        value: 'value',\n      },\n    })\n  } else if (type === 'checkbox') {\n    labelValue = value ? locale.yes : locale.no\n  } else if (type === 'dateRange' && format) {\n    if (value?.length) {\n      labelValue = [moment(value?.[0]).format(format), moment(value?.[1]).format(format)].join('~')\n    }\n  } else if (type === 'date' && format) {\n    labelValue = value ? moment(value).format(format) : undefined\n  }\n  return _propsTitle + ':' + (labelValue === undefined ? '' : labelValue)\n}\n\nexport const isInput = (type) =>\n  ['input', 'string', 'search', 'aloneSearch', 'number', 'inputNumber', 'otherInput'].includes(type)\n"]}

package/lib/query-form/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":";AAcA,mFAuNC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":";AAeA,mFAkPC"}

package/lib/query-form/index.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _Composition = _interopRequireDefault(require("./Field/Composition"));
@@ -21,11 +22,6 @@ var _createActions = _interopRequireDefault(require("./createActions"));
 var _Field = _interopRequireDefault(require("./Field"));
 var _useForm = _interopRequireDefault(require("./useForm"));
 require("./index.less");
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
 function _getRequireWildcardCache(e) {
   if ("function" != typeof WeakMap) return null;
   var r = new WeakMap(),
@@ -51,6 +47,11 @@ function _interopRequireWildcard(e, r) {
   }
   return n["default"] = e, t && t.set(e, n), n;
 }
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
+  };
+}
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
     value: t,
@@ -146,7 +147,9 @@ var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
     minGroupCount = _ref$minGroupCount === void 0 ? 3 : _ref$minGroupCount,
     _ref$compositionShowR = _ref.compositionShowReset,
     compositionShowReset = _ref$compositionShowR === void 0 ? true : _ref$compositionShowR,
-    inline = _ref.inline;
+    inline = _ref.inline,
+    defaultSearchField = _ref.defaultSearchField,
+    defaultSearchPlaceholder = _ref.defaultSearchPlaceholder;
   var _useState = (0, _react.useState)(_initialValues || {}),
     _useState2 = _slicedToArray(_useState, 2),
     initialValues = _useState2[0],
@@ -267,7 +270,32 @@ var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
           }
         }
       }
-      return [groupFields, outFields, rightChildren, Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined];
+      return [(0, _flatten2["default"])(groupFields.map(function (it) {
+        if (it.props.type === 'selectInput') {
+          var _ref2 = it.props || {},
+            _name = _ref2.name,
+            props = _ref2.props;
+          var _ref3 = props || {},
+            _ref3$options = _ref3.options,
+            options = _ref3$options === void 0 ? [] : _ref3$options;
+          return options.map(function (_ref4) {
+            var label = _ref4.label,
+              value = _ref4.value;
+            return {
+              props: {
+                pName: _name,
+                cName: value,
+                name: "".concat(_name, ".").concat(value),
+                title: label,
+                type: 'otherInput',
+                props: {}
+              }
+            };
+          });
+        } else {
+          return it;
+        }
+      })), outFields, rightChildren, Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined];
     }, [children, minGroupCount, initialValues]),
     _useMemo2 = _slicedToArray(_useMemo, 4),
     groupFields = _useMemo2[0],
@@ -277,6 +305,7 @@ var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
   var isGroupMode = groupFields.length > 0;
   var hasOutField = outFields.length > 0;
   var showExtra = rightChildren.length > 0 || extraActions;
+  console.log(groupFields);
   return _react["default"].createElement("div", {
     className: (0, _classnames["default"])(clsPrefix, className, _defineProperty({}, "".concat(clsPrefix, "-inline"), inline))
   }, _react["default"].createElement(_form["default"], {
@@ -301,7 +330,9 @@ var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
     _onSearch: _onSearch,
     onChange: _onCompositionFieldChange,
     form: formRef.current,
-    compositionShowReset: compositionShowReset
+    compositionShowReset: compositionShowReset,
+    defaultSearchField: defaultSearchField,
+    defaultSearchPlaceholder: defaultSearchPlaceholder
   }), renderActions ? renderActions() : _react["default"].createElement(_react["default"].Fragment, null)), showExtra && _react["default"].createElement("div", {
     className: "".concat(clsPrefix, "-extra")
   }, rightChildren, extraActions)), isGroupMode && hasOutField && !inline && _react["default"].createElement("div", {
@@ -314,7 +345,9 @@ var QueryForm = (0, _react.forwardRef)(function (_ref, ref) {
     _onSearch: _onSearch,
     onChange: _onCompositionFieldChange,
     form: formRef.current,
-    compositionShowReset: compositionShowReset
+    compositionShowReset: compositionShowReset,
+    defaultSearchField: defaultSearchField,
+    defaultSearchPlaceholder: defaultSearchPlaceholder
   }))));
 });
 QueryForm.Field = _Field["default"];