@flatbiz/antd 3.2.0 → 4.0.2

package/index.d.ts

@@ -3,14 +3,16 @@
 
 import { API, ModelType } from '@dimjs/model';
 import { ButtonProps, CascaderProps, DrawerProps, DropdownProps, FormInstance, FormItemProps, InputNumberProps, InputProps, ModalProps, PopconfirmProps, RadioGroupProps, RowProps, SelectProps, SpaceProps, SwitchProps, TableProps, TimePickerProps, TimeRangePickerProps, TooltipProps, TreeProps, TreeSelectProps, UploadProps } from 'antd';
+import { ConfigProviderProps } from 'antd/es/config-provider';
+import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { CheckboxGroupProps } from 'antd/lib/checkbox';
-import { ConfigProviderProps } from 'antd/lib/config-provider';
-import { PickerDateProps, RangePickerDateProps } from 'antd/lib/date-picker/generatePicker';
+import { RangePickerDateProps } from 'antd/lib/date-picker/generatePicker';
 import { FormListFieldData, FormListOperation, FormListProps } from 'antd/lib/form/FormList';
 import { SearchProps, TextAreaProps } from 'antd/lib/input';
 import { ColumnsType } from 'antd/lib/table';
 import { UploadChangeParam } from 'antd/lib/upload';
 import { UploadFile } from 'antd/lib/upload/interface';
+import dayjs from 'dayjs';
 import { CSSProperties, DependencyList, Dispatch, EffectCallback, FC, ReactElement, ReactNode, SetStateAction } from 'react';
 
 export declare const styles: () => void;
@@ -28,7 +30,7 @@ export interface ButtonOperateItem extends ButtonProps {
 export interface ButtonOperateProps {
 	/**
 	 * 如果数组中使用ReactElement类型
-	 * 1. 一般为antd Button组件，可设置type=link，会有设置的hover效果
+	 * 1. 一般为antd Button组件，如果组件存在属性hidden=true，则会隐藏
 	 * 2. 可配置 v-permission 权限值，例如 v-permission="add"
 	 * 3. 任何confirm、disabled等状态在外部控制
 	 * 3. 不支持fold效果
@@ -42,7 +44,7 @@ export interface ButtonOperateProps {
 }
 export declare const ButtonOperate: FC<ButtonOperateProps>;
 export declare type ButtonWrapperProps = Omit<ButtonProps, "onClick" | "loading"> & {
-	onClick: (event: React.MouseEvent<HTMLElement>) => Promise<void> | void;
+	onClick: (e: any) => Promise<void> | void;
 	debounceDuration?: number;
 	permission?: string;
 };
@@ -118,6 +120,10 @@ export declare const CascaderWrapper: import("react").ForwardRefExoticComponent<
 	onChange?: ((value: string | number, selectedList: TPlainObject[]) => void) | undefined;
 	requestMessageConfig?: RequestStatusRenderProps["messageConfig"];
 } & import("react").RefAttributes<CascaderWrapperRefApi>>;
+export declare type ConfigProviderWrapperProps = Omit<ConfigProviderProps, "locale"> & {
+	locale?: "en" | "zh-cn";
+};
+export declare const ConfigProviderWrapper: (props: ConfigProviderWrapperProps) => JSX.Element;
 export interface CommonPropsWithChildren<S extends TPlainObject = TPlainObject> {
 	className?: string;
 	style?: CSSProperties & Partial<S>;
@@ -139,7 +145,7 @@ export declare type CssHoverProps = {
  * @returns
  */
 export declare const CssNodeHover: (props: CssHoverProps) => JSX.Element;
-export declare type DatePickerWrapperProps = Omit<PickerDateProps<moment.Moment>, "value" | "onChange"> & {
+export declare type DatePickerWrapperProps = Omit<PickerDateProps<dayjs.Dayjs>, "value" | "onChange"> & {
 	value?: string;
 	onChange?: (value?: string) => void;
 	/**
@@ -161,7 +167,7 @@ export declare type DatePickerWrapperProps = Omit<PickerDateProps<moment.Moment>
  * ```
  */
 export declare const DatePickerWrapper: (props: DatePickerWrapperProps) => JSX.Element;
-export declare type DateRangePickerWrapperProps = Omit<RangePickerDateProps<moment.Moment>, "value" | "onChange" | "onOpenChange" | "onCalendarChange" | "disabledDate"> & {
+export declare type DateRangePickerWrapperProps = Omit<RangePickerDateProps<dayjs.Dayjs>, "value" | "onChange" | "onOpenChange" | "onCalendarChange" | "disabledDate"> & {
 	value?: [
 		string,
 		string
@@ -218,7 +224,7 @@ export declare type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "n
  * ```
  */
 export declare const DateRangePickerWrapperFormItem: (props: DateRangePickerWrapperFormItemProps) => JSX.Element;
-export declare type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getContainer" | "visible" | "open" | "footer"> & {
+export declare type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getContainer" | "open" | "open" | "footer"> & {
 	okText?: string | ReactElement;
 	cancelText?: string | ReactElement;
 	onOk?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
@@ -226,7 +232,7 @@ export declare type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" |
 	content: string | ReactElement | ((form: FormInstance, operate: {
 		onClose: TNoopDefine;
 	}) => ReactElement);
-	configProviderProps?: ConfigProviderProps;
+	configProviderProps?: ConfigProviderWrapperProps;
 	okButtonExtraProps?: Omit<ButtonProps, "onClick" | "children" | "loading">;
 	cancelButtonExtraProps?: Omit<ButtonProps, "onClick" | "children">;
 	operatePosition?: "header" | "footer";
@@ -269,13 +275,13 @@ export declare const dialogDrawer: {
 		close: () => void;
 	};
 };
-export declare type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContainer" | "visible" | "open"> & {
+export declare type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContainer" | "open" | "open"> & {
 	onOk?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	onCancel?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	content: string | ReactElement | ((form: FormInstance, operate: {
 		onClose: TNoopDefine;
 	}) => ReactElement);
-	configProviderProps?: ConfigProviderProps;
+	configProviderProps?: ConfigProviderWrapperProps;
 };
 /**
  * 函数式调用弹框；初始化后，内容无法更新
@@ -317,63 +323,7 @@ export interface DrawerStateType {
 	/**
 	 * 显示drawer
 	 */
-	visible: boolean;
-	/**
-	 * 用来处理form, `更新`的时候的传递当前item列表行的数据, 当`创建`的时候强制设置为 `undefined`
-	 */
-	itemData?: Record<string, any>;
-	operateType: "create" | "update" | "view" | null;
-	pageLoading?: boolean;
-}
-export interface DrawerActionsParamType {
-	openDrawerForm: Pick<DrawerStateType, "title" | "itemData" | "operateType" | "pageLoading">;
-	closeDrawer: void;
-	setDrawerItemData: Record<string, any>;
-}
-export interface DrawerOperationOldProps {
-	loading?: boolean;
-	okText?: string;
-	cancelText?: string;
-	onOk?: () => void;
-	onCancel?: () => void;
-	hideOkBtn?: boolean;
-	okButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
-	cancelButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
-}
-export declare type DrawerFormProps = {
-	className?: string;
-	/**
-	 * 整个drawer页面级的spinning <Page loading />
-	 */
-	pageLoading?: boolean;
-	operationProps?: DrawerOperationOldProps;
-} & DrawerProps;
-/**
- * 弹窗机制
- * @deprecated 请使用【dialogDrawer】组件替换
- * ```
- * 1. 默认 destroyOnClose = true
- * 2. 默认 forceRender = false
- * ```
- */
-export declare const DrawerWraper: (props: DrawerFormProps) => JSX.Element;
-/**
- * drawer弹窗模型
- * @param key 唯一值必传
- * @returns
- *
- * ```
- * 使用方式
- * const [drawerState, drawerActions] = createDrawerWraperModel('key值').useStore();
- * ```
- */
-export declare const createDrawerWraperModel: (key: string) => API<ModelType<DrawerStateType, DrawerActionsParamType, any>>;
-export interface DrawerStateType {
-	title: string;
-	/**
-	 * 显示drawer
-	 */
-	visible: boolean;
+	open: boolean;
 	/**
 	 * 用来处理form, `更新`的时候的传递当前item列表行的数据, 当`创建`的时候强制设置为 `undefined`
 	 */
@@ -447,7 +397,7 @@ export interface DropdownMenuItem extends ButtonProps {
 	hidden?: boolean;
 	popconfirmProps?: Pick<PopconfirmProps, "placement" | "okText" | "cancelText" | "trigger">;
 }
-export interface DropdownMenuWrapperProps extends Omit<DropdownProps, "overlay"> {
+export interface DropdownMenuWrapperProps extends Omit<DropdownProps, "menu"> {
 	menuList: Array<DropdownMenuItem | null>;
 }
 export declare const DropdownMenuWrapper: (props: DropdownMenuWrapperProps) => JSX.Element;
@@ -462,7 +412,9 @@ export declare type SelectorServiceConfig = {
 	 */
 	onRequestResultAdapter?: (respData: TAny) => TPlainObject[];
 };
-export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "onSearch" | "notFoundContent" | "options" | "fieldNames" | "onChange" | "value" | "loading"> & {
+export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "onSearch" | "notFoundContent" | "options" | "fieldNames" | "onChange" | "value" | "loading" | "mode"> & {
+	/** 不支持 tags 模式，tags模式请使用antd Select 组件 */
+	mode?: "multiple";
 	modelKey: string;
 	fieldNames?: {
 		label: string;
@@ -661,6 +613,7 @@ export declare type EditableCustomConfig = {
 		name: Array<number | string>;
 		editable?: boolean;
 		completeName: Array<number | string>;
+		tableRowIndex: number;
 	}) => ReactElement;
 };
 export declare type EditableTypeConfig = EditableCustomConfig | EditableInputConfig | EditableSelectWrapperConfig | EditableDatePickerWrapperConfig | EditableDateRangePickerWrapperConfig | EditableCheckboxGroupConfig | EditableTextareaConfig | EditableInputNumberConfig | EditableRadioGroupConfig | EditableFileUploadConfig;
@@ -792,49 +745,6 @@ export declare const FileImport: {
 		accept: string;
 	};
 };
-export declare type FileUploadItem = {
-	fileKey: string;
-	fileName: string;
-};
-export declare type FileUploadProps = {
-	onChange?: (value?: FileUploadItem[]) => void;
-	onUploadError?: (message?: string) => void;
-	value?: FileUploadItem[];
-	onPreview?: (item: FileUploadItem) => void;
-	onUploadChange?: (info: UploadChangeParam<UploadFile>) => void;
-	/**
-	 * 属性映射
-	 */
-	fieldNames?: {
-		fileKey?: string;
-		fileName?: string;
-	};
-} & Omit<UploadProps, "onChange" | "fileList" | "onPreview">;
-/**
- * 文件上传，结合Form使用最佳
- * @deprecated 请使用【UploadWrapper】组件替换
- * ```
- * 接口返回结构：
- * formData上传接口必须返回fileKey值
- * {
- *  code: '0000',
- *  data: {
- *    fileKey: '预览文件对应的fileKey'
- *  }
- * }
- * 可通过fieldNames配置接口返回值属性名称映射
- * ```
- * ```
- * 最佳使用方式：
- * <Form.Item name="attachmentList" label="附件">
- *   <FileUpload action={uploadUrl} onPreview={onPreviewFile}>
- *      <Button type="primary">选择文件导入</Button>
- *   </FileUpload>
- * </Form.Item>
- * ```
- *
- */
-export declare const FileUpload: (props: FileUploadProps) => JSX.Element;
 export declare type FlexLayoutProps = {
 	className?: string;
 	fullIndex?: number | number[];
@@ -1033,61 +943,7 @@ export interface ModalStateType {
 	/**
 	 * 显示modal
 	 */
-	visible: boolean;
-	/**
-	 * 用来处理form, `更新`的时候的传递当前item列表行的数据, 当`创建`的时候强制设置为 `undefined`
-	 */
-	itemData?: Record<string, unknown> | null;
-	operateType: "create" | "update" | "view";
-	pageLoading?: boolean;
-}
-export interface ModalActionsParamType {
-	openModalForm: Pick<ModalStateType, "title" | "itemData" | "operateType" | "pageLoading">;
-	closeModal: void;
-	setModalItemData: Record<string, unknown>;
-}
-export interface ModalOperationProps {
-	loading?: boolean;
-	okText?: string;
-	cancelText?: string;
-	onOk?: () => void;
-	onCancel?: () => void;
-	hideOkBtn?: boolean;
-	okButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
-	cancelButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
-}
-export declare type ModalFormProps = {
-	className?: string;
-	pageLoading?: boolean;
-	operationProps?: ModalOperationProps;
-	footer?: null | React.ReactNode;
-} & Omit<ModalProps, "footer" | "onOk" | "okText" | "cancelText" | "okButtonProps" | "cancelButtonProps" | "okType" | "confirmLoading">;
-/**
- * 弹窗机制
- * ```
- * 1. 默认 destroyOnClose = true
- * 2. 默认 forceRender = false
- * @deprecated 请使用【dialogModal】组件替换
- * ```
- */
-export declare const ModalWraper: (props: ModalFormProps) => JSX.Element;
-/**
- * modal弹窗模型
- * @param key 唯一值必传
- * @returns
- *
- * ```
- * 使用方式
- * const [modalState, modalActions] = createModalWraperModel('key值').useStore();
- * ```
- */
-export declare const createModalWraperModel: (key: string) => API<ModelType<ModalStateType, ModalActionsParamType, any>>;
-export interface ModalStateType {
-	title?: string;
-	/**
-	 * 显示modal
-	 */
-	visible: boolean;
+	open: boolean;
 	/**
 	 * 用来处理form, `更新`的时候的传递当前item列表行的数据, 当`创建`的时候强制设置为 `undefined`
 	 */
@@ -1154,7 +1010,10 @@ export declare type PageFixedFooterProps = {
 	children?: ReactNode | ReactNode[];
 };
 export declare const PageFixedFooter: (props: PageFixedFooterProps) => JSX.Element;
-export declare const Page404: () => JSX.Element;
+export declare type Page404Props = {
+	message?: string;
+};
+export declare const Page404: (props: Page404Props) => JSX.Element;
 export declare const getPermissionList: () => string[];
 export declare const hasPermission: (name?: string) => boolean;
 export interface PermissionProps {
@@ -1630,19 +1489,19 @@ export declare type TreeWrapperValue = string | number | Array<string | number>
 export declare type TreeServiceConfig = {
 	params?: TPlainObject;
 	requiredParamsKeys?: string[];
-	onRequest?: (params?: any) => any;
+	onRequest?: (params?: TAny) => TAny;
 	/**
 	 * 响应数据适配器
 	 */
-	onRequestResultAdapter?: (respData: any) => TPlainObject[];
+	onRequestResultAdapter?: (respData: TAny) => TPlainObject[];
 };
 export declare type TreeLoadDataServiceConfig = {
 	getParams: (dataItem: TPlainObject) => TPlainObject;
-	onRequest: (params: TPlainObject) => any;
+	onRequest: (params: TPlainObject) => TAny;
 	/**
 	 * 响应数据适配器
 	 */
-	onRequestResultAdapter?: (respData: any) => TPlainObject[];
+	onRequestResultAdapter?: (respData: TAny) => TPlainObject[];
 };
 export declare type TreeWrapperMenuItem = {
 	title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "3.2.0",
+  "version": "4.0.2",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -26,15 +26,15 @@
     "node": ">=13.8.0"
   },
   "peerDependencies": {
-    "@ant-design/icons": ">=4.7.0",
+    "@ant-design/icons": ">=4.8.0",
     "@dimjs/lang": ">=1.2.23",
     "@dimjs/model": ">=1.1.8",
     "@dimjs/model-react": ">=1.1.8",
     "@dimjs/utils": ">=1.2.23",
-    "@flatbiz/utils": ">=3.0.15",
+    "@flatbiz/utils": ">=3.1.4",
     "@wove/react": ">=1.2.22",
-    "antd": ">=4.22.2 < 5.0.0",
-    "moment": ">=2.29.4",
+    "antd": ">=5.0.4",
+    "dayjs": ">=1.11.6",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"
   },
@@ -44,13 +44,13 @@
     "@dimjs/model": "^1.1.8",
     "@dimjs/model-react": "^1.1.8",
     "@dimjs/utils": "^1.2.23",
-    "@flatbiz/utils": "^3.2.0",
-    "@wove/react": "^1.2.21",
-    "antd": "4.22.2",
+    "@flatbiz/utils": "^4.0.0",
+    "@wove/react": "^1.2.22",
+    "antd": "^5.0.4",
+    "dayjs": ">=1.11.6",
     "dequal": "^2.0.3",
-    "moment": "^2.29.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
-  "gitHead": "63fe35407a413d07ac636203c31825442065f3f6"
+  "gitHead": "4378d433b73ee28fd7cb4c64bed8571f993eb5a9"
 }