@zat-design/sisyphus-react 3.6.0-beta.7 → 3.6.0-beta.9

package/es/ProEditTable/utils/config.js

@@ -204,9 +204,13 @@ export var actions = {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
-            _context2.next = 14;
+            if (!virtualKey) {
+              _context2.next = 15;
+              break;
+            }
+            _context2.next = 15;
             return form.validateFields([name]);
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }

package/es/ProForm/components/render/RenderFields.js

@@ -186,12 +186,6 @@ var RenderFields = function RenderFields(props) {
       globalControl: globalControl,
       formDisabled: formDisabled
     };
-    if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
-      setTimeout(function () {
-        form.resetFields([column === null || column === void 0 ? void 0 : column.name]);
-      }, 200);
-      return null;
-    }
     return _jsx(FieldProvider, {
       value: otherProps,
       children: _jsx(Render, {

package/es/ProForm/utils/useForm.d.ts

@@ -1,14 +1,15 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
-type ModifiedFormInstance<T> = Omit<FormInstance<T>, 'setFieldValue'> & {
+type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */
     setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
+    _init?: boolean;
 };
 interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
 }
-export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
 export {};

package/es/ProForm/utils/useForm.js

@@ -8,11 +8,17 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { filterInternalFields } from './index';
 import { handleScrollToError } from '../../ProEditTable/utils/tools';
 export var useForm = function useForm(originForm, options) {
-  var _ref = options || {},
+  // 如果没有form实例可以直接把options放在第一个参数位置
+  // @ts-ignore
+  var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _options =
+  // @ts-ignore
+  options || originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize;
-  var _Form$useForm = _Form.useForm(originForm),
+  var _Form$useForm = _Form.useForm(_originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,

package/lib/ProEditTable/utils/config.js

@@ -210,9 +210,13 @@ var actions = exports.actions = {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
-            _context2.next = 14;
+            if (!virtualKey) {
+              _context2.next = 15;
+              break;
+            }
+            _context2.next = 15;
             return form.validateFields([name]);
-          case 14:
+          case 15:
           case "end":
             return _context2.stop();
         }

package/lib/ProForm/components/render/RenderFields.js

@@ -194,12 +194,6 @@ var RenderFields = function RenderFields(props) {
       globalControl: globalControl,
       formDisabled: formDisabled
     };
-    if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
-      setTimeout(function () {
-        form.resetFields([column === null || column === void 0 ? void 0 : column.name]);
-      }, 200);
-      return null;
-    }
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,
       children: (0, _jsxRuntime.jsx)(_Render.default, {

package/lib/ProForm/utils/useForm.d.ts

@@ -1,14 +1,15 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
-type ModifiedFormInstance<T> = Omit<FormInstance<T>, 'setFieldValue'> & {
+type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */
     setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
+    _init?: boolean;
 };
 interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
 }
-export declare const useForm: <T>(originForm: ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
 export {};

package/lib/ProForm/utils/useForm.js

@@ -14,11 +14,17 @@ var _antd = require("antd");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
 var useForm = exports.useForm = function useForm(originForm, options) {
-  var _ref = options || {},
+  // 如果没有form实例可以直接把options放在第一个参数位置
+  // @ts-ignore
+  var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _options =
+  // @ts-ignore
+  options || originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize;
-  var _Form$useForm = _antd.Form.useForm(originForm),
+  var _Form$useForm = _antd.Form.useForm(_originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,

package/package.json

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