@teamix/pro 1.2.15 → 1.2.19

package/lib/form/Components/LightFilter/index.js

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _utils = require("@teamix/utils");
 
-var _componentMap = _interopRequireDefault(require("./componentMap"));
+var _componentMap = require("./componentMap");
 
 require("./index.scss");
 
@@ -53,14 +53,12 @@ var useMain = function useMain(active) {
   var main = [];
   schema.mapProperties(function (schema, name) {
     // console.log(schema.required); // 添加 *
-    console.log(schema);
-
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': _componentMap.default[schema['x-component']] || schema['x-component']
+          'x-component': _componentMap.componentMap[schema['x-component']] || schema['x-component']
         })
       });
     }
@@ -79,16 +77,21 @@ var useFilterItems = function useFilterItems() {
     });
   });
   return filterItems;
+}; // 是否输入框类型的组件
+
+
+var isInputCategory = function isInputCategory(currentSchema) {
+  var component = currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema['x-component'];
+  return _componentMap.inputCategory.includes(component);
 };
 
 var LightFilter = (0, _react2.observer)(function (props) {
-  var _filterItems$;
+  var _filterItems$, _main$;
 
-  var field = (0, _react2.useField)();
-  var schema = (0, _react2.useFieldSchema)();
   var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
 
@@ -98,6 +101,7 @@ var LightFilter = (0, _react2.observer)(function (props) {
       setActive = _useState2[1];
 
   var main = useMain(active);
+  var currentSchema = (_main$ = main[0]) === null || _main$ === void 0 ? void 0 : _main$.schema;
   var defaultCls = (0, _utils.usePrefixCls)();
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form-light-filter'
@@ -108,20 +112,21 @@ var LightFilter = (0, _react2.observer)(function (props) {
     return /*#__PURE__*/_react.default.createElement(_react2.RecursionField, {
       key: key,
       name: name,
-      schema: schema,
-      filterProperties: function filterProperties(schema) {
-        return true;
-      }
+      schema: schema
     });
   });
+  var onSelectChange = (0, _react.useCallback)(function (value) {
+    setActive(value);
+    onFilterChange && onFilterChange(currentSchema);
+  }, [onFilterChange]);
   return /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size))
+    className: (0, _classnames.default)(prefixCls, "".concat(defaultCls).concat(size), isInputCategory(currentSchema) ? "".concat(prefixCls, "-input-category") : '')
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-main")
   }, /*#__PURE__*/_react.default.createElement(_components.Select, _objectSpread(_objectSpread({}, filterProps), {}, {
     className: (0, _classnames.default)("".concat(prefixCls, "-select"), filterProps === null || filterProps === void 0 ? void 0 : filterProps.className),
     dataSource: filterItems,
-    onChange: setActive,
+    onChange: onSelectChange,
     value: active
   })), content), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-addonAfter")

package/lib/form/Components/LightFilter/index.scss

@@ -18,10 +18,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
     box-sizing: border-box;
     border: var(--search-normal-normal-border-width, 1px) solid
       var(--color-line1-2, #d9d9d9);
-    border-right: 0;
     border-radius: var(--search-normal-corner, 2px);
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
     // 表单项选择
     .#{$light-filter}-select {
       min-width: auto;
@@ -44,6 +41,7 @@ $light-filter: #{teamix-pro-form}-light-filter;
 
   // 按钮后缀
   .#{$light-filter}-addonAfter {
+    display: none;
     .#{$css-prefix}btn {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
@@ -54,6 +52,18 @@ $light-filter: #{teamix-pro-form}-light-filter;
   }
 }
 
+// LightFilter输入类
+.#{$light-filter}-input-category {
+  .#{$light-filter}-main {
+    border-right: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .#{$light-filter}-addonAfter {
+    display: block;
+  }
+}
+
 // LightFilter无边框
 .#{$form-item-cls}-bordered-none {
   .#{$form-item-cls}-control {

package/lib/form/Filter/index.js

@@ -96,7 +96,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }])
     }];
-  }, []);
+  }, [schema, triggerType]);
   var eventProps = getEventProps(triggerType, onFilter);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
     feedbackLayout: "popover",
@@ -174,7 +174,7 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }]
       }])
     }];
-  }, []);
+  }, [schema, onReset, triggerType]);
   var getTeamixLayout = (0, _react.useMemo)(function () {
     return {
       breakpoints: [990],

package/lib/form/Filter/index2.js

@@ -17,6 +17,8 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _core = require("@formily/core");
 
+var _reactive = require("@formily/reactive");
+
 var _utils = require("@teamix/utils");
 
 var _index = _interopRequireDefault(require("../../field/index"));
@@ -33,8 +35,8 @@ require("./index2.scss");
 
 var _excluded = ["schema", "onChange", "onSubmit"],
     _excluded2 = ["form", "schema", "onSubmit", "onChange"],
-    _excluded3 = ["schema", "onSubmit", "onChange", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
-    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "mode", "expand"];
+    _excluded3 = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"],
+    _excluded4 = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -42,6 +44,10 @@ 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 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); }); }; }
+
 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."); }
@@ -124,9 +130,17 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   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',
@@ -136,19 +150,12 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }
     }];
-  }, [schema]); // useEffect(() => {
-  //   form.addEffects('onChange', () => {
-  //     onFieldValueChange('',(field:any) => {
-  //       console.log(field.value);
-  //     });
-  //   });
-  // }, [form, onChange]);
-
+  }, [schema, onBtnClick]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: LightSchema,
-    feedbackLayout: "popover",
+    feedbackLayout: "none",
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
@@ -162,7 +169,6 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var schema = props.schema,
       onSubmit = props.onSubmit,
-      onChange = props.onChange,
       onReset = props.onReset,
       layout = props.layout,
       labelAlign = props.labelAlign,
@@ -237,25 +243,79 @@ AdvancedFilter.defaultProps = {
   labelCol: 6,
   wrapperCol: 18
 };
+
+var getSpecialProps = function getSpecialProps(props) {
+  var initialValues = props.initialValues,
+      initialRequest = props.initialRequest;
+  var hasDefault = !!initialValues;
+  var hasAsyncDefault = !!initialRequest;
+  var hasRequired = false;
+
+  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
+    schema.forEach(function (item) {
+      var value = item.default,
+          required = item.required,
+          rules = item.rules,
+          request = item.request,
+          dataSource = item.dataSource,
+          children = item.children;
+      hasDefault = hasDefault || (0, _utils.isSignificative)(value);
+      hasRequired = hasRequired || required || !!rules;
+      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
+      !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+
+      if (children === null || children === void 0 ? void 0 : children.length) {
+        hasDefaultOrRule(children);
+      }
+    });
+  };
+
+  hasDefaultOrRule(props.schema);
+  return {
+    hasDefault: hasDefault,
+    hasAsyncDefault: hasAsyncDefault,
+    hasRequired: hasRequired
+  };
+};
 /**
  * 查询筛选
  */
 
+
 var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var addonAfter = props.addonAfter,
       addonBefore = props.addonBefore,
       onFilter = props.onFilter,
+      onInit = props.onInit,
+      onReset = props.onReset,
       mode = props.mode,
       expand = props.expand,
       otherProps = _objectWithoutProperties(props, _excluded4);
 
-  var form = (0, _react.useMemo)(function () {
-    return props.form || (0, _core.createForm)({
+  var simpleForm = (0, _react.useMemo)(function () {
+    return (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
+  var lightForm = (0, _react.useMemo)(function () {
+    return (0, _core.createForm)({
+      validateFirst: true
+    });
+  }, []);
+  var advancedForm = (0, _react.useMemo)(function () {
+    return (0, _core.createForm)({
       validateFirst: true
     });
   }, []);
 
-  var _useState = (0, _react.useState)(expand),
+  var _getSpecialProps = getSpecialProps(props),
+      hasDefault = _getSpecialProps.hasDefault,
+      hasAsyncDefault = _getSpecialProps.hasAsyncDefault,
+      hasRequired = _getSpecialProps.hasRequired;
+
+  var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
+
+  var _useState = (0, _react.useState)(!!expand || hasDefaultOrRequired),
       _useState2 = _slicedToArray(_useState, 2),
       advancedFilterVisible = _useState2[0],
       setAdvancedFilterVisible = _useState2[1];
@@ -267,7 +327,8 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   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) {
@@ -293,31 +354,78 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }).filter(function (item) {
       return (0, _utils.isSignificative)(item.value);
     });
-  }, []); // 表单值提交
-
-  var onFormSubmit = (0, _react.useCallback)(function (values) {
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, []); // 轻量表单onChange
+  }, []); // 设置标签数据
+
+  var configTag = (0, _react.useCallback)(function () {
+    setTagDataSource(getTagDataSource(advancedForm));
+  }, []); // 简单搜索Filter
+
+  var onSimpleFilter = (0, _react.useCallback)(function (values) {
+    if (currentForm === 'simple') {
+      onFilter && onFilter(values);
+    }
+  }, [onFilter, currentForm]); // 轻量搜索Filter
+
+  var onLightFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref3 = _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')) {
+                _context.next = 5;
+                break;
+              }
+
+              onFilter && onFilter(values);
+              _context.next = 4;
+              return advancedForm.reset();
+
+            case 4:
+              configTag();
+
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
 
-  var onLightValueChange = (0, _react.useCallback)(function (values) {
-    form.reset();
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, [form]); // 简单表单onChange
+    return function (_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }(), [onFilter, currentForm]); // 高级搜索Filter
 
-  var onSimpleValueChange = (0, _react.useCallback)(function (values) {
-    setTagDataSource(getTagDataSource(form));
-    onFilter && onFilter(values);
-  }, []); // 关闭标签清空表单字段值
+  var onAdvancedFilter = (0, _react.useCallback)(function (values) {
+    if (currentForm === 'advanced') {
+      onFilter && onFilter(values);
+      configTag();
+      lightForm.reset();
+    }
+  }, [onFilter, currentForm]); // 关闭标签清空表单字段值
 
   var onTagClose = (0, _react.useCallback)(function (key) {
-    form.setValuesIn(key, undefined);
-  }, [form]); // 设置默认值标签数据
+    advancedForm.setValuesIn(key, undefined);
+    setTagDataSource(getTagDataSource(advancedForm));
+  }, []); // 判断表单是否有校验和默认值
 
   (0, _react.useEffect)(function () {
-    setTagDataSource(getTagDataSource(form));
-  }, []);
+    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]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, props.className)
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -327,11 +435,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: "".concat(prefixCls, "-inline-form")
+    className: (0, _classnames.default)("".concat(prefixCls, "-inline-form"), hasAsyncDefault ? "".concat(prefixCls, "-inline-form-hidden") : '')
   }, /*#__PURE__*/_react.default.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    onFilter: onLightValueChange,
-    onSubmit: onFormSubmit
+    form: lightForm,
+    onChange: onLightFilter,
+    onSubmit: onLightFilter
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
@@ -351,20 +459,20 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/_react.default.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: form,
-    onFilter: onSimpleValueChange,
-    onSubmit: onFormSubmit
+    form: simpleForm,
+    onChange: onSimpleFilter,
+    onSubmit: onSimpleFilter
   })))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
   }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
     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 (_ref3) {
-    var key = _ref3.key,
-        label = _ref3.label,
-        value = _ref3.value,
-        type = _ref3.type;
+  }, /*#__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;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
       key: key,
       afterClose: function afterClose() {
@@ -381,8 +489,8 @@ 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), {}, {
-    form: form,
-    onSubmit: onFormSubmit
+    form: advancedForm,
+    onSubmit: onAdvancedFilter
   })))) : null);
 });
 exports.QueryFilter = QueryFilter;

package/lib/form/Filter/index2.scss

@@ -19,6 +19,9 @@ $query-filter: #{$teamix-pro-form}-query-filter;
     margin-right: 8px;
     margin-bottom: 8px;
   }
+  .#{$query-filter}-inline-form-hidden {
+    display: none;
+  }
   .#{$query-filter}-toggle {
     margin-bottom: 8px;
   }

package/lib/form/ProForm/index.js

@@ -29,6 +29,8 @@ var _useInitialRequest = _interopRequireDefault(require("./useInitialRequest"));
 
 var _validate = _interopRequireDefault(require("../locales/validate"));
 
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
+
 require("./index.scss");
 
 var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "className"];
@@ -105,12 +107,13 @@ 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)(function (form) {
+      (0, _core.onFormValuesChange)((0, _lodash.default)(function (form) {
         if (onChange) {
           onChange((0, _reactive.toJS)(form.values));
         }
-      });
+      }, 300));
     });
   }, [form, onChange]); // 配置表单默认值
 

package/lib/form/ProForm/useFieldRequest.js

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _react = require("@formily/react");
 
-var _utils = require("@teamix/utils");
-
 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; }
@@ -19,13 +17,7 @@ var _default = function _default() {
   var field = (0, _react.useField)();
 
   var refresh = function refresh() {
-    if (!(0, _utils.isPlainObj)(field.data)) {
-      field.data = {
-        refresh: {}
-      };
-    } else {
-      field.data.refresh = _objectSpread({}, field.data.refresh);
-    }
+    field.data.refresh = _objectSpread({}, field.data.refresh);
   };
 
   return {

package/lib/form/SchemaForm/index.js

@@ -266,7 +266,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data
+        data: data || {
+          placeholder: true
+        }
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
@@ -285,7 +287,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, []); // console.log(proFormSchema);
+  }, [schema]); // console.log(proFormSchema);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: proFormSchema,

package/lib/form/typing.d.ts

@@ -64,6 +64,10 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
+export interface FilterProps extends ProFormProps {
+    form: FormType;
+    onReset?: (payload?: any) => void;
+}
 export interface QueryFilterProps extends ProFormProps {
     /**
      * @deprecated triggerType已弃用
@@ -73,6 +77,7 @@ export interface QueryFilterProps extends ProFormProps {
     expand?: boolean;
     addonBefore?: ReactNode;
     addonAfter?: ReactNode;
+    onInit?: (values: any) => void;
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;
 }

package/lib/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.14";
+declare const version = "1.2.18";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -253,5 +253,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
 // export * from './sidebar';
-var version = '1.2.14';
+var version = '1.2.18';
 exports.version = version;

package/lib/nocode/configurators/ProTable.js

@@ -26,6 +26,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }