@dovetail-v2/refine 0.4.2-alpha.1 → 0.4.2-alpha.2

package/dist/components/Form/YamlForm.d.ts

@@ -24,8 +24,6 @@ export interface YamlFormProps<Model extends ResourceModel = ResourceModel> {
     transformInitValues?: (values: Record<string, unknown>) => Record<string, unknown>;
     transformApplyValues?: (values: Unstructured) => Unstructured;
     beforeSubmit?: (values: Unstructured, setErrors: (errors: string[]) => void) => Promise<Unstructured>;
-    /** 自定义提交函数，存在时替代 refine core 的 onFinish */
-    onSubmit?: (values: Record<string, unknown>) => Promise<unknown>;
     onSaveButtonPropsChange?: (saveButtonProps: {
         disabled?: boolean;
         onClick: () => void;

package/dist/components/Form/useReactHookForm.d.ts

@@ -34,7 +34,5 @@ export type UseFormProps<TQueryFnData extends BaseRecord = BaseRecord, TError ex
     onBeforeSubmitError?: (errors: string[]) => void;
     onSubmitStart?: () => void;
     onSubmitAbort?: () => void;
-    /** 自定义提交函数，存在时替代 refine core 的 onFinish */
-    onSubmit?: (values: Record<string, unknown>) => Promise<unknown>;
 } & UseHookFormProps<TVariables, TContext>;
-export declare const useForm: <TQueryFnData extends BaseRecord = BaseRecord, TError extends HttpError = HttpError, TVariables extends FieldValues = FieldValues, TContext extends object = object, TData extends BaseRecord = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError>({ refineCoreProps, warnWhenUnsavedChanges: warnWhenUnsavedChangesProp, disableServerSideValidation: disableServerSideValidationProp, transformApplyValues, transformInitValues, beforeSubmit, onBeforeSubmitError, onSubmitStart, onSubmitAbort, onSubmit, ...rest }?: UseFormProps<TQueryFnData, TError, TVariables, TContext, TData, TResponse, TResponseError>) => UseFormReturnType<TQueryFnData, TError, TVariables, TContext, TData, TResponse, TResponseError>;
+export declare const useForm: <TQueryFnData extends BaseRecord = BaseRecord, TError extends HttpError = HttpError, TVariables extends FieldValues = FieldValues, TContext extends object = object, TData extends BaseRecord = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError>({ refineCoreProps, warnWhenUnsavedChanges: warnWhenUnsavedChangesProp, disableServerSideValidation: disableServerSideValidationProp, transformApplyValues, transformInitValues, beforeSubmit, onBeforeSubmitError, onSubmitStart, onSubmitAbort, ...rest }?: UseFormProps<TQueryFnData, TError, TVariables, TContext, TData, TResponse, TResponseError>) => UseFormReturnType<TQueryFnData, TError, TVariables, TContext, TData, TResponse, TResponseError>;

package/dist/components/Form/useYamlForm.d.ts

@@ -31,8 +31,6 @@ export type UseFormProps<TQueryFnData extends BaseRecord = BaseRecord, TError ex
     onBeforeSubmitError?: (errors: string[]) => void;
     onSubmitStart?: () => void;
     onSubmitAbort?: () => void;
-    /** 自定义提交函数，存在时替代 refine core 的 onFinish */
-    onSubmit?: (values: Record<string, unknown>) => Promise<unknown>;
     rules?: YamlFormRule[];
 };
 export type UseFormReturnType<TQueryFnData extends BaseRecord = BaseRecord, TError extends HttpError = HttpError, TVariables extends object = object, TData extends BaseRecord = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError> = UseFormReturnTypeCore<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError> & {
@@ -57,5 +55,5 @@ declare const useYamlForm: <TQueryFnData extends Unstructured = Unstructured & {
     [prop: string]: unknown;
 } = {
     [prop: string]: unknown;
-}, TData extends Unstructured = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError>({ action: actionFromProps, resource, onMutationSuccess: onMutationSuccessProp, onMutationError, submitOnEnter, warnWhenUnsavedChanges: warnWhenUnsavedChangesProp, redirect, successNotification, errorNotification, meta, metaData, queryMeta, mutationMeta, liveMode, liveParams, mutationMode, dataProviderName, onLiveEvent, invalidates, undoableTimeout, queryOptions, createMutationOptions, updateMutationOptions, id: idFromProps, overtimeOptions, editorOptions, initialValuesForCreate, initialValuesForEdit, transformInitValues, transformApplyValues, beforeSubmit, onBeforeSubmitError, onSubmitStart, onSubmitAbort, onSubmit, rules, }?: UseFormProps<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError>) => UseFormReturnType<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError>;
+}, TData extends Unstructured = TQueryFnData, TResponse extends BaseRecord = TData, TResponseError extends HttpError = TError>({ action: actionFromProps, resource, onMutationSuccess: onMutationSuccessProp, onMutationError, submitOnEnter, warnWhenUnsavedChanges: warnWhenUnsavedChangesProp, redirect, successNotification, errorNotification, meta, metaData, queryMeta, mutationMeta, liveMode, liveParams, mutationMode, dataProviderName, onLiveEvent, invalidates, undoableTimeout, queryOptions, createMutationOptions, updateMutationOptions, id: idFromProps, overtimeOptions, editorOptions, initialValuesForCreate, initialValuesForEdit, transformInitValues, transformApplyValues, beforeSubmit, onBeforeSubmitError, onSubmitStart, onSubmitAbort, rules, }?: UseFormProps<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError>) => UseFormReturnType<TQueryFnData, TError, TVariables, TData, TResponse, TResponseError>;
 export default useYamlForm;

package/dist/components/KeyValueTableForm/FormatRulePopover.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 export interface FormatRulePopoverProps {
     buttonText: string;
-    columns: any[];
-    dataSource: any[];
+    columns: Record<string, unknown>[];
+    dataSource: Record<string, unknown>[];
 }
 export declare const FormatRulePopover: React.FC<FormatRulePopoverProps>;

package/dist/refine.cjs

@@ -11248,7 +11248,6 @@ const useYamlForm = ({
   onBeforeSubmitError,
   onSubmitStart,
   onSubmitAbort,
-  onSubmit,
   rules
 } = {}) => {
   var _a;
@@ -11462,11 +11461,6 @@ const useYamlForm = ({
               setIsBeforeSubmitLoading(false);
             }
           }
-          if (onSubmit) {
-            const result = await onSubmit(finalValues);
-            onMutationSuccessProp == null ? void 0 : onMutationSuccessProp({ data: result }, {}, {});
-            return result;
-          }
           return onFinish(finalValues);
         } catch (error) {
           onSubmitAbort == null ? void 0 : onSubmitAbort();
@@ -11516,7 +11510,6 @@ function YamlForm(props) {
     transformInitValues,
     transformApplyValues,
     beforeSubmit,
-    onSubmit,
     onSaveButtonPropsChange,
     onErrorsChange,
     rules
@@ -11555,7 +11548,6 @@ function YamlForm(props) {
     initialValuesForEdit: props.initialValuesForEdit,
     rules,
     beforeSubmit,
-    onSubmit,
     successNotification(data2) {
       var _a;
       const displayName = resourceConfig.displayName || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind);
@@ -16934,7 +16926,6 @@ const useForm = ({
   onBeforeSubmitError,
   onSubmitStart,
   onSubmitAbort,
-  onSubmit,
   ...rest
 } = {}) => {
   const { options } = core.useRefineContext();
@@ -17058,7 +17049,6 @@ const useForm = ({
         onSubmitStart == null ? void 0 : onSubmitStart();
         handleSubmit(
           async (v) => {
-            var _a;
             let finalValues = transformApplyValues ? transformApplyValues(v) : v;
             if (beforeSubmit) {
               try {
@@ -17085,11 +17075,6 @@ const useForm = ({
                 setIsBeforeSubmitLoading(false);
               }
             }
-            if (onSubmit) {
-              const result = await onSubmit(finalValues);
-              (_a = refineCoreProps == null ? void 0 : refineCoreProps.onMutationSuccess) == null ? void 0 : _a.call(refineCoreProps, { data: result }, {}, {});
-              return result;
-            }
             return onFinish(finalValues);
           },
           () => {
@@ -17104,8 +17089,6 @@ const useForm = ({
     isBeforeSubmitLoading,
     handleSubmit,
     onFinish,
-    onSubmit,
-    refineCoreProps,
     transformApplyValues,
     beforeSubmit,
     onBeforeSubmitError,
@@ -17168,7 +17151,6 @@ const useRefineForm = (props) => {
     onBeforeSubmitError: options == null ? void 0 : options.onBeforeSubmitError,
     onSubmitStart: options == null ? void 0 : options.onSubmitStart,
     onSubmitAbort: options == null ? void 0 : options.onSubmitAbort,
-    onSubmit: formConfig == null ? void 0 : formConfig.onSubmit,
     ...formConfig == null ? void 0 : formConfig.useFormProps
   });
   React.useEffect(() => {
@@ -17203,7 +17185,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
   onError,
   onSaveButtonPropsChange
 }, ref) {
-  var _a;
+  var _a, _b;
   const action = id ? "edit" : "create";
   const pushModal = eagle.usePushModal();
   const popModal = eagle.usePopModal();
@@ -17291,7 +17273,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         id,
         action,
         isShowLayout: false,
-        onSubmit: formConfig == null ? void 0 : formConfig.onSubmit,
         useFormProps: {
           redirect: false,
           mutationMeta: (_a2 = formConfig == null ? void 0 : formConfig.refineCoreProps) == null ? void 0 : _a2.mutationMeta,
@@ -17330,6 +17311,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     id,
     refineFormResult,
     formConfig == null ? void 0 : formConfig.beforeSubmit,
+    (_a = formConfig == null ? void 0 : formConfig.refineCoreProps) == null ? void 0 : _a.mutationMeta,
     transformApplyValues,
     onSaveButtonPropsChange,
     onSuccess,
@@ -17350,7 +17332,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     [refineFormResult.formResult]
   );
   const currentFormValues = refineFormResult.formResult.getValues();
-  const isReady = (formConfig == null ? void 0 : formConfig.isDataReady) ? formConfig.isDataReady(currentFormValues) : !!((_a = currentFormValues == null ? void 0 : currentFormValues.metadata) == null ? void 0 : _a.name);
+  const isReady = (formConfig == null ? void 0 : formConfig.isDataReady) ? formConfig.isDataReady(currentFormValues) : !!((_b = currentFormValues == null ? void 0 : currentFormValues.metadata) == null ? void 0 : _b.name);
   if (action === "edit" && !isReady) {
     return /* @__PURE__ */ common.jsxRuntimeExports.jsx(eagle.Loading, {});
   }

package/dist/refine.js

@@ -11229,7 +11229,6 @@ const useYamlForm = ({
   onBeforeSubmitError,
   onSubmitStart,
   onSubmitAbort,
-  onSubmit,
   rules
 } = {}) => {
   var _a;
@@ -11443,11 +11442,6 @@ const useYamlForm = ({
               setIsBeforeSubmitLoading(false);
             }
           }
-          if (onSubmit) {
-            const result = await onSubmit(finalValues);
-            onMutationSuccessProp == null ? void 0 : onMutationSuccessProp({ data: result }, {}, {});
-            return result;
-          }
           return onFinish(finalValues);
         } catch (error) {
           onSubmitAbort == null ? void 0 : onSubmitAbort();
@@ -11497,7 +11491,6 @@ function YamlForm(props) {
     transformInitValues,
     transformApplyValues,
     beforeSubmit,
-    onSubmit,
     onSaveButtonPropsChange,
     onErrorsChange,
     rules
@@ -11536,7 +11529,6 @@ function YamlForm(props) {
     initialValuesForEdit: props.initialValuesForEdit,
     rules,
     beforeSubmit,
-    onSubmit,
     successNotification(data2) {
       var _a;
       const displayName = resourceConfig.displayName || ((_a = resource == null ? void 0 : resource.meta) == null ? void 0 : _a.kind);
@@ -16915,7 +16907,6 @@ const useForm = ({
   onBeforeSubmitError,
   onSubmitStart,
   onSubmitAbort,
-  onSubmit,
   ...rest
 } = {}) => {
   const { options } = useRefineContext();
@@ -17039,7 +17030,6 @@ const useForm = ({
         onSubmitStart == null ? void 0 : onSubmitStart();
         handleSubmit(
           async (v) => {
-            var _a;
             let finalValues = transformApplyValues ? transformApplyValues(v) : v;
             if (beforeSubmit) {
               try {
@@ -17066,11 +17056,6 @@ const useForm = ({
                 setIsBeforeSubmitLoading(false);
               }
             }
-            if (onSubmit) {
-              const result = await onSubmit(finalValues);
-              (_a = refineCoreProps == null ? void 0 : refineCoreProps.onMutationSuccess) == null ? void 0 : _a.call(refineCoreProps, { data: result }, {}, {});
-              return result;
-            }
             return onFinish(finalValues);
           },
           () => {
@@ -17085,8 +17070,6 @@ const useForm = ({
     isBeforeSubmitLoading,
     handleSubmit,
     onFinish,
-    onSubmit,
-    refineCoreProps,
     transformApplyValues,
     beforeSubmit,
     onBeforeSubmitError,
@@ -17149,7 +17132,6 @@ const useRefineForm = (props) => {
     onBeforeSubmitError: options == null ? void 0 : options.onBeforeSubmitError,
     onSubmitStart: options == null ? void 0 : options.onSubmitStart,
     onSubmitAbort: options == null ? void 0 : options.onSubmitAbort,
-    onSubmit: formConfig == null ? void 0 : formConfig.onSubmit,
     ...formConfig == null ? void 0 : formConfig.useFormProps
   });
   useEffect(() => {
@@ -17184,7 +17166,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
   onError,
   onSaveButtonPropsChange
 }, ref) {
-  var _a;
+  var _a, _b;
   const action = id ? "edit" : "create";
   const pushModal = usePushModal();
   const popModal = usePopModal();
@@ -17272,7 +17254,6 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
         id,
         action,
         isShowLayout: false,
-        onSubmit: formConfig == null ? void 0 : formConfig.onSubmit,
         useFormProps: {
           redirect: false,
           mutationMeta: (_a2 = formConfig == null ? void 0 : formConfig.refineCoreProps) == null ? void 0 : _a2.mutationMeta,
@@ -17311,6 +17292,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     id,
     refineFormResult,
     formConfig == null ? void 0 : formConfig.beforeSubmit,
+    (_a = formConfig == null ? void 0 : formConfig.refineCoreProps) == null ? void 0 : _a.mutationMeta,
     transformApplyValues,
     onSaveButtonPropsChange,
     onSuccess,
@@ -17331,7 +17313,7 @@ const RefineFormContainer = React.forwardRef(function RefineFormContainer2({
     [refineFormResult.formResult]
   );
   const currentFormValues = refineFormResult.formResult.getValues();
-  const isReady = (formConfig == null ? void 0 : formConfig.isDataReady) ? formConfig.isDataReady(currentFormValues) : !!((_a = currentFormValues == null ? void 0 : currentFormValues.metadata) == null ? void 0 : _a.name);
+  const isReady = (formConfig == null ? void 0 : formConfig.isDataReady) ? formConfig.isDataReady(currentFormValues) : !!((_b = currentFormValues == null ? void 0 : currentFormValues.metadata) == null ? void 0 : _b.name);
   if (action === "edit" && !isReady) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Loading, {});
   }

package/dist/types/resource.d.ts

@@ -154,11 +154,6 @@ export type CommonFormConfig<Model extends ResourceModel = ResourceModel> = {
      * 默认检查 metadata.name，非标准 K8s 资源可覆盖
      */
     isDataReady?: (formValues: Record<string, unknown>) => boolean;
-    /**
-     * 自定义提交函数，存在时替代 refine core 的 onFinish
-     * 用于非标准 K8s 资源或需要自定义 API 调用的场景
-     */
-    onSubmit?: (values: Record<string, unknown>) => Promise<unknown>;
     /**
      * 自定义成功 toast 消息
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.4.2-alpha.1",
+  "version": "0.4.2-alpha.2",
   "type": "module",
   "files": [
     "dist",