@flatbiz/antd 4.0.5 → 4.0.6

package/index.d.ts

@@ -45,9 +45,10 @@ export interface ButtonOperateProps {
 }
 export declare const ButtonOperate: FC<ButtonOperateProps>;
 export type ButtonWrapperProps = Omit<ButtonProps, "onClick" | "loading"> & {
-	onClick: (e: any) => Promise<void> | void;
+	onClick?: (e: React.MouseEvent<HTMLElement>) => Promise<void> | void;
 	debounceDuration?: number;
 	permission?: string;
+	hidden?: boolean;
 };
 /**
  * antd Button包装组件
@@ -254,25 +255,23 @@ export type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "name"> &
  * ```
  */
 export declare const DateRangePickerWrapperFormItem: (props: DateRangePickerWrapperFormItemProps) => JSX.Element;
-export type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getContainer" | "open" | "open" | "footer"> & {
-	okText?: string | ReactElement;
-	cancelText?: string | ReactElement;
+export type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContainer" | "open" | "open" | "okButtonProps" | "cancelButtonProps"> & {
 	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?: ConfigProviderWrapperProps;
-	okButtonExtraProps?: Omit<ButtonProps, "onClick" | "children" | "loading">;
-	cancelButtonExtraProps?: Omit<ButtonProps, "onClick" | "children">;
-	operatePosition?: "header" | "footer";
-	operateRender?: (form: FormInstance) => ReactElement;
+	okHidden?: boolean;
+	cancelHidden?: boolean;
+	okButtonProps?: Omit<ButtonProps, "hidden" | "children" | "onClick">;
+	cancelButtonProps?: Omit<ButtonProps, "hidden" | "children" | "onClick">;
 };
 /**
  * 函数式调用弹框；初始化后，内容无法更新
  *```
  * 1. 基础使用方式
- * dialogDrawer.open({
+ * dialogModal.open({
  *   title: '我是弹框',
  *   content: <div>我是内容</div>,
  * });
@@ -280,7 +279,7 @@ export type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getCont
  * ```
  * ***************************
  * 2. 结合内置form使用，可在onOK、onCancel获取form对象
- * dialogDrawer.open({
+ * dialogModal.open({
  *   title: '我是弹框',
  *   content: (form, operate) => {
  *     return (
@@ -296,28 +295,54 @@ export type DialogDrawerProps = Omit<DrawerProps, "onOk" | "onCancel" | "getCont
  *     return Promise.resolve();
  *   },
  * });
- * 注意：
- * 1.  设置operateRender后，需要自定义操作按钮，onOk、onCancel、okText、cancelText、okButtonExtraProps、cancelButtonExtraProps配置失效
  * ```
  */
-export declare const dialogDrawer: {
-	open: (props: DialogDrawerProps) => {
+export declare const dialogModal: {
+	open: (props: DialogModalProps) => {
+		close: () => void;
+	};
+	/**
+	 * ```
+	 * 1. 关闭最新弹框，如果有多个弹框只能关闭最后一个
+	 * 2. 多个弹框主动关闭，只能使用 dialogModal.open()返回值中的close
+	 * ```
+	 */
+	close: () => void;
+};
+export type DialogAlertProps = Omit<DialogModalProps, "onOk"> & {
+	onOk?: (e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
+};
+export declare const dialogAlert: {
+	open: (props: DialogAlertProps) => {
 		close: () => void;
 	};
 };
-export type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContainer" | "open" | "open"> & {
+export declare const dialogConfirm: {
+	open: (props: DialogModalProps) => {
+		close: () => void;
+	};
+};
+export 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>;
 	onCancel?: (form: FormInstance, e: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	content: string | ReactElement | ((form: FormInstance, operate: {
 		onClose: TNoopDefine;
 	}) => ReactElement);
 	configProviderProps?: ConfigProviderWrapperProps;
+	okButtonExtraProps?: Omit<ButtonProps, "onClick" | "children" | "loading" | "hidden">;
+	cancelButtonExtraProps?: Omit<ButtonProps, "onClick" | "children" | "hidden">;
+	operatePosition?: "header" | "footer";
+	operateRender?: (form: FormInstance) => ReactElement;
+	okHidden?: boolean;
+	cancelHidden?: boolean;
 };
 /**
  * 函数式调用弹框；初始化后，内容无法更新
  *```
  * 1. 基础使用方式
- * dialogModal.open({
+ * dialogDrawer.open({
  *   title: '我是弹框',
  *   content: <div>我是内容</div>,
  * });
@@ -325,7 +350,7 @@ export type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContai
  * ```
  * ***************************
  * 2. 结合内置form使用，可在onOK、onCancel获取form对象
- * dialogModal.open({
+ * dialogDrawer.open({
  *   title: '我是弹框',
  *   content: (form, operate) => {
  *     return (
@@ -341,12 +366,37 @@ export type DialogModalProps = Omit<ModalProps, "onOk" | "onCancel" | "getContai
  *     return Promise.resolve();
  *   },
  * });
+ * 注意：
+ * 1.  设置operateRender后，需要自定义操作按钮，onOk、onCancel、okText、cancelText、okButtonExtraProps、cancelButtonExtraProps配置失效
  * ```
  */
-export declare const dialogModal: {
-	open: (props: DialogModalProps) => {
+export declare const dialogDrawer: {
+	open: (props: DialogDrawerProps) => {
 		close: () => void;
 	};
+	/**
+	 * ```
+	 * 1. 关闭最新弹框，如果有多个弹框只能关闭最后一个
+	 * 2. 多个弹框主动关闭，只能使用 dialogDrawer.open()返回值中的close
+	 * ```
+	 */
+	close: () => void;
+};
+export type DialogLoadingProps = {
+	className?: string;
+	message?: string;
+};
+export declare const dialogLoading: {
+	open: (props?: DialogLoadingProps) => {
+		close: () => void;
+	};
+	/**
+	 * ```
+	 * 1. 关闭最新弹框，如果有多个弹框只能关闭最后一个
+	 * 2. 多个弹框主动关闭，只能使用 dialogModal.open()返回值中的close
+	 * ```
+	 */
+	close: () => void;
 };
 export interface DrawerStateType {
 	title: string;
@@ -1321,7 +1371,25 @@ export type TagWrapperProps = {
  * ```
  */
 export declare const TagWrapper: FC<TagWrapperProps>;
+export type TableColumnIconRenderProps = {
+	/** 额外内容  */
+	extra: ReactElement;
+	onClick?: (e: any) => void;
+	showData?: boolean;
+	showMaxNumber?: number;
+	extraPosition?: "before" | "after";
+};
 export declare const tableCellRender: {
+	/**
+	 * 表格单元格 拼接额外内容渲染
+	 * ```
+	 * 1. extra 额外内容
+	 * 2. showData 是否显示数据，默认值：true
+	 * 3. onClick 点击事件，showData != false 有效
+	 * 4. showMaxNumber 显示最大长度，作用于原单元格字符串数据
+	 * ```
+	 */
+	extraContentRender: (options: TableColumnIconRenderProps) => (value?: TAny) => JSX.Element;
 	/**
 	 * table 索引展示，如果存在pageSize、pageNo参数可分页展示索引，否则每页都从1开始
 	 */
@@ -1357,9 +1425,10 @@ export declare const tableCellRender: {
 	 */
 	operateCell: (options: (item: TAny) => ButtonOperateProps) => (_value: string | number, record: any) => JSX.Element;
 	/**
-	 * 实现字段超出隐藏，默认长度20个【字节】
+	 * 实现字段超出隐藏，默认长度10个字符
 	 * ```
-	 * showMaxNumber: 显示最大【字节】长度
+	 * 1. showMaxNumber: 显示最大长度
+	 * 2. 会讲字符转出字节进行计算显示
 	 * ```
 	 */
 	tooltipCell: (showMaxNumber?: number, defaultValue?: string) => (value: string | number) => string | number | JSX.Element | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",