react-antd-xform 1.0.2 → 1.0.4

package/dist/form/common-utils.d.ts

@@ -1,3 +1,5 @@
+import { Watchable } from './type';
+import { FormModel } from './model';
 export declare function keyToValueShape(key: string): "array" | "object";
 export declare function splitToPath(name: number | string): string[];
 /** 合并两个值，如果第一个不为 undefined，则使用第一个值，否则使用第二个值 */
@@ -13,3 +15,4 @@ export declare const range: (n: number) => number[];
 export declare function pick<T extends object, K extends string>(obj: T, keys: K[]): {
     [P in K]?: P extends keyof T ? T[P] : never;
 };
+export declare function convertWatchableToExpression(watch: Watchable, model: FormModel<any>): () => any;

package/dist/form/common-utils.js

@@ -1,5 +1,8 @@
 import { useState } from "react";
 import * as mobx from "mobx";
+import { toJS } from "mobx";
+import { Field, FormModel } from "./model.js";
+import { AsyncValue } from "./helpers/AsyncValue.js";
 function isNumericKey(key) {
   return String(Number.parseInt(key)) === key;
 }
@@ -86,9 +89,39 @@ function pick(obj, keys) {
   });
   return result;
 }
+function convertWatchableToExpression(watch, model) {
+  if (typeof watch === "string") {
+    return () => toJS(model.getValue(watch));
+  } else if (typeof watch === "function") {
+    return watch;
+  } else if (watch instanceof Field) {
+    return () => watch.value;
+  } else if (watch instanceof FormModel) {
+    return () => toJS(watch.values);
+  } else if (watch instanceof AsyncValue) {
+    return () => watch.current;
+  } else if (Array.isArray(watch)) {
+    return () => {
+      return watch.map((t) => {
+        if (typeof t === "string") {
+          return toJS(model.getValue(t));
+        } else if (t instanceof AsyncValue) {
+          return t.current;
+        } else if (t instanceof Field) {
+          return t.value;
+        } else if (t instanceof FormModel) {
+          return toJS(t.values);
+        }
+      });
+    };
+  } else {
+    console.warn("[xform] 无法识别的 watch 参数", watch);
+  }
+}
 export {
   asCSSLength,
   composeValue,
+  convertWatchableToExpression,
   isFalsyOrEmptyArray,
   keyToValueShape,
   observableGetIn,

package/dist/form/extend/form-array.d.ts

@@ -0,0 +1,12 @@
+import { FormModel } from '../model';
+import { FormArrayLayoutInput } from '../type';
+export interface FormArrayProps<T> {
+    use?: boolean;
+    arrayModel?: FormModel<T[]>;
+    name?: string;
+    layout?(input: FormArrayLayoutInput): React.ReactElement;
+    children?: React.ReactNode | ((index: number, model: FormModel<T>) => React.ReactNode);
+}
+export declare const FormArray: (<T extends unknown>({ name, children, layout, arrayModel: arrayModelProp, use, }: FormArrayProps<T>) => import("react/jsx-runtime").JSX.Element) & {
+    displayName: string;
+};

package/dist/form/extend/form-array.js

@@ -0,0 +1,33 @@
+import { j as jsxRuntimeExports } from "../../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
+import "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
+import { useModel, ModelProvider } from "../context/modelContext.js";
+import { range } from "../common-utils.js";
+import { arrayHelpers } from "../array-helper.js";
+import { observer } from "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+const defaultArrayLayout = ({ arrayModel, itemContent, itemCount }) => {
+  return range(itemCount).map(
+    (itemIndex) => arrayHelpers.renderArrayItem(arrayModel, itemIndex, itemContent)
+  );
+};
+const FormArray = observer(
+  ({
+    name,
+    children,
+    layout,
+    arrayModel: arrayModelProp,
+    use
+  }) => {
+    var _a;
+    const parent = useModel();
+    if (use === false) {
+      return null;
+    }
+    const arrayModel = arrayModelProp ?? (name === "&" ? parent : parent.getSubModel(name));
+    const itemCount = ((_a = arrayModel.values) == null ? void 0 : _a.length) ?? 0;
+    const itemContent = typeof children === "function" ? children : () => children;
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(ModelProvider, { value: arrayModel, children: (layout ?? defaultArrayLayout)({ arrayModel, itemCount, itemContent }) });
+  }
+);
+export {
+  FormArray
+};

package/dist/form/extend/form-check.d.ts

@@ -0,0 +1,12 @@
+import { Check } from '../model';
+import { CheckConfig, Watchable } from '../type';
+export interface FormCheckProps<T = any> extends CheckConfig<T> {
+    name?: string;
+    check?: Check<T>;
+    watch?: Watchable;
+    renderError?: boolean | ((error: any) => React.ReactNode);
+    deps?: unknown[];
+}
+export declare const FormCheck: (<T = any>({ name, check: checkProp, validate, watch, validateOnMount, renderError, deps, }: FormCheckProps<T>) => any) & {
+    displayName: string;
+};

package/dist/form/extend/form-check.js

@@ -0,0 +1,44 @@
+import { useLayoutEffect, useEffect } from "react";
+import { reaction } from "mobx";
+import "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
+import { useModel } from "../context/modelContext.js";
+import { useFormEnv } from "../context/formEnvContext.js";
+import { composeValue, convertWatchableToExpression } from "../common-utils.js";
+import { observer } from "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+const FormCheck = observer(function FormCheck2({
+  name,
+  check: checkProp,
+  validate,
+  watch = [],
+  validateOnMount,
+  renderError,
+  deps = []
+}) {
+  const formEnv = useFormEnv();
+  const model = useModel();
+  const check = composeValue(checkProp, model.getCheck(name));
+  const checkConfig = {
+    validateOnMount: validateOnMount ?? formEnv.validateOnMount,
+    validate
+  };
+  useLayoutEffect(() => check._track(checkConfig));
+  useEffect(() => {
+    return reaction(
+      convertWatchableToExpression(watch, model),
+      () => {
+        check.validate();
+      },
+      { fireImmediately: checkConfig.validateOnMount }
+    );
+  }, [check, model, ...deps]);
+  if (renderError === true) {
+    return check.error;
+  } else if (typeof renderError === "function") {
+    return renderError(check.error);
+  } else {
+    return null;
+  }
+});
+export {
+  FormCheck
+};

package/dist/form/extend/form-effect.d.ts

@@ -0,0 +1,17 @@
+import { IEqualsComparer } from 'mobx';
+import { Watchable } from '../type';
+import { FormModel } from '../model';
+export interface FormEffectProps<T = any> {
+    watch: Watchable<T>;
+    effect(value: T, detail: {
+        prev: T;
+        next: T;
+        model: FormModel<any>;
+    }): void;
+    fireImmediately?: boolean;
+    deps?: unknown[];
+    equals?: IEqualsComparer<T>;
+}
+export declare const FormEffect: (<T = any>({ watch, effect, fireImmediately, deps, equals, }: FormEffectProps<T>) => React.ReactElement) & {
+    displayName: string;
+};

package/dist/form/extend/form-effect.js

@@ -0,0 +1,32 @@
+import { useRef, useEffect } from "react";
+import "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
+import { reaction } from "mobx";
+import { useModel } from "../context/modelContext.js";
+import { convertWatchableToExpression } from "../common-utils.js";
+import { observer } from "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+const FormEffect = observer(function FormEffect2({
+  watch,
+  effect,
+  fireImmediately,
+  deps = [],
+  equals
+}) {
+  const model = useModel();
+  const effectRef = useRef(effect);
+  useEffect(() => {
+    effectRef.current = effect;
+  });
+  useEffect(() => {
+    return reaction(
+      convertWatchableToExpression(watch, model),
+      (next, prev) => {
+        effectRef.current(next, { model, prev, next });
+      },
+      { fireImmediately, equals }
+    );
+  }, deps);
+  return null;
+});
+export {
+  FormEffect
+};

package/dist/form/{layout.d.ts → extend/form-layout.d.ts}

@@ -1,4 +1,4 @@
-import { FormLayoutProps, FormItemGroupProps } from './type';
+import { FormLayoutProps, FormItemGroupProps } from '../type';
 export declare function FormLayout({ children, className, style, labelPosition, labelWidth, formItemGap, controlWidth, defaultLabelTopPosition, inlineError, containerProps, }: FormLayoutProps): import("react/jsx-runtime").JSX.Element;
 /** @deprecated 请使用 Form.ItemView 代替 ItemGroup */
 export declare const FormItemGroup: ({ label, asterisk, tip, children, labelWidth, controlWidth, className, style, inline, }: FormItemGroupProps) => import("react/jsx-runtime").JSX.Element;

package/dist/form/{layout.js → extend/form-layout.js}

@@ -1,7 +1,7 @@
-import { j as jsxRuntimeExports } from "../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
-import cx from "../node_modules/.pnpm/classnames@2.5.1/node_modules/classnames/index.js";
+import { j as jsxRuntimeExports } from "../../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
+import cx from "../../node_modules/.pnpm/classnames@2.5.1/node_modules/classnames/index.js";
 import styled from "styled-components";
-import { asCSSLength } from "./common-utils.js";
+import { asCSSLength } from "../common-utils.js";
 const FormLayoutContainer = styled.div`
   --label-width: auto;
   --control-width: auto;

package/dist/form/extend/form-model-consumer.d.ts

@@ -0,0 +1,4 @@
+import { FormModel } from '../model';
+export declare const FormModelConsumer: (({ children }: React.ConsumerProps<FormModel<any>>) => React.ReactElement) & {
+    displayName: string;
+};

package/dist/form/extend/form-model-consumer.js

@@ -0,0 +1,10 @@
+import "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
+import { useModel } from "../context/modelContext.js";
+import { observer } from "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+const FormModelConsumer = observer(({ children }) => {
+  const model = useModel();
+  return children(model);
+});
+export {
+  FormModelConsumer
+};

package/dist/form/extend/form-object.d.ts

@@ -0,0 +1,7 @@
+export declare const FormObject: (({ name, children, use }: {
+    children: React.ReactNode;
+    name: string;
+    use?: boolean;
+}) => import("react/jsx-runtime").JSX.Element) & {
+    displayName: string;
+};

package/dist/form/extend/form-object.js

@@ -0,0 +1,17 @@
+import { j as jsxRuntimeExports } from "../../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
+import "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
+import { useModel, ModelProvider } from "../context/modelContext.js";
+import { observer } from "../../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+const FormObject = observer(
+  ({ name, children, use }) => {
+    const parent = useModel();
+    if (use === false) {
+      return null;
+    }
+    const model = name === "&" ? parent : parent.getSubModel(name);
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(ModelProvider, { value: model, children });
+  }
+);
+export {
+  FormObject
+};

package/dist/form/extend/form-reset.d.ts

@@ -0,0 +1,9 @@
+import { ComponentType } from 'react';
+type FormSubmitProps<T extends object = {}> = {
+    /** 必须传入的按钮组件 */
+    ButtonComponent: ComponentType<T>;
+    /** 按钮内容 */
+    children: React.ReactNode;
+} & T;
+export declare function FormReset<T extends object = {}>({ ButtonComponent, children, ...props }: FormSubmitProps<T>): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/form/extend/form-reset.js

@@ -0,0 +1,25 @@
+import { j as jsxRuntimeExports } from "../../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
+import { action } from "mobx";
+import { modelUtils } from "../model-utils.js";
+import { useModel } from "../context/modelContext.js";
+import { useFormEnv } from "../context/formEnvContext.js";
+function FormReset({
+  ButtonComponent,
+  children = "提交",
+  ...props
+}) {
+  const model = useModel();
+  const formEnv = useFormEnv();
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(
+    ButtonComponent,
+    {
+      ...props,
+      onClick: action(() => modelUtils.reset(model, formEnv)),
+      children,
+      ...props
+    }
+  );
+}
+export {
+  FormReset
+};

package/dist/form/extend/form-submit.d.ts

@@ -0,0 +1,9 @@
+import { ComponentType } from 'react';
+type FormSubmitProps<T extends object = {}> = {
+    /** 必须传入的按钮组件 */
+    ButtonComponent: ComponentType<T>;
+    /** 按钮内容 */
+    children: React.ReactNode;
+} & T;
+export declare function FormSubmit<T extends object = {}>({ ButtonComponent, children, ...props }: FormSubmitProps<T>): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/form/extend/form-submit.js

@@ -0,0 +1,28 @@
+import { j as jsxRuntimeExports } from "../../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
+import { modelUtils } from "../model-utils.js";
+import { useModel } from "../context/modelContext.js";
+import { useFormEnv } from "../context/formEnvContext.js";
+function FormSubmit({
+  ButtonComponent,
+  children = "提交",
+  ...props
+}) {
+  const model = useModel();
+  const { onSubmit, onError } = useFormEnv();
+  const submitOptions = {
+    onSubmit,
+    onError
+  };
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(
+    ButtonComponent,
+    {
+      ...props,
+      onClick: () => modelUtils.submit(model, submitOptions),
+      children,
+      ...props
+    }
+  );
+}
+export {
+  FormSubmit
+};

package/dist/form/form-item.js

@@ -1,11 +1,11 @@
 import { j as jsxRuntimeExports } from "../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
 import require$$0, { useLayoutEffect, useEffect } from "react";
 import cx from "../node_modules/.pnpm/classnames@2.5.1/node_modules/classnames/index.js";
-import { isFalsyOrEmptyArray, composeValue, pick, asCSSLength } from "./common-utils.js";
 import "../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
 import stringifyObject from "../node_modules/.pnpm/stringify-object@5.0.0/node_modules/stringify-object/index.js";
 import { toJS, reaction, runInAction } from "mobx";
 import { FieldType } from "./enum.js";
+import { isFalsyOrEmptyArray, composeValue, pick, asCSSLength } from "./common-utils.js";
 import { Field } from "./model.js";
 import { useModel } from "./context/modelContext.js";
 import { useFormEnv } from "./context/formEnvContext.js";

package/dist/form/index.d.ts

@@ -1,15 +1,18 @@
 import { default as React } from 'react';
+import { FormProps } from './type';
 import { FormModel } from './model';
-import { FormProps, FormArrayProps } from './type';
-import { FormSubmit } from '../form-ui/default-button';
+import { FormItemView } from './form-item';
+import { FormLayout } from './extend/form-layout';
+import { FormSubmit } from './extend/form-submit';
 export declare function Form({ model: modelProp, defaultValue, children, className, style, layout, containerProps, htmlIdPrefix: htmlIdPrefixProp, ...restEnvProps }: FormProps): import("react/jsx-runtime").JSX.Element;
 export declare namespace Form {
-    var Submit: typeof FormSubmit;
-    var ModelConsumer: (({ children }: React.ConsumerProps<FormModel<any>>) => React.ReactElement) & {
+    var Array: (<T extends unknown>({ name, children, layout, arrayModel: arrayModelProp, use, }: import("./extend/form-array").FormArrayProps<T>) => import("react/jsx-runtime").JSX.Element) & {
         displayName: string;
     };
-    var ModelProvider: React.Provider<FormModel<any>>;
-    var Array: (<T extends unknown>({ name, children, layout, arrayModel: arrayModelProp, use, }: FormArrayProps<T>) => import("react/jsx-runtime").JSX.Element) & {
+    var Check: (<T = any>({ name, check: checkProp, validate, watch, validateOnMount, renderError, deps, }: import("./extend/form-check").FormCheckProps<T>) => any) & {
+        displayName: string;
+    };
+    var Effect: (<T = any>({ watch, effect, fireImmediately, deps, equals, }: import("./extend/form-effect").FormEffectProps<T>) => React.ReactElement) & {
         displayName: string;
     };
     var Object: (({ name, children, use }: {
@@ -19,4 +22,12 @@ export declare namespace Form {
     }) => import("react/jsx-runtime").JSX.Element) & {
         displayName: string;
     };
+    var Submit: typeof FormSubmit;
+    var Layout: typeof FormLayout;
+    var ItemView: typeof FormItemView;
+    var ModelProvider: React.Provider<FormModel<any>>;
+    var ModelConsumer: (({ children }: React.ConsumerProps<FormModel<any>>) => React.ReactElement) & {
+        displayName: string;
+    };
+    var FormReset: typeof import("./extend/form-reset").FormReset;
 }

package/dist/form/index.js

@@ -1,14 +1,18 @@
 import { j as jsxRuntimeExports } from "../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
-import "../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/index.js";
 import { useState } from "react";
 import { FormModel } from "./model.js";
-import { useHtmlIdPrefix, composeValue, range } from "./common-utils.js";
+import { FormItemView } from "./form-item.js";
+import { ModelProvider } from "./context/modelContext.js";
 import { FormEnvProvider } from "./context/formEnvContext.js";
-import { ModelProvider, useModel } from "./context/modelContext.js";
-import { FormLayout } from "./layout.js";
-import { FormSubmit } from "../form-ui/default-button.js";
-import { arrayHelpers } from "./array-helper.js";
-import { observer } from "../node_modules/.pnpm/mobx-react-lite@4.1.0_mobx@6.13.7_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/mobx-react-lite/es/observer.js";
+import { useHtmlIdPrefix, composeValue } from "./common-utils.js";
+import { FormArray } from "./extend/form-array.js";
+import { FormCheck } from "./extend/form-check.js";
+import { FormReset } from "./extend/form-reset.js";
+import { FormLayout } from "./extend/form-layout.js";
+import { FormSubmit } from "./extend/form-submit.js";
+import { FormEffect } from "./extend/form-effect.js";
+import { FormObject } from "./extend/form-object.js";
+import { FormModelConsumer } from "./extend/form-model-consumer.js";
 function Form({
   model: modelProp,
   defaultValue,
@@ -25,49 +29,16 @@ function Form({
   const htmlIdPrefix = useHtmlIdPrefix(htmlIdPrefixProp);
   return /* @__PURE__ */ jsxRuntimeExports.jsx(FormEnvProvider, { htmlIdPrefix, ...restEnvProps, children: /* @__PURE__ */ jsxRuntimeExports.jsx(ModelProvider, { value: model, children: /* @__PURE__ */ jsxRuntimeExports.jsx(FormLayout, { style, className, containerProps, ...layout, children }) }) });
 }
-const FormModelConsumer = observer(({ children }) => {
-  const model = useModel();
-  return children(model);
-});
-const defaultArrayLayout = ({ arrayModel, itemContent, itemCount }) => {
-  return range(itemCount).map(
-    (itemIndex) => arrayHelpers.renderArrayItem(arrayModel, itemIndex, itemContent)
-  );
-};
-const FormArray = observer(
-  ({
-    name,
-    children,
-    layout,
-    arrayModel: arrayModelProp,
-    use
-  }) => {
-    var _a;
-    const parent = useModel();
-    if (use === false) {
-      return null;
-    }
-    const arrayModel = arrayModelProp ?? (name === "&" ? parent : parent.getSubModel(name));
-    const itemCount = ((_a = arrayModel.values) == null ? void 0 : _a.length) ?? 0;
-    const itemContent = typeof children === "function" ? children : () => children;
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(ModelProvider, { value: arrayModel, children: (layout ?? defaultArrayLayout)({ arrayModel, itemCount, itemContent }) });
-  }
-);
-const FormObject = observer(
-  ({ name, children, use }) => {
-    const parent = useModel();
-    if (use === false) {
-      return null;
-    }
-    const model = name === "&" ? parent : parent.getSubModel(name);
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(ModelProvider, { value: model, children });
-  }
-);
-Form.Submit = FormSubmit;
-Form.ModelConsumer = FormModelConsumer;
-Form.ModelProvider = ModelProvider;
 Form.Array = FormArray;
+Form.Check = FormCheck;
+Form.Effect = FormEffect;
 Form.Object = FormObject;
+Form.Submit = FormSubmit;
+Form.Layout = FormLayout;
+Form.ItemView = FormItemView;
+Form.ModelProvider = ModelProvider;
+Form.ModelConsumer = FormModelConsumer;
+Form.FormReset = FormReset;
 export {
   Form
 };

package/dist/form/type.d.ts

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Field, FormModel } from './model';
 import { FieldType, ModelType } from './enum';
+import { AsyncValue } from './helpers/AsyncValue';
 type valueOf<T> = T[keyof T];
 export type XName<D> = 0 extends D & 1 ? any : D extends (infer U)[] ? number | `${number}` | `${number}.${XName<U>}` : D extends object ? valueOf<{
     [K in keyof D & string]: K | `${K}.${XName<D[K]>}`;
@@ -279,11 +280,5 @@ export interface FormArrayLayoutInput {
     /** 获取每个数组元素对应的子表单 */
     itemContent(itemIndex: number, itemModel: FormModel<any>): React.ReactNode;
 }
-export interface FormArrayProps<T> {
-    use?: boolean;
-    arrayModel?: FormModel<T[]>;
-    name?: string;
-    layout?(input: FormArrayLayoutInput): React.ReactElement;
-    children?: React.ReactNode | ((index: number, model: FormModel<T>) => React.ReactNode);
-}
+export type Watchable<T = any> = (() => T) | string | Field<T> | FormModel<T> | AsyncValue<T> | Array<string | Field | AsyncValue<any> | FormModel<any>>;
 export {};

package/dist/index.d.ts

@@ -4,6 +4,6 @@ import { FormEnvProvider, useFormEnv } from './form/context/formEnvContext';
 import { FormItem, createFormItem } from './form/form-item';
 import { FormModel } from './form/model';
 import { arrayHelpers } from './form/array-helper';
-import { AsyncValue } from './helpers/AsyncValue';
+import { AsyncValue } from './form/helpers/AsyncValue';
 import { modelUtils } from './form/model-utils';
 export { Form, FormEnvProvider, useFormEnv, useModel, FormItem, createFormItem, FormModel, arrayHelpers, AsyncValue, modelUtils, };

package/dist/index.js

@@ -4,7 +4,7 @@ import { FormEnvProvider, useFormEnv } from "./form/context/formEnvContext.js";
 import { FormItem, createFormItem } from "./form/form-item.js";
 import { FormModel } from "./form/model.js";
 import { arrayHelpers } from "./form/array-helper.js";
-import { AsyncValue } from "./helpers/AsyncValue.js";
+import { AsyncValue } from "./form/helpers/AsyncValue.js";
 import { modelUtils } from "./form/model-utils.js";
 export {
   AsyncValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-antd-xform",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "基于mobx的form解决方案",
   "type": "module",
   "main": "./dist/index.js",
@@ -10,7 +10,13 @@
   "files": [
     "dist"
   ],
-  "keywords": [],
+  "keywords": [
+    "form",
+    "antd",
+    "react",
+    "mobx",
+    "react-antd-xform"
+  ],
   "author": "",
   "license": "MIT",
   "dependencies": {

package/dist/form-ui/default-button.d.ts

@@ -1,3 +0,0 @@
-import { SubmitExtraOptions } from '../form/type';
-import { ButtonProps } from './type';
-export declare function FormSubmit({ type, children, valueFilter, mergeDefaultValue, animateErrorFields, scrollToFirstError, ...props }: ButtonProps & SubmitExtraOptions): import("react/jsx-runtime").JSX.Element;

package/dist/form-ui/default-button.js

@@ -1,39 +0,0 @@
-import { j as jsxRuntimeExports } from "../node_modules/.pnpm/react@18.3.1/node_modules/react/jsx-runtime.js";
-import cx from "../node_modules/.pnpm/classnames@2.5.1/node_modules/classnames/index.js";
-import { Button } from "antd";
-import { modelUtils } from "../form/model-utils.js";
-import { useModel } from "../form/context/modelContext.js";
-import { useFormEnv } from "../form/context/formEnvContext.js";
-function FormSubmit({
-  type = "primary",
-  children = "提交",
-  valueFilter,
-  mergeDefaultValue,
-  animateErrorFields,
-  scrollToFirstError,
-  ...props
-}) {
-  const model = useModel();
-  const { onSubmit, onError } = useFormEnv();
-  const submitOptions = {
-    onSubmit,
-    onError,
-    valueFilter,
-    mergeDefaultValue,
-    animateErrorFields,
-    scrollToFirstError
-  };
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(
-    Button,
-    {
-      onClick: () => modelUtils.submit(model, submitOptions),
-      type,
-      children,
-      ...props,
-      className: cx("form-submit-button", props.className)
-    }
-  );
-}
-export {
-  FormSubmit
-};