@flatbiz/antd 4.2.81 → 4.2.83

package/index.d.ts

@@ -3,9 +3,10 @@
 /// <reference types="scheduler" />
 
 import { API, ModelType } from '@dimjs/model';
+import { PlainObject } from '@dimjs/utils';
 import { DateFormatType, TAny, TNoopDefine, TPlainObject } from '@flatbiz/utils';
 import { IAllProps } from '@tinymce/tinymce-react';
-import { ButtonProps, CascaderProps, CheckboxProps, CollapseProps, ColorPickerProps, DrawerProps, DropdownProps, FormInstance, FormItemProps, FormListFieldData, FormListOperation, InputNumberProps, InputProps, ModalProps, PaginationProps, PopconfirmProps, RadioGroupProps, RowProps, SelectProps, SpaceProps, SwitchProps, TableProps, TabsProps, TagProps, TimePickerProps, TimeRangePickerProps, TooltipProps, TreeProps, TreeSelectProps, UploadProps } from 'antd';
+import { ButtonProps, CascaderProps, CheckboxProps, CollapseProps, ColorPickerProps, DrawerProps, DropdownProps, FormInstance, FormItemProps, FormListFieldData, FormListOperation, InputNumberProps, InputProps, ModalProps, PaginationProps, PopconfirmProps, PopoverProps, RadioGroupProps, RowProps, SelectProps, SpaceProps, SwitchProps, TableProps, TabsProps, TagProps, TimePickerProps, TimeRangePickerProps, TooltipProps, TreeProps, TreeSelectProps, UploadProps } from 'antd';
 import { ConfigProviderProps } from 'antd/es/config-provider';
 import { PickerDateProps, RangePickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { FormListProps } from 'antd/es/form';
@@ -1012,11 +1013,11 @@ export type EasyTableFilterProps = {
 	/** 是否为纯净模式（查询条件布局是否自定义）， */
 	isPure?: boolean;
 	/** 查询按钮配置 */
-	queryButtonProps?: Omit<ButtonProps, "onClick"> & {
+	queryButtonProps?: Omit<ButtonWrapperProps, "onClick"> & {
 		text?: string;
 	};
 	/** 重置按钮配置 */
-	resetButtonProps?: Omit<ButtonProps, "onClick"> & {
+	resetButtonProps?: Omit<ButtonWrapperProps, "onClick"> & {
 		text?: string;
 	};
 	/**
@@ -1032,11 +1033,58 @@ export type EasyTableFilterProps = {
 	filterWrapperStyle?: CSSProperties;
 	/** filter Form 外层 SimpleLayout className  */
 	filterWrapperClassName?: string;
+	/**
+	 * 自定义 filterOperate.rightList 后 默认【查询、重置】按钮处理逻辑
+	 * 1. cover：覆盖内部查询重置按钮（默认值）
+	 * 2. beforeAppend：添加到【查询重置】按钮前面
+	 * 3. afterAppend：添加到【查询重置】按钮后面
+	 *
+	 * 如果想隐藏【查询、重置】按钮中的某一个，可设置 queryButtonProps.hidden、resetButtonProps.hidden
+	 */
+	rightOperateAreaAppendType?: "cover" | "beforeAppend" | "afterAppend";
+};
+export type TipsWrapperProps = {
+	gap?: number;
+	className?: string;
+	style?: CSSProperties;
+	children?: ReactNode;
+	icon?: ReactElement;
+	/** Icon添加点击事件，设置hoverTips后失效 */
+	onClick?: (event: any) => void;
+	/**
+	 * 提示效果类型
+	 * ```
+	 * 1. popover 气泡卡片，内容通过popoverProps设置
+	 * 2. tooltip 文字提示，内容通过tooltipProps设置
+	 * ```
+	 */
+	tipType?: "popover" | "tooltip";
+	popoverProps?: PopoverProps;
+	tooltipProps?: TooltipProps;
+	trigger?: "icon" | "all";
 };
+/**
+ * 为目标元素右侧添加Icon
+ * ```
+ * Icon有两种交互行为
+ * 1. 鼠标悬浮显示提示效果;
+ * 2. 为Icon添加点击事件
+ *
+ * 例如：
+ * 1.
+ * <TipsWrapper tipType="tooltip" tooltipProps={{ title:'说明文案' }}>ABC</TipsWrapper>
+ * 2.
+ * <TipsWrapper tipType="popover" popoverProps={{ title:'说明标题', content:'说明内容' }}>ABC</TipsWrapper>
+ * 3.
+ * <TipsWrapper onClick={noop}>ABC</TipsWrapper>
+ * ```
+ */
+export declare const TipsWrapper: (props: TipsWrapperProps) => import("react/jsx-runtime").JSX.Element;
 export type TEasyTableTableColumn<T> = ColumnsType<T>[0] & {
 	/**
-	 * 会在 title 之后展示一个 icon，hover 之后提示一些信息
+	 * @description 请使用 tipsWrapperProps 属性配置
 	 * ```
+	 * 会在 title 之后展示一个 icon，hover 之后提示一些信息
 	 * 1. title为string类型有效
 	 * 2. hoverArea 默认值：icon
 	 * ```
@@ -1047,6 +1095,15 @@ export type TEasyTableTableColumn<T> = ColumnsType<T>[0] & {
 		hoverArea?: "icon" | "all";
 	};
 	dataIndex?: keyof T | (string & {});
+	/**
+	 * 会在 title 之后展示一个 icon
+	 * ```
+	 * 1. title为string类型有效
+	 * 2. 可为icon添加提示效果
+	 * 3. 可为icon添加点击事件
+	 * ```
+	 */
+	tipsWrapperProps?: string | TipsWrapperProps;
 };
 export type EasyTableTableProps<T> = Omit<TableProps<TAny>, "dataSource" | "loading" | "rowKey" | "columns"> & {
 	children?: ReactElement | ReactElement[];
@@ -1112,6 +1169,7 @@ export declare const EasyTable: import("react").ForwardRefExoticComponent<EasyTa
 	 *3. EasyTable.Filter中内置了 Form 标签，当children为函数时，可获取form实例
 	 *4. 默认布局下，可通过设置 filterOperate 设置操作按钮
 	 *5. Filter 子节点包含 hidden = true 会被忽略
+	 *6. 如果想隐藏【查询、重置】按钮中的某一个，可设置 queryButtonProps.hidden、resetButtonProps.hidden
 	 *```
 	 */
 	Filter: (props: EasyTableFilterProps) => import("react/jsx-runtime").JSX.Element;
@@ -1127,7 +1185,9 @@ export declare const EasyTable: import("react").ForwardRefExoticComponent<EasyTa
 	/**
 	 * @deprecated 已过时 4.3.0版本移除，请使用 useEasyTable
 	 */
-	useEasyTablRef: () => import("react").MutableRefObject<EasyTableRefApi>;
+	useEasyTablRef: () => {
+		current: EasyTableRefApi;
+	};
 	/**  在 EasyTable子组件内才可使用 */
 	useEasyTable: () => EasyTableRefApi;
 };
@@ -1454,8 +1514,9 @@ export type fieldConfigFunctionParams = {
  */
 export type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
 	/**
-	 * 会在 title 之后展示一个 icon，hover 之后提示一些信息
+	 * @description 请使用 tipsWrapperProps 属性配置
 	 * ```
+	 * 会在 title 之后展示一个 icon，hover 之后提示一些信息
 	 * 1. title为string类型、ReactElement有效
 	 * 2. hoverArea 默认值：icon
 	 * ```
@@ -1465,6 +1526,15 @@ export type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
 		icon?: ReactElement;
 		hoverArea?: "icon" | "all";
 	};
+	/**
+	 * 会在 title 之后展示一个 icon
+	 * ```
+	 * 1. title为string类型有效
+	 * 2. 可为icon添加提示效果
+	 * 3. 可为icon添加点击事件
+	 * ```
+	 */
+	tipsWrapperProps?: string | TipsWrapperProps;
 	dataIndex?: string;
 	fieldConfig?: FieldSingleConfig | FormListConfig | ((data: fieldConfigFunctionParams) => FieldSingleConfig | FormListConfig);
 	/** 隐藏域字段 */
@@ -1488,7 +1558,7 @@ export type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
 		index: number;
 	}) => ReactElement | null;
 	/** table datasource children column 自定义渲染  */
-	tableChildrenColumnRender?: (value: any, record: TPlainObject, index: number) => ReactElement | null;
+	tableChildrenColumnRender?: (value: TAny, record: TPlainObject, index: number) => ReactElement | null;
 };
 export type EditableTableProps = {
 	name: EditableTableName;
@@ -1513,6 +1583,10 @@ export type EditableTableProps = {
 	/** 新增行默认值，自定义onTableAfterRender后失效 */
 	getAddRowDefaultValues?: () => TPlainObject;
 };
+export type EditableTableRefApi = {
+	/** 可用于表格行选择操作时，获取操作列数据 */
+	getTableItemDataByFormListItemKey: (key: number) => TPlainObject;
+};
 /**
  * 可编辑表格
  * demo：https://fex.qa.tcshuke.com/docs/admin/main/table/row-editable1
@@ -1521,9 +1595,10 @@ export type EditableTableProps = {
  * 1. table children column 不可编辑
  * 2. 当存在折叠children数据时，组件会在children中内置_isChildrenItem字段
  * 3. 可通过tableChildrenColumnRender自定义渲染 table children column 显示
+ * 4. 设置 rowSelection 后，rowSelection.onChange 通过 ref 的 getTableItemDataByFormListItemKey获取数据
  * ```
  */
-export declare const EditableTable: (props: EditableTableProps) => import("react/jsx-runtime").JSX.Element;
+export declare const EditableTable: import("react").ForwardRefExoticComponent<EditableTableProps & import("react").RefAttributes<EditableTableRefApi>>;
 export type EditorWrapperProps = {
 	onChange?: (data?: string) => void;
 	value?: string;
@@ -1753,14 +1828,14 @@ export declare const FormGrid: {
 	 * FormItem网格响应式布局
 	 *```
 	 * 1. 应用场景：Form条件布局
-	 * 2. 子元素只能是 FormCol、FormOperateCol，其他会被忽略
-	 * 3. 所有子元素中只能存在一个 FormOperateCol
+	 * 2. 子元素只能是 FormGrid.Col、FormGrid.OperateCol，其他会被忽略
+	 * 3. 所有子元素中只能存在一个 FormGrid.OperateCol
 	 */
 	Row: (props: FormRowProps) => import("react/jsx-runtime").JSX.Element;
 	/**
 	 * 网格响应式布局，默认值：{ xs: 24, sm: 12, md: 12, lg: 8, xl: 8, xxl: 6 }
 	 *```
-	 * 1. 设置 span 栅格占位格数，不考虑响应式
+	 * 1. 设置 span 栅格占位格数，替换lg、xl、xxl默认数据，不替换xs、sm布局数据
 	 * 2. grid 自定义响应式网格布局
 	 * xs: 屏幕 < 576px
 	 * sm: 屏幕 ≥ 576px
@@ -2005,6 +2080,7 @@ export type LabelValueLayoutProps = {
 	column?: number;
 	bordered?: boolean;
 	className?: string;
+	style?: CSSProperties;
 };
 /**
  * options[].span 是 Description.Item 的数量。 span={2} 会占用两个 DescriptionItem 的宽度
@@ -2370,6 +2446,40 @@ export type RuleDescribeProps = {
 	ruleItemDescStyle?: CSSProperties;
 };
 export declare const RuleDescribe: (props: RuleDescribeProps) => import("react/jsx-runtime").JSX.Element;
+export interface ISearchMenuProps {
+	/**
+	 * 如果传了value，就变成受控组件
+	 * 目前只支持单选
+	 */
+	value?: string;
+	onChange?: (key: string, keyPath: string[], targetItem?: PlainObject) => void;
+	/** 树型源数据 */
+	dataSource: TPlainObject[];
+	/** 惰性搜索 */
+	lazySearch?: boolean;
+	/** 搜索目标字段 */
+	searchKeyList?: string[];
+	/** 格式化参数 */
+	fieldNames?: {
+		label?: string;
+		key?: string;
+		children?: string;
+	};
+	/** 自定义渲染条目 */
+	renderItem?: FC<TAny>;
+	/** 搜索框参数 */
+	inputProps?: InputSearchWrapperProps;
+	placeholder?: string;
+	className?: string;
+	wrapStyle?: React.CSSProperties;
+	style?: React.CSSProperties;
+}
+/**
+ * 列表搜索
+ * @param props
+ * @returns
+ */
+export declare function SearchMenu(props: ISearchMenuProps): import("react/jsx-runtime").JSX.Element;
 export type SelectorWrapperSearchServiceConfig = {
 	params?: TPlainObject;
 	onRequest: (params?: TAny) => TAny;
@@ -2848,7 +2958,7 @@ export type TableTitleTooltipProps = {
 	title: string | ReactElement;
 	tooltip: string | {
 		icon?: ReactElement;
-		content?: string;
+		content: string;
 		hoverArea?: "icon" | "all";
 	};
 	gap?: number;
@@ -2857,8 +2967,7 @@ export type TableTitleTooltipProps = {
 };
 /**
  * title + tooltip
- * @param props
- * @returns
+ * @deprecated 已过期，请使用 TipsWrapper 组件
  */
 export declare const TableTitleTooltip: (props: TableTitleTooltipProps) => import("react/jsx-runtime").JSX.Element;
 export type TabsWrapperProps = TabsProps & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "4.2.81",
+  "version": "4.2.83",
   "description": "flat-biz ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -31,7 +31,7 @@
     "@dimjs/model": ">=1.1.8",
     "@dimjs/model-react": ">=1.1.8",
     "@dimjs/utils": ">=1.3.2",
-    "@flatbiz/utils": ">=4.0.13",
+    "@flatbiz/utils": ">=4.0.15",
     "@wove/react": ">=1.2.23",
     "antd": ">=5.5.1",
     "dayjs": ">=1.11.9",