🐛 fix(ims-view-pc): types error

eternallycyf · Sep 27, 2024 · fa1ab60 · fa1ab60
1 parent e2dfd90
commit fa1ab60
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/packages/ims-view-pc/src/components/CustomForm/FormItem/update.tsx b/packages/ims-view-pc/src/components/CustomForm/FormItem/update.tsx
@@ -9,6 +9,12 @@ import {
 } from 'ims-view-pc';
 import React, { Fragment, useImperativeHandle, useState } from 'react';
 
+export type Next<Values = AnyObject, Rest = AnyObject, Extra = unknown, FormValues = Values> = (
+  values: FormValues,
+  form: Omit<FormInstance<FormValues>, 'scrollToField' | 'getFieldInstance'>,
+  index?: number,
+) => false | React.ReactNode | DeepPartial<ISearchesType<Values, Rest, Extra>>;
+
 export interface IUpdateControlProps<
   Values = AnyObject,
   Rest = AnyObject,
@@ -18,11 +24,7 @@ export interface IUpdateControlProps<
   itemProps?: {
     shouldUpdate?: (prevValues: Values, nextValues: Values) => boolean;
     /**@name index使用commonEditable 自动注入 */
-    next?: (
-      values: FormValues,
-      form: Omit<FormInstance<FormValues>, 'scrollToField' | 'getFieldInstance'>,
-      index?: number,
-    ) => false | React.ReactNode | DeepPartial<ISearchesType<Values, Rest, Extra>>;
+    next?: Next<Values, Rest, Extra, FormValues>;
   };
 }
 

diff --git a/packages/ims-view-pc/src/components/CustomForm/interface.ts b/packages/ims-view-pc/src/components/CustomForm/interface.ts
@@ -3,4 +3,4 @@ export { ICascadeControlProps } from './FormItem/cascader';
 export { IEditorProps } from './FormItem/editor';
 export { IMentionsControlProps } from './FormItem/mentions';
 export { ISimpleControlProps } from './FormItem/simple';
-export { IUpdateControlProps } from './FormItem/update';
+export { IUpdateControlProps, Next } from './FormItem/update';
diff --git a/packages/ims-view-pc/src/index.ts b/packages/ims-view-pc/src/index.ts
@@ -29,6 +29,7 @@ export type {
   IMentionsControlProps,
   ISimpleControlProps,
   IUpdateControlProps,
+  Next,
 } from './components/CustomForm/interface';
 export { default as CustomModal } from './components/CustomModal';
 export type { FormModalProps, ICustomModalFormList } from './components/CustomModal/form';

diff --git a/packages/ims-view-pc/src/type/form/base.ts b/packages/ims-view-pc/src/type/form/base.ts
@@ -8,6 +8,7 @@ import {
   IMentionsControlProps,
   ISimpleControlProps,
   IUpdateControlProps,
+  type Next,
 } from 'ims-view-pc';
 import { Search } from '.';
 
@@ -50,7 +51,7 @@ export const FORM_TYPE_DICT = [
 export type FormControlType = (typeof FORM_TYPE_DICT)[number];
 
 export type ItemProps<Values, Rest, Extra> = FormItemProps<Values> & {
-  next?: IUpdateControlProps<Values, Rest, Extra, Values>['itemProps']['next'];
+  next?: Next<Values, Rest, Extra, Values>;
 };
 
 export interface IFetchConfig<Record = AnyObject> {