@flatbiz/antd 2.5.28 → 3.0.0

package/index.d.ts

@@ -9,10 +9,9 @@ import { PickerDateProps, RangePickerDateProps } from 'antd/lib/date-picker/gene
 import { FormListFieldData, FormListOperation, FormListProps } from 'antd/lib/form/FormList';
 import { SearchProps, TextAreaProps } from 'antd/lib/input';
 import { ColumnsType } from 'antd/lib/table';
-import { AntdTreeNodeAttribute } from 'antd/lib/tree';
 import { UploadChangeParam } from 'antd/lib/upload';
 import { UploadFile } from 'antd/lib/upload/interface';
-import { CSSProperties, DependencyList, Dispatch, EffectCallback, FC, ReactElement, ReactNode, SetStateAction, VFC } from 'react';
+import { CSSProperties, DependencyList, Dispatch, EffectCallback, FC, ReactElement, ReactNode, SetStateAction } from 'react';
 
 export declare const styles: () => void;
 export interface ButtonOperateItem extends ButtonProps {
@@ -27,14 +26,21 @@ export interface ButtonOperateItem extends ButtonProps {
 	isFold?: boolean;
 }
 export interface ButtonOperateProps {
-	operateList: Array<ButtonOperateItem | null>;
+	/**
+	 * 如果数组中使用ReactElement类型
+	 * 1. 一般为antd Button组件，可设置type=link，会有设置的hover效果
+	 * 2. 任何permission、confirm、disabled等状态在外部控制
+	 * 3. 不支持fold效果
+	 */
+	operateList: Array<ButtonOperateItem | null | ReactElement>;
 	wrap?: boolean;
 	size?: SpaceProps["size"];
 	foldIcon?: ReactElement;
 	className?: string;
 }
-export declare const ButtonOperate: VFC<ButtonOperateProps>;
-export declare type TPlainObject<T = any> = Record<string, T>;
+export declare const ButtonOperate: FC<ButtonOperateProps>;
+export declare type TAny = any;
+export declare type TPlainObject<T = TAny> = Record<string, T>;
 export declare type TNoopDefine = () => void;
 export declare type RequestStatus = "request-init" | "request-progress" | "request-success" | "request-error";
 export declare type RequestStatusRenderProps = {
@@ -116,7 +122,7 @@ export declare type DatePickerWrapperProps = Omit<PickerDateProps<moment.Moment>
  * 5. 设置disabledDate后，disabledDateConfig配置将失效
  * ```
  */
-export declare const DatePickerWrapper: VFC<DatePickerWrapperProps>;
+export declare const DatePickerWrapper: (props: DatePickerWrapperProps) => JSX.Element;
 export declare type DateRangePickerWrapperProps = Omit<RangePickerDateProps<moment.Moment>, "value" | "onChange" | "onOpenChange" | "onCalendarChange" | "disabledDate"> & {
 	value?: [
 		string,
@@ -149,7 +155,7 @@ export declare type DateRangePickerWrapperProps = Omit<RangePickerDateProps<mome
  * TODO: 存在场景缺陷，当设置maxDays、showTime后，在选择单个日期不通过确认按钮直接切换输入框，无法获取回调，无法约束disabledDate
  * ```
  */
-export declare const DateRangePickerWrapper: VFC<DateRangePickerWrapperProps>;
+export declare const DateRangePickerWrapper: (props: DateRangePickerWrapperProps) => JSX.Element;
 export declare type FormItemNamePath = string | number | Array<string | number>;
 export declare type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "name"> & {
 	/**
@@ -169,7 +175,58 @@ export declare type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "n
 /**
  * 包含了Form.Item组件的时间区间选择组件
  */
-export declare const DateRangePickerWrapperFormItem: VFC<DateRangePickerWrapperFormItemProps>;
+export declare const DateRangePickerWrapperFormItem: (props: DateRangePickerWrapperFormItemProps) => JSX.Element;
+export declare type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getContainer" | "visible" | "open"> & {
+	okText?: string | ReactElement;
+	cancelText?: string | ReactElement;
+	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;
+	okButtonExtraProps?: Omit<ButtonProps, "onClick" | "children" | "loading">;
+	cancelButtonExtraProps?: Omit<ButtonProps, "onClick" | "children">;
+	operatePosition?: "header" | "footer";
+};
+/**
+ * 函数式调用弹框；初始化后，内容无法更新
+ *```
+ * 1. 基础使用方式
+ * dialogDrawer.open({
+ *   title: '我是弹框',
+ *   content: <div>我是内容</div>,
+ * });
+ * ```
+ * ```
+ * ***************************
+ * 2. 结合内置form使用，可在onOK、onCancel获取form对象
+ * dialogDrawer.open({
+ *   title: '我是弹框',
+ *   content: (form, operate) => {
+ *     return (
+ *       <Form form={form}>
+ *         <Form.Item name="useName">
+ *           <Input placeholder="请输入" />
+ *         </Form.Item>
+ *       </Form>
+ *     );
+ *   },
+ *   onOK: (form) => {
+ *     console.log('content form数据', form.getFieldsValue());
+ *     return Promise.resolve();
+ *   },
+ * });
+ * 注意：
+ * 1. operatePosition='footer' 设置footer后 onOk、onCancel、okText、cancelText、okButtonExtraProps、cancelButtonExtraProps配置失效
+ * 1. operatePosition='header' 设置extra后 onOk、onCancel、okText、cancelText、okButtonExtraProps、cancelButtonExtraProps配置失效
+ * ```
+ */
+export declare const dialogDrawer: {
+	open: (props: DialogDrawerProps) => {
+		close: () => void;
+	};
+};
 export declare type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContainer" | "visible" | "open"> & {
 	onOk?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	onCancel?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
@@ -256,7 +313,7 @@ export declare type DrawerFormProps = {
  * 2. 默认 forceRender = false
  * ```
  */
-export declare const DrawerWraper: FC<DrawerFormProps>;
+export declare const DrawerWraper: (props: DrawerFormProps) => JSX.Element;
 /**
  * drawer弹窗模型
  * @param key 唯一值必传
@@ -307,9 +364,10 @@ export declare type DrawerWrapperProps = {
 	 */
 	pageLoading?: boolean;
 } & Omit<DrawerProps, "footer">;
-declare const DrawerWrapperContent: FC<{
+declare const DrawerWrapperContent: (props: {
 	operationProps?: DrawerOperationProps;
-}>;
+	children?: ReactNode;
+}) => JSX.Element;
 declare const DrawerWrapperFooter: (props: any) => JSX.Element;
 /**
  * 弹窗机制
@@ -349,7 +407,7 @@ export interface DropdownMenuItem extends ButtonProps {
 export interface DropdownMenuWrapperProps extends Omit<DropdownProps, "overlay"> {
 	menuList: Array<DropdownMenuItem | null>;
 }
-export declare const DropdownMenuWrapper: FC<DropdownMenuWrapperProps>;
+export declare const DropdownMenuWrapper: (props: DropdownMenuWrapperProps) => JSX.Element;
 export declare type SelectorWrapperValue = string | number | Array<string | number> | TPlainObject<string | number> | Array<TPlainObject<string | number>>;
 export declare type SelectorServiceConfig = {
 	params?: TPlainObject;
@@ -585,7 +643,7 @@ export declare type UploadWrapperProps<T extends TPlainObject = TPlainObject> =
  * ```
  *
  */
-export declare const UploadWrapper: FC<UploadWrapperProps>;
+export declare const UploadWrapper: (props: UploadWrapperProps) => JSX.Element;
 export declare type EditableTableName = string | number | Array<string | number>;
 export declare type EditableTableRecordType = FormListFieldData & {
 	operation: FormListOperation;
@@ -686,8 +744,8 @@ export declare type FormListConfig = {
 	}>;
 	onFormListBeforeRender?: (data: FormListMethodOperateProps) => ReactElement | null;
 	onFormListAfterRender?: (data: FormListMethodOperateProps) => ReactElement | null;
-	onFormListItemBeforeRender?: (data: FormListItemMethodOperateProps) => void;
-	onFormListItemAfterRender?: (data: FormListItemMethodOperateProps) => void;
+	onFormListItemBeforeRender?: (data: FormListItemMethodOperateProps) => ReactElement | null;
+	onFormListItemAfterRender?: (data: FormListItemMethodOperateProps) => ReactElement | null;
 	deleteOperateRender?: (data: {
 		remove: () => void;
 		formListItemIndex: number;
@@ -765,7 +823,13 @@ export declare type FileImportProps = {
  * accept: '.xlsx,.xls',
  * ```
  */
-export declare const FileImport: FC<FileImportProps>;
+export declare const FileImport: {
+	(props: FileImportProps): JSX.Element;
+	defaultProps: {
+		name: string;
+		accept: string;
+	};
+};
 export declare type FileUploadItem = {
 	fileKey: string;
 	fileName: string;
@@ -807,7 +871,7 @@ export declare type FileUploadProps = {
  * ```
  *
  */
-export declare const FileUpload: FC<FileUploadProps>;
+export declare const FileUpload: (props: FileUploadProps) => JSX.Element;
 export declare type FlexLayoutProps = {
 	className?: string;
 	fullIndex?: number | number[];
@@ -815,6 +879,7 @@ export declare type FlexLayoutProps = {
 	onClick?: () => void;
 	style?: CSSProperties;
 	gap?: number;
+	children?: ReactNode;
 };
 /**
  * flex布局
@@ -825,7 +890,7 @@ export declare type FlexLayoutProps = {
  * @param props
  * @returns
  */
-export declare const FlexLayout: FC<FlexLayoutProps>;
+export declare const FlexLayout: (props: FlexLayoutProps) => JSX.Element;
 export declare type FormColProps = {
 	/** 屏幕 < 576px  */
 	xs?: number;
@@ -841,6 +906,7 @@ export declare type FormColProps = {
 	xxl?: number;
 	/** 强制单独一行 */
 	forceAloneRow?: boolean;
+	children?: ReactNode | ReactNode[];
 };
 /**
  * 网格响应式布局，默认值：{ xs: 24, sm: 12, md: 12, lg: 8, xl: 8, xxl: 6 }
@@ -856,7 +922,10 @@ export declare type FormColProps = {
  *
  * @returns
  */
-export declare const FormCol: FC<FormColProps>;
+export declare const FormCol: {
+	(props: FormColProps): JSX.Element;
+	domTypeName: string;
+};
 export declare type FormOperateColProps = {
 	className?: string;
 	leftList?: ReactElement[];
@@ -874,8 +943,13 @@ export declare type FormOperateColProps = {
  * 4. 如果只设置 leftList、rightList其中一个，则会在最后一行剩余网格内居右对齐
  * ```
  */
-export declare const FormOperateCol: VFC<FormOperateColProps>;
-export declare type FormRowProps = RowProps;
+export declare const FormOperateCol: {
+	(props: FormOperateColProps): JSX.Element;
+	domTypeName: string;
+};
+export declare type FormRowProps = RowProps & {
+	children?: ReactNode | ReactNode[];
+};
 /**
  * FormItem网格响应式布局
  *```
@@ -883,7 +957,7 @@ export declare type FormRowProps = RowProps;
  * 2. 子元素只能是 FormCol、FormOperateCol，其他会被忽略
  * 3. 所有子元素中只能存在一个 FormOperateCol
  */
-export declare const FormRow: FC<FormRowProps>;
+export declare const FormRow: (props: FormRowProps) => JSX.Element;
 export declare type GapProps = {
 	height?: number;
 	width?: number;
@@ -896,7 +970,7 @@ export declare type GapProps = {
  * @param props
  * @returns
  */
-export declare const Gap: VFC<GapProps>;
+export declare const Gap: (props: GapProps) => JSX.Element;
 export declare const useEffectCustom: (fn: EffectCallback, deps: DependencyList) => void;
 export declare const useEffectCustomAsync: (fn: () => Promise<void>, deps: DependencyList) => void;
 export declare type ShouldUpdateFunc<T> = (prev: T | undefined, next: T) => boolean;
@@ -913,7 +987,7 @@ export declare type IconWrapperProps = {
 	size?: "small" | "middle" | "large";
 	onClick?: (event: any) => void;
 };
-export declare const IconWrapper: VFC<IconWrapperProps>;
+export declare const IconWrapper: (props: IconWrapperProps) => JSX.Element;
 export declare type InputWrapperProps = Omit<InputProps, "defaultValue">;
 /**
  * ```
@@ -926,7 +1000,7 @@ export declare type InputWrapperProps = Omit<InputProps, "defaultValue">;
  *
  * ```
  */
-export declare const InputWrapper: VFC<InputWrapperProps>;
+export declare const InputWrapper: (props: InputWrapperProps) => JSX.Element;
 export declare type InputSearchWrapperProps = Omit<SearchProps, "defaultValue">;
 /**
  * ```
@@ -939,7 +1013,7 @@ export declare type InputSearchWrapperProps = Omit<SearchProps, "defaultValue">;
  *
  * ```
  */
-export declare const InputSearchWrapper: VFC<InputSearchWrapperProps>;
+export declare const InputSearchWrapper: (props: InputSearchWrapperProps) => JSX.Element;
 export declare type InputTextAreaWrapperProps = Omit<TextAreaProps, "defaultValue">;
 /**
  * ```
@@ -952,7 +1026,7 @@ export declare type InputTextAreaWrapperProps = Omit<TextAreaProps, "defaultValu
  *
  * ```
  */
-export declare const InputTextAreaWrapper: VFC<InputTextAreaWrapperProps>;
+export declare const InputTextAreaWrapper: (props: InputTextAreaWrapperProps) => JSX.Element;
 export declare type LabelValueLayoutProps = {
 	options: {
 		label: string | ReactElement;
@@ -962,7 +1036,7 @@ export declare type LabelValueLayoutProps = {
 	column?: number;
 	bordered?: boolean;
 };
-export declare const LabelValueLayout: VFC<LabelValueLayoutProps>;
+export declare const LabelValueLayout: (props: LabelValueLayoutProps) => JSX.Element;
 export interface ModalStateType {
 	title?: string;
 	/**
@@ -1002,9 +1076,10 @@ export declare type ModalFormProps = {
  * ```
  * 1. 默认 destroyOnClose = true
  * 2. 默认 forceRender = false
+ * @deprecated 请使用ModalWrapper替换
  * ```
  */
-export declare const ModalWraper: FC<ModalFormProps>;
+export declare const ModalWraper: (props: ModalFormProps) => JSX.Element;
 /**
  * modal弹窗模型
  * @param key 唯一值必传
@@ -1052,9 +1127,10 @@ export declare type ModalWrapperProps = {
 	className?: string;
 	pageLoading?: boolean;
 } & Omit<ModalProps, "footer" | "onOk" | "okText" | "cancelText" | "okButtonProps" | "cancelButtonProps" | "okType" | "confirmLoading">;
-declare const ModalWrapperContent: FC<{
+declare const ModalWrapperContent: (props: {
 	operationProps?: ModalOperationOldProps;
-}>;
+	children?: ReactNode;
+}) => JSX.Element;
 declare const ModalWrapperFooter: (props: any) => JSX.Element;
 /**
  * 弹窗机制
@@ -1084,15 +1160,17 @@ export declare const createModalWrapperModel: (key: string) => API<ModelType<Mod
 export declare type PageFixedFooterProps = {
 	className?: string;
 	style?: CSSProperties;
+	children?: ReactNode | ReactNode[];
 };
-export declare const PageFixedFooter: FC<PageFixedFooterProps>;
+export declare const PageFixedFooter: (props: PageFixedFooterProps) => JSX.Element;
 export declare const Page404: () => JSX.Element;
 export declare const getPermissionList: () => string[];
 export declare const hasPermission: (name: string) => boolean;
 export interface PermissionProps {
 	name: string;
+	children?: ReactNode | ReactNode[];
 }
-export declare const Permission: FC<PermissionProps>;
+export declare const Permission: (props: PermissionProps) => JSX.Element | null;
 /**
  * 预定义className
  * ```
@@ -1143,6 +1221,7 @@ export declare type SimpleLayoutProps = {
 	padding?: CSSProperties["padding"];
 	/** 优先级大于 style width */
 	width?: CSSProperties["width"];
+	children?: ReactNode | ReactNode[];
 };
 /**
  * 简单布局
@@ -1154,7 +1233,13 @@ export declare type SimpleLayoutProps = {
  *    tight：紧凑布局
  * ```
  */
-export declare const SimpleLayout: FC<SimpleLayoutProps>;
+export declare const SimpleLayout: {
+	(props: SimpleLayoutProps): JSX.Element;
+	defaultProps: {
+		titleLeftLine: boolean;
+		layoutType: string;
+	};
+};
 export interface SmsCountDownProps {
 	onSendRequest: () => Promise<void>;
 	totalTicks?: number;
@@ -1168,30 +1253,6 @@ export interface SmsCountDownProps {
 	className?: string;
 }
 export declare const SmsCountDown: FC<SmsCountDownProps>;
-export declare type StaticMethods = {
-	Condition: typeof Condition;
-	Operate: typeof Operate;
-	Table: typeof Table;
-	Footer: typeof Footer;
-};
-export declare type TableFilterLayoutProps = {
-	className?: string;
-	isFixed?: boolean;
-	fullIndex?: number;
-};
-export declare const TableFilterLayout: FC<TableFilterLayoutProps> & StaticMethods;
-declare const Condition: FC<{
-	className?: string;
-}>;
-declare const Operate: FC<{
-	className?: string;
-}>;
-declare const Table: FC<{
-	className?: string;
-}>;
-declare const Footer: FC<{
-	className?: string;
-}>;
 export declare type TreeSelectorWrapperValue = string | number | Array<string | number> | TPlainObject<string | number> | Array<TPlainObject<string | number>>;
 export declare type TreeSelectorServiceConfig = {
 	params?: TPlainObject;
@@ -1358,7 +1419,7 @@ export declare type TreeWrapperProps = Omit<TreeProps, "expandedKeys" | "treeDat
 	showSearch?: boolean;
 	onSearchValueChange?: (searchValue?: string) => void;
 	searchPlaceholder?: string;
-	icon?: (data: AntdTreeNodeAttribute & {
+	icon?: (data: {
 		isParent: boolean;
 		isLeaf: boolean;
 	}) => ReactElement;
@@ -1455,7 +1516,7 @@ export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit
 	showSearch?: boolean | undefined;
 	onSearchValueChange?: ((searchValue?: string) => void) | undefined;
 	searchPlaceholder?: string | undefined;
-	icon?: ((data: AntdTreeNodeAttribute & {
+	icon?: ((data: {
 		isParent: boolean;
 		isLeaf: boolean;
 	}) => ReactElement) | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "2.5.28",
+  "version": "3.0.0",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -26,30 +26,32 @@
     "node": ">=13.8.0"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "@dimjs/lang": "^1.2.19",
-    "@dimjs/model": "^1.1.7",
-    "@dimjs/model-react": "^1.1.7",
-    "@dimjs/utils": "^1.2.19",
-    "@flatbiz/utils": "^2.4.9",
-    "@wove/react": "^1.2.19",
-    "antd": "^4.22.2",
-    "dequal": "^2.0.3"
+    "@ant-design/icons": ">=4.7.0",
+    "@dimjs/lang": ">=1.2.23",
+    "@dimjs/model": ">=1.1.8",
+    "@dimjs/model-react": ">=1.1.8",
+    "@dimjs/utils": ">=1.2.23",
+    "@flatbiz/utils": ">=2.5.29",
+    "@wove/react": ">=1.2.21",
+    "antd": ">=4.22.2",
+    "dequal": ">=2.0.3",
+    "moment": ">=2.29.4",
+    "react": ">=17.0.2",
+    "react-dom": ">=17.0.2"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@dimjs/lang": "^1.2.19",
-    "@dimjs/model": "^1.1.7",
-    "@dimjs/model-react": "^1.1.7",
-    "@dimjs/utils": "^1.2.19",
-    "@flatbiz/utils": "^2.5.17",
-    "@wove/react": "^1.2.19",
-    "antd": "^4.22.2",
+    "@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.0",
+    "@wove/react": "^1.2.21",
+    "antd": "4.22.2",
+    "dequal": "^2.0.3",
     "moment": "^2.29.4",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router": "^6.3.0",
-    "react-router-dom": "^6.3.0"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
-  "gitHead": "7bbf8352ca6473ae852099ab8b75e6d3418727a4"
+  "gitHead": "590413f8f5e11d9d19986e1ed1388279d907a956"
 }