@teamix/pro 1.3.15 → 1.3.16

package/es/form/Filter/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "bindUrl", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -49,6 +49,7 @@ import LightFilter from './LightFilter';
 import AdvancedFilter from './AdvancedFilter';
 import { QueryFilterLayout } from './Layout';
 import useSpecialProps from './useSpecialProps';
+import useBindUrl from './useBindUrl';
 import './index.scss';
 /**
  * 查询筛选
@@ -64,9 +65,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       defaultFilterValue = props.defaultFilterValue,
       filterValues = props.filterValues,
       filterDebounce = props.filterDebounce,
-      onFilter = props.onFilter,
-      onInit = props.onInit,
-      onReset = props.onReset,
+      bindUrl = props.bindUrl,
+      outerFilter = props.onFilter,
+      outerInit = props.onInit,
+      outerReset = props.onReset,
       onExpand = props.onExpand,
       onChange = props.onChange,
       otherProps = _objectWithoutProperties(props, _excluded);
@@ -85,15 +87,27 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       setTagDataSource = _useState4[1];
 
   var filterItem = useRef([]);
-  var defaultForm = mode === 'panel' ? 'advanced' : 'simple';
-  var currentForm = useRef(defaultForm);
+  var defaultFormName = mode === 'panel' ? 'advanced' : 'simple';
+  var currentFormName = useRef(defaultFormName);
+  var currentForm = useRef();
   var activeFilterValueRef = useRef();
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   });
   var debounceFun = debounce(function (fun, props) {
     return fun(props);
-  }, filterDebounce); // onInit
+  }, filterDebounce); // 绑定URL
+
+  var _useBindUrl = useBindUrl(bindUrl, {
+    onInit: outerInit,
+    onFilter: outerFilter,
+    onReset: outerReset
+  }, currentForm),
+      setValuesByUrlState = _useBindUrl.setValuesByUrlState,
+      onInit = _useBindUrl.onInit,
+      onFilter = _useBindUrl.onFilter,
+      onReset = _useBindUrl.onReset; // onInit
+
 
   var initialRequestRef = useRef(!!(props === null || props === void 0 ? void 0 : props.initialRequest));
   var filterEnable = useRef('waiting');
@@ -114,29 +128,31 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
               }); // 等待mounted + 字段loading结束 + initialRequest结束 => 表单默认值初始化完成
 
               if (!(form.mounted && !loadingField.length && !form.loading)) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
 
               onFormInit = undefined; // init后销毁 isFormInit 方法
 
-              if (!onInit) {
-                _context.next = 9;
+              setValuesByUrlState(form); // 配置URL参数到表单
+
+              if (!outerInit) {
+                _context.next = 10;
                 break;
               }
 
-              _context.next = 7;
+              _context.next = 8;
               return form.validate();
 
-            case 7:
-              onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values)); // 设置Tag
+            case 8:
+              onInit(toJS(form.values)); // 设置Tag
 
               if (mode === 'panel') {
                 configFilterItem(advancedForm);
                 !panelVisible && configTag();
               }
 
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -151,10 +167,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
 
   var setCurrentForm = function setCurrentForm(formName) {
-    currentForm.current = formName;
+    currentFormName.current = formName;
+    currentForm.current = formMap[formName];
+    var form = currentForm.current;
 
     if (formRef) {
-      var form = formMap[formName];
       formRef.current = form; // 自定义updateTags方法
 
       if (!formRef.current.updateTags) {
@@ -182,7 +199,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
                     return form.validate();
 
                   case 4:
-                    onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(form.values));
+                    onFilter(toJS(form.values));
                     updateTags(form);
 
                   case 6:
@@ -210,7 +227,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
                   return form.validate();
 
                 case 2:
-                  onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(form.values));
+                  onFilter(toJS(form.values));
 
                   if (formName === 'advanced') {
                     updateTags(form);
@@ -238,7 +255,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
                     advancedForm.reset('*', config);
 
                     if (formName === 'advanced') {
-                      onReset === null || onReset === void 0 ? void 0 : onReset(toJS(advancedForm.values));
+                      onReset(toJS(advancedForm.values));
                       updateTags(form);
                     }
 
@@ -368,7 +385,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
     if (result) {
       // 展开高级筛选，Light回填Advanced
-      if (currentForm.current === 'light') {
+      if (currentFormName.current === 'light') {
         var key = activeFilterValueRef.current;
         var value = lightForm.values[key];
         advancedForm.setValuesIn(key, value);
@@ -392,7 +409,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
               return simpleForm.validate();
 
             case 2:
-              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+              onFilter(values);
 
             case 3:
             case "end":
@@ -408,7 +425,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }(), [onFilter]); // 简单搜索Change
 
   var onSimpleChange = useCallback(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'simple') {
+    if (currentFormName.current === 'simple') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
 
       if (filterEnable.current === 'filter') {
@@ -420,7 +437,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   var onLightFilter = useCallback(function (values) {
     var _Object$keys;
 
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值
+    onFilter(values); // 清空advancedForm的值
 
     var clearKeys = {};
     (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
@@ -431,7 +448,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, [onFilter]); // 轻量搜索Change
 
   var onLightChange = useCallback(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'light') {
+    if (currentFormName.current === 'light') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
 
       if (filterEnable.current === 'filter') {
@@ -442,7 +459,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var onAdvancedFilter = useCallback(function (values) {
     setCurrentForm('advanced');
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
+    onFilter(values);
     configFilterItem(advancedForm); // 清空lightForm的值
 
     lightForm.reset('*', {
@@ -452,7 +469,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
   var onAdvancedReset = useCallback(function () {
     setCurrentForm('advanced');
-    onReset === null || onReset === void 0 ? void 0 : onReset(toJS(advancedForm.values));
+    onReset(toJS(advancedForm.values));
     configFilterItem(advancedForm); // 清空lightForm的值
 
     lightForm.reset('*', {
@@ -461,7 +478,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, [onReset]); // 高级搜索Change
 
   var onAdvancedChange = useCallback(function (values, fieldValue, fieldName) {
-    if (currentForm.current === 'advanced') {
+    if (currentFormName.current === 'advanced') {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
     }
   }, [onChange]); // 关闭标签清空表单字段值
@@ -476,7 +493,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
     advancedForm.setValuesIn(key, newValue);
     updateTags(advancedForm);
-    onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(advancedForm.values));
+    onFilter(toJS(advancedForm.values));
   }, [onFilter]); // initialRequest 的回调
 
   var onInitialComplete = useCallback(function (form) {
@@ -487,7 +504,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, []); // 组件挂载
 
   useEffect(function () {
-    setCurrentForm(currentForm.current);
+    setCurrentForm(currentFormName.current);
   }, []);
   return /*#__PURE__*/React.createElement(QueryFilterLayout, {
     className: cls(prefixCls, props.className),

package/es/form/Filter/layout.scss

@@ -6,6 +6,10 @@ $query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
   --panel-filter-bg: #1f1f1f;
 }
 
+.theme-hybridcloud {
+  --panel-filter-bg: var(--color-fill1-2);
+}
+
 .#{$query-filter-layout} {
   .#{$query-filter-layout}-inline {
     display: flex;

package/es/form/Filter/useBindUrl.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (bindUrl: any, functions: any, formRef: any) => any;
+export default _default;

package/es/form/Filter/useBindUrl.js

@@ -0,0 +1,118 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { useUrlState } from '@teamix/hooks';
+import { isUsable } from '@teamix/utils';
+export default (function (bindUrl, functions, formRef) {
+  // 预处理 bindUrl 参数（主要兼容 SelectGroup 组件）
+  var initializeBindUrl = function initializeBindUrl(options) {
+    return options ? _objectSpread(_objectSpread({}, options), {}, {
+      beforeStringify: function beforeStringify(values) {
+        var _Object$entries;
+
+        var beforeStringify = options.beforeStringify;
+
+        var newValues = _objectSpread({}, values);
+
+        (_Object$entries = Object.entries(values)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
+          var _form$query;
+
+          var _ref2 = _slicedToArray(_ref, 2),
+              key = _ref2[0],
+              value = _ref2[1];
+
+          var form = formRef.current;
+          var field = (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
+
+          if ((field === null || field === void 0 ? void 0 : field.component[0]) === 'SelectGroup') {
+            newValues[key] = value.map(function (_ref3) {
+              var key = _ref3.key,
+                  value = _ref3.value;
+              return key && value ? "".concat(key, "||").concat(value === null || value === void 0 ? void 0 : value.join('|')) : '';
+            });
+          }
+        });
+        return beforeStringify ? beforeStringify(newValues) : newValues;
+      }
+    }) : options;
+  }; // 通过 useUrlState 获取 url 上的参数和 url 配置方法
+
+
+  var _useUrlState = useUrlState(undefined, initializeBindUrl(bindUrl)),
+      _useUrlState2 = _slicedToArray(_useUrlState, 2),
+      urlState = _useUrlState2[0],
+      setUrlState = _useUrlState2[1]; // 输出配置url参数的函数
+
+
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref4) {
+    var _ref5 = _slicedToArray(_ref4, 2),
+        key = _ref5[0],
+        fun = _ref5[1];
+
+    prev[key] = function (values) {
+      fun === null || fun === void 0 ? void 0 : fun(values);
+      setUrlState(values);
+    };
+
+    return prev;
+  }, {}); // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
+
+  var setValuesByUrlState = function setValuesByUrlState(form) {
+    if (urlState) {
+      var _Object$entries2;
+
+      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref6) {
+        var _form$query2;
+
+        var _ref7 = _slicedToArray(_ref6, 2),
+            key = _ref7[0],
+            value = _ref7[1];
+
+        var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+
+        if (field) {
+          var newValue = value;
+
+          if (field.displayName === 'ArrayField') {
+            newValue = [].concat(isUsable(newValue) ? newValue : []);
+          }
+
+          if (field.component[0] === 'SelectGroup') {
+            newValue = newValue.map(function (item) {
+              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
+                  _item$split2 = _slicedToArray(_item$split, 2),
+                  key = _item$split2[0],
+                  value = _item$split2[1];
+
+              return {
+                key: key,
+                value: value === null || value === void 0 ? void 0 : value.split('|')
+              };
+            });
+          }
+
+          form.setValuesIn(key, newValue);
+        }
+      });
+    }
+  };
+
+  return _objectSpread({
+    setValuesByUrlState: setValuesByUrlState
+  }, initializedFunctions);
+});

package/es/form/ProForm/index.js

@@ -101,7 +101,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
-  var onAutoSubmit = useAutoSubmit(onSubmit); // todo 需要formily支持断点下的属性更新
+  var onAutoSubmit = useAutoSubmit(onSubmit, context); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = useMemo(function () {
     return breakpoints ? {
@@ -126,7 +126,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     if (initialValues) {
       form.setInitialValues(initialValues);
     } else if (initialRequest) {
-      useInitialRequest(initialRequest).then(function (values) {
+      useInitialRequest(initialRequest, context).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
@@ -171,10 +171,12 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
 });
 
-ProForm.Field = function () {
+var Field = function Field() {
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 };
 
+Field.displayName = 'ProFormField';
+ProForm.Field = Field;
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/es/form/ProForm/useFieldSchema.js

@@ -11,7 +11,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-import { getValueByValue, deepMerge } from '@teamix/utils';
+import { getValueByValue, deepMerge, isStr } from '@teamix/utils';
 /**
  * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
  * @param field Field 字段
@@ -21,45 +21,70 @@ import { getValueByValue, deepMerge } from '@teamix/utils';
  */
 
 var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
-  return field.reduce(function (prev, curr, index) {
+  return [].concat(field).reduce(function (prev, curr, index) {
+    var _curr$type;
+
     var _ref = curr.props || {},
         id = _ref.id,
         _ref$children = _ref.children,
         children = _ref$children === void 0 ? [] : _ref$children,
         _ref$reactions = _ref.reactions,
         reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
-        rest = _objectWithoutProperties(_ref, _excluded); // 获取字段额外的 schema 配置（From ProForm）
+        rest = _objectWithoutProperties(_ref, _excluded);
 
+    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
 
-    var extraFieldProps = extra[index] || {};
+    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
 
-    if (id !== extraFieldProps.id) {
-      // 索引不匹配，通过 id 查找获取
-      extraFieldProps = getValueByValue(extra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      }) || getValueByValue(wholeExtra, id, {
-        inputKey: 'id',
-        outputKey: '__whole__'
-      });
+    if (displayName === 'ProFormField') {
+      // 获取字段额外的 schema 配置（From ProForm）
+      var extraFieldProps = extra[index] || {};
 
-      if (extraFieldProps) {
-        console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+      if (id !== extraFieldProps.id) {
+        // 索引不匹配，通过 id 查找获取
+        extraFieldProps = getValueByValue(extra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        }) || getValueByValue(wholeExtra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        });
+
+        if (extraFieldProps) {
+          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+        }
       }
+
+      var _ref2 = extraFieldProps || {},
+          extraId = _ref2.id,
+          _ref2$children = _ref2.children,
+          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
+          _ref2$reactions = _ref2.reactions,
+          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
+          extraRest = _objectWithoutProperties(_ref2, _excluded2);
+
+      var mergedReactions = [].concat(reactions, extraReactions);
+      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
+      prev.push(_objectSpread(_objectSpread(_objectSpread({}, deepMerge(rest, extraRest)), mergedReactions.length && {
+        reactions: mergedReactions
+      }), mergedChildren.length && {
+        children: mergedChildren
+      }));
+    } else if (isStr(type)) {
+      prev.push({
+        component: type,
+        props: curr.props
+      });
+    } else if (isStr(displayName)) {
+      prev.push({
+        decorator: displayName,
+        decoratorProps: _objectSpread({
+          id: id
+        }, rest),
+        children: children ? getMergedSchema(children, [], wholeExtra) : []
+      });
     }
 
-    var _ref2 = extraFieldProps || {},
-        extraId = _ref2.id,
-        _ref2$children = _ref2.children,
-        extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
-        _ref2$reactions = _ref2.reactions,
-        extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
-        extraRest = _objectWithoutProperties(_ref2, _excluded2);
-
-    prev.push(_objectSpread(_objectSpread({}, deepMerge(rest, extraRest)), {}, {
-      reactions: [].concat(reactions, extraReactions),
-      children: (children === null || children === void 0 ? void 0 : children.length) ? getMergedSchema(children, extraChildren, wholeExtra) : []
-    }));
     return prev;
   }, []);
 };
@@ -73,11 +98,7 @@ var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
 export default (function (_ref3) {
   var children = _ref3.children,
       schema = _ref3.schema;
-  var field = [].concat(children !== null && children !== void 0 ? children : []).filter(function (item) {
-    var _item$type, _item$props;
-
-    return (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.name) === '' && (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.component);
-  }); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
+  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
 
   if (field.length) {
     return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);

package/es/form/SchemaForm/reactions.js

@@ -27,10 +27,13 @@ var $request = function $request(field, context, _ref, type) {
   var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = isPlainObj(refresh) ? refresh : {}; // 执行通用数据请求
+  var refreshResult = isPlainObj(refresh) ? refresh : {}; // 合并请求参数
+
+  var mergedParams = _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult); // 执行通用数据请求
+
 
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
+    params: mergedParams,
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
@@ -40,7 +43,10 @@ var $request = function $request(field, context, _ref, type) {
     onSuccess: isFn(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
-  }), context);
+  }), _objectSpread(_objectSpread({}, context), {}, {
+    field: field,
+    params: mergedParams
+  }));
 }; // 通用请求配置上下文
 
 

package/es/form/typing.d.ts

@@ -2,6 +2,7 @@ import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
 import type { CommonRequestConfig } from '@teamix/utils';
+import type { UrlStateOptions } from '@teamix/hooks';
 import React from 'react';
 interface AnyObject {
     [propName: string]: any;
@@ -124,6 +125,8 @@ export interface QueryFilterProps extends ProFormProps {
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
+    /** 绑定URL参数 */
+    bindUrl?: boolean | UrlStateOptions;
     /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => void;
     /** 表单筛选回调函数 */

package/es/form/utils.d.ts

@@ -43,5 +43,13 @@ declare const mergeArrayValue: (arr: any[], v?: any) => any[];
  * @param suffix scope名称后缀
  * @returns 表达式和scope上下文
  */
-declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => any;
+declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => {
+    expression: string;
+    scope: {
+        [x: string]: object;
+    };
+} | {
+    expression?: undefined;
+    scope?: undefined;
+};
 export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression, };

package/es/form/utils.js

@@ -1,9 +1,3 @@
-var _excluded = ["customRequest"];
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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."); }
@@ -32,7 +26,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isVoidField } from '@formily/core';
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
-import { isArr, isObj, getValueByValue, isPlainObj, isFn } from '@teamix/utils';
+import { isArr, isObj, getValueByValue, isPlainObj } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
 /**
  * 映射字段size，主要是default转medium
@@ -192,33 +186,15 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 
 
 var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
-  var schema = {};
-
   if (isPlainObj(config)) {
-    var customRequest = config.customRequest,
-        requestConfig = _objectWithoutProperties(config, _excluded);
-
     var requestConfigName = "$requestConfig_".concat(suffix);
-
-    if (isFn(customRequest)) {
-      var _scope;
-
-      // 自定义请求方法 customRequest
-      var customRequestName = "$customRequest_".concat(suffix);
-      schema = {
-        expression: "{{".concat(mode, "(").concat(customRequestName, ",context,").concat(requestConfigName, ")}}"),
-        scope: (_scope = {}, _defineProperty(_scope, customRequestName, customRequest), _defineProperty(_scope, requestConfigName, requestConfig), _scope)
-      };
-    } else {
-      // pro 通用数据请求 $request
-      schema = {
-        expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
+    return {
+      expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
+      scope: _defineProperty({}, requestConfigName, config)
+    };
   }
 
-  return schema;
+  return {};
 };
 
 export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression };