@flatbiz/antd 2.4.9 → 2.5.2

package/index.d.ts

@@ -6,8 +6,9 @@ import { ButtonProps, CascaderProps, DrawerProps, DropdownProps, FormItemProps,
 import { CheckboxGroupProps } from 'antd/lib/checkbox';
 import { PickerDateProps, RangePickerDateProps } from 'antd/lib/date-picker/generatePicker';
 import { FormListFieldData, FormListOperation, FormListProps } from 'antd/lib/form/FormList';
-import { TextAreaProps } from 'antd/lib/input';
+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';
@@ -40,7 +41,7 @@ export declare type CascaderWrapperServiceConfig = {
 	 */
 	onRequestResultAdapter?: (respData: any) => TPlainObject[];
 };
-export declare type CascaderWrapperProps = Omit<CascaderProps<any>, "loading" | "notFoundContent" | "options"> & {
+export declare type CascaderWrapperProps = Omit<CascaderProps<any>, "loading" | "notFoundContent" | "options" | "value" | "multiple" | "onChange"> & {
 	modelKey: string;
 	/**
 	 * 请求服务需求的数据，当设置`selectorList`后无效果
@@ -51,6 +52,8 @@ export declare type CascaderWrapperProps = Omit<CascaderProps<any>, "loading" |
 	 * 是否动态加载选项
 	 */
 	isDynamicLoad?: boolean;
+	value?: string | number;
+	onChange?: (value: string | number, selectedList: TPlainObject[]) => void;
 };
 export declare type CascaderWrapperRefApi = {
 	getCascaderList: () => TPlainObject[];
@@ -60,10 +63,12 @@ export declare type CascaderWrapperRefApi = {
  * @param props
  * @returns
  * ```
- * 1. modelKey的配置是为了缓存数据，只缓存初始化数据，如果isDynamicLoad=true，动态获取的数据不再缓存
+ * 1. 不支持多选
+ * 2. modelKey的配置是为了缓存数据，只缓存初始化数据，如果isDynamicLoad=true，动态获取的数据不再缓存
+ * 3. onChange操作第一个参数返回叶子节点value，第二个参数返回选中的多级数据
  * ```
  */
-export declare const CascaderWrapper: import("react").ForwardRefExoticComponent<Omit<CascaderProps<any>, "loading" | "options" | "notFoundContent"> & {
+export declare const CascaderWrapper: import("react").ForwardRefExoticComponent<Omit<CascaderProps<any>, "value" | "loading" | "multiple" | "options" | "onChange" | "notFoundContent"> & {
 	modelKey: string;
 	/**
 	 * 请求服务需求的数据，当设置`selectorList`后无效果
@@ -74,6 +79,8 @@ export declare const CascaderWrapper: import("react").ForwardRefExoticComponent<
 	 * 是否动态加载选项
 	 */
 	isDynamicLoad?: boolean | undefined;
+	value?: string | number | undefined;
+	onChange?: ((value: string | number, selectedList: TPlainObject[]) => void) | undefined;
 } & import("react").RefAttributes<CascaderWrapperRefApi>>;
 export declare type DatePickerWrapperProps = Omit<PickerDateProps<moment.Moment>, "value" | "onChange"> & {
 	value?: string;
@@ -233,6 +240,7 @@ declare const DrawerWrapperFooter: (props: any) => JSX.Element;
  * ```
  * 1. 默认 destroyOnClose = true
  * 2. 默认 forceRender = false
+ * 3. 如果设置 forceRender = true，会导致弹框中的接口提前调用
  * ```
  */
 export declare const DrawerWrapper: FC<DrawerWrapperProps> & DrawerWrapperStaticMethods;
@@ -297,6 +305,10 @@ export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "o
 	 * 通过服务获取数据后回调，当设置`selectorList`后无效果
 	 */
 	onSelectorListChange?: (dataList: TPlainObject[]) => void;
+	/**
+	 * 通过服务获取数据异常回调，当设置`treeSelectorList`后无效果
+	 */
+	onSelectorRequestError?: (error: Error) => void;
 	/**
 	 * 添加全部选项
 	 * ```
@@ -317,6 +329,8 @@ export declare type SelectorWrapperProps = Omit<SelectProps, "filterOption" | "o
 	searchFieldName?: string;
 	onLabelRenderAdapter?: (dataItem: TPlainObject) => string | ReactElement;
 	onChange?: (value?: string | number | string[] | number[], selectedList?: TPlainObject[] | TPlainObject) => void;
+	showIcon?: boolean;
+	icon?: (data: TPlainObject) => ReactElement;
 };
 export declare type SelectorWrapperRefApi = {
 	onClearSelectorList: () => void;
@@ -363,6 +377,10 @@ export declare const SelectorWrapper: import("react").ForwardRefExoticComponent<
 	 * 通过服务获取数据后回调，当设置`selectorList`后无效果
 	 */
 	onSelectorListChange?: ((dataList: TPlainObject[]) => void) | undefined;
+	/**
+	 * 通过服务获取数据异常回调，当设置`treeSelectorList`后无效果
+	 */
+	onSelectorRequestError?: ((error: Error) => void) | undefined;
 	/**
 	 * 添加全部选项
 	 * ```
@@ -383,6 +401,8 @@ export declare const SelectorWrapper: import("react").ForwardRefExoticComponent<
 	searchFieldName?: string | undefined;
 	onLabelRenderAdapter?: ((dataItem: TPlainObject) => string | ReactElement) | undefined;
 	onChange?: ((value?: string | number | string[] | number[], selectedList?: TPlainObject[] | TPlainObject) => void) | undefined;
+	showIcon?: boolean | undefined;
+	icon?: ((data: TPlainObject) => ReactElement) | undefined;
 } & import("react").RefAttributes<SelectorWrapperRefApi>>;
 export declare type UploadWrapperFileItem = {
 	uid: string;
@@ -431,6 +451,7 @@ export declare type UploadWrapperProps<T extends TPlainObject = TPlainObject> =
  *
  */
 export declare const UploadWrapper: FC<UploadWrapperProps>;
+export declare type EditableTableName = string | number | Array<string | number>;
 export declare type EditableTableRecordType = FormListFieldData & {
 	operation: FormListOperation;
 };
@@ -537,12 +558,17 @@ export declare type FormListConfig = {
 		formListItemIndex: number;
 	}) => ReactElement;
 };
+export declare type fieldConfigFunctionParams = {
+	tableRowIndex: number;
+	name: EditableTableName;
+	tableRowName: EditableTableName;
+};
 /**
  * antd 默认render功能此处不能使用
  */
 export declare type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
 	dataIndex?: string;
-	fieldConfig?: FieldSingleConfig | FormListConfig;
+	fieldConfig?: FieldSingleConfig | FormListConfig | ((data: fieldConfigFunctionParams) => FieldSingleConfig | FormListConfig);
 	/**
 	 * 渲染中间件，如果renderMiddleware返回值为ReactElement格式，则会终止后续逻辑，fieldConfig配置将失效
 	 * ```
@@ -553,7 +579,8 @@ export declare type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
 	 */
 	renderMiddleware?: (item: {
 		tableRowIndex: number;
-		name: string | number | Array<string | number>;
+		name: EditableTableName;
+		tableRowName: EditableTableName;
 		operation: FormListOperation;
 	}) => ReactElement | null;
 };
@@ -690,6 +717,45 @@ export declare type IconWrapperProps = {
 	onClick?: (event: any) => void;
 };
 export declare const IconWrapper: VFC<IconWrapperProps>;
+export declare type InputWrapperProps = Omit<InputProps, "defaultValue">;
+/**
+ * ```
+ * 1. 在输入框内输入拼音的时候，在拼音尚未输入完成时，字母会触发Input的onChange事件；导致以上效果的原因是input事件没办法知道我们在使用中文输入法
+ * 2. 此处封装可以解决此问题，在输入拼音未完成时不会触达onChange，选择拼音结果触发onChange
+ *
+ * 3. 设置value时，内部可将受控操作转为非受控操作（具体实现逻辑，自行查看源码）
+ * 4. 适用场景：需要通过onChange事件处理业务逻辑，例如：在onChange中调用接口数据
+ * 5. defaultValue不可使用
+ *
+ * ```
+ */
+export declare const InputWrapper: VFC<InputWrapperProps>;
+export declare type InputSearchWrapperProps = Omit<SearchProps, "defaultValue">;
+/**
+ * ```
+ * 1. 在输入框内输入拼音的时候，在拼音尚未输入完成时，字母会触发Input的onChange事件；导致以上效果的原因是input事件没办法知道我们在使用中文输入法
+ * 2. 此处封装可以解决此问题，在输入拼音未完成时不会触达onChange，选择拼音结果触发onChange
+ *
+ * 3. 设置value时，内部可将受控操作转为非受控操作（具体实现逻辑，自行查看源码）
+ * 4. 适用场景：需要通过onChange事件处理业务逻辑，例如：在onChange中调用接口数据
+ * 5. defaultValue不可使用
+ *
+ * ```
+ */
+export declare const InputSearchWrapper: VFC<InputSearchWrapperProps>;
+export declare type InputTextAreaWrapperProps = Omit<TextAreaProps, "defaultValue">;
+/**
+ * ```
+ * 1. 在输入框内输入拼音的时候，在拼音尚未输入完成时，字母会触发Input的onChange事件；导致以上效果的原因是input事件没办法知道我们在使用中文输入法
+ * 2. 此处封装可以解决此问题，在输入拼音未完成时不会触达onChange，选择拼音结果触发onChange
+ *
+ * 3. 设置value时，内部可将受控操作转为非受控操作（具体实现逻辑，自行查看源码）
+ * 4. 适用场景：需要通过onChange事件处理业务逻辑，例如：在onChange中调用接口数据
+ * 5. defaultValue不可使用
+ *
+ * ```
+ */
+export declare const InputTextAreaWrapper: VFC<InputTextAreaWrapperProps>;
 export interface ModalStateType {
 	title?: string;
 	/**
@@ -788,6 +854,7 @@ declare const ModalWrapperFooter: (props: any) => JSX.Element;
  * ```
  * 1. 默认 destroyOnClose = true
  * 2. 默认 forceRender = false
+ * 3. 如果设置 forceRender = true，会导致弹框中的接口提前调用
  * ```
  */
 export declare const ModalWrapper: FC<ModalWrapperProps> & ModalWrapperStaticMethods;
@@ -830,6 +897,8 @@ export declare const preDefinedClassName: {
 		label_width_110: string;
 		label_width_120: string;
 		label_width_130: string;
+		label_width_140: string;
+		label_width_150: string;
 		label_width_auto: string;
 		label_align_left: string;
 		label_align_right: string;
@@ -842,6 +911,8 @@ export declare const preDefinedClassName: {
 		label_width_110: string;
 		label_width_120: string;
 		label_width_130: string;
+		label_width_140: string;
+		label_width_150: string;
 		label_width_auto: string;
 		label_align_left: string;
 		label_align_right: string;
@@ -855,6 +926,7 @@ export declare type SimpleLayoutProps = {
 	formLabelAlign?: "left" | "right";
 	layoutType?: "layer" | "tight";
 	titleLeftLine?: boolean;
+	contentStyle?: CSSProperties;
 };
 /**
  * 简单布局
@@ -913,7 +985,8 @@ export declare type TreeSelectorServiceConfig = {
 	 */
 	onRequestResultAdapter?: (respData: any) => TPlainObject[];
 };
-export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpandedKeys" | "treeData" | "loading" | "onTreeExpand" | "onChange"> & {
+export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpandedKeys" | "treeData" | "loading" | "onTreeExpand" | "onChange" | "value"> & {
+	value?: string | number | Array<string | number>;
 	modelKey: string;
 	effectDependencyList?: DependencyList;
 	/**
@@ -931,6 +1004,10 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 	 * 通过服务获取数据后回调，当设置`treeSelectorList`后无效果
 	 */
 	onTreeSelectorListChange?: (treeSelectorList?: TreeSelectProps["treeData"]) => void;
+	/**
+	 * 通过服务获取数据异常回调，当设置`treeSelectorList`后无效果
+	 */
+	onTreeSelectorRequestError?: (error: Error) => void;
 	/**
 	 * 添加全部选项
 	 * ```
@@ -941,7 +1018,15 @@ export declare type TreeSelectorWrapperProps = Omit<TreeSelectProps, "treeExpand
 	 * ```
 	 */
 	showAllOption?: true | TPlainObject<string | number>;
-	onChange?: (selectedValueList?: Array<string | number> | string | number, selectedList?: TPlainObject[] | TPlainObject) => void;
+	/**
+	 * 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?: Array<string | number> | string | number, selectedData?: TPlainObject[] | TPlainObject, selectAllDataList?: TPlainObject[]) => void;
+	onLabelRenderAdapter?: (dataItem: TPlainObject) => string;
 };
 export declare type TreeSelectorWrapperRefApi = {
 	onClearSelectorList: () => void;
@@ -953,9 +1038,11 @@ export declare type TreeSelectorWrapperRefApi = {
  * @returns
  * ```
  * 1. 当设置treeSelectorList属性后，serviceConfig、onTreeSelectorListChange将失效
+ * 2. 父节点默认不返回，需要返回请设置showCheckedStrategy
  * ```
  */
-export declare const TreeSelectorWrapper: import("react").ForwardRefExoticComponent<Omit<TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType>, "loading" | "onChange" | "treeData" | "treeExpandedKeys" | "onTreeExpand"> & {
+export declare const TreeSelectorWrapper: import("react").ForwardRefExoticComponent<Omit<TreeSelectProps<any, import("rc-tree-select/lib/TreeSelect").DefaultOptionType>, "value" | "loading" | "onChange" | "treeData" | "treeExpandedKeys" | "onTreeExpand"> & {
+	value?: string | number | (string | number)[] | undefined;
 	modelKey: string;
 	effectDependencyList?: DependencyList | undefined;
 	/**
@@ -973,6 +1060,10 @@ export declare const TreeSelectorWrapper: import("react").ForwardRefExoticCompon
 	 * 通过服务获取数据后回调，当设置`treeSelectorList`后无效果
 	 */
 	onTreeSelectorListChange?: ((treeSelectorList?: TreeSelectProps["treeData"]) => void) | undefined;
+	/**
+	 * 通过服务获取数据异常回调，当设置`treeSelectorList`后无效果
+	 */
+	onTreeSelectorRequestError?: ((error: Error) => void) | undefined;
 	/**
 	 * 添加全部选项
 	 * ```
@@ -983,7 +1074,15 @@ export declare const TreeSelectorWrapper: import("react").ForwardRefExoticCompon
 	 * ```
 	 */
 	showAllOption?: true | TPlainObject<string | number> | undefined;
-	onChange?: ((selectedValueList?: Array<string | number> | string | number, selectedList?: TPlainObject[] | TPlainObject) => void) | 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?: Array<string | number> | string | number, selectedData?: TPlainObject[] | TPlainObject, selectAllDataList?: TPlainObject[]) => void) | undefined;
+	onLabelRenderAdapter?: ((dataItem: TPlainObject) => string) | undefined;
 } & import("react").RefAttributes<TreeSelectorWrapperRefApi>>;
 export declare type TreeServiceConfig = {
 	params?: TPlainObject;
@@ -1007,7 +1106,7 @@ export declare type TreeWrapperMenuItem = {
 	onClick: (dataItem: TPlainObject, event: any) => void;
 	icon?: ReactElement;
 };
-export declare type TreeWrapperProps = Omit<TreeProps, "expandedKeys" | "treeData" | "onExpand" | "selectedKeys" | "checkedKeys" | "onCheck" | "onSelect" | "defaultCheckedKeys" | "defaultSelectedKeys" | "fieldNames" | "multiple"> & {
+export declare type TreeWrapperProps = Omit<TreeProps, "expandedKeys" | "treeData" | "onExpand" | "selectedKeys" | "checkedKeys" | "onCheck" | "onSelect" | "defaultCheckedKeys" | "defaultSelectedKeys" | "fieldNames" | "multiple" | "loadData" | "icon"> & {
 	modelKey: string;
 	effectDependencyList?: DependencyList;
 	/**
@@ -1046,6 +1145,10 @@ export declare type TreeWrapperProps = Omit<TreeProps, "expandedKeys" | "treeDat
 	showSearch?: boolean;
 	onSearchValueChange?: (searchValue?: string) => void;
 	searchPlaceholder?: string;
+	icon?: (data: AntdTreeNodeAttribute & {
+		isParent: boolean;
+		isLeaf: boolean;
+	}) => ReactElement;
 };
 export declare type TreeWrapperRefApi = {
 	onClearSelectorList: () => void;
@@ -1056,13 +1159,17 @@ export declare type TreeWrapperRefApi = {
  * @param props
  * @returns
  * ```
- * 1. 当设置selectorTreeList属性后，serviceConfig将失效
- * 2. checkable=true，为多选模式
- * 3. 设置value后，组件显示受控
- * 4. 设置loadDataFlag=true，会动态获取children，当dataItem中包含isLeaf=true字段，表示为叶子节点，没有children了
+ * 1. treeNode内置字段说明（如需要相关功能，可在接口中添加固定字段）
+ *    a. disabled 禁掉响应
+ *    b. isLeaf  设置为叶子节点 (设置了 loadData 时有效)。为 false 时会强制将其作为父节点
+ *    c. disableCheckbox  checkable模式下，treeNode复选框是否可选
+ * 2. 当设置selectorTreeList属性后，serviceConfig将失效
+ * 3. checkable=true，为多选模式
+ * 4. 设置value后，组件显示受控
+ * 5. 设置loadDataFlag=true，会动态获取children，当treeNode中包含isLeaf=true字段，表示为叶子节点，没有children了
  * ```
  */
-export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit<TreeProps<import("antd").TreeDataNode>, "multiple" | "onSelect" | "checkedKeys" | "selectedKeys" | "fieldNames" | "defaultSelectedKeys" | "onExpand" | "expandedKeys" | "treeData" | "defaultCheckedKeys" | "onCheck"> & {
+export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit<TreeProps<import("antd").TreeDataNode>, "multiple" | "icon" | "onSelect" | "checkedKeys" | "selectedKeys" | "fieldNames" | "loadData" | "defaultSelectedKeys" | "onExpand" | "expandedKeys" | "treeData" | "defaultCheckedKeys" | "onCheck"> & {
 	modelKey: string;
 	effectDependencyList?: DependencyList | undefined;
 	/**
@@ -1101,6 +1208,10 @@ export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit
 	showSearch?: boolean | undefined;
 	onSearchValueChange?: ((searchValue?: string) => void) | undefined;
 	searchPlaceholder?: string | undefined;
+	icon?: ((data: AntdTreeNodeAttribute & {
+		isParent: boolean;
+		isLeaf: boolean;
+	}) => ReactElement) | undefined;
 } & import("react").RefAttributes<TreeWrapperRefApi>>;
 
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "2.4.9",
+  "version": "2.5.2",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -27,27 +27,29 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@dimjs/lang": "^1.2.9",
-    "@dimjs/model": "^1.1.3",
-    "@dimjs/model-react": "^1.1.4",
-    "@dimjs/utils": "^1.2.9",
-    "@flatbiz/utils": "^2.3.15",
-    "@wove/react": "^1.2.10"
+    "@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"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@dimjs/lang": "^1.2.9",
-    "@dimjs/model": "^1.1.3",
-    "@dimjs/model-react": "^1.1.4",
-    "@dimjs/utils": "^1.2.9",
-    "@flatbiz/utils": "^2.4.9",
-    "@wove/react": "^1.2.10",
-    "antd": "^4.20.0",
-    "moment": "^2.29.3",
+    "@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.1",
+    "@wove/react": "^1.2.19",
+    "antd": "^4.22.2",
+    "moment": "^2.29.4",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0"
   },
-  "gitHead": "109d86585ec831d90302db4d661316b0c5672576"
+  "gitHead": "a68070dfa6f3d8223e072eef2971733a738ebf3a"
 }