@flatbiz/antd 4.0.22 → 4.0.24

package/index.d.ts

@@ -280,7 +280,7 @@ export type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "name"> &
 	 * 如果 DateRangePickerWrapperFormItem 在Form.List场景下 必传
 	 */
 	formListName?: FormItemNamePath;
-	dateRangePickerWrapperProps?: Omit<DateRangePickerWrapperProps, "onChange">;
+	dateRangePickerWrapperProps?: DateRangePickerWrapperProps;
 };
 /**
  * 包含了Form.Item组件的时间区间选择组件
@@ -733,8 +733,8 @@ export type SelectorServiceConfig = {
 	 */
 	onRequestResultAdapter?: (respData: TAny) => TPlainObject[];
 };
-export type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "onSearch" | "notFoundContent" | "options" | "fieldNames" | "onChange" | "value" | "loading" | "mode"> & {
-	/** 不支持 tags 模式，tags模式请使用antd Select 组件 */
+export type SelectorWrapperProps = Omit<SelectProps, "onSearch" | "notFoundContent" | "options" | "fieldNames" | "onChange" | "value" | "loading" | "mode"> & {
+	/** 不支持 tags 模式，tags模式请使用 SelectorWrapperSimple 组件 */
 	mode?: "multiple";
 	modelKey: string;
 	fieldNames?: {
@@ -755,10 +755,10 @@ export type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "onSearch"
 	 */
 	selectorList?: TPlainObject[];
 	/**
-	 * selectorList发生变更时触发，第一次不调用
+	 * select 数据源发生变更时触发，第一次不调用
 	 */
 	onSelectorListChange?: (dataList: TPlainObject[]) => void;
-	/** selectorList发生变更时触发，每次都会调用 */
+	/** select 数据源发生变更时触发，每次都会调用 */
 	onSelectorListAllChange?: (dataList: TPlainObject[]) => void;
 	/**
 	 * 通过服务获取数据异常回调
@@ -772,55 +772,27 @@ export type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "onSearch"
 	 * ```
 	 */
 	showAllOption?: true | TPlainObject<string | number>;
-	/**
-	 * 输入操作类型，默认值：filter
-	 * ```
-	 * 1. search：根据输入项去服务端查询，如设置selectorList配置失效
-	 * 2. filter：初始化已查询数据，根据输入内容筛选
-	 * ```
-	 */
-	operateType?: "search" | "filter";
-	searchFieldName?: string;
-	/**
-	 * search模式下，回填value查询接口字段名称，默认值：searchId
-	 * ```
-	 * search模式下，外部传递 value 数据用于回填Select，会在查询接口中默认添加searchId字段（searchId的值为回填的value，类型有：string | number | Array<string | number>）
-	 * ```
-	 */
-	searchIdFieldName?: string;
 	onLabelRenderAdapter?: (dataItem: TPlainObject) => string | ReactElement;
 	onChange?: (value?: SelectorWrapperValue, selectedList?: TPlainObject[] | TPlainObject) => void;
 	showIcon?: boolean;
-	icon?: (data: TPlainObject) => ReactElement;
+	/** select option添加图标；与showIcon组合使用 */
+	icon?: (data: TPlainObject, index: number) => ReactElement;
 	requestMessageConfig?: RequestStatusRenderProps["messageConfig"];
 	/**
 	 * value格式
 	 *```
 	 * 1. string 、number
 	 * 2. Array<string | number>
-	 * 3. lableInValue = true，根据labelInValueFieldNames配置格式
-	 * 4. lableInValue = true，Array<labelInValueFieldNames配置>
+	 * 3. lableInValue = true，根据fieldNames配置格式
+	 * 4. lableInValue = true，Array<fieldNames配置>
 	 * ```
 	 */
 	value?: SelectorWrapperValue;
-	/**
-	 * ```
-	 * lableInValue = true，onChange输出数据字段名称，默认：{ label: string; value: string|number }
-	 * ```
-	 */
-	labelInValueFieldNames?: {
-		label: string;
-		value: string;
-	};
 };
 /**
  * 选择器包装组件
- * @param props
- * @returns
  * ```
- * 1. modelKey的配置是为了缓存数据；
- * 2. 设置 labelInValue 后，onChange 返回数据item：labelInValueFieldNames配置格式
- * 2. operateType=search状态下，外部传递 selectorValueList 回填数据查询接口时，会在接口中默认添加searchId字段（searchId的值为回填的selectorValueList，类型有：string | number | Array<string | number>）
+ * 1. 不支持搜索 + 调用服务模式
  * ```
  */
 export declare const SelectorWrapper: (props: SelectorWrapperProps) => JSX.Element;
@@ -1113,6 +1085,10 @@ export declare const FormItemGroup: {
 };
 export interface FormItemWrapperProps extends FormItemProps {
 	wrapper?: (children: ReactNode) => ReactElement;
+	/** 设置wrapper后，before、after失效 */
+	before?: ReactNode;
+	/** 设置wrapper后，before、after失效 */
+	after?: ReactNode;
 }
 /**
  * 对 Form.Item 的 children 增加 before、after
@@ -1220,7 +1196,7 @@ export interface LocalLoadingProps {
 	/** 接口数据配置 */
 	serviceConfig: LocalLoadingServiceConfig;
 	/** children 为函数，参数【respData】为接口返回数据 */
-	children?: (respData?: TAny) => ReactElement;
+	children: (respData?: TAny) => ReactElement;
 	/**
 	 * 是否异步，默认：false
 	 * ```
@@ -1229,8 +1205,6 @@ export interface LocalLoadingProps {
 	 * ```
 	 */
 	isAsync?: boolean;
-	/** 最小高度  */
-	minHeight?: number;
 	/** 自定义异常渲染处理 */
 	errorRender?: (error?: TAny) => ReactElement;
 }
@@ -1491,6 +1465,49 @@ export type RuleDescribeProps = {
 	ruleItemDescStyle?: CSSProperties;
 };
 export declare const RuleDescribe: (props: RuleDescribeProps) => JSX.Element;
+export type SelectorWrapperSearchServiceConfig = {
+	params?: TPlainObject;
+	onRequest: (params?: TAny) => TAny;
+	onRequestResultAdapter?: (respData: TAny) => TPlainObject[];
+};
+export type SelectorWrapperSearchProps = Omit<SelectProps, "onSearch" | "notFoundContent" | "options" | "fieldNames" | "loading"> & {
+	fieldNames?: {
+		label: string;
+		value: string;
+		disabled?: string;
+		searchKeyword?: string;
+	};
+	/**
+	 * 请求服务需求的数据
+	 */
+	serviceConfig: SelectorWrapperSearchServiceConfig;
+	/**
+	 * 添加全部选项
+	 * ```
+	 * 1. 默认值label="全部"，value=""
+	 * 2. 可配置label、value
+	 * ```
+	 */
+	showAllOption?: true | TPlainObject<string | number>;
+	/** selectorList发生变更时触发，每次都会调用 */
+	onSelectorListChange?: (dataList: TPlainObject[]) => void;
+	/**
+	 * 通过服务获取数据异常回调
+	 */
+	onSelectorRequestError?: (error: Error) => void;
+	requestMessageConfig?: RequestStatusRenderProps["messageConfig"];
+};
+/**
+ * 选择器简单包装组件
+ * @param props
+ * @returns
+ * ```
+ * 1. 只支持 search + 服务 功能
+ * 2. 不会缓存接口数据
+ * 3. 不会对value、onChange做任何处理
+ * ```
+ */
+export declare const SelectorWrapperSearch: (props: SelectorWrapperSearchProps) => JSX.Element;
 export type SelectorWrapperSimpleServiceConfig = {
 	params?: TPlainObject;
 	onRequest: (params?: TAny) => TAny;
@@ -2081,7 +2098,7 @@ export type TreeWrapperRefApi = {
  * 5. 设置loadDataFlag=true，会动态获取children，当treeNode中包含isLeaf=true字段，表示为叶子节点，没有children了
  * ```
  */
-export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit<TreeProps<import("antd").TreeDataNode>, "multiple" | "icon" | "onSelect" | "checkedKeys" | "selectedKeys" | "fieldNames" | "defaultSelectedKeys" | "loadData" | "onExpand" | "expandedKeys" | "treeData" | "defaultCheckedKeys" | "onCheck"> & {
+export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit<TreeProps<import("antd").TreeDataNode>, "multiple" | "icon" | "onSelect" | "onExpand" | "checkedKeys" | "fieldNames" | "defaultSelectedKeys" | "selectedKeys" | "loadData" | "expandedKeys" | "treeData" | "defaultCheckedKeys" | "onCheck"> & {
 	modelKey: string;
 	/**
 	 * useEffect依赖项数组，用于重新发起获取接口数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "4.0.22",
+  "version": "4.0.24",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -33,7 +33,7 @@
     "@dimjs/utils": ">=1.2.23",
     "@flatbiz/utils": ">=4.0.2",
     "@wove/react": ">=1.2.22",
-    "antd": ">=5.1.2",
+    "antd": ">=5.1.3",
     "dayjs": ">=1.11.7",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"
@@ -46,11 +46,12 @@
     "@dimjs/utils": "^1.2.23",
     "@flatbiz/utils": "^4.0.2",
     "@wove/react": "^1.2.22",
-    "antd": "^5.1.2",
+    "antd": "^5.1.3",
     "dayjs": "1.11.7",
     "dequal": "^2.0.3",
     "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react-dom": "18.2.0",
+    "pubsub-js": "^1.9.4"
   },
   "dependencies": {
     "dequal": "^2.0.3"