@flatbiz/antd 2.5.10 → 2.5.13

package/index.d.ts

@@ -15,7 +15,7 @@ import { CSSProperties, DependencyList, Dispatch, EffectCallback, FC, ReactEleme
 
 export declare const styles: () => void;
 export interface ButtonOperateItem extends ButtonProps {
-	text: string;
+	text: string | ReactElement;
 	color?: string;
 	onClick: (event: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	permission?: string;
@@ -147,6 +147,26 @@ export declare type DateRangePickerWrapperProps = Omit<RangePickerDateProps<mome
  * ```
  */
 export declare const DateRangePickerWrapper: VFC<DateRangePickerWrapperProps>;
+export declare type FormItemNamePath = string | number | Array<string | number>;
+export declare type DateRangePickerWrapperFormItemProps = Omit<FormItemProps, "name"> & {
+	/**
+	 * 开始的时间name
+	 */
+	startName: FormItemNamePath;
+	/**
+	 * 结束的时间name
+	 */
+	endName: FormItemNamePath;
+	/**
+	 * 如果 DateRangePickerWrapperFormItem 在Form.List场景下 必传
+	 */
+	formListName?: FormItemNamePath;
+	dateRangePickerWrapperProps?: Omit<DateRangePickerWrapperProps, "onChange">;
+};
+/**
+ * 包含了Form.Item组件的时间区间选择组件
+ */
+export declare const DateRangePickerWrapperFormItem: VFC<DateRangePickerWrapperFormItemProps>;
 export interface DrawerStateType {
 	title: string;
 	/**
@@ -271,7 +291,7 @@ export declare const DrawerWrapper: FC<DrawerWrapperProps> & DrawerWrapperStatic
  */
 export declare const createDrawerWrapperModel: (key: string) => API<ModelType<DrawerStateType, DrawerActionsParamType, any>>;
 export interface DropdownMenuItem extends ButtonProps {
-	text: string;
+	text: string | ReactElement;
 	color?: string;
 	onClick: (event: React.MouseEvent<HTMLElement>) => void | Promise<void>;
 	permission?: string;
@@ -316,6 +336,7 @@ export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "o
 	 * ```
 	 * 1. 如果配置fieldNames，会转换后使用
 	 * 2. 值为undefined、null不会更新，需要清空可传递空数组
+	 * 3. 设置后 serviceConfig 失效
 	 * ```
 	 */
 	selectorList?: TPlainObject[];
@@ -338,7 +359,7 @@ export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "o
 	/**
 	 * 输入操作类型，默认值：filter
 	 * ```
-	 * 1. search：根据输入项去服务端查询
+	 * 1. search：根据输入项去服务端查询，如设置selectorList配置失效
 	 * 2. filter：初始化已查询数据，根据输入内容筛选
 	 * ```
 	 */
@@ -411,6 +432,7 @@ export declare const SelectorWrapper: import("react").ForwardRefExoticComponent<
 	 * ```
 	 * 1. 如果配置fieldNames，会转换后使用
 	 * 2. 值为undefined、null不会更新，需要清空可传递空数组
+	 * 3. 设置后 serviceConfig 失效
 	 * ```
 	 */
 	selectorList?: TPlainObject<any>[] | undefined;
@@ -433,7 +455,7 @@ export declare const SelectorWrapper: import("react").ForwardRefExoticComponent<
 	/**
 	 * 输入操作类型，默认值：filter
 	 * ```
-	 * 1. search：根据输入项去服务端查询
+	 * 1. search：根据输入项去服务端查询，如设置selectorList配置失效
 	 * 2. filter：初始化已查询数据，根据输入内容筛选
 	 * ```
 	 */
@@ -684,6 +706,10 @@ export declare type EditorWrapperProps = {
 export declare const EditorWrapper: (props: any) => JSX.Element;
 export declare type FileImportProps = {
 	onImportFinish: (data?: any) => void;
+	buttonName?: string | ReactElement;
+	children?: (data: {
+		loading: boolean;
+	}) => React.ReactNode;
 } & Omit<UploadProps, "fileList" | "showUploadList" | "itemRender" | "listType" | "multiple" | "previewFile" | "progress" | "onChange" | "onDownload" | "onRemove" | "onPreview" | "directory" | "customRequest" | "defaultFileList" | "iconRender">;
 /**
  * 文件导入
@@ -886,7 +912,7 @@ export declare type LabelValueLayoutProps = {
 		label: string | ReactElement;
 		value: string | number | ReactElement;
 	}[];
-	labelWidth?: boolean;
+	labelWidth?: number;
 	column?: number;
 	bordered?: boolean;
 };
@@ -1128,8 +1154,14 @@ export declare type TreeSelectorServiceConfig = {
 	 */
 	onRequestResultAdapter?: (respData: any) => TPlainObject[];
 };
-export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpandedKeys" | "treeData" | "loading" | "onTreeExpand" | "onChange" | "value"> & {
+export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpandedKeys" | "treeData" | "loading" | "onTreeExpand" | "onChange" | "value" | "fieldNames"> & {
 	modelKey: string;
+	fieldNames?: {
+		label?: string;
+		value?: string;
+		children?: string;
+		disabled?: string;
+	};
 	/**
 	 * useEffect依赖项数组，用于重新发起获取接口数据
 	 */
@@ -1139,10 +1171,7 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 	 */
 	serviceConfig?: TreeSelectorServiceConfig;
 	/**
-	 * 当设置treeSelectorList后，serviceConfig、onTreeSelectorListChange将失效
-	 * ```
-	 * 1. 不支持异步数据，异步使用serviceConfig方式
-	 * ```
+	 * 当设置treeSelectorList后，serviceConfig 将失效
 	 */
 	treeSelectorList?: TreeSelectProps["treeData"];
 	/**
@@ -1164,14 +1193,18 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 	 */
 	showAllOption?: true | TPlainObject<string | number>;
 	/**
-	 * 1. 当 treeCheckable = true && treeCheckStrictly = true，selectedValue、selectedList返回数据包含父节点
+	 * 1. 当 treeCheckable = true && treeCheckStrictly = true，如果选择的数据中含有父节点，selectedValue、selectedList返回数据包含父节点
 	 * 2. 当 treeCheckable = true && treeCheckStrictly = false，selectedValue、selectedList返回的数据不包含父节点
 	 * 3. 当 treeCheckable = false，节点选择没有级联关系，selectedValue、selectedList返回的数据就是实际选择
 	 * 4. selectAllDataList 返回的数据都包含父节点
-	 * 5. 使用 onLabelRenderAdapter 拼接数据后，选中回填数据也是拼接后的
+	 * 5. 使用 onTreeItemAdapter 拼接label数据后，选中回填数据也是拼接后的
+	 * 6. triggerInfo 当前操作节点数据
 	 */
-	onChange?: (selectedValue?: TreeSelectorWrapperValue, selectedData?: TPlainObject[] | TPlainObject, selectAllDataList?: TPlainObject[]) => void;
-	onLabelRenderAdapter?: (dataItem: TPlainObject) => string;
+	onChangeHandle?: (selectedValue?: TreeSelectorWrapperValue, selectedData?: TPlainObject[] | TPlainObject, triggerInfo?: TPlainObject) => void;
+	/**
+	 * tree item 数据适配器
+	 */
+	onTreeItemDataAdapter?: (dataItem: TPlainObject) => TPlainObject;
 	requestMessageConfig?: RequestStatusRenderProps["messageConfig"];
 	/**
 	 * value格式
@@ -1183,6 +1216,10 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 	 * ```
 	 */
 	value?: TreeSelectorWrapperValue;
+	/**
+	 * treeCheckStrictly 	checkable 状态下节点选择完全受控（父子节点选中状态不再关联），
+	 * 会使得 labelInValue 强制为 true
+	 */
 	labelInValue?: boolean;
 	/**
 	 * ```
@@ -1193,10 +1230,10 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 		label: string;
 		value: string;
 	};
-};
-export declare type TreeSelectorWrapperRefApi = {
-	onClearSelectorList: () => void;
-	getTreeSelectorList: () => TreeSelectProps["treeData"];
+	/**
+	 * treeCheckStrictly = true模式下有效，点击父节点是否选中所有子节点，默认值：true
+	 */
+	selectedParentCheckedAllChildrenList?: boolean;
 };
 /**
  * 树选择器包装组件
@@ -1207,72 +1244,7 @@ export declare type TreeSelectorWrapperRefApi = {
  * 2. 父节点默认不返回，需要返回请设置showCheckedStrategy
  * ```
  */
-export declare const TreeSelectorWrapper: import("react").ForwardRefExoticComponent<Omit<TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType>, "value" | "loading" | "onChange" | "treeData" | "treeExpandedKeys" | "onTreeExpand"> & {
-	modelKey: string;
-	/**
-	 * useEffect依赖项数组，用于重新发起获取接口数据
-	 */
-	effectDependencyList?: DependencyList | undefined;
-	/**
-	 * 请求服务需求的数据，当设置`treeSelectorList`后无效果
-	 */
-	serviceConfig?: TreeSelectorServiceConfig | undefined;
-	/**
-	 * 当设置treeSelectorList后，serviceConfig、onTreeSelectorListChange将失效
-	 * ```
-	 * 1. 不支持异步数据，异步使用serviceConfig方式
-	 * ```
-	 */
-	treeSelectorList?: TreeSelectProps["treeData"];
-	/**
-	 * 通过服务获取数据后回调，当设置`treeSelectorList`后无效果
-	 */
-	onTreeSelectorListChange?: ((treeSelectorList?: TreeSelectProps["treeData"]) => void) | undefined;
-	/**
-	 * 通过服务获取数据异常回调，当设置`treeSelectorList`后无效果
-	 */
-	onTreeSelectorRequestError?: ((error: Error) => void) | undefined;
-	/**
-	 * 添加全部选项
-	 * ```
-	 * 1. showAllOption = true，添加默认全部选项（value值为空字符串）
-	 * 2. 可自定义全部选项，例如：{ label: '全部', value: 'all' }
-	 * 3. 自定义字段会通过fieldNames转换后使用
-	 * 4. 多选操作时，最好不要设置全部选项
-	 * ```
-	 */
-	showAllOption?: true | TPlainObject<string | number> | undefined;
-	/**
-	 * 1. 当 treeCheckable = true && treeCheckStrictly = true，selectedValue、selectedList返回数据包含父节点
-	 * 2. 当 treeCheckable = true && treeCheckStrictly = false，selectedValue、selectedList返回的数据不包含父节点
-	 * 3. 当 treeCheckable = false，节点选择没有级联关系，selectedValue、selectedList返回的数据就是实际选择
-	 * 4. selectAllDataList 返回的数据都包含父节点
-	 * 5. 使用 onLabelRenderAdapter 拼接数据后，选中回填数据也是拼接后的
-	 */
-	onChange?: ((selectedValue?: TreeSelectorWrapperValue, selectedData?: TPlainObject[] | TPlainObject, selectAllDataList?: TPlainObject[]) => void) | undefined;
-	onLabelRenderAdapter?: ((dataItem: TPlainObject) => string) | undefined;
-	requestMessageConfig?: RequestStatusRenderProps["messageConfig"];
-	/**
-	 * value格式
-	 *```
-	 * 1. string 、number
-	 * 2. Array<string | number>
-	 * 3. lableInValue = true，根据labelInValueFieldNames配置格式
-	 * 4. lableInValue = true，Array<labelInValueFieldNames配置>
-	 * ```
-	 */
-	value?: TreeSelectorWrapperValue | undefined;
-	labelInValue?: boolean | undefined;
-	/**
-	 * ```
-	 * lableInValue = true，onChange输出数据字段名称，默认：{ label: string; value: string|number }
-	 * ```
-	 */
-	labelInValueFieldNames?: {
-		label: string;
-		value: string;
-	} | undefined;
-} & import("react").RefAttributes<TreeSelectorWrapperRefApi>>;
+export declare const TreeSelectorWrapper: (props: any) => JSX.Element;
 export declare type TreeWrapperValue = string | number | Array<string | number> | TPlainObject<string | number> | Array<TPlainObject<string | number>>;
 export declare type TreeServiceConfig = {
 	params?: TPlainObject;
@@ -1313,7 +1285,7 @@ export declare type TreeWrapperProps = Omit<TreeProps, "expandedKeys" | "treeDat
 	 * 1. 不支持异步数据，异步使用serviceConfig方式
 	 * ```
 	 */
-	selectorTreeList?: TreeProps["treeData"];
+	selectorTreeList?: TPlainObject[];
 	/**
 	 * 通过服务获取数据后回调，当设置`selectorList`后无效果
 	 */
@@ -1410,7 +1382,7 @@ export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit
 	 * 1. 不支持异步数据，异步使用serviceConfig方式
 	 * ```
 	 */
-	selectorTreeList?: TreeProps["treeData"];
+	selectorTreeList?: TPlainObject<any>[] | undefined;
 	/**
 	 * 通过服务获取数据后回调，当设置`selectorList`后无效果
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "2.5.10",
+  "version": "2.5.13",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -42,7 +42,7 @@
     "@dimjs/model": "^1.1.7",
     "@dimjs/model-react": "^1.1.7",
     "@dimjs/utils": "^1.2.19",
-    "@flatbiz/utils": "^2.5.10",
+    "@flatbiz/utils": "^2.5.13",
     "@wove/react": "^1.2.19",
     "antd": "^4.22.2",
     "moment": "^2.29.4",
@@ -51,5 +51,5 @@
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0"
   },
-  "gitHead": "4cc7bdab9f166314663275f1495799f126af81c0"
+  "gitHead": "40bb03d2b86f999c7bfbed581bed6f6142e4187a"
 }