@flatbiz/antd 2.3.20 → 2.3.21

package/index.d.ts

@@ -55,6 +55,7 @@ export declare type DateRangePickerWrapperProps = {
 /**
  * DatePicker.RangePicker包装组件
  * ```
+ * TODO: 引用DatePicker.RangePicker TS有问题，待解决
  * 1. value类型为 [string, string]
  * 2. onChange返回类型 [string, string]
  * 3. 默认格式化类型 YYYY-MM-DD； 当showTime===true时，默认格式化类型YYYY-MM-DD HH:mm:ss
@@ -90,7 +91,7 @@ export interface DrawerOperationOldProps {
 	okButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 	cancelButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 }
-export declare type DrawerFormProps = {
+export declare type DrawerFormOldProps = {
 	className?: string;
 	/**
 	 * 整个drawer页面级的spinning <Page loading />
@@ -105,7 +106,7 @@ export declare type DrawerFormProps = {
  * 2. 默认 forceRender = false
  * ```
  */
-export declare const DrawerWraper: FC<DrawerFormProps>;
+export declare const DrawerWraper: FC<DrawerFormOldProps>;
 /**
  * drawer弹窗模型
  * @param key 唯一值必传
@@ -145,7 +146,7 @@ export interface DrawerOperationProps {
 	okButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 	cancelButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 }
-export declare type DrawerWrapperProps = {
+export declare type DrawerFormProps = {
 	className?: string;
 	/**
 	 * 整个drawer页面级的spinning <Page loading />
@@ -160,7 +161,7 @@ export declare type DrawerWrapperProps = {
  * 2. 默认 forceRender = false
  * ```
  */
-export declare const DrawerWrapper: FC<DrawerWrapperProps>;
+export declare const DrawerWrapper: FC<DrawerFormProps>;
 /**
  * drawer弹窗模型
  * @param key 唯一值必传
@@ -172,48 +173,6 @@ export declare const DrawerWrapper: FC<DrawerWrapperProps>;
  * ```
  */
 export declare const createDrawerWrapperModel: (key: string) => API<ModelType<DrawerStateType, DrawerActionsParamType, any>>;
-export declare type FileUploadItem = {
-	fileKey: string;
-	fileName: string;
-};
-export declare type FileUploadProps = {
-	onChange?: (value?: FileUploadItem[]) => void;
-	onUploadError?: (message?: string) => void;
-	value?: FileUploadItem[];
-	onPreview?: (item: FileUploadItem) => void;
-	onUploadChange?: (info: UploadChangeParam<UploadFile>) => void;
-	/**
-	 * 属性映射
-	 */
-	fieldNames?: {
-		fileKey?: string;
-		fileName?: string;
-	};
-} & Omit<UploadProps, "onChange" | "fileList" | "onPreview">;
-/**
- * 文件上传，结合Form使用最佳
- * ```
- * 接口返回结构：
- * formData上传接口必须返回fileKey值
- * {
- *  code: '0000',
- *  data: {
- *    fileKey: '预览文件对应的fileKey'
- *  }
- * }
- * 可通过fieldNames配置接口返回值属性名称映射
- * ```
- * ```
- * 最佳使用方式：
- * <Form.Item name="attachmentList" label="附件">
- *   <FileUpload action={uploadUrl} onPreview={onPreviewFile}>
- *      <Button type="primary">选择文件导入</Button>
- *   </FileUpload>
- * </Form.Item>
- * ```
- *
- */
-export declare const FileUpload: FC<FileUploadProps>;
 export declare type LabelValueItem<T extends string | number = string | number> = {
 	value: T;
 	label: string;
@@ -338,6 +297,52 @@ export declare const SelectorWrapper: import("react").ForwardRefExoticComponent<
 	operateType?: "search" | "filter" | undefined;
 	searchFieldName?: string | undefined;
 } & import("react").RefAttributes<SelectorWrapperRefApi>>;
+export declare type UploadWrapperFileItem = {
+	uid: string;
+	name: string;
+	url: string;
+};
+export declare type UploadWrapperProps<T extends TPlainObject = TPlainObject> = {
+	value?: T[];
+	onChange?: (value?: T[]) => void;
+	onUploadError?: (message?: string) => void;
+	onUploadChange?: (info: UploadChangeParam<UploadFile>) => void;
+	/**
+	 * 属性映射
+	 */
+	fieldNames?: {
+		uid: string;
+		name: string;
+		url: string;
+	};
+	/**
+	 * 接口响应数据适配器，如果配置了fieldNames，适配器返回值会再进过fieldNames转换
+	 */
+	onRequestResultAdapter?: (respData: any) => TPlainObject;
+} & Omit<UploadProps, "onChange" | "fileList">;
+/**
+ * 文件上传
+ * ```
+ * 1. 可通过配置children替换默认上传触发布局
+ * 2. 接口返回结构：
+ * formData上传接口返回值
+ * {
+ *  code: '0000',
+ *  data: {
+ *    uid: '唯一值，可使用fileKey值'
+ *    name: '文件名称'
+ *    url: '预览地址'
+ *  }
+ * }
+ * 可通过fieldNames配置接口返回值属性名称映射
+ * 3. 最佳使用方式，与Form结合使用
+ * <Form.Item name="attachmentList" label="附件">
+ *   <UploadWrapper action={uploadUrl} onPreview={onPreviewFile} />
+ * </Form.Item>
+ * ```
+ *
+ */
+export declare const UploadWrapper: FC<UploadWrapperProps>;
 export declare type EditableTableRecordType = FormListFieldData & {
 	operation: FormListOperation;
 };
@@ -374,8 +379,8 @@ export declare type EditableTextareaConfig = {
 	editableComptProps: TextAreaProps;
 };
 export declare type EditableFileUploadConfig = {
-	type: "fileUpload";
-	editableComptProps: FileUploadProps;
+	type: "uploadWrapper";
+	editableComptProps: UploadWrapperProps;
 };
 /**
  * 自定义编辑组件
@@ -447,7 +452,7 @@ export declare type FormListConfig = {
  * antd 默认render功能此处不能使用
  */
 export declare type EditableTableColumn = Omit<ColumnsType["0"], "render"> & {
-	dataIndex: string;
+	dataIndex?: string;
 	fieldConfig?: FieldSingleConfig | FormListConfig;
 	/**
 	 * 配置操作功能处理后，fieldConfig配置将失效
@@ -483,8 +488,8 @@ export declare type EditableTableProps = {
 };
 export declare const EditableTable: (props: EditableTableProps) => JSX.Element;
 export declare type FileImportProps = {
-	onImportFinish: (data?: any[]) => void;
-} & Pick<UploadProps, "accept" | "action" | "beforeUpload" | "disabled" | "maxCount" | "method" | "name">;
+	onImportFinish: (data?: any) => void;
+} & Omit<UploadProps, "fileList" | "showUploadList" | "itemRender" | "listType" | "multiple" | "previewFile" | "progress" | "onChange" | "onDownload" | "onRemove" | "onPreview" | "directory" | "customRequest" | "defaultFileList" | "iconRender">;
 /**
  * 文件导入
  * ```
@@ -494,6 +499,48 @@ export declare type FileImportProps = {
  * ```
  */
 export declare const FileImport: FC<FileImportProps>;
+export declare type FileUploadItem = {
+	fileKey: string;
+	fileName: string;
+};
+export declare type FileUploadProps = {
+	onChange?: (value?: FileUploadItem[]) => void;
+	onUploadError?: (message?: string) => void;
+	value?: FileUploadItem[];
+	onPreview?: (item: FileUploadItem) => void;
+	onUploadChange?: (info: UploadChangeParam<UploadFile>) => void;
+	/**
+	 * 属性映射
+	 */
+	fieldNames?: {
+		fileKey?: string;
+		fileName?: string;
+	};
+} & Omit<UploadProps, "onChange" | "fileList" | "onPreview">;
+/**
+ * 文件上传，结合Form使用最佳
+ * ```
+ * 接口返回结构：
+ * formData上传接口必须返回fileKey值
+ * {
+ *  code: '0000',
+ *  data: {
+ *    fileKey: '预览文件对应的fileKey'
+ *  }
+ * }
+ * 可通过fieldNames配置接口返回值属性名称映射
+ * ```
+ * ```
+ * 最佳使用方式：
+ * <Form.Item name="attachmentList" label="附件">
+ *   <FileUpload action={uploadUrl} onPreview={onPreviewFile}>
+ *      <Button type="primary">选择文件导入</Button>
+ *   </FileUpload>
+ * </Form.Item>
+ * ```
+ *
+ */
+export declare const FileUpload: FC<FileUploadProps>;
 export declare type FlexLayoutProps = {
 	className?: string;
 	fullIndex?: number | number[];
@@ -543,7 +590,7 @@ export interface ModalActionsParamType {
 	closeModal: void;
 	setModalItemData: Record<string, unknown>;
 }
-export interface ModalOperationProps {
+export interface ModalOperationOldProps {
 	loading?: boolean;
 	okText?: string;
 	cancelText?: string;
@@ -556,7 +603,7 @@ export interface ModalOperationProps {
 export declare type ModalFormProps = {
 	className?: string;
 	pageLoading?: boolean;
-	operationProps?: ModalOperationProps;
+	operationProps?: ModalOperationOldProps;
 	footer?: null | React.ReactNode;
 } & Omit<ModalProps, "footer" | "onOk" | "okText" | "cancelText" | "okButtonProps" | "cancelButtonProps" | "okType" | "confirmLoading">;
 /**
@@ -596,7 +643,7 @@ export interface ModalActionsParamType {
 	closeModal: void;
 	setModalItemData: Record<string, unknown>;
 }
-export interface ModalOperationOldProps {
+export interface ModalOperationProps {
 	loading?: boolean;
 	okText?: string;
 	cancelText?: string;
@@ -606,10 +653,10 @@ export interface ModalOperationOldProps {
 	okButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 	cancelButtonProps?: Omit<ButtonProps, "onClick" | "loading" | "className">;
 }
-export declare type ModalWrapperProps = {
+export declare type ModalFormOldProps = {
 	className?: string;
 	pageLoading?: boolean;
-	operationProps?: ModalOperationOldProps;
+	operationProps?: ModalOperationProps;
 	footer?: null | React.ReactNode;
 } & Omit<ModalProps, "footer" | "onOk" | "okText" | "cancelText" | "okButtonProps" | "cancelButtonProps" | "okType" | "confirmLoading">;
 /**
@@ -619,7 +666,7 @@ export declare type ModalWrapperProps = {
  * 2. 默认 forceRender = false
  * ```
  */
-export declare const ModalWrapper: FC<ModalWrapperProps>;
+export declare const ModalWrapper: FC<ModalFormOldProps>;
 /**
  * modal弹窗模型
  * @param key 唯一值必传
@@ -850,51 +897,5 @@ export declare const TreeWrapper: import("react").ForwardRefExoticComponent<Omit
 	 */
 	filterLabel?: string | undefined;
 } & import("react").RefAttributes<TreeWrapperRefApi>>;
-export declare type UploadWrapperFileItem = {
-	uid: string;
-	name: string;
-	url: string;
-};
-export declare type UploadWrapperProps<T extends TPlainObject = TPlainObject> = {
-	value?: T[];
-	onChange?: (value?: T[]) => void;
-	onUploadError?: (message?: string) => void;
-	onUploadChange?: (info: UploadChangeParam<UploadFile>) => void;
-	/**
-	 * 属性映射
-	 */
-	fieldNames?: {
-		uid: string;
-		name: string;
-		url: string;
-	};
-	/**
-	 * 接口响应数据适配器，如果配置了fieldNames，适配器返回值会再进过fieldNames转换
-	 */
-	onRequestResultAdapter?: (respData: any) => TPlainObject;
-} & Omit<UploadProps, "onChange" | "fileList">;
-/**
- * 文件上传
- * ```
- * 1. 可通过配置children替换默认上传触发布局
- * 2. 接口返回结构：
- * formData上传接口返回值
- * {
- *  code: '0000',
- *  data: {
- *    uid: '唯一值，可使用fileKey值'
- *    name: '文件名称'
- *    url: '预览地址'
- *  }
- * }
- * 可通过fieldNames配置接口返回值属性名称映射
- * 3. 最佳使用方式，与Form结合使用
- * <Form.Item name="attachmentList" label="附件">
- *   <UploadWrapper action={uploadUrl} onPreview={onPreviewFile} />
- * </Form.Item>
- * ```
- *
- */
-export declare const UploadWrapper: FC<UploadWrapperProps>;
 
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@flatbiz/antd",
-	"version": "2.3.20",
+	"version": "2.3.21",
 	"description": "flat-biz oss ui components",
 	"main": "index.js",
 	"typings": "index.d.ts",
@@ -25,12 +25,6 @@
 	"engines": {
 		"node": ">=13.8.0"
 	},
-	"devDependencies": {
-		"antd": "^4.20.0",
-		"moment": "^2.29.3",
-		"react": "^17.0.2",
-		"react-dom": "^17.0.2"
-	},
 	"peerDependencies": {
 		"@ant-design/icons": "^4.7.0",
 		"@dimjs/lang": "^1.2.9",
@@ -40,5 +34,20 @@
 		"@flatbiz/utils": "^2.3.15",
 		"@wove/react": "^1.2.10"
 	},
-	"gitHead": "832728aa5971b953283f06598f0fe5cf8a7b32fa"
+	"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.3.21",
+		"@wove/react": "^1.2.10",
+		"antd": "^4.20.0",
+		"moment": "^2.29.3",
+		"react": "^17.0.2",
+		"react-dom": "^17.0.2",
+		"react-router": "^6.3.0",
+		"react-router-dom": "^6.3.0"
+	},
+	"gitHead": "06589677717004192b67a37a1e8e0d579c71dd91"
 }