@teamix/pro 1.2.19 → 1.2.20

package/lib/form/Filter/index2.js

@@ -23,20 +23,19 @@ var _utils = require("@teamix/utils");
 
 var _index = _interopRequireDefault(require("../../field/index"));
 
-var _ProForm = _interopRequireDefault(require("../ProForm"));
-
 var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
 var _useFormDisplayValues = require("../ProForm/useFormDisplayValues");
 
-var _utils2 = require("../utils");
+var _SimpleFilter = _interopRequireDefault(require("./SimpleFilter"));
+
+var _LightFilter = _interopRequireDefault(require("./LightFilter"));
+
+var _AdvancedFilter = _interopRequireDefault(require("./AdvancedFilter"));
 
 require("./index2.scss");
 
-var _excluded = ["schema", "onChange", "onSubmit"],
-    _excluded2 = ["form", "schema", "onSubmit", "onChange"],
-    _excluded3 = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
-    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand"];
+var _excluded = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand", "formRef", "defaultFilterValue"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,6 +43,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -52,198 +57,19 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 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 _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 _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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 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 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 _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 _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; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 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; }
 
-/**
- * 简单筛选
- */
-var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      onChange = props.onChange,
-      onSubmit = props.onSubmit,
-      otherProps = _objectWithoutProperties(props, _excluded);
-
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-simple'
-  });
-  var simpleSchema = (0, _react.useMemo)(function () {
-    return [{
-      component: 'FormFlex',
-      props: {
-        size: 8
-      },
-      children: schema
-    }, {
-      component: 'Submit',
-      props: {
-        style: {
-          display: 'none'
-        }
-      }
-    }];
-  }, [schema]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: simpleSchema,
-    feedbackLayout: "popover",
-    breakpoints: [],
-    inset: true,
-    onSubmit: onSubmit,
-    onChange: onChange
-  }));
-});
-/**
- * 轻量筛选
- */
-
-var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var form = props.form,
-      schema = props.schema,
-      onSubmit = props.onSubmit,
-      onChange = props.onChange,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-light'
-  });
-  var onBtnClick = (0, _react.useCallback)(function () {
-    onChange && onChange((0, _reactive.toJS)(form.values));
-  }, [form]);
-  var LightSchema = (0, _react.useMemo)(function () {
-    return [{
-      component: 'LightFilter',
-      props: {
-        buttonProps: {
-          onClick: onBtnClick
-        }
-      },
-      children: schema
-    }, {
-      component: 'Submit',
-      props: {
-        style: {
-          display: 'none'
-        }
-      }
-    }];
-  }, [schema, onBtnClick]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: LightSchema,
-    feedbackLayout: "none",
-    breakpoints: [],
-    bordered: false,
-    onSubmit: onSubmit,
-    onChange: onChange
-  }));
-});
-/**
- * 高级筛选
- */
-
-var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      onSubmit = props.onSubmit,
-      onReset = props.onReset,
-      layout = props.layout,
-      labelAlign = props.labelAlign,
-      wrapperAlign = props.wrapperAlign,
-      labelCol = props.labelCol,
-      wrapperCol = props.wrapperCol,
-      otherProps = _objectWithoutProperties(props, _excluded3);
-
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-query-filter-advanced'
-  });
-  var gridSchema = (0, _react.useMemo)(function () {
-    return [{
-      name: 'FormGrid',
-      component: 'FormGrid',
-      props: {
-        breakpoints: [480, 720, 990, 1200, Infinity],
-        maxColumns: [1, 2, 3, 3, 4],
-        columnGap: 16,
-        rowGap: 12
-      },
-      children: [].concat(_toConsumableArray(schema), [{
-        component: 'FormGrid.GridColumn',
-        props: {
-          gridSpan: -1
-        },
-        children: [{
-          component: 'FormButtonGroup',
-          props: {
-            align: 'right'
-          },
-          children: [{
-            component: 'Reset',
-            props: {
-              onResetValidateSuccess: onReset,
-              children: (0, _utils.getMessage)('reset')
-            }
-          }, {
-            component: 'Submit',
-            props: {
-              style: {
-                marginRight: -8
-              },
-              children: (0, _utils.getMessage)('search')
-            }
-          }]
-        }]
-      }])
-    }];
-  }, [schema, onReset]);
-  var getTeamixLayout = (0, _react.useMemo)(function () {
-    return {
-      breakpoints: [990],
-      layout: (0, _utils2.mergeArrayValue)(['vertical'], layout),
-      labelAlign: (0, _utils2.mergeArrayValue)(['left'], labelAlign),
-      wrapperAlign: (0, _utils2.mergeArrayValue)(['left'], wrapperAlign),
-      labelCol: (0, _utils2.mergeArrayValue)([24], labelCol),
-      wrapperCol: (0, _utils2.mergeArrayValue)([24], wrapperCol)
-    };
-  }, [layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: gridSchema,
-    feedbackLayout: "popover"
-  }, otherProps), getTeamixLayout), {}, {
-    onSubmit: onSubmit
-  }));
-});
-AdvancedFilter.defaultProps = {
-  layout: 'horizontal',
-  labelAlign: 'right',
-  labelCol: 6,
-  wrapperCol: 18
-};
-
+// 获取Schema是否包含默认值、异步默认值、必选校验等
 var getSpecialProps = function getSpecialProps(props) {
   var initialValues = props.initialValues,
       initialRequest = props.initialRequest;
@@ -290,23 +116,89 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onReset = props.onReset,
       mode = props.mode,
       expand = props.expand,
-      otherProps = _objectWithoutProperties(props, _excluded4);
+      formRef = props.formRef,
+      defaultFilterValue = props.defaultFilterValue,
+      otherProps = _objectWithoutProperties(props, _excluded); // 表单默认值初始化回调
+
+
+  var _onFormInit = function onFormInit(form, _ref, configFilterItem) {
+    var initialRequest = _ref.initialRequest,
+        onInit = _ref.onInit;
+
+    if (!form.mounted) {
+      form.loading = !!initialRequest;
+    }
+
+    var loadingField = Object.values(form.fields).filter(function (field) {
+      return !!field.loading;
+    });
+
+    if (form.mounted) {
+      if (loadingField.length === 0 && !form.loading) {
+        var onInitResult = onInit && onInit((0, _reactive.toJS)(form.values));
+
+        if (onInitResult) {
+          // 根据onInit返回值，判断是否使用该事件执行筛选，使用过则添加筛选标签
+          configFilterItem && configFilterItem(form);
+        }
+
+        _onFormInit = function onFormInit() {};
+      }
+    }
+  }; // 设置当前form
+
+
+  var setCurrentForm = function setCurrentForm(formName) {
+    currentForm.current = formName;
+
+    if (formRef) {
+      var form = formMap[formName];
+      formRef.current = form;
+
+      formRef.current.updateTags = function () {
+        configFilterItem(form);
+      };
+    }
+  }; // 创建简单筛选表单实例
+
 
   var simpleForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
-      validateFirst: true
+      validateFirst: true,
+      effects: function effects() {
+        (0, _core.onFormReact)(function (form) {
+          _onFormInit(form, props);
+        });
+      }
     });
