tntd 3.0.40-beta.7 → 3.0.40-beta.8

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"];

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useMemo, useRef, useEffect, useState, useImperativeHandle, forwardRef } from 'react'\nimport cn from 'classnames'\nimport Composition from './Field/Composition'\n// import Button from '../button'\nimport Form from '../form'\n// import { getLanguage, getText } from '../prev-locale'\nimport createActions from './createActions'\nimport Field from './Field'\nimport useForm from './useForm'\n\nimport './index.less'\n\nconst clsPrefix = 'tnt-queryform'\n\nconst QueryForm = forwardRef(\n  (\n    {\n      form,\n      className = '',\n      initialValues: _initialValues,\n      language,\n      onSearch,\n      onReset,\n      hasOnChange,\n      onChange,\n      renderActions,\n      extraActions,\n      children,\n      showSearch = false,\n      showReset = false,\n      showFieldCount = 3,\n      minGroupCount = 3, // 最小聚合个数\n      compositionShowReset = true,\n      inline,\n    },\n    ref\n  ) => {\n    const [initialValues, setInitialValues] = useState(_initialValues || {})\n    const formRef = useRef(form || createActions())\n\n    useImperativeHandle(\n      ref,\n      () => ({\n        form: formRef.current,\n      }),\n      []\n    )\n\n    useEffect(() => {\n      const _search = (params = {}) => {\n        onSearch?.({\n          ...formRef.current.getValues(),\n          ...params,\n        })\n      }\n      formRef.current.setData('initialValues', initialValues)\n      formRef.current.setData('values', initialValues)\n      formRef.current.on('search', _search)\n      return () => {\n        formRef.current.off('search', _search)\n      }\n    }, [])\n\n    // const _getText = (key) => {\n    //   return getText(key, language || getLanguage())\n    // }\n    const _onSearch = () => {\n      onSearch?.(formRef.current.getValues())\n    }\n\n    const _onReset = () => {\n      formRef.current.setValues({ ...initialValues })\n      onReset?.(initialValues)\n      setInitialValues({ ...initialValues })\n    }\n\n    const _onFieldChange = (name, value, ...rest) => {\n      const values = formRef.current.getValues()\n      const newValues = {\n        ...values,\n        [name]: value,\n      }\n      const changedInfo = { name, value, preValue: values?.[name] }\n      formRef.current.setData('values', newValues)\n      onChange && onChange(newValues, changedInfo, ...rest)\n    }\n\n    const _onCompositionFieldChange = (value, deleteKeys, needSearch, isReset) => {\n      const values = formRef.current.getValues()\n      const newValues = {\n        ...values,\n        ...value,\n      }\n      const changeKeys = Object.keys(newValues)\n      if (deleteKeys?.length) {\n        deleteKeys?.forEach((key) => {\n          if (values?.[key] || values?.[key] === 0 || values?.[key] === false) {\n            delete newValues[key]\n          }\n        })\n      }\n      formRef.current.setData('values', newValues)\n      if (isReset) {\n        return\n      } else if (deleteKeys?.length === 1) {\n        // 删除一定要搜索\n        if (onSearch) {\n          onSearch(newValues, true)\n        } else {\n          onChange(newValues, { name: deleteKeys[0] })\n        }\n      } else if (needSearch && !hasOnChange) {\n        formRef.current.emit('search', { ...newValues, current: 1 })\n      } else if (onChange) {\n        changeKeys.forEach((key) => {\n          if (JSON.stringify(value[key]) !== JSON.stringify(values[key])) {\n            const changedInfo = { name: key, value: value[key], preValue: values?.[key] }\n            onChange(newValues, changedInfo)\n          }\n        })\n      }\n    }\n\n    const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {\n      let groupFields = []\n      let outFields = []\n      let otherFields = []\n      const rightChildren = []\n      const compositionInitValues = {}\n      React.Children.map(children, (child) => {\n        if (child) {\n          if (child.props?.align === 'right') {\n            rightChildren.push(child)\n            return\n          } else if (child.props?.isGroup === false) {\n            outFields.push(child)\n          } else {\n            groupFields.push(child)\n          }\n          otherFields.push(child)\n        }\n      })\n      if (groupFields.length <= minGroupCount) {\n        groupFields = []\n        outFields = otherFields\n      } else {\n        // 初始值\n        for (let i = 0; i < groupFields.length; i++) {\n          const name = groupFields[i].props?.name\n          if (initialValues[name] !== undefined) {\n            compositionInitValues[name] = initialValues[name]\n          }\n        }\n      }\n      return [\n        groupFields,\n        outFields,\n        rightChildren,\n        Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined,\n      ]\n    }, [children, minGroupCount, initialValues])\n\n    const isGroupMode = groupFields.length > 0\n    const hasOutField = outFields.length > 0\n    const showExtra = rightChildren.length > 0 || extraActions\n\n    return (\n      <div className={cn(clsPrefix, className, { [`${clsPrefix}-inline`]: inline })}>\n        <Form layout=\"inline\">\n          <div className={`${clsPrefix}-top`}>\n            <div className={`${clsPrefix}-top-body`}>\n              {outFields.map((child, i) =>\n                React.cloneElement(child, {\n                  form: formRef.current,\n                  initialValue: initialValues?.[child.props?.name],\n                  onChange: _onFieldChange,\n                  key: i,\n                })\n              )}\n              {isGroupMode && (!hasOutField || inline) && (\n                <Composition\n                  clsPrefix={clsPrefix}\n                  fieldItems={groupFields}\n                  initialValues={compositionInitValues}\n                  _onReset={_onReset}\n                  _onSearch={_onSearch}\n                  onChange={_onCompositionFieldChange}\n                  form={formRef.current}\n                  compositionShowReset={compositionShowReset}\n                />\n              )}\n              {renderActions ? (\n                renderActions()\n              ) : (\n                <>\n                  {/* {showSearch && (\n                    <Button type=\"primary\" onClick={_onSearch}>\n                      {_getText('search')}\n                    </Button>\n                  )}\n                  {showReset && <Button onClick={_onReset}>{_getText('reset')}</Button>} */}\n                </>\n              )}\n            </div>\n            {showExtra && (\n              <div className={`${clsPrefix}-extra`}>\n                {rightChildren}\n                {extraActions}\n              </div>\n            )}\n          </div>\n          {isGroupMode && hasOutField && !inline && (\n            <div className={`${clsPrefix}-bottom`}>\n              <Composition\n                clsPrefix={clsPrefix}\n                fieldItems={groupFields}\n                initialValues={compositionInitValues}\n                _onReset={_onReset}\n                _onSearch={_onSearch}\n                onChange={_onCompositionFieldChange}\n                form={formRef.current}\n                compositionShowReset={compositionShowReset}\n              />\n            </div>\n          )}\n        </Form>\n      </div>\n    )\n  }\n)\n\nQueryForm.Field = Field\nQueryForm.useForm = useForm\nQueryForm.createForm = createActions\n\nexport default QueryForm\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query-form/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAoG;AACpG,4DAA2B;AAC3B,mCAAgC;AAChC,sEAA6C;AAC7C,iCAAiC;AACjC,mDAA0B;AAC1B,wDAAwD;AACxD,oEAA2C;AAC3C,oDAA2B;AAC3B,wDAA+B;AAE/B,wBAAqB;AAErB,MAAM,SAAS,GAAG,eAAe,CAAA;AAEjC,MAAM,SAAS,GAAG,IAAA,kBAAU,EAC1B,CACE,EACE,IAAI,EACJ,SAAS,GAAG,EAAE,EACd,aAAa,EAAE,cAAc,EAC7B,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,WAAW,EACX,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,QAAQ,EACR,UAAU,GAAG,KAAK,EAClB,SAAS,GAAG,KAAK,EACjB,cAAc,GAAG,CAAC,EAClB,aAAa,GAAG,CAAC,EAAE,SAAS;AAC5B,oBAAoB,GAAG,IAAI,EAC3B,MAAM,EACN,kBAAkB,EAClB,wBAAwB,GACzB,EACD,GAAG,EACH,EAAE;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,cAAc,IAAI,EAAE,CAAC,CAAA;IACxE,MAAM,OAAO,GAAG,IAAA,cAAM,EAAC,IAAI,IAAI,IAAA,uBAAa,GAAE,CAAC,CAAA;IAE/C,IAAA,2BAAmB,EACjB,GAAG,EACH,GAAG,EAAE,CAAC,CAAC;QACL,IAAI,EAAE,OAAO,CAAC,OAAO;KACtB,CAAC,EACF,EAAE,CACH,CAAA;IAED,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,EAAE;YAC9B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,iCACH,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAC3B,MAAM,EACT,CAAA;QACJ,CAAC,CAAA;QACD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;QACvD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAChD,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACrC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,8BAA8B;IAC9B,mDAAmD;IACnD,IAAI;IACJ,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;IACzC,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,OAAO,CAAC,OAAO,CAAC,SAAS,mBAAM,aAAa,EAAG,CAAA;QAC/C,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,aAAa,CAAC,CAAA;QACxB,gBAAgB,mBAAM,aAAa,EAAG,CAAA;IACxC,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;QAC1C,MAAM,SAAS,mCACV,MAAM,KACT,CAAC,IAAI,CAAC,EAAE,KAAK,GACd,CAAA;QACD,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,IAAI,CAAC,EAAE,CAAA;QAC7D,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC5C,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,CAAA;IACvD,CAAC,CAAA;IAED,MAAM,yBAAyB,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE;QAC3E,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAA;QAC1C,MAAM,SAAS,mCACV,MAAM,GACN,KAAK,CACT,CAAA;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACzC,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,EAAE;YACtB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,KAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,MAAK,CAAC,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,MAAK,KAAK,EAAE;oBACnE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;iBACtB;YACH,CAAC,CAAC,CAAA;SACH;QACD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC5C,IAAI,OAAO,EAAE;YACX,OAAM;SACP;aAAM,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,MAAK,CAAC,EAAE;YACnC,UAAU;YACV,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;aAC1B;iBAAM;gBACL,QAAQ,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;aAC7C;SACF;aAAM,IAAI,UAAU,IAAI,CAAC,WAAW,EAAE;YACrC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,kCAAO,SAAS,KAAE,OAAO,EAAE,CAAC,IAAG,CAAA;SAC7D;aAAM,IAAI,QAAQ,EAAE;YACnB,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzB,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC9D,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,EAAE,CAAA;oBAC7E,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;iBACjC;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,CAAA;IAED,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,qBAAqB,CAAC,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;;QAClF,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,IAAI,SAAS,GAAG,EAAE,CAAA;QAClB,IAAI,WAAW,GAAG,EAAE,CAAA;QACpB,MAAM,aAAa,GAAG,EAAE,CAAA;QACxB,MAAM,qBAAqB,GAAG,EAAE,CAAA;QAChC,eAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;;YACrC,IAAI,KAAK,EAAE;gBACT,IAAI,CAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,KAAK,MAAK,OAAO,EAAE;oBAClC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;oBACzB,OAAM;iBACP;qBAAM,IAAI,CAAA,MAAA,KAAK,CAAC,KAAK,0CAAE,OAAO,MAAK,KAAK,EAAE;oBACzC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACtB;qBAAM;oBACL,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACxB;gBACD,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;aACxB;QACH,CAAC,CAAC,CAAA;QACF,IAAI,WAAW,CAAC,MAAM,IAAI,aAAa,EAAE;YACvC,WAAW,GAAG,EAAE,CAAA;YAChB,SAAS,GAAG,WAAW,CAAA;SACxB;aAAM;YACL,MAAM;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC3C,MAAM,IAAI,GAAG,MAAA,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAA;gBACvC,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;oBACrC,qBAAqB,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;iBAClD;aACF;SACF;QACD,OAAO;YACL,IAAA,gBAAO,EACL,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBACrB,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;oBACnC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAA;oBACtC,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,KAAK,IAAI,EAAE,CAAA;oBACpC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;wBACxC,KAAK,EAAE;4BACL,KAAK,EAAE,IAAI;4BACX,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE;4BACxB,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,YAAY;4BAClB,KAAK,EAAE,EAAE;yBACV;qBACF,CAAC,CAAC,CAAA;iBACJ;qBAAM;oBACL,OAAO,EAAE,CAAA;iBACV;YACH,CAAC,CAAC,CACH;YACD,SAAS;YACT,aAAa;YACb,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS;SAClF,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC,CAAA;IAE5C,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAA;IAC1C,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;IACxC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,CAAA;IAE1D,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAExB,OAAO,CACL,uCAAK,SAAS,EAAE,IAAA,oBAAE,EAAC,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3E,8BAAC,cAAI,IAAC,MAAM,EAAC,QAAQ;YACnB,uCAAK,SAAS,EAAE,GAAG,SAAS,MAAM;gBAChC,uCAAK,SAAS,EAAE,GAAG,SAAS,WAAW;oBACpC,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;wBAC1B,OAAA,eAAK,CAAC,YAAY,CAAC,KAAK,EAAE;4BACxB,IAAI,EAAE,OAAO,CAAC,OAAO;4BACrB,YAAY,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAG,MAAA,KAAK,CAAC,KAAK,0CAAE,IAAI,CAAC;4BAChD,QAAQ,EAAE,cAAc;4BACxB,GAAG,EAAE,CAAC;yBACP,CAAC,CAAA;qBAAA,CACH;oBACA,WAAW,IAAI,CAAC,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAC1C,8BAAC,qBAAW,IACV,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,EACvB,aAAa,EAAE,qBAAqB,EACpC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,yBAAyB,EACnC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,oBAAoB,EAAE,oBAAoB,EAC1C,kBAAkB,EAAE,kBAAkB,EACtC,wBAAwB,EAAE,wBAAwB,GAClD,CACH;oBACA,aAAa,CAAC,CAAC,CAAC,CACf,aAAa,EAAE,CAChB,CAAC,CAAC,CAAC,CACF,6DAOG,CACJ,CACG;gBACL,SAAS,IAAI,CACZ,uCAAK,SAAS,EAAE,GAAG,SAAS,QAAQ;oBACjC,aAAa;oBACb,YAAY,CACT,CACP,CACG;YACL,WAAW,IAAI,WAAW,IAAI,CAAC,MAAM,IAAI,CACxC,uCAAK,SAAS,EAAE,GAAG,SAAS,SAAS;gBACnC,8BAAC,qBAAW,IACV,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,EACvB,aAAa,EAAE,qBAAqB,EACpC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,yBAAyB,EACnC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,oBAAoB,EAAE,oBAAoB,EAC1C,kBAAkB,EAAE,kBAAkB,EACtC,wBAAwB,EAAE,wBAAwB,GAClD,CACE,CACP,CACI,CACH,CACP,CAAA;AACH,CAAC,CACF,CAAA;AAED,SAAS,CAAC,KAAK,GAAG,eAAK,CAAA;AACvB,SAAS,CAAC,OAAO,GAAG,iBAAO,CAAA;AAC3B,SAAS,CAAC,UAAU,GAAG,uBAAa,CAAA;AAEpC,kBAAe,SAAS,CAAA","sourcesContent":["import React, { useMemo, useRef, useEffect, useState, useImperativeHandle, forwardRef } from 'react'\nimport cn from 'classnames'\nimport { flatten } from 'lodash'\nimport Composition from './Field/Composition'\n// import Button from '../button'\nimport Form from '../form'\n// import { getLanguage, getText } from '../prev-locale'\nimport createActions from './createActions'\nimport Field from './Field'\nimport useForm from './useForm'\n\nimport './index.less'\n\nconst clsPrefix = 'tnt-queryform'\n\nconst QueryForm = forwardRef(\n  (\n    {\n      form,\n      className = '',\n      initialValues: _initialValues,\n      language,\n      onSearch,\n      onReset,\n      hasOnChange,\n      onChange,\n      renderActions,\n      extraActions,\n      children,\n      showSearch = false,\n      showReset = false,\n      showFieldCount = 3,\n      minGroupCount = 3, // 最小聚合个数\n      compositionShowReset = true,\n      inline,\n      defaultSearchField,\n      defaultSearchPlaceholder,\n    },\n    ref\n  ) => {\n    const [initialValues, setInitialValues] = useState(_initialValues || {})\n    const formRef = useRef(form || createActions())\n\n    useImperativeHandle(\n      ref,\n      () => ({\n        form: formRef.current,\n      }),\n      []\n    )\n\n    useEffect(() => {\n      const _search = (params = {}) => {\n        onSearch?.({\n          ...formRef.current.getValues(),\n          ...params,\n        })\n      }\n      formRef.current.setData('initialValues', initialValues)\n      formRef.current.setData('values', initialValues)\n      formRef.current.on('search', _search)\n      return () => {\n        formRef.current.off('search', _search)\n      }\n    }, [])\n\n    // const _getText = (key) => {\n    //   return getText(key, language || getLanguage())\n    // }\n    const _onSearch = () => {\n      onSearch?.(formRef.current.getValues())\n    }\n\n    const _onReset = () => {\n      formRef.current.setValues({ ...initialValues })\n      onReset?.(initialValues)\n      setInitialValues({ ...initialValues })\n    }\n\n    const _onFieldChange = (name, value, ...rest) => {\n      const values = formRef.current.getValues()\n      const newValues = {\n        ...values,\n        [name]: value,\n      }\n      const changedInfo = { name, value, preValue: values?.[name] }\n      formRef.current.setData('values', newValues)\n      onChange && onChange(newValues, changedInfo, ...rest)\n    }\n\n    const _onCompositionFieldChange = (value, deleteKeys, needSearch, isReset) => {\n      const values = formRef.current.getValues()\n      const newValues = {\n        ...values,\n        ...value,\n      }\n      const changeKeys = Object.keys(newValues)\n      if (deleteKeys?.length) {\n        deleteKeys?.forEach((key) => {\n          if (values?.[key] || values?.[key] === 0 || values?.[key] === false) {\n            delete newValues[key]\n          }\n        })\n      }\n      formRef.current.setData('values', newValues)\n      if (isReset) {\n        return\n      } else if (deleteKeys?.length === 1) {\n        // 删除一定要搜索\n        if (onSearch) {\n          onSearch(newValues, true)\n        } else {\n          onChange(newValues, { name: deleteKeys[0] })\n        }\n      } else if (needSearch && !hasOnChange) {\n        formRef.current.emit('search', { ...newValues, current: 1 })\n      } else if (onChange) {\n        changeKeys.forEach((key) => {\n          if (JSON.stringify(value[key]) !== JSON.stringify(values[key])) {\n            const changedInfo = { name: key, value: value[key], preValue: values?.[key] }\n            onChange(newValues, changedInfo)\n          }\n        })\n      }\n    }\n\n    const [groupFields, outFields, rightChildren, compositionInitValues] = useMemo(() => {\n      let groupFields = []\n      let outFields = []\n      let otherFields = []\n      const rightChildren = []\n      const compositionInitValues = {}\n      React.Children.map(children, (child) => {\n        if (child) {\n          if (child.props?.align === 'right') {\n            rightChildren.push(child)\n            return\n          } else if (child.props?.isGroup === false) {\n            outFields.push(child)\n          } else {\n            groupFields.push(child)\n          }\n          otherFields.push(child)\n        }\n      })\n      if (groupFields.length <= minGroupCount) {\n        groupFields = []\n        outFields = otherFields\n      } else {\n        // 初始值\n        for (let i = 0; i < groupFields.length; i++) {\n          const name = groupFields[i].props?.name\n          if (initialValues[name] !== undefined) {\n            compositionInitValues[name] = initialValues[name]\n          }\n        }\n      }\n      return [\n        flatten(\n          groupFields.map((it) => {\n            if (it.props.type === 'selectInput') {\n              const { name, props } = it.props || {}\n              const { options = [] } = props || {}\n              return options.map(({ label, value }) => ({\n                props: {\n                  pName: name,\n                  cName: value,\n                  name: `${name}.${value}`,\n                  title: label,\n                  type: 'otherInput',\n                  props: {},\n                },\n              }))\n            } else {\n              return it\n            }\n          })\n        ),\n        outFields,\n        rightChildren,\n        Object.keys(compositionInitValues).length > 0 ? compositionInitValues : undefined,\n      ]\n    }, [children, minGroupCount, initialValues])\n\n    const isGroupMode = groupFields.length > 0\n    const hasOutField = outFields.length > 0\n    const showExtra = rightChildren.length > 0 || extraActions\n\n    console.log(groupFields)\n\n    return (\n      <div className={cn(clsPrefix, className, { [`${clsPrefix}-inline`]: inline })}>\n        <Form layout=\"inline\">\n          <div className={`${clsPrefix}-top`}>\n            <div className={`${clsPrefix}-top-body`}>\n              {outFields.map((child, i) =>\n                React.cloneElement(child, {\n                  form: formRef.current,\n                  initialValue: initialValues?.[child.props?.name],\n                  onChange: _onFieldChange,\n                  key: i,\n                })\n              )}\n              {isGroupMode && (!hasOutField || inline) && (\n                <Composition\n                  clsPrefix={clsPrefix}\n                  fieldItems={groupFields}\n                  initialValues={compositionInitValues}\n                  _onReset={_onReset}\n                  _onSearch={_onSearch}\n                  onChange={_onCompositionFieldChange}\n                  form={formRef.current}\n                  compositionShowReset={compositionShowReset}\n                  defaultSearchField={defaultSearchField}\n                  defaultSearchPlaceholder={defaultSearchPlaceholder}\n                />\n              )}\n              {renderActions ? (\n                renderActions()\n              ) : (\n                <>\n                  {/* {showSearch && (\n                    <Button type=\"primary\" onClick={_onSearch}>\n                      {_getText('search')}\n                    </Button>\n                  )}\n                  {showReset && <Button onClick={_onReset}>{_getText('reset')}</Button>} */}\n                </>\n              )}\n            </div>\n            {showExtra && (\n              <div className={`${clsPrefix}-extra`}>\n                {rightChildren}\n                {extraActions}\n              </div>\n            )}\n          </div>\n          {isGroupMode && hasOutField && !inline && (\n            <div className={`${clsPrefix}-bottom`}>\n              <Composition\n                clsPrefix={clsPrefix}\n                fieldItems={groupFields}\n                initialValues={compositionInitValues}\n                _onReset={_onReset}\n                _onSearch={_onSearch}\n                onChange={_onCompositionFieldChange}\n                form={formRef.current}\n                compositionShowReset={compositionShowReset}\n                defaultSearchField={defaultSearchField}\n                defaultSearchPlaceholder={defaultSearchPlaceholder}\n              />\n            </div>\n          )}\n        </Form>\n      </div>\n    )\n  }\n)\n\nQueryForm.Field = Field\nQueryForm.useForm = useForm\nQueryForm.createForm = createActions\n\nexport default QueryForm\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "3.0.40-beta.7",
+    "version": "3.0.40-beta.8",
     "license": "MIT",
     "scripts": {
         "start": "heft start --storybook",