tntd 3.0.0-beta → 3.0.0-beta.10

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

@@ -15,6 +15,9 @@ require("./index.less");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -65,6 +68,7 @@ var parseObjectToArray = function parseObjectToArray(value, data) {
         return {
           key: key,
           value: value[key],
+          closable: true,
           label: selectLabel + ':' + inputValue
         };
       }
@@ -79,6 +83,7 @@ var parseObjectToArray = function parseObjectToArray(value, data) {
     return {
       key: key,
       value: value[key],
+      closable: true,
       label: setLabel ? setLabel(labelValue) : _propsTitle + ':' + labelValue
     };
   })) === null || _b === void 0 ? void 0 : _b.filter(function (item) {
@@ -91,9 +96,7 @@ var parseArrayToObject = function parseArrayToObject(value) {
     return acc;
   }, {});
 };
-// import './index.less';
 /**
- *
  * @param value: [{
     key: 'key1',
       value: 'value1',
@@ -106,9 +109,10 @@ var parseArrayToObject = function parseArrayToObject(value) {
  * @param {*} ref
  * @returns
  */
+var regex = /^.+:.*$/;
 var CompositionInput = function CompositionInput(_ref3, ref) {
   var _value = _ref3.value,
-    data = _ref3.data,
+    fieldItems = _ref3.fieldItems,
     initialValues = _ref3.initialValues,
     onChange = _ref3.onChange,
     placeholder = _ref3.placeholder,
@@ -133,17 +137,20 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     visible = _useState8[0],
     setVisible = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+  var _useState9 = (0, _react.useState)(undefined),
     _useState10 = _slicedToArray(_useState9, 2),
-    searchTarget = _useState10[0],
-    setSearchTarget = _useState10[1];
+    fieldItem = _useState10[0],
+    setFieldItem = _useState10[1];
+  var _ref4 = fieldItem || {},
+    props = _ref4.props;
   var inputRef = (0, _react.useRef)(null);
   var widthRef = (0, _react.useRef)(null);
+  var fieldRef = (0, _react.useRef)(null);
   var handleFocus = function handleFocus(e) {
     var _a;
     e.preventDefault();
     (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
-    if (!visible) {
+    if (!visible && !regex.test(searchText)) {
       setVisible(true);
     }
   };
@@ -155,28 +162,19 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
     };
   });
   (0, _react.useEffect)(function () {
-    form.on('setValue', updateValue);
-    form.on('setValues', onFormChange);
-    return function () {
-      form.off('setValue', updateValue);
-      form.off('setValues', onFormChange);
-    };
-  }, []);
-  (0, _react.useEffect)(function () {
-    if (initialValues) {
-      setValue(parseObjectToArray(initialValues, data));
-    }
-  }, [initialValues, data]);
-  (0, _react.useEffect)(function () {
-    if (!visible) {
-      var newValues = value === null || value === void 0 ? void 0 : value.filter(function (v) {
-        return !!(v === null || v === void 0 ? void 0 : v.value);
-      });
-      if (newValues.length !== (value === null || value === void 0 ? void 0 : value.length)) {
-        setValue(newValues);
-      }
+    var values = form.getValues();
+    if (values) {
+      setValue(parseObjectToArray(values, fieldItems));
     }
-  }, [visible, value]);
+  }, [fieldItems, form]);
+  // useEffect(() => {
+  //   if (!visible) {
+  //     const newValues = value?.filter((v) => !!v?.value)
+  //     if (newValues.length !== value?.length) {
+  //       setValue(newValues)
+  //     }
+  //   }
+  // }, [visible, value])
   (0, _react.useLayoutEffect)(function () {
     var target = document.querySelector(".".concat(prefix, " .inputClass"));
     if (!target) return;
@@ -188,19 +186,13 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
       target.style.width = '100px';
     }
   }, [searchText, value]);
-  var updateValue = function updateValue(name, value) {
-    // if (name === this.props.name) {
-    //   this.setState({ value })
-    //   this.props.onChange(name, value)
-    // }
-  };
   var onFormChange = function onFormChange(formData) {
     setValue(parseObjectToArray(formData, data));
   };
   var onClear = function onClear(e) {
     e.stopPropagation();
-    var deleteKeys = value === null || value === void 0 ? void 0 : value.map(function (_ref4) {
-      var key = _ref4.key;
+    var deleteKeys = value === null || value === void 0 ? void 0 : value.map(function (_ref5) {
+      var key = _ref5.key;
       return key;
     });
     setValue([]);
@@ -226,12 +218,12 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
     setValue(value);
     setSearchText('');
     setTempItem();
-    console.log('*****value****', value);
     if (hasValue) onChange(parseArrayToObject(value));
   };
-  var onInputChange = function onInputChange(value) {
+  // 输入框事件方法
+  var onInputChange = function onInputChange(e) {
+    var value = e.target.value;
     if (tempItem) {
-      var regex = /^.+:.*$/;
       if (regex.test(value)) {
         // 有输入值
         setSearchText(value);
@@ -239,7 +231,6 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
         // 没有输入值, 清空选择的属性类型重新显示属性列表
         setSearchText('');
         setTempItem();
-        setVisible(true);
       }
     } else {
       setSearchText(value);
@@ -251,6 +242,7 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
     if (tempItem && inputValue) {
       setVisible(false);
       tempItem.label = searchText;
+      tempItem.closable = true;
       tempItem.value = inputValue; // 得到输入值
       if (!(value === null || value === void 0 ? void 0 : value.find(function (v) {
         return v.key === tempItem.key;
@@ -265,12 +257,24 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
         setValue(_newValue);
         onChange(parseArrayToObject(_newValue));
       }
-      setTempItem();
-      setSearchText('');
+      e.target.value = inputValue;
+      form.emit('search', _defineProperty(_defineProperty({}, tempItem.key, inputValue), "current", 1));
+      (props === null || props === void 0 ? void 0 : props.onPressEnter) && props.onPressEnter(e);
     }
-    if (searchText && !searchTarget) {
-      setSearchText('');
+    setTempItem();
+    setSearchText('');
+  };
+  var handleTag = function handleTag(obj) {
+    var curItem = undefined;
+    for (var index = 0; index < fieldItems.length; index++) {
+      var item = fieldItems[index];
+      if (item.props.name === obj.key) {
+        curItem = item;
+        break;
+      }
     }
+    // setSearchText(obj.label)
+    fieldRef.current.onPropsClick(curItem.props);
   };
   return _react["default"].createElement(_LocaleReceiver["default"], {
     componentName: "QueryForm"
@@ -289,39 +293,47 @@ var CompositionInput = function CompositionInput(_ref3, ref) {
         key: index,
         className: "".concat(prefix, "-items-item")
       }, _react["default"].createElement(_tag["default"], {
-        closable: !disabled,
+        closable: !disabled && item.closable,
+        onClick: function onClick(e) {
+          e.preventDefault();
+          e.stopPropagation();
+          handleTag(item);
+        },
         onClose: function onClose(e) {
           return onDelete(item.key, e);
+        },
+        ellipsisOptions: {
+          widthLimit: "140px"
         }
       }, item === null || item === void 0 ? void 0 : item.label));
     }), _react["default"].createElement("li", {
       className: "".concat(prefix, "-items-input")
     }, _react["default"].createElement(_FieldPopover["default"], {
+      ref: fieldRef,
       onChange: handleFieldChange,
       clsPrefix: clsPrefix,
-      options: data,
-      trigger: "click",
+      fieldItems: fieldItems,
+      propItem: fieldItem,
+      setFieldItem: setFieldItem,
+      form: form,
+      regex: regex,
       visible: visible,
       value: value,
       setVisible: setVisible,
-      searchText: !tempItem && searchText ? searchText : null,
-      locale: locale,
-      searchTarget: searchTarget,
-      setSearchTarget: setSearchTarget
-    }, _react["default"].createElement(_input["default"]
-    // onKeyDown={keyDown}
-    , {
-      // onKeyDown={keyDown}
+      searchText: searchText,
+      locale: locale
+    }, _react["default"].createElement(_input["default"], Object.assign({
       ref: inputRef,
       value: searchText,
       className: "inputClass",
-      onPressEnter: onPressEnter,
-      onChange: function onChange(e) {
-        return onInputChange(e.target.value);
-      },
       placeholder: !(value === null || value === void 0 ? void 0 : value.length) ? placeholder || locale.placeholder : undefined,
       disabled: disabled
-    })))), _react["default"].createElement("div", {
+    }, props, {
+      onPressEnter: onPressEnter,
+      onChange: function onChange(e) {
+        onInputChange(e);
+      }
+    }))))), _react["default"].createElement("div", {
       className: "".concat(prefix, "-prefix")
     }, _react["default"].createElement(_icon["default"], {
       type: "filter"

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  useLayoutEffect,\n  useState,\n  useRef,\n  useImperativeHandle,\n  forwardRef,\n} from 'react'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport Icon from '../../../icon'\n\nimport Tag from '../../../tag'\nimport Input from '../../../input'\nimport FieldPopover from './FieldPopover'\nimport './index.less'\n\nconst 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 {\n        type,\n        component,\n        setLabel,\n        props: fieldProps,\n        propsTitle,\n        title,\n        name,\n      } = dataItem || {}\n      const _propsTitle = propsTitle || title || name\n      const { options } = fieldProps || {}\n      const fieldNames = dataItem?.props?.fieldNames || {\n        label: 'label',\n        value: 'value',\n      }\n      let labelValue = value[key]\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(labelValue)?.[0]\n          const inputValue = labelValue[selectKey]\n          const selectLabel = options?.find((v) => v.value === selectKey)?.label\n          return {\n            key,\n            value: value[key],\n            label: selectLabel + ':' + inputValue,\n          }\n        }\n        const target = options?.find((item) => {\n          const valueKey = fieldNames?.value\n          const itemValue = item instanceof Object ? item[valueKey] : item\n          return itemValue === value[key]\n        })\n        labelValue = target instanceof Object ? target?.[fieldNames?.label] : target\n      }\n      // setLabel: 对于自定义组件，无法控制label的显示，可以通过setLabel方法控制\n      return {\n        key,\n        value: value[key],\n        label: setLabel ? setLabel(labelValue) : _propsTitle + ':' + labelValue,\n      }\n    })\n    ?.filter((item) => !!item)\n}\n\nconst parseArrayToObject = (value) =>\n  value?.reduce((acc, v) => {\n    acc[v.key] = v.value\n    return acc\n  }, {})\n\n// import './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 CompositionInput = (\n  { value: _value, data, initialValues, onChange, placeholder, disabled, form, style, clsPrefix },\n  ref\n) => {\n  const prefix = `${clsPrefix}-composition-input`;\n  const [value, setValue] = useState([])\n  const [tempItem, setTempItem] = useState()\n  const [searchText, setSearchText] = useState('')\n  const [visible, setVisible] = useState(false)\n  const [searchTarget, setSearchTarget] = useState(null)\n  const inputRef = useRef(null)\n  const widthRef = useRef(null)\n\n  const handleFocus = (e) => {\n    e.preventDefault()\n    inputRef?.current?.focus()\n    if (!visible) {\n      setVisible(true)\n    }\n  }\n  useImperativeHandle(ref, () => ({\n    changeVal: () => {\n      return value\n    },\n  }))\n\n  useEffect(() => {\n    form.on('setValue', updateValue)\n    form.on('setValues', onFormChange)\n    return () => {\n      form.off('setValue', updateValue)\n      form.off('setValues', onFormChange)\n    }\n  }, [])\n  useEffect(() => {\n    if (initialValues) {\n      setValue(parseObjectToArray(initialValues, data))\n    }\n  }, [initialValues, data])\n\n  useEffect(() => {\n    if (!visible) {\n      const newValues = value?.filter((v) => !!v?.value)\n      if (newValues.length !== value?.length) {\n        setValue(newValues)\n      }\n    }\n  }, [visible, value])\n\n  useLayoutEffect(() => {\n    const target = document.querySelector(`.${prefix} .inputClass`)\n\n    if (!target) return\n    if (searchText && widthRef.current.clientWidth > 50) {\n      target.style.width = widthRef.current.clientWidth + 10 + 'px'\n    } else if (!value?.length) {\n      target.style.width = '300px'\n    } else {\n      target.style.width = '100px'\n    }\n  }, [searchText, value])\n\n  const updateValue = (name, value) => {\n    // if (name === this.props.name) {\n    //   this.setState({ value })\n    //   this.props.onChange(name, value)\n    // }\n  }\n\n  const onFormChange = (formData) => {\n    setValue(parseObjectToArray(formData, data))\n  }\n\n  const onClear = (e) => {\n    e.stopPropagation()\n    const deleteKeys = value?.map(({ key }) => key)\n    setValue([])\n    onChange([], deleteKeys)\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)\n    }\n  }\n  const handleFieldChange = (value, isInput, hasValue) => {\n    if (isInput) {\n      setSearchText(value?.label)\n      setTempItem(value)\n      return\n    }\n    setValue(value)\n    setSearchText('')\n    setTempItem()\n    console.log('*****value****', value)\n    if (hasValue) onChange(parseArrayToObject(value))\n  }\n  const onInputChange = (value) => {\n    if (tempItem) {\n      const regex = /^.+:.*$/\n      if (regex.test(value)) {\n        // 有输入值\n        setSearchText(value)\n      } else {\n        // 没有输入值, 清空选择的属性类型重新显示属性列表\n        setSearchText('')\n        setTempItem()\n        setVisible(true)\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      setTempItem()\n      setSearchText('')\n    }\n    if (searchText && !searchTarget) {\n      setSearchText('')\n    }\n  }\n  return (\n    <LocaleReceiver componentName=\"QueryForm\">\n      {(locale) => {\n        return (\n          <div className={prefix} style={style} 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={index} className={`${prefix}-items-item`}>\n                    <Tag closable={!disabled} onClose={(e) => onDelete(item.key, e)}>\n                      {item?.label}\n                    </Tag>\n                  </li>\n                ))}\n              <li className={`${prefix}-items-input`}>\n                <FieldPopover\n                  onChange={handleFieldChange}\n                  clsPrefix={clsPrefix}\n                  options={data}\n                  trigger=\"click\"\n                  visible={visible}\n                  value={value}\n                  setVisible={setVisible}\n                  searchText={!tempItem && searchText ? searchText : null}\n                  locale={locale}\n                  searchTarget={searchTarget}\n                  setSearchTarget={setSearchTarget}\n                >\n                  <Input\n                    // onKeyDown={keyDown}\n                    ref={inputRef}\n                    value={searchText}\n                    className=\"inputClass\"\n                    onPressEnter={onPressEnter}\n                    onChange={(e) => onInputChange(e.target.value)}\n                    placeholder={!value?.length ? placeholder || locale.placeholder : undefined}\n                    disabled={disabled}\n                  />\n                </FieldPopover>\n              </li>\n            </ul>\n            <div className={`${prefix}-prefix`}>\n              <Icon type=\"filter\" />\n            </div>\n            <div className={`${prefix}-clear`}>\n              <Icon\n                onClick={onClear}\n                type=\"close-circle\"\n                theme=\"filled\"\n              />\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":"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","sourcesContent":["import React, {\n  useEffect,\n  useLayoutEffect,\n  useState,\n  useRef,\n  useImperativeHandle,\n  forwardRef,\n} from 'react'\nimport LocaleReceiver from 'antd/lib/locale-provider/LocaleReceiver'\nimport Icon from '../../../icon'\n\nimport Tag from '../../../tag'\nimport Input from '../../../input'\nimport FieldPopover from './FieldPopover'\nimport './index.less'\n\nconst 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 {\n        type,\n        component,\n        setLabel,\n        props: fieldProps,\n        propsTitle,\n        title,\n        name,\n      } = dataItem || {}\n      const _propsTitle = propsTitle || title || name\n      const { options } = fieldProps || {}\n      const fieldNames = dataItem?.props?.fieldNames || {\n        label: 'label',\n        value: 'value',\n      }\n      let labelValue = value[key]\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(labelValue)?.[0]\n          const inputValue = labelValue[selectKey]\n          const selectLabel = options?.find((v) => v.value === selectKey)?.label\n          return {\n            key,\n            value: value[key],\n            closable: true,\n            label: selectLabel + ':' + inputValue,\n          }\n        }\n        const target = options?.find((item) => {\n          const valueKey = fieldNames?.value\n          const itemValue = item instanceof Object ? item[valueKey] : item\n          return itemValue === value[key]\n        })\n        labelValue = target instanceof Object ? target?.[fieldNames?.label] : target\n      }\n      // setLabel: 对于自定义组件，无法控制label的显示，可以通过setLabel方法控制\n      return {\n        key,\n        value: value[key],\n        closable: true,\n        label: setLabel ? setLabel(labelValue) : _propsTitle + ':' + labelValue,\n      }\n    })\n    ?.filter((item) => !!item)\n}\n\nconst parseArrayToObject = (value) =>\n  value?.reduce((acc, v) => {\n    acc[v.key] = v.value\n    return acc\n  }, {})\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 = /^.+:.*$/\n\nconst CompositionInput = (\n  { value: _value, fieldItems, initialValues, onChange, placeholder, disabled, form, style, clsPrefix },\n  ref\n) => {\n  const prefix = `${clsPrefix}-composition-input`;\n  const [value, setValue] = useState([])\n  const [tempItem, setTempItem] = useState()\n  const [searchText, setSearchText] = useState('')\n  const [visible, setVisible] = useState(false)\n  const [fieldItem, setFieldItem] = useState(undefined)\n  const { props } = fieldItem || {}\n\n  const inputRef = useRef(null)\n  const widthRef = useRef(null)\n  const fieldRef = useRef(null)\n\n  const handleFocus = (e) => {\n    e.preventDefault()\n    inputRef?.current?.focus()\n    if (!visible && !regex.test(searchText)) {\n      setVisible(true)\n    }\n  }\n  useImperativeHandle(ref, () => ({\n    changeVal: () => {\n      return value\n    },\n  }))\n\n  useEffect(() => {\n    let values = form.getValues();\n    if (values) {\n      setValue(parseObjectToArray(values, fieldItems))\n    }\n  }, [fieldItems, form])\n\n  // useEffect(() => {\n  //   if (!visible) {\n  //     const newValues = value?.filter((v) => !!v?.value)\n  //     if (newValues.length !== value?.length) {\n  //       setValue(newValues)\n  //     }\n  //   }\n  // }, [visible, value])\n\n  useLayoutEffect(() => {\n    const target = document.querySelector(`.${prefix} .inputClass`)\n\n    if (!target) return\n    if (searchText && widthRef.current.clientWidth > 50) {\n      target.style.width = widthRef.current.clientWidth + 10 + 'px'\n    } else if (!value?.length) {\n      target.style.width = '300px'\n    } else {\n      target.style.width = '100px'\n    }\n  }, [searchText, value])\n\n\n  const onFormChange = (formData) => {\n    setValue(parseObjectToArray(formData, data))\n  }\n\n  const onClear = (e) => {\n    e.stopPropagation()\n    const deleteKeys = value?.map(({ key }) => key)\n    setValue([])\n    onChange([], deleteKeys)\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)\n    }\n  }\n  const handleFieldChange = (value, isInput, hasValue) => {\n    if (isInput) {\n      setSearchText(value?.label)\n      setTempItem(value)\n      return\n    }\n    setValue(value)\n    setSearchText('')\n    setTempItem()\n    if (hasValue) onChange(parseArrayToObject(value))\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.closable = true\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  const handleTag = (obj) => {\n    let curItem = undefined\n    for (let index = 0; index < fieldItems.length; index++) {\n      const item = fieldItems[index];\n      if (item.props.name === obj.key) {\n        curItem = item\n        break;\n      }\n    }\n    // setSearchText(obj.label)\n    fieldRef.current.onPropsClick(curItem.props)\n  }\n  return (\n    <LocaleReceiver componentName=\"QueryForm\">\n      {(locale) => {\n        return (\n          <div className={prefix} style={style} 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={index} className={`${prefix}-items-item`}>\n                    <Tag closable={!disabled && item.closable} onClick={(e) => {\n                      e.preventDefault()\n                      e.stopPropagation()\n                      handleTag(item)\n                    }} onClose={(e) => onDelete(item.key, e)} ellipsisOptions={{widthLimit:\"140px\"}}>\n                      {item?.label}\n                    </Tag>\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                >\n                  <Input\n                    ref={inputRef}\n                    value={searchText}\n                    className=\"inputClass\"\n                    placeholder={!value?.length ? placeholder || locale.placeholder : undefined}\n                    disabled={disabled}\n                    {...props}\n                    onPressEnter={onPressEnter}\n                    onChange={(e) => {\n                      onInputChange(e)\n                    }}\n                  />\n                </FieldPopover>\n              </li>\n            </ul>\n            <div className={`${prefix}-prefix`}>\n              <Icon type=\"filter\" />\n            </div>\n            <div className={`${prefix}-clear`}>\n              <Icon\n                onClick={onClear}\n                type=\"close-circle\"\n                theme=\"filled\"\n              />\n            </div>\n          </div>\n        )\n      }}\n    </LocaleReceiver>\n  )\n}\nexport default forwardRef(CompositionInput)\n"]}

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

@@ -8,7 +8,7 @@
   max-height: 162px;
   overflow-x: hidden;
   cursor: text;
-  padding: 0 @padding-xl;
+  padding: 2px @padding-xl;
   position: relative;
   box-sizing: border-box;
   background-color: @select-background;
@@ -53,13 +53,21 @@
     &-input {
       .inputClass {
         background: none;
-        border: none;
+        border: none !important;
         outline: none;
         box-shadow: none !important;
-        width: 150px;
+        width: 150px !important;
         height: 26px;
         line-height: 26px;
         padding: 0;
+        input {
+          border: none !important;
+          outline: none !important;
+          box-shadow: none !important;
+          height: 26px;
+          line-height: 26px;
+          padding: 0;
+        }
         textarea {
           padding: 0;
         }
@@ -68,7 +76,6 @@
         min-width: 398px !important;
       }
     }
-    
   }
   &-clear {
     position: absolute;
@@ -93,7 +100,8 @@
     }
     // box-shadow: 0 0 0 2px rgb(18 107 251 / 20%);
   }
-  &:focus, &:active {
+  &:focus,
+  &:active {
     border-color: @blue-5;
     outline: 0;
     // box-shadow: 0 0 0 2px rgb(18 107 251 / 20%);

package/lib/query-form/Field/SelectInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelectInput.d.ts","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":"AAQe,yDAsDd"}
+{"version":3,"file":"SelectInput.d.ts","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":"AAQe,yDA+Dd"}

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

@@ -35,7 +35,9 @@ var _default = exports["default"] = function _default(props) {
     options = _props$options === void 0 ? [] : _props$options,
     addonBeforeStyle = props.addonBeforeStyle,
     selectProps = props.selectProps,
-    inputProps = __rest(props, ["options", "addonBeforeStyle", "selectProps"]);
+    form = props.form,
+    close = props.close,
+    inputProps = __rest(props, ["options", "addonBeforeStyle", "selectProps", "form", "close"]);
   var _useState = (0, _react.useState)(options),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
@@ -80,9 +82,19 @@ var _default = exports["default"] = function _default(props) {
     setItems(options);
     setKey(getInitialKey());
   }, [options, inputProps.value]);
-  return _react["default"].createElement(_input["default"], Object.assign({}, inputProps, {
-    value: getInputValue(),
+  return _react["default"].createElement(_input["default"].Search, Object.assign({
     addonBefore: addonBefore,
+    onPressEnter: function onPressEnter(evt) {
+      var _a;
+      form.emit('search', _defineProperty(_defineProperty({}, key, (_a = evt === null || evt === void 0 ? void 0 : evt.target) === null || _a === void 0 ? void 0 : _a.value), "current", 1));
+      close && close();
+    },
+    onSearch: function onSearch(value) {
+      form.emit('search', _defineProperty(_defineProperty({}, key, value), "current", 1));
+      close && close();
+    }
+  }, inputProps, {
+    value: getInputValue(),
     onChange: onChange
   }));
 };

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

@@ -1 +1 @@
-{"version":3,"file":"SelectInput.js","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAkD;AAClD,mCAA4B;AAE5B,0DAAiC;AACjC,wDAA+B;AAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAM,CAAA;AAEzB,kBAAe,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,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,GAAG,GAAG,IAAA,YAAG,EAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAEjC,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,GAAG,GAAG,IAAA,YAAG,EAAC,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,IAAA,gBAAQ,EAAC,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,8BAAC,gBAAM,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,8BAAC,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,IAAA,YAAG,EAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,IAAA,iBAAS,EAAC,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,8BAAC,eAAK,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'\n\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 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} value={getInputValue()} onChange={onChange}   />\n  )\n}\n"]}

package/lib/query-form/Field/fieldsMap.d.ts

@@ -1,8 +1,12 @@
 export const defaultFieldWidth: "200px";
 export function getFieldWidth(type: any): any;
 declare namespace _default {
-    export { Input as string };
-    export { Input as input };
+    export const string: import("react").ForwardRefExoticComponent<import("../../input").SearchProps & {
+        capitalize?: boolean | undefined;
+    } & import("react").RefAttributes<import("antd/lib/input/Search").default>>;
+    export const input: import("react").ForwardRefExoticComponent<import("../../input").SearchProps & {
+        capitalize?: boolean | undefined;
+    } & import("react").RefAttributes<import("antd/lib/input/Search").default>>;
     export const search: import("react").ForwardRefExoticComponent<import("../../input").SearchProps & {
         capitalize?: boolean | undefined;
     } & import("react").RefAttributes<import("antd/lib/input/Search").default>>;
@@ -15,7 +19,6 @@ declare namespace _default {
     export { SelectInput as selectInput };
 }
 export default _default;
-import Input from "../../input";
 import InputNumber from "../../input-number";
 import SelectField from "./Select";
 import CheckboxField from "./Checkbox";

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

@@ -22,8 +22,8 @@ var getFieldWidth = exports.getFieldWidth = function getFieldWidth(type) {
   }[type] || defaultFieldWidth;
 };
 var _default = exports["default"] = {
-  string: _input["default"],
-  input: _input["default"],
+  string: _input["default"].Search,
+  input: _input["default"].Search,
   search: _input["default"].Search,
   inputNumber: _inputNumber["default"],
   number: _inputNumber["default"],

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

@@ -1 +1 @@
-{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form/Field/fieldsMap.js"],"names":[],"mappings":";;;;;;AAAA,0DAAsC;AACtC,sDAAkC;AAClC,gEAAuC;AACvC,oEAA0C;AAC1C,wDAA+B;AAC/B,sEAA4C;AAE/B,QAAA,iBAAiB,GAAG,OAAO,CAAA;AAEjC,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,yBAAiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,aAAa,iBAWzB;AAED,kBAAe;IACb,MAAM,EAAE,eAAK;IACb,KAAK,EAAE,eAAK;IACZ,MAAM,EAAE,eAAK,CAAC,MAAM;IACpB,WAAW,EAAE,sBAAW;IACxB,MAAM,EAAE,sBAAW;IACnB,MAAM,EAAE,gBAAW;IACnB,QAAQ,EAAE,kBAAa;IACvB,IAAI,EAAE,qBAAU;IAChB,SAAS,EAAE,qBAAU,CAAC,WAAW;IACjC,WAAW,EAAE,qBAAW;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,0DAAsC;AACtC,sDAAkC;AAClC,gEAAuC;AACvC,oEAA0C;AAC1C,wDAA+B;AAC/B,sEAA4C;AAE/B,QAAA,iBAAiB,GAAG,OAAO,CAAA;AAEjC,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,yBAAiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAXY,QAAA,aAAa,iBAWzB;AAED,kBAAe;IACb,MAAM,EAAE,eAAK,CAAC,MAAM;IACpB,KAAK,EAAE,eAAK,CAAC,MAAM;IACnB,MAAM,EAAE,eAAK,CAAC,MAAM;IACpB,WAAW,EAAE,sBAAW;IACxB,MAAM,EAAE,sBAAW;IACnB,MAAM,EAAE,gBAAW;IACnB,QAAQ,EAAE,kBAAa;IACvB,IAAI,EAAE,qBAAU;IAChB,SAAS,EAAE,qBAAU,CAAC,WAAW;IACjC,WAAW,EAAE,qBAAW;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/lib/query-form/Field/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/query-form/Field/index.js"],"names":[],"mappings":"AAUA;IACE,wBAMC;IAHC;;MAEC;IAGH,4BAkCC;IAED,6CAKC;IAED,mCAaC;IAED,sCAIC;IAED,0BAKC;IAED,6BAKC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/query-form/Field/index.js"],"names":[],"mappings":"AAUA;IACE,wBAMC;IAHC;;MAEC;IAGH,4BAmCC;IAED,6CAKC;IAED,mCAaC;IAED,sCAIC;IAED,0BAKC;IAED,6BAKC;CACF"}

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

@@ -112,6 +112,7 @@ var Field = exports["default"] = /*#__PURE__*/function (_PureComponent) {
         label: title,
         className: className
       }, _react["default"].createElement(_Field, Object.assign({
+        form: form,
         value: value
       }, isInput(type) ? {
         onPressEnter: function onPressEnter(evt) {

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

@@ -1 +1 @@
-{"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          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/lib/query-form/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":";AAgBA;IACE,wBAaC;IAVC;;MAEC;IACD,gCAA4B;IAC5B,iCAA6B;IAC7B,gCAA4B;IAE5B,UAAmC;IAKrC,4BA6CC;IAED,uBAEC;IAED,iCAoBC;IAED,0BA4BC;IAED,2DASM;IAEN,8BAKC;IAED,qBAEC;IAED,oBAKC;IAED,+DAYC;IACD,gFAuBC;IAED,kDAcC;IAED,0BAoBC;IAFG,+CAAoD;IAIxD,6BAKC;IAED,0GAkDC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":";AAgBA;IACE,wBAaC;IAVC;;MAEC;IACD,gCAA4B;IAC5B,iCAA6B;IAC7B,gCAA4B;IAE5B,UAAmC;IAKrC,4BA6CC;IAED,uBAEC;IAED,iCAoBC;IAED,0BA4BC;IAED,2DASM;IAEN,8BAKC;IAED,qBAGC;IAED,oBAKC;IAED,+DAYC;IACD,gFAuBC;IAED,kDAcC;IAED,0BAoBC;IAFG,+CAAoD;IAIxD,6BAKC;IAED,0GAuDC;CACF"}

package/lib/query-form/index.js

@@ -67,6 +67,7 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
       writable: true,
       value: function value() {
         var _a, _b;
+        console.log('search============');
         (_b = (_a = _this.props).onSearch) === null || _b === void 0 ? void 0 : _b.call(_a, _this.form.getValues());
       }
     });
@@ -187,9 +188,9 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
         initialValues = _this$props2$initialV === void 0 ? {} : _this$props2$initialV,
         renderActions = _this$props2.renderActions,
         _this$props2$showSear = _this$props2.showSearch,
-        showSearch = _this$props2$showSear === void 0 ? true : _this$props2$showSear,
+        showSearch = _this$props2$showSear === void 0 ? false : _this$props2$showSear,
         _this$props2$showRese = _this$props2.showReset,
-        showReset = _this$props2$showRese === void 0 ? true : _this$props2$showRese,
+        showReset = _this$props2$showRese === void 0 ? false : _this$props2$showRese,
         _this$props2$showFiel = _this$props2.showFieldCount,
         showFieldCount = _this$props2$showFiel === void 0 ? 3 : _this$props2$showFiel,
         _this$props2$drawerPr = _this$props2.drawerProps,
@@ -320,7 +321,13 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
     value: function renderFields(children, initialValues, showFieldCount, actionWidth) {
       var _this3 = this;
       var rest = [];
-      var size = _react["default"].Children.count(children);
+      // const size = React.Children.count(children)
+      var size = 0;
+      _react["default"].Children.map(children, function (child) {
+        if (child && child.isGroup !== false) {
+          size++;
+        }
+      });
       var fields = null;
       if (size <= showFieldCount) {
         // 过滤器不超过3个
@@ -350,7 +357,6 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
               });
             } else {
               rest.push(child);
-              console.log('child', index, child);
             }
           }
           return;
@@ -362,7 +368,7 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
         }
       }, fields, !!(rest === null || rest === void 0 ? void 0 : rest.length) && _react["default"].createElement(_Composition["default"], {
         clsPrefix: clsPrefix,
-        data: rest,
+        fieldItems: rest,
         initialValues: initialValues,
         onChange: this.onCompositionFieldChange,
         form: this.form,