-  }, []);
+  }, []); // 创建轻量筛选表单实例
+
   var lightForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
-      validateFirst: true
+      validateFirst: true,
+      effects: function effects() {
+        (0, _core.onFormInputChange)(function () {
+          setCurrentForm('light');
+        });
+      }
     });
-  }, []);
+  }, []); // 创建高级筛选表单实例
+
   var advancedForm = (0, _react.useMemo)(function () {
     return (0, _core.createForm)({
-      validateFirst: true
+      validateFirst: true,
+      effects: function effects() {
+        (0, _core.onFormReact)(function (form) {
+          _onFormInit(form, props, configFilterItem);
+        });
+      }
     });
   }, []);
+  var formMap = {
+    simple: simpleForm,
+    light: lightForm,
+    advanced: advancedForm
+  };
 
   var _getSpecialProps = getSpecialProps(props),
       hasDefault = _getSpecialProps.hasDefault,
@@ -325,25 +217,24 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       tagDataSource = _useState4[0],
       setTagDataSource = _useState4[1];
 
+  var filterItem = (0, _react.useRef)([]);
+  var currentForm = (0, _react.useRef)(mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple');
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-query-filter'
-  });
-  var currentForm = mode === 'panel' ? advancedFilterVisible ? 'advanced' : 'light' : 'simple'; // 展开收起高级筛选
+  }); // 设置筛选数据
 
-  var toggleAdvancedFilter = (0, _react.useCallback)(function () {
-    setAdvancedFilterVisible(function (visible) {
-      return !visible;
-    });
-  }, []); // 获取标签数据
+  var configFilterItem = (0, _react.useCallback)(function (form) {
+    filterItem.current = getFilterDisplayValues(form);
+  }, []); // 获取筛选数据Label
 
-  var getTagDataSource = (0, _react.useCallback)(function (form) {
+  var getFilterDisplayValues = (0, _react.useCallback)(function (form) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
-    return Object.entries(displayValues).map(function (_ref) {
+    return Object.entries(displayValues).map(function (_ref2) {
       var _data$displayValue;
 
-      var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          data = _ref2[1];
+      var _ref3 = _slicedToArray(_ref2, 2),
+          key = _ref3[0],
+          data = _ref3[1];
 
       return {
         key: key,
@@ -357,32 +248,46 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, []); // 设置标签数据
 
   var configTag = (0, _react.useCallback)(function () {
-    setTagDataSource(getTagDataSource(advancedForm));
-  }, []); // 简单搜索Filter
+    setTagDataSource(filterItem.current);
+  }, [filterItem.current]); // 展开收起高级筛选
 
-  var onSimpleFilter = (0, _react.useCallback)(function (values) {
-    if (currentForm === 'simple') {
-      onFilter && onFilter(values);
+  var toggleAdvancedFilter = (0, _react.useCallback)(function () {
+    var result = !advancedFilterVisible;
+
+    if (result) {
+      // 展开高级筛选，Light回填Advanced
+      if (currentForm.current === 'light') {
+        advancedForm.setValues(lightForm.values);
+      }
+    } else {
+      // 收起高级筛选，配置标签数据
+      configTag();
     }
-  }, [onFilter, currentForm]); // 轻量搜索Filter
 
-  var onLightFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+    setAdvancedFilterVisible(result);
+  }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
+
+  var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              if (!(currentForm === 'light')) {
+              if (!(currentForm.current === 'simple')) {
                 _context.next = 5;
                 break;
               }
 
-              onFilter && onFilter(values);
+              if (!hasRequired) {
+                _context.next = 4;
+                break;
+              }
+
               _context.next = 4;
-              return advancedForm.reset();
+              return simpleForm.validate();
 
             case 4:
-              configTag();
+              onFilter && onFilter(values);
 
             case 5:
             case "end":
@@ -393,39 +298,77 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }));
 
     return function (_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, currentForm]); // 高级搜索Filter
+  }(), [onFilter, currentForm.current, hasRequired]); // 轻量搜索Filter
+
+  var onLightFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!(currentForm.current === 'light')) {
+                _context2.next = 6;
+                break;
+              }
+
+              onFilter && onFilter(values);
+              _context2.next = 4;
+              return advancedForm.reset();
+
+            case 4:
+              // 不会触发高级筛选的onReset回调函数
+              configFilterItem(advancedForm);
+              configTag();
+
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    return function (_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), [onFilter, currentForm.current]); // 高级筛选Change
+
+  var onAdvancedChange = (0, _react.useCallback)(function () {
+    setCurrentForm('advanced');
+  }, []); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
-    if (currentForm === 'advanced') {
-      onFilter && onFilter(values);
-      configTag();
-      lightForm.reset();
-    }
-  }, [onFilter, currentForm]); // 关闭标签清空表单字段值
+    setCurrentForm('advanced');
+    onFilter && onFilter(values);
+    configFilterItem(advancedForm);
+    lightForm.reset();
+  }, [onFilter, currentForm.current]); // 高级搜索Reset
+
+  var onAdvancedReset = (0, _react.useCallback)(function () {
+    setCurrentForm('advanced');
+    onReset && onReset((0, _reactive.toJS)(advancedForm.values));
+    configFilterItem(advancedForm);
+    lightForm.reset();
+  }, [onReset]); // 关闭标签清空表单字段值
 
   var onTagClose = (0, _react.useCallback)(function (key) {
     advancedForm.setValuesIn(key, undefined);
-    setTagDataSource(getTagDataSource(advancedForm));
-  }, []); // 判断表单是否有校验和默认值
-
+    configFilterItem(advancedForm);
+    configTag();
+    onFilter && onFilter((0, _reactive.toJS)(advancedForm.values));
+  }, []); // 异步默认值回调，设置form的loading状态为false
+
+  var onInitialRequestComplete = (0, _react.useCallback)(function (_, __, _ref6) {
+    var form = _ref6.form;
+    form.setState({
+      loading: false
+    });
+  }, []);
   (0, _react.useEffect)(function () {
-    if (hasDefault || hasAsyncDefault || hasRequired) {}
-  }, [hasDefault, hasAsyncDefault, hasRequired]); // 设置默认值标签数据
-
-  (0, _react.useEffect)(function () {// onInit
-    // if (mode === 'panel') {
-    //   if (expand) {
-    //     onInit && onInit(toJS(advancedForm.values));
-    //   } else {
-    //     onInit && onInit(toJS(lightForm.values));
-    //   }
-    //   configTag();
-    // } else {
-    //   onInit && onInit(toJS(simpleForm.values));
-    // }
-  }, [mode]);
+    setCurrentForm(currentForm.current);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, props.className)
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -435,11 +378,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonBefore")
   }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-inline-form"), hasAsyncDefault ? "".concat(prefixCls, "-inline-form-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+    className: (0, _classnames.default)("".concat(prefixCls, "-inline-form"), hasDefaultOrRequired ? "".concat(prefixCls, "-inline-form-hidden") : '')
+  }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    defaultFilterValue: defaultFilterValue,
     form: lightForm,
-    onChange: onLightFilter,
-    onSubmit: onLightFilter
+    onChange: onLightFilter
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
@@ -458,7 +401,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     type: "filter-line"
   }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-inline-form")
-  }, /*#__PURE__*/_react.default.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+  }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: simpleForm,
     onChange: onSimpleFilter,
     onSubmit: onSimpleFilter
@@ -468,11 +411,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     className: "".concat(prefixCls, "-panel")
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref4) {
-    var key = _ref4.key,
-        label = _ref4.label,
-        value = _ref4.value,
-        type = _ref4.type;
+  }, /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref7) {
+    var key = _ref7.key,
+        label = _ref7.label,
+        value = _ref7.value,
+        type = _ref7.type;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: key,
       afterClose: function afterClose() {
@@ -488,9 +431,14 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     })));
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(AdvancedFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
+  }, /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
+      onComplete: onInitialRequestComplete
+    }) : undefined,
     form: advancedForm,
-    onSubmit: onAdvancedFilter
+    onChange: onAdvancedChange,
+    onSubmit: onAdvancedFilter,
+    onReset: onAdvancedReset
   })))) : null);
 });
 exports.QueryFilter = QueryFilter;

package/lib/form/ProForm/index.js

@@ -107,12 +107,10 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]); // 添加onChange
 
   (0, _react.useEffect)(function () {
-    form.removeEffects('onChange');
-    form.addEffects('onChange', function () {
-      (0, _core.onFormValuesChange)((0, _lodash.default)(function (form) {
-        if (onChange) {
-          onChange((0, _reactive.toJS)(form.values));
-        }
+    form.removeEffects('onFieldValueChange');
+    form.addEffects('onFieldValueChange', function () {
+      (0, _core.onFieldValueChange)('*', (0, _lodash.default)(function (field, form) {
+        onChange && onChange((0, _reactive.toJS)(form.values), (0, _reactive.toJS)(field.value), field.props.name);
       }, 300));
     });
   }, [form, onChange]); // 配置表单默认值
@@ -123,6 +121,10 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
     } else if (initialRequest) {
       (0, _useInitialRequest.default)(initialRequest).then(function (values) {
         form.setInitialValues(values);
+      }).finally(function () {
+        initialRequest.onComplete && initialRequest.onComplete(undefined, undefined, {
+          form: form
+        });
       });
     }
   }, []); // 配置国际化

package/lib/form/ProForm/index.scss

@@ -180,6 +180,9 @@
       border: 0;
     }
   }
+  .#{$css-prefix}input-control:last-child {
+    padding-right: 0;
+  }
 }
 
 // 数组类组件添加按钮

package/lib/form/typing.d.ts

@@ -58,15 +58,17 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: CommonRequestConfig;
+    initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, displayValues?: any) => any;
+    onChange?: (values: any, fieldValue?: any, fieldName?: string) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
+    defaultFilterValue?: string;
     onReset?: (payload?: any) => void;
+    onResetClick?: () => void;
 }
 export interface QueryFilterProps extends ProFormProps {
     /**
@@ -77,7 +79,9 @@ export interface QueryFilterProps extends ProFormProps {
     expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
-    onInit?: (values: any) => void;
+    defaultFilterValue?: string;
+    formRef?: React.MutableRefObject<any>;
+    onInit?: (values: any) => boolean;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }