@zat-design/sisyphus-react 3.4.11-beta.4 → 3.4.11-beta.6

package/es/ProDrawerForm/index.js

@@ -20,6 +20,7 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     originalForm = props.form,
     proFormProps = props.proFormProps,
     onCancel = props.onCancel,
+    onCloseClean = props.onCloseClean,
     children = props.children;
   showType = mode || showType;
   isView = isView || disabled;
@@ -37,7 +38,7 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     _ProForm$useForm2 = _slicedToArray(_ProForm$useForm, 1),
     form = _ProForm$useForm2[0];
   var handleCancel = function handleCancel() {
-    form.resetFields();
+    onCloseClean && form.resetFields();
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
   // 暴露form实例给用户
@@ -70,6 +71,7 @@ ProDrawerForm.defaultProps = {
   showType: 'Drawer',
   size: 'middle',
   isConfirmClose: true,
+  onCloseClean: true,
   maskClosable: false,
   cancelText: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
   proFormProps: {}

package/es/ProDrawerForm/propsType.d.ts

@@ -92,5 +92,10 @@ export interface ProDrawerFormPropsType {
      * @name 抽屉的属性
      */
     drawerProps?: Omit<DrawerProps, 'visible'>;
+    /**
+     * 不支持 'visible'，请使用全局的 visible
+     * @name 关闭时弹框或者抽屉是否清空formValues
+     */
+    onCloseClean?: boolean;
     children?: React.ReactNode;
 }

package/es/ProEditTable/components/RenderField/index.js

@@ -286,6 +286,12 @@ var RenderField = function RenderField(_ref) {
     }
     return nextArgs;
   };
+  var debounceValidate = function debounceValidate() {
+    var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setTimeout(function () {
+      form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+    }, 100);
+  };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
   var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
@@ -366,10 +372,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat(_toConsumableArray(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              setTimeout(function () {
-                form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
-              }, 100);
+              debounceValidate(validateFieldKeys);
             }
+          } else {
+            debounceValidate();
           }
           setState({
             forceUpdate: {
@@ -432,8 +438,10 @@ var RenderField = function RenderField(_ref) {
                 return [].concat(_toConsumableArray(rowPath), [key]);
               });
               if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                form.validateFields(validateFieldKeys);
+                debounceValidate(validateFieldKeys);
               }
+            } else {
+              debounceValidate();
             }
             if (!isCell) {
               _context2.next = 20;

package/lib/ProDrawerForm/index.js

@@ -27,6 +27,7 @@ var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     originalForm = props.form,
     proFormProps = props.proFormProps,
     onCancel = props.onCancel,
+    onCloseClean = props.onCloseClean,
     children = props.children;
   showType = mode || showType;
   isView = isView || disabled;
@@ -44,7 +45,7 @@ var ProDrawerForm = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     _ProForm$useForm2 = (0, _slicedToArray2.default)(_ProForm$useForm, 1),
     form = _ProForm$useForm2[0];
   var handleCancel = function handleCancel() {
-    form.resetFields();
+    onCloseClean && form.resetFields();
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
   // 暴露form实例给用户
@@ -77,6 +78,7 @@ ProDrawerForm.defaultProps = {
   showType: 'Drawer',
   size: 'middle',
   isConfirmClose: true,
+  onCloseClean: true,
   maskClosable: false,
   cancelText: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProDrawerForm3 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
   proFormProps: {}

package/lib/ProDrawerForm/propsType.d.ts

@@ -92,5 +92,10 @@ export interface ProDrawerFormPropsType {
      * @name 抽屉的属性
      */
     drawerProps?: Omit<DrawerProps, 'visible'>;
+    /**
+     * 不支持 'visible'，请使用全局的 visible
+     * @name 关闭时弹框或者抽屉是否清空formValues
+     */
+    onCloseClean?: boolean;
     children?: React.ReactNode;
 }

package/lib/ProEditTable/components/RenderField/index.js

@@ -289,6 +289,12 @@ var RenderField = function RenderField(_ref) {
     }
     return nextArgs;
   };
+  var debounceValidate = function debounceValidate() {
+    var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setTimeout(function () {
+      form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
+    }, 100);
+  };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
   var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _len2,
@@ -369,10 +375,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              setTimeout(function () {
-                form.validateFields([name].concat((0, _toConsumableArray2.default)(validateFieldKeys)));
-              }, 100);
+              debounceValidate(validateFieldKeys);
             }
+          } else {
+            debounceValidate();
           }
           setState({
             forceUpdate: {
@@ -435,8 +441,10 @@ var RenderField = function RenderField(_ref) {
                 return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
               });
               if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-                form.validateFields(validateFieldKeys);
+                debounceValidate(validateFieldKeys);
               }
+            } else {
+              debounceValidate();
             }
             if (!isCell) {
               _context2.next = 20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.11-beta.4",
+  "version": "3.4.11-beta.6",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",