@flatbiz/antd 3.1.1 → 3.1.3

package/index.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="scheduler" />
 
 import { API, ModelType } from '@dimjs/model';
-import { ButtonProps, CascaderProps, DrawerProps, DropdownProps, FormInstance, FormItemProps, InputNumberProps, InputProps, ModalProps, PopconfirmProps, RadioGroupProps, RowProps, SelectProps, SpaceProps, TableProps, TimePickerProps, TimeRangePickerProps, TreeProps, TreeSelectProps, UploadProps } from 'antd';
+import { ButtonProps, CascaderProps, DrawerProps, DropdownProps, FormInstance, FormItemProps, InputNumberProps, InputProps, ModalProps, PopconfirmProps, RadioGroupProps, RowProps, SelectProps, SpaceProps, SwitchProps, TableProps, TimePickerProps, TimeRangePickerProps, TooltipProps, TreeProps, TreeSelectProps, UploadProps } from 'antd';
 import { CheckboxGroupProps } from 'antd/lib/checkbox';
 import { ConfigProviderProps } from 'antd/lib/config-provider';
 import { PickerDateProps, RangePickerDateProps } from 'antd/lib/date-picker/generatePicker';
@@ -937,6 +937,8 @@ export declare type FormItemHorizontalUnionProps = {
 	}[];
 	gap?: number;
 	flexLayoutStyle?: CSSProperties;
+	hidden?: boolean;
+	required?: boolean;
 };
 export declare type FormItemCardProps = {
 	title?: string | ReactElement;
@@ -1219,31 +1221,53 @@ export declare type RelationProps = {
 	/** 缩进宽度，配合【RelationGroup】使用 */
 	indentWidth?: number;
 	/** 连接线上Tag文案 */
-	tagText: string;
+	tagName?: string;
 	/** 连接线上Tag颜色 */
 	tagColor?: string;
 	/** 连接线上Tag宽度 */
 	tagWidth?: number;
 	/** 连接线上Tag点击事件 */
-	onTagClick?: (tagText: string) => void;
+	onTagClick?: (tagName?: string) => void;
 	/**连接线颜色 */
 	lineColor?: string;
-	children: ReactElement | null | Array<ReactElement | null>;
+	solt1: () => ReactElement;
+	solt2?: () => ReactElement | null;
 	className?: string;
+	onlyOne?: boolean;
+	onlyNoMainOne?: boolean;
+	label?: string;
 };
-export declare const Relation: (props: RelationProps) => JSX.Element;
-export declare type RelationGroupProps = {
-	children: ReactElement | null | Array<ReactElement | null>;
+export declare type RelationTreeProps = {
 	className?: string;
-	style?: CSSProperties;
+	dataSource?: TRelationTreeData;
+	children: (data: TRelationTreeCustomData, operate: TRelationTreeOperate, extraData?: TPlainObject) => ReactElement;
+	onChange?: (dataSource?: TRelationTreeData) => void;
+	relationProps?: Pick<RelationProps, "tagLineWidth" | "indentWidth" | "tagColor" | "tagWidth" | "lineColor">;
+	onTagClick?: (uid: string, extraData?: TPlainObject) => void;
 };
-export declare const RelationGroup: (props: RelationGroupProps) => JSX.Element;
-export declare type RelationItemProps = {
-	children: ReactElement | null | Array<ReactElement | null>;
-	className?: string;
-	style?: CSSProperties;
+export declare type TRelationTreeCustomData = TPlainObject & {
+	uid: string;
+};
+export declare type TRelationTreeRelationItem = {
+	uid: string;
+	customData?: TRelationTreeCustomData;
+	children?: TRelationTreeData[];
+	extraData?: TPlainObject;
 };
-export declare const RelationItem: (props: RelationItemProps) => JSX.Element;
+export declare type TRelationTreeData = {
+	uid: string;
+	tagName: string;
+	label?: string;
+	relationList: TRelationTreeRelationItem[];
+	extraData?: TPlainObject;
+};
+export declare type TRelationTreeOperate = {
+	add: (soruceData: TRelationTreeCustomData, initialData: TRelationTreeRelationItem) => void;
+	addChildren: (soruceData: TRelationTreeCustomData, initialData: TRelationTreeData) => void;
+	remove: (uid: string) => void;
+	onChange: (name: string, value: any) => void;
+};
+export declare const RelationTree: (props: RelationTreeProps) => JSX.Element;
 export declare type SimpleLayoutProps = {
 	className?: string;
 	style?: CSSProperties;
@@ -1290,6 +1314,29 @@ export interface SmsCountDownProps {
 	className?: string;
 }
 export declare const SmsCountDown: FC<SmsCountDownProps>;
+export declare type SwitchWrapperValue = string | number | boolean;
+export declare type SwitchWrapperProps = Omit<SwitchProps, "checked" | "defaultChecked" | "onChange"> & {
+	value?: SwitchWrapperValue;
+	checkedValue: SwitchWrapperValue;
+	unCheckedValue: SwitchWrapperValue;
+	onChange?: (value: SwitchWrapperValue) => void;
+	tooltipProps?: Omit<TooltipProps, "title">;
+	tooltipTitle?: string | ((value?: SwitchWrapperValue) => string | undefined);
+};
+/**
+ * 解决Switch 和 Form.Item 使用只能接收boolean的限制
+ * ```
+ * 1. value 为状态值，不局限于boolean，可以为 [string | number | boolean]
+ * 2. checkedValue 选中值
+ * 3. unCheckedValue 未选中值
+ * 4. 与 Form.Item 组合使用最佳
+ *     <Form.Item name="fieldName" >
+ *       <SwitchWrapper checkedValue={2} unCheckedValue={1} />
+ *     </Form.Item>
+ * 5. 可设置tooltip效果数据显示
+ * ```
+ */
+export declare const SwitchWrapper: (props: SwitchWrapperProps) => JSX.Element;
 export declare type TTagItem = {
 	label: string;
 	value: string | number | boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flatbiz/antd",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "flat-biz oss ui components",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -34,7 +34,6 @@
     "@flatbiz/utils": ">=3.0.15",
     "@wove/react": ">=1.2.22",
     "antd": ">=4.22.2",
-    "dequal": ">=2.0.3",
     "moment": ">=2.29.4",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"
@@ -45,7 +44,7 @@
     "@dimjs/model": "^1.1.8",
     "@dimjs/model-react": "^1.1.8",
     "@dimjs/utils": "^1.2.23",
-    "@flatbiz/utils": "^3.0.16",
+    "@flatbiz/utils": "^3.1.3",
     "@wove/react": "^1.2.21",
     "antd": "4.22.2",
     "dequal": "^2.0.3",
@@ -53,5 +52,5 @@
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
-  "gitHead": "4378d433b73ee28fd7cb4c64bed8571f993eb5a9"
+  "gitHead": "693ba32a0a7ef4021c089b486d0efec1e3772e81"
 }