@sheinx/hooks 3.8.0-beta.4 → 3.8.0-beta.41

package/esm/components/use-form/use-form-schema/form-schema-builder.js

@@ -0,0 +1,367 @@
+var _excluded = ["required"];
+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 _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+export var SchemaBuilder = /*#__PURE__*/function () {
+  function SchemaBuilder(formName) {
+    _classCallCheck(this, SchemaBuilder);
+    _defineProperty(this, "schema", void 0);
+    this.schema = {
+      type: 'object',
+      title: formName,
+      properties: {}
+    };
+  }
+  _createClass(SchemaBuilder, [{
+    key: "updateSchema",
+    value: function updateSchema(_ref) {
+      var path = _ref.path,
+        meta = _ref.meta;
+      var pathSegments = this.parsePath(path);
+      if (!pathSegments) return;
+      this.mergeSchema(this.schema, pathSegments, meta);
+    }
+
+    /**
+     * 根据组件信息构建 schema meta
+     */
+  }, {
+    key: "buildSchemaFromComponent",
+    value: function buildSchemaFromComponent(params) {
+      var _componentElement$pro;
+      var componentElement = params.componentElement,
+        rules = params.rules,
+        label = params.label,
+        finalFieldId = params.finalFieldId,
+        separator = params.separator;
+      var fieldSchemaInfo = {
+        title: label
+      };
+      var data = componentElement.props.data;
+      var isRequired = rules === null || rules === void 0 ? void 0 : rules.some(function (rule) {
+        return rule.required;
+      });
+      fieldSchemaInfo.required = isRequired;
+      fieldSchemaInfo.description = '';
+      if (rules !== null && rules !== void 0 && rules.length) {
+        var messageRules = rules.filter(function (rule) {
+          return typeof rule.message === 'string';
+        });
+        if (messageRules.length) {
+          fieldSchemaInfo.description += "rules: ".concat(messageRules.map(function (rule) {
+            return rule.message;
+          }).join(', '), ";");
+        }
+      }
+      var itemType;
+      if (typeof componentElement.type === 'function') {
+        var componentName = componentElement.type.displayName || componentElement.type.name;
+        var format = componentElement.props.format || componentElement.props.keygen;
+        switch (componentName) {
+          case 'ShineoutInput':
+          case 'ShineoutEditableArea':
+            fieldSchemaInfo.type = 'string';
+            break;
+          case 'ShineoutInputNumber':
+            fieldSchemaInfo.type = 'number';
+            break;
+          case 'ShineoutInputPassword':
+            fieldSchemaInfo.type = 'string';
+            break;
+          case 'ShineoutTextarea':
+            fieldSchemaInfo.type = 'string';
+            break;
+          case 'ShineoutCascader':
+          case 'ShineoutSelect':
+          case 'ShineoutTreeSelect':
+            {
+              if (typeof componentElement.props.keygen !== 'boolean') {
+                if (typeof format === 'string') {
+                  var _data$;
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]) === 'object' ? _typeof(data === null || data === void 0 || (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$[format]) : _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                } else if (typeof format === 'function') {
+                  itemType = _typeof(format(data === null || data === void 0 ? void 0 : data[0]));
+                } else {
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                }
+              } else {
+                itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+              }
+              if (componentElement.props.multiple) {
+                fieldSchemaInfo.type = 'array';
+                fieldSchemaInfo.items = {
+                  type: itemType
+                };
+              } else {
+                fieldSchemaInfo.type = itemType;
+              }
+              if (itemType === 'object') {
+                // 对于对象类型，使用 oneOf 而不是 enum
+                if (componentElement.props.multiple) {
+                  fieldSchemaInfo.items.oneOf = componentElement.props.data.map(function (item) {
+                    return {
+                      const: item,
+                      title: (item === null || item === void 0 ? void 0 : item.title) || JSON.stringify(item)
+                    };
+                  });
+                } else {
+                  fieldSchemaInfo.oneOf = componentElement.props.data.map(function (item) {
+                    return {
+                      const: item,
+                      title: (item === null || item === void 0 ? void 0 : item.title) || JSON.stringify(item)
+                    };
+                  });
+                }
+              } else {
+                fieldSchemaInfo.enum = componentElement.props.data.map(function (item) {
+                  return (item === null || item === void 0 ? void 0 : item[format]) || item;
+                });
+              }
+              break;
+            }
+          case 'ShineoutDatePicker':
+            if (componentElement.props.range) {
+              if (finalFieldId !== null && finalFieldId !== void 0 && finalFieldId.includes(separator || '')) {
+                fieldSchemaInfo.type = 'string';
+                fieldSchemaInfo.format = 'date';
+              } else {
+                fieldSchemaInfo.type = 'array';
+                fieldSchemaInfo.items = {
+                  type: 'string',
+                  format: 'date'
+                };
+              }
+            } else {
+              fieldSchemaInfo.type = 'string';
+              fieldSchemaInfo.format = 'date';
+            }
+            fieldSchemaInfo.description += "\u9ED8\u8BA4\u65F6\u95F4\uFF1A".concat(((_componentElement$pro = componentElement.props.defaultTime) === null || _componentElement$pro === void 0 ? void 0 : _componentElement$pro.toString()) || '', "; \u683C\u5F0F\uFF1A").concat(componentElement.props.format || '', " ");
+            break;
+          case 'ShineoutCheckbox':
+          case 'ShineoutCheckboxGroup':
+            {
+              if (typeof componentElement.props.keygen !== 'boolean') {
+                if (typeof format === 'string') {
+                  var _data$2;
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]) === 'object' ? _typeof(data === null || data === void 0 || (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : _data$2[format]) : _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                } else if (typeof format === 'function') {
+                  itemType = _typeof(format(data === null || data === void 0 ? void 0 : data[0]));
+                } else {
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                }
+              } else {
+                itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+              }
+              fieldSchemaInfo.type = 'array';
+              fieldSchemaInfo.items = {
+                type: itemType
+              };
+
+              // ShineoutCheckboxGroup 有 data 时（多选的）
+              if (itemType === 'object') {
+                fieldSchemaInfo.items.oneOf = componentElement.props.data.map(function (item) {
+                  return {
+                    const: item,
+                    title: (item === null || item === void 0 ? void 0 : item.title) || JSON.stringify(item)
+                  };
+                });
+              } else {
+                fieldSchemaInfo.items.enum = componentElement.props.data.map(function (item) {
+                  return (item === null || item === void 0 ? void 0 : item[format]) || item;
+                });
+              }
+              break;
+            }
+          case 'ShineoutRadio':
+          case 'ShineoutRadioGroup':
+            {
+              if (typeof componentElement.props.keygen !== 'boolean') {
+                if (typeof format === 'string') {
+                  var _data$3;
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]) === 'object' ? _typeof(data === null || data === void 0 || (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : _data$3[format]) : _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                } else if (typeof format === 'function') {
+                  itemType = _typeof(format(data === null || data === void 0 ? void 0 : data[0]));
+                } else {
+                  itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+                }
+              } else {
+                itemType = _typeof(data === null || data === void 0 ? void 0 : data[0]);
+              }
+              fieldSchemaInfo.type = itemType;
+
+              // ShineoutRadioGroup 有 data 时（单选的）
+              if (itemType === 'object') {
+                fieldSchemaInfo.oneOf = componentElement.props.data.map(function (item) {
+                  return {
+                    const: item,
+                    title: (item === null || item === void 0 ? void 0 : item.title) || JSON.stringify(item)
+                  };
+                });
+              } else {
+                fieldSchemaInfo.enum = componentElement.props.data.map(function (item) {
+                  return (item === null || item === void 0 ? void 0 : item[format]) || item;
+                });
+              }
+              break;
+            }
+          case 'ShineoutSwitch':
+            fieldSchemaInfo.type = 'boolean';
+            break;
+          case 'ShineoutSlider':
+          case 'ShineoutRate':
+            fieldSchemaInfo.type = 'number';
+            break;
+          default:
+            if (Array.isArray(componentElement.props.value) && componentElement.props.value.length === 0) {
+              fieldSchemaInfo.type = 'array';
+              fieldSchemaInfo.items = {
+                type: 'string'
+              };
+            } else {
+              fieldSchemaInfo.type = _typeof(componentElement.props.value);
+            }
+            break;
+        }
+      }
+      return fieldSchemaInfo;
+    }
+
+    // 解析路径字符串，如 'a[0].b1' -> ['a', '[0]', 'b1']
+  }, {
+    key: "parsePath",
+    value: function parsePath(path) {
+      if (!path) return null;
+      var segments = [];
+      var current = '';
+      var inBracket = false;
+      for (var i = 0; i < path.length; i++) {
+        var char = path[i];
+        if (char === '[') {
+          if (current) {
+            segments.push(current);
+            current = '';
+          }
+          current = '[';
+          inBracket = true;
+        } else if (char === ']') {
+          current += ']';
+          segments.push(current);
+          current = '';
+          inBracket = false;
+        } else if (char === '.' && !inBracket) {
+          if (current) {
+            segments.push(current);
+            current = '';
+          }
+        } else {
+          current += char;
+        }
+      }
+      if (current) {
+        segments.push(current);
+      }
+      return segments;
+    }
+
+    // 递归合并 schema
+  }, {
+    key: "mergeSchema",
+    value: function mergeSchema(currentSchema, pathSegments, meta) {
+      if (pathSegments.length === 0) {
+        // 到达叶子节点，应用元数据
+        Object.assign(currentSchema, meta);
+        return;
+      }
+      var _pathSegments = _toArray(pathSegments),
+        currentSegment = _pathSegments[0],
+        remainingSegments = _pathSegments.slice(1);
+      if (currentSegment.startsWith('[') && currentSegment.endsWith(']')) {
+        // 处理数组索引，如 [0]
+        this.handleArraySegment(currentSchema, remainingSegments, meta);
+      } else {
+        // 处理对象属性
+        this.handleObjectProperty(currentSchema, currentSegment, remainingSegments, meta);
+      }
+    }
+  }, {
+    key: "handleArraySegment",
+    value: function handleArraySegment(currentSchema, remainingSegments, meta) {
+      // 当前节点应该是数组类型
+      if (!currentSchema.items) {
+        currentSchema.type = 'array';
+        currentSchema.items = {
+          type: 'object',
+          properties: {}
+        };
+      }
+      this.mergeSchema(currentSchema.items, remainingSegments, meta);
+    }
+  }, {
+    key: "handleObjectProperty",
+    value: function handleObjectProperty(currentSchema, propertyName, remainingSegments, meta) {
+      // 确保当前节点有 properties
+      if (!currentSchema.properties) {
+        currentSchema.properties = {};
+      }
+
+      // 如果属性不存在，创建它
+      if (!currentSchema.properties[propertyName]) {
+        currentSchema.properties[propertyName] = remainingSegments.length > 0 ? {
+          type: 'object'
+        } : {};
+      }
+      if (remainingSegments.length === 0) {
+        // 叶子节点，应用元数据并处理 required
+        var required = meta.required,
+          restMeta = _objectWithoutProperties(meta, _excluded);
+        Object.assign(currentSchema.properties[propertyName], restMeta);
+        if (typeof required === 'boolean') {
+          this.handleRequired(currentSchema, propertyName, required);
+        }
+      } else {
+        // 继续递归
+        this.mergeSchema(currentSchema.properties[propertyName], remainingSegments, meta);
+      }
+    }
+  }, {
+    key: "handleRequired",
+    value: function handleRequired(parentSchema, propertyName, isRequired) {
+      // 如果required是布尔值，转换为数组形式
+      if (typeof parentSchema.required === 'boolean') {
+        return;
+      }
+      if (!parentSchema.required) {
+        parentSchema.required = [];
+      }
+      var requiredIndex = parentSchema.required.indexOf(propertyName);
+      if (isRequired && requiredIndex === -1) {
+        parentSchema.required.push(propertyName);
+      } else if (!isRequired && requiredIndex !== -1) {
+        parentSchema.required.splice(requiredIndex, 1);
+      }
+
+      // 如果 required 数组为空，删除它
+      if (parentSchema.required.length === 0) {
+        delete parentSchema.required;
+      }
+    }
+  }, {
+    key: "getFormSchema",
+    value: function getFormSchema() {
+      return this.schema;
+    }
+  }]);
+  return SchemaBuilder;
+}();

package/esm/components/use-form/use-form-schema/index.d.ts

@@ -0,0 +1,3 @@
+export { SchemaBuilder } from "./form-schema-builder";
+export type { SchemaProperty } from "./form-schema-builder";
+//# sourceMappingURL=index.d.ts.map

package/esm/components/use-form/use-form-schema/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/esm/components/use-form/use-form-schema/index.js

@@ -0,0 +1,2 @@
+"use client";
+export { SchemaBuilder } from "./form-schema-builder";

package/esm/components/use-form/use-form.d.ts

@@ -1,3 +1,4 @@
+import { SchemaBuilder } from './use-form-schema/form-schema-builder';
 import { ProviderProps, UseFormProps, UseFormSlotProps, ValidateFnConfig } from './use-form.type';
 import { ObjectType } from '../../common/type';
 declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
@@ -24,7 +25,9 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
             insertError: (name: string, index: number, error?: Error) => void;
             spliceError: (name: string, index: number) => void;
             scrollToField: (name: string, scrollIntoViewOptions?: ScrollIntoViewOptions) => void;
+            getFormSchema: () => import("./use-form-schema/form-schema-builder").SchemaProperty | undefined;
         };
+        formSchema: SchemaBuilder | null;
     };
     formFunc: {
         setValue: (vals: {
@@ -44,6 +47,7 @@ declare const useForm: <T extends ObjectType>(props: UseFormProps<T>) => {
         insertError: (name: string, index: number, error?: Error) => void;
         spliceError: (name: string, index: number) => void;
         scrollToField: (name: string, scrollIntoViewOptions?: ScrollIntoViewOptions) => void;
+        getFormSchema: () => import("./use-form-schema/form-schema-builder").SchemaProperty | undefined;
     };
 };
 export default useForm;

package/esm/components/use-form/use-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAoSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BArPnB,MAAM;oCAgUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA3RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCA8VvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCAjJpD,MAAM,0BAAyB,qBAAqB;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BArPnB,MAAM;gCAgUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA3RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCA8VvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BAjJpD,MAAM,0BAAyB,qBAAqB;;CAqb9D,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["use-form.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AA2BtE,OAAO,EAEL,aAAa,EACb,YAAY,EACZ,gBAAgB,EAGhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI5D,QAAA,MAAM,OAAO;;;;;;;;;wBAqSC;gBAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;gBAAC,WAAW,CAAC,EAAE,OAAO,CAAA;aAAE;8BArPnB,MAAM;oCAoUD,OAAO,aAAoB,MAAM,IAAI;;6BAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;oCAdrB,MAAM,EAAE;sCA/RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;qCAkWvB,MAAM,WAAW,gBAAgB;gCAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;gCAKpC,MAAM,SAAS,MAAM;kCArJpD,MAAM,0BAAyB,qBAAqB;;;;;;;;oBA2EjD;YAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAA;SAAE;0BArPnB,MAAM;gCAoUD,OAAO,aAAoB,MAAM,IAAI;;yBAf3C,MAAM,KAAK,KAAK,GAAG,SAAS;;gCAdrB,MAAM,EAAE;kCA/RxC,MAAM,GAAG,MAAM,EAAE,WAAU,gBAAgB;iCAkWvB,MAAM,WAAW,gBAAgB;4BAhDzB,MAAM,SAAS,MAAM,UAAU,KAAK;4BAKpC,MAAM,SAAS,MAAM;8BArJpD,MAAM,0BAAyB,qBAAqB;;;CA4b9D,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/esm/components/use-form/use-form.js

@@ -14,7 +14,9 @@ import usePersistFn from "../../common/use-persist-fn";
 import { getDataAttributeName } from "../../utils/attribute";
 import { insertValue, spliceValue } from "../../utils/flat";
 import { usePrevious } from "../../common/use-default-value";
+import { SchemaBuilder } from "./use-form-schema/form-schema-builder";
 var globalKey = '__global__&&@@';
+var SUBMIT_TIMEOUT = 10;
 import { current, produce } from "../../utils/immer";
 import { deepGet, deepRemove, deepSet, docScroll, extractEventHandlers, isArray, isObject, shallowEqual, wrapFormError, deepClone, getAllKeyPaths, getCompleteFieldKeys, devUseWarning, getFieldId, getClosestScrollContainer } from "../../utils";
 var emptyObj = {};
@@ -61,7 +63,8 @@ var useForm = function useForm(props) {
       resetTime: 0,
       mounted: false,
       unmounted: false,
-      removeLock: false
+      removeLock: false,
+      schema: props.name ? new SchemaBuilder(props.name) : null
     }),
     context = _React$useRef.current;
   var getValue = usePersistFn(function (name) {
@@ -220,13 +223,13 @@ var useForm = function useForm(props) {
           docScroll.top -= scrollToError;
         }
       }
-    });
+    }, SUBMIT_TIMEOUT + 10);
   };
   var onChange = usePersistFn(function (change) {
     var _props$onChange;
     var newValue = typeof change === 'function' ? produce(context.value, change) : change;
     context.value = newValue;
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, context.value);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newValue);
   });
   var scrollToField = usePersistFn(function (name) {
     var _document;
@@ -329,6 +332,10 @@ var useForm = function useForm(props) {
     Object.keys(context.defaultValues).forEach(function (df) {
       var latestDefaultValue = getValue(df);
       if (latestDefaultValue === undefined) {
+        // todo: Form组件传了clearToUndefined时，加入这部分判断？
+        // if(context.value.hasOwnProperty(df) && clearToUndefined){
+        //   return;
+        // }
         setValue(_defineProperty({}, df, context.defaultValues[df]), {
           validate: false
         });
@@ -421,7 +428,7 @@ var useForm = function useForm(props) {
         var _other$onSubmit;
         submit();
         other === null || other === void 0 || (_other$onSubmit = other.onSubmit) === null || _other$onSubmit === void 0 || _other$onSubmit.call(other, e);
-      }, 10);
+      }, SUBMIT_TIMEOUT);
     };
   };
   var validateFieldset = function validateFieldset(name, config) {
@@ -514,6 +521,9 @@ var useForm = function useForm(props) {
         context.names.delete(n);
         delete context.defaultValues[n];
       }
+      if (context.errors[n]) {
+        delete context.errors[n];
+      }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
       if (!finalReserveAble && !context.removeLock) {
         addRemove(n);
@@ -567,7 +577,11 @@ var useForm = function useForm(props) {
     validateFieldset: validateFieldset,
     insertError: insertError,
     spliceError: spliceError,
-    scrollToField: scrollToField
+    scrollToField: scrollToField,
+    getFormSchema: function getFormSchema() {
+      var _context$schema;
+      return (_context$schema = context.schema) === null || _context$schema === void 0 ? void 0 : _context$schema.getFormSchema();
+    }
   });
   var formConfig = React.useMemo(function () {
     return {
@@ -605,11 +619,6 @@ var useForm = function useForm(props) {
   // 默认值更新
   React.useEffect(function () {
     context.removeLock = false;
-    // 内部 onChange 改的 value, 不需要更新
-    if (props.value === context.value) {
-      if (!isControl) update();
-      return;
-    }
     if (initValidate && !context.resetTime) {
       var keys = Object.keys(context.validateMap).filter(function (key) {
         var oldValue = deepGet(preValue || emptyObj, key);
@@ -619,6 +628,7 @@ var useForm = function useForm(props) {
       validateFields(keys).catch(function () {});
     }
     update();
+    if (!isControl) return;
     // 默认值上位时会提前触发外部的onChange, 导致外部的多次setFormValue不能合并后生效的问题(ReactDOM.render方式渲染)
     setTimeout(updateDefaultValue);
     context.resetTime = 0;
@@ -640,7 +650,8 @@ var useForm = function useForm(props) {
     ProviderProps: {
       formValue: formValue,
       formConfig: formConfig,
-      formFunc: formFunc
+      formFunc: formFunc,
+      formSchema: context.schema
     },
     formFunc: formFunc
   };