@canlooks/can-ui 0.0.26 → 0.0.27

package/dist/cjs/components/descriptions/descriptions.d.ts

@@ -1,5 +1,5 @@
-import { ReactElement, ReactNode, ElementType } from 'react';
-import { MergeProps, Obj, OverridableProps, ResponsiveProp, Size } from '../../types';
+import { ReactElement, ReactNode, ElementType, ComponentPropsWithRef } from 'react';
+import { Obj, ResponsiveProp, Size } from '../../types';
 import { GridProps } from '../grid';
 import { DescriptionItem, DescriptionItemProps } from './descriptionItem';
 export type DescriptionsSharedProps = {
@@ -14,7 +14,7 @@ export type DescriptionsSharedProps = {
     /** 是否禁用padding,{@link DescriptionsProps.variant}为table有效 */
     disablePadding?: boolean;
 };
-export interface DescriptionsBaseProps extends DescriptionsSharedProps {
+interface DescriptionsBaseProps extends DescriptionsSharedProps {
     items?: (DescriptionItemProps & Obj)[];
     /**
      * @private 用于渲染item的组件，通常为内部使用
@@ -22,21 +22,21 @@ export interface DescriptionsBaseProps extends DescriptionsSharedProps {
      */
     itemComponent?: ElementType;
 }
-export interface DescriptionsGridOwnProps extends DescriptionsBaseProps {
+interface DescriptionsGridProps extends DescriptionsBaseProps, GridProps {
     variant?: 'grid';
 }
-export interface DescriptionsTableProps extends DescriptionsBaseProps {
+interface DescriptionsTableProps extends DescriptionsBaseProps, ComponentPropsWithRef<'table'> {
     variant: 'table';
     columnCount?: ResponsiveProp;
 }
-export type DescriptionsProps<C extends ElementType = 'div' | 'table'> = MergeProps<DescriptionsGridOwnProps, GridProps<C>> | OverridableProps<DescriptionsTableProps, C>;
+export type DescriptionsProps = DescriptionsGridProps | DescriptionsTableProps;
 interface DescriptionsContext extends DescriptionsSharedProps {
     variant?: 'grid' | 'table';
 }
 export declare function useDescriptionsContext(): DescriptionsContext;
 declare const DescriptionsContext: import("react").Context<DescriptionsContext>;
 export declare const Descriptions: {
-    <C extends ElementType = "div">(props: DescriptionsProps<C>): ReactElement;
+    (props: DescriptionsProps): ReactElement;
     Item: typeof DescriptionItem;
 };
 export {};

package/dist/cjs/components/form/form.d.ts

@@ -1,16 +1,18 @@
 import React, { Dispatch, ReactElement, ReactNode, Ref, RefObject, SetStateAction, ElementType } from 'react';
-import { MergeProps, Obj } from '../../types';
+import { Obj, OverridableProps } from '../../types';
 import { FieldPath } from '../../utils';
 import { FieldError, FormItem, FormItemProps, FormItemRef } from './formItem';
 import { FormRelatable } from './formRelatable';
-import { DescriptionsProps } from '../descriptions';
+import { DescriptionsProps, DescriptionsSharedProps } from '../descriptions';
+import { GridOwnProps } from '../grid';
 export type FormValue = Obj;
 export type FormSharedProps = {
+    /** 必填字段的标记，默认为`*` */
     requiredMark?: ReactNode;
     /** variant为"grid"或"table"时会渲染Descriptions组件，并传递variant属性，默认为`grid` */
     variant?: 'plain' | 'grid' | 'table';
 };
-export interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps {
+interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps, DescriptionsSharedProps, GridOwnProps {
     ref?: Ref<FormRef<V> | null>;
     /** 最外层元素的ref，默认{@link ref}属性已经被{@link FormRef}取代 */
     wrapperRef?: Ref<HTMLFormElement>;
@@ -20,9 +22,8 @@ export interface FormOwnProps<V extends FormValue = FormValue> extends FormShare
     items?: (FormItemProps & Obj)[];
     descriptionsProps?: DescriptionsProps;
 }
-export type FormProps<V extends FormValue = FormValue, C extends ElementType = 'form'> = MergeProps<FormOwnProps<V>, DescriptionsProps<C>>;
+export type FormProps<V extends FormValue = FormValue, C extends ElementType = 'form'> = OverridableProps<FormOwnProps<V>, C>;
 interface FormContext<V extends FormValue> extends FormSharedProps {
-    requiredMark?: ReactNode;
     formValue?: V;
     setFieldValue?(field: FieldPath, value: any, silent?: boolean): void;
     itemsContainer?: Map<string, FormItemRef>;

package/dist/cjs/components/form/form.js

@@ -13,11 +13,11 @@ const FormContext = (0, react_1.createContext)({});
 function useFormContext() {
     return (0, react_1.useContext)(FormContext);
 }
-exports.Form = (({ ref, component: Component = 'form', wrapperRef, initialValue, onChange, onFinish, requiredMark = '*', columnCount = 1, descriptionsProps, 
-// 以下属性从DescriptionsBaseProps继承
-items, variant = 'grid', 
+exports.Form = (({ component: Component = 'form', ref, wrapperRef, initialValue, onChange, onFinish, items, descriptionsProps, requiredMark = '*', variant = 'grid', 
 // 以下属性从DescriptionsSharedProps继承
-labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePadding, ...props }) => {
+labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePadding, 
+// 以下属性从GridOwnProps继承
+inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
     /**
      * ------------------------------------------------------------------------
      * 表单值
@@ -97,7 +97,7 @@ labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePa
                 itemsContainer: itemsContainer.current, formRef
             }), [requiredMark, variant, formValue.current]), children: variant === 'plain'
                 ? props.children
-                : (0, jsx_runtime_1.jsx)(descriptions_1.Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, columnCount: columnCount, items: items, variant: variant, itemComponent: formItem_1.FormItem, children: props.children }) }) }));
+                : (0, jsx_runtime_1.jsx)(descriptions_1.Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, items: items, variant: variant, itemComponent: formItem_1.FormItem, inline: inline, columnCount: columnCount, gap: gap, columnGap: columnGap, rowGap: rowGap, children: props.children }) }) }));
 });
 exports.Form.Item = formItem_1.FormItem;
 exports.Form.Relatable = formRelatable_1.FormRelatable;

package/dist/esm/components/descriptions/descriptions.d.ts

@@ -1,5 +1,5 @@
-import { ReactElement, ReactNode, ElementType } from 'react';
-import { MergeProps, Obj, OverridableProps, ResponsiveProp, Size } from '../../types';
+import { ReactElement, ReactNode, ElementType, ComponentPropsWithRef } from 'react';
+import { Obj, ResponsiveProp, Size } from '../../types';
 import { GridProps } from '../grid';
 import { DescriptionItem, DescriptionItemProps } from './descriptionItem';
 export type DescriptionsSharedProps = {
@@ -14,7 +14,7 @@ export type DescriptionsSharedProps = {
     /** 是否禁用padding,{@link DescriptionsProps.variant}为table有效 */
     disablePadding?: boolean;
 };
-export interface DescriptionsBaseProps extends DescriptionsSharedProps {
+interface DescriptionsBaseProps extends DescriptionsSharedProps {
     items?: (DescriptionItemProps & Obj)[];
     /**
      * @private 用于渲染item的组件，通常为内部使用
@@ -22,21 +22,21 @@ export interface DescriptionsBaseProps extends DescriptionsSharedProps {
      */
     itemComponent?: ElementType;
 }
-export interface DescriptionsGridOwnProps extends DescriptionsBaseProps {
+interface DescriptionsGridProps extends DescriptionsBaseProps, GridProps {
     variant?: 'grid';
 }
-export interface DescriptionsTableProps extends DescriptionsBaseProps {
+interface DescriptionsTableProps extends DescriptionsBaseProps, ComponentPropsWithRef<'table'> {
     variant: 'table';
     columnCount?: ResponsiveProp;
 }
-export type DescriptionsProps<C extends ElementType = 'div' | 'table'> = MergeProps<DescriptionsGridOwnProps, GridProps<C>> | OverridableProps<DescriptionsTableProps, C>;
+export type DescriptionsProps = DescriptionsGridProps | DescriptionsTableProps;
 interface DescriptionsContext extends DescriptionsSharedProps {
     variant?: 'grid' | 'table';
 }
 export declare function useDescriptionsContext(): DescriptionsContext;
 declare const DescriptionsContext: import("react").Context<DescriptionsContext>;
 export declare const Descriptions: {
-    <C extends ElementType = "div">(props: DescriptionsProps<C>): ReactElement;
+    (props: DescriptionsProps): ReactElement;
     Item: typeof DescriptionItem;
 };
 export {};

package/dist/esm/components/form/form.d.ts

@@ -1,16 +1,18 @@
 import React, { Dispatch, ReactElement, ReactNode, Ref, RefObject, SetStateAction, ElementType } from 'react';
-import { MergeProps, Obj } from '../../types';
+import { Obj, OverridableProps } from '../../types';
 import { FieldPath } from '../../utils';
 import { FieldError, FormItem, FormItemProps, FormItemRef } from './formItem';
 import { FormRelatable } from './formRelatable';
-import { DescriptionsProps } from '../descriptions';
+import { DescriptionsProps, DescriptionsSharedProps } from '../descriptions';
+import { GridOwnProps } from '../grid';
 export type FormValue = Obj;
 export type FormSharedProps = {
+    /** 必填字段的标记，默认为`*` */
     requiredMark?: ReactNode;
     /** variant为"grid"或"table"时会渲染Descriptions组件，并传递variant属性，默认为`grid` */
     variant?: 'plain' | 'grid' | 'table';
 };
-export interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps {
+interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps, DescriptionsSharedProps, GridOwnProps {
     ref?: Ref<FormRef<V> | null>;
     /** 最外层元素的ref，默认{@link ref}属性已经被{@link FormRef}取代 */
     wrapperRef?: Ref<HTMLFormElement>;
@@ -20,9 +22,8 @@ export interface FormOwnProps<V extends FormValue = FormValue> extends FormShare
     items?: (FormItemProps & Obj)[];
     descriptionsProps?: DescriptionsProps;
 }
-export type FormProps<V extends FormValue = FormValue, C extends ElementType = 'form'> = MergeProps<FormOwnProps<V>, DescriptionsProps<C>>;
+export type FormProps<V extends FormValue = FormValue, C extends ElementType = 'form'> = OverridableProps<FormOwnProps<V>, C>;
 interface FormContext<V extends FormValue> extends FormSharedProps {
-    requiredMark?: ReactNode;
     formValue?: V;
     setFieldValue?(field: FieldPath, value: any, silent?: boolean): void;
     itemsContainer?: Map<string, FormItemRef>;

package/dist/esm/components/form/form.js

@@ -9,11 +9,11 @@ const FormContext = createContext({});
 export function useFormContext() {
     return useContext(FormContext);
 }
-export const Form = (({ ref, component: Component = 'form', wrapperRef, initialValue, onChange, onFinish, requiredMark = '*', columnCount = 1, descriptionsProps, 
-// 以下属性从DescriptionsBaseProps继承
-items, variant = 'grid', 
+export const Form = (({ component: Component = 'form', ref, wrapperRef, initialValue, onChange, onFinish, items, descriptionsProps, requiredMark = '*', variant = 'grid', 
 // 以下属性从DescriptionsSharedProps继承
-labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePadding, ...props }) => {
+labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePadding, 
+// 以下属性从GridOwnProps继承
+inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
     /**
      * ------------------------------------------------------------------------
      * 表单值
@@ -93,7 +93,7 @@ labelWidth, labelPlacement = 'left', colon = ':', size, disableMargin, disablePa
                 itemsContainer: itemsContainer.current, formRef
             }), [requiredMark, variant, formValue.current]), children: variant === 'plain'
                 ? props.children
-                : _jsx(Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, columnCount: columnCount, items: items, variant: variant, itemComponent: FormItem, children: props.children }) }) }));
+                : _jsx(Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, items: items, variant: variant, itemComponent: FormItem, inline: inline, columnCount: columnCount, gap: gap, columnGap: columnGap, rowGap: rowGap, children: props.children }) }) }));
 });
 Form.Item = FormItem;
 Form.Relatable = FormRelatable;