@mi-avalon/libs 1.0.1 → 1.0.2

package/dist/components/MDescriptions/index.d.ts

@@ -53,13 +53,22 @@ export interface IMDescriptionProps {
      */
     className?: string;
     /**
-     * 标签样式
+     * 标签样式（兼容旧版本）
+     * @deprecated 使用styles.label代替
      */
     labelStyle?: React.CSSProperties;
     /**
-     * 内容样式
+     * 内容样式（兼容旧版本）
+     * @deprecated 使用styles.content代替
      */
     contentStyle?: React.CSSProperties;
+    /**
+     * 样式配置对象（antd 6 推荐使用）
+     */
+    styles?: {
+        label?: React.CSSProperties;
+        content?: React.CSSProperties;
+    };
 }
 declare const MDescriptions: React.FC<IMDescriptionProps>;
 export { MDescriptions };

package/dist/components/MDescriptions/index.js

@@ -6,20 +6,25 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Descriptions } from 'antd';
 import { CompThemeProvider } from '../ThemeContext';
 const MDescriptions = props => {
-    const { data, title, column = 3, lineHeight, align = 'left', itemLayout, colon = true, bordered = false, style, className, labelStyle, contentStyle, } = props;
-    // 合并样式
+    const { data, title, column = 3, lineHeight, align = 'left', itemLayout, colon = true, bordered = false, style, className, labelStyle, contentStyle, styles = {}, } = props;
+    // 合并样式，优先使用styles（antd 6 推荐），同时兼容旧版的labelStyle和contentStyle
     const mergedLabelStyle = {
         ...(lineHeight ? { lineHeight: `${lineHeight}px` } : {}),
         textAlign: align,
         ...(itemLayout?.label ? { width: `${itemLayout.label}px` } : {}),
         ...labelStyle,
+        ...styles.label,
     };
     const mergedContentStyle = {
         ...(lineHeight ? { lineHeight: `${lineHeight}px` } : {}),
         ...(itemLayout?.value ? { width: `${itemLayout.value}px` } : {}),
         ...contentStyle,
+        ...styles.content,
     };
-    return (_jsx(CompThemeProvider, { children: _jsx(Descriptions, { title: title, column: column, colon: colon, bordered: bordered, style: style, className: className, labelStyle: mergedLabelStyle, contentStyle: mergedContentStyle, children: data.map((item, index) => (_jsx(Descriptions.Item, { label: item.label, span: item.span, children: item.value || '-' }, item.label?.toString() || index))) }) }));
+    return (_jsx(CompThemeProvider, { children: _jsx(Descriptions, { title: title, column: column, colon: colon, bordered: bordered, style: style, className: className, styles: {
+                label: mergedLabelStyle,
+                content: mergedContentStyle,
+            }, children: data.map((item, index) => (_jsx(Descriptions.Item, { label: item.label, span: item.span, children: item.value || '-' }, item.label?.toString() || index))) }) }));
 };
 MDescriptions.displayName = 'MDescriptions';
 export { MDescriptions };

package/dist/components/MForm/MFormItemConst.d.ts

@@ -1,10 +1,10 @@
 import { type IMFormCascaderItem, type IMFormCheckBoxGroupItem, type IMFormDatePickerItem, type IMFormInputItem, type IMFormInputNumItem, type IMFormItem, type IMFormMentionsItem, type IMFormRadioGroupItem, type IMFormRangePickerItem, type IMFormSelectItem, type IMFormTextItem, type IMFormTreeSelectItem, type IMFormUploadItem } from './type';
 export declare class MFormItemConst {
-    static readonly labelCol: {
-        span: number;
+    static readonly defaultLabelStyle: {
+        flex: string;
     };
-    static readonly wrapperCol: {
-        span: number;
+    static readonly defaultContentStyle: {
+        flex: string;
     };
     static readonly defaultRowGutter = 24;
     static getDefaultArrayPlaceholder(item: IMFormItem): [string, string];

package/dist/components/MForm/MFormItemConst.js

@@ -4,8 +4,9 @@ import { Button, Cascader, Checkbox, DatePicker, Input, InputNumber, Mentions, R
 import { MFormItemTypeEnum, } from './type';
 const { RangePicker } = DatePicker;
 export class MFormItemConst {
-    static labelCol = { span: 7 };
-    static wrapperCol = { span: 17 };
+    // antd 6不再使用labelCol和wrapperCol，改为使用新的布局方式
+    static defaultLabelStyle = { flex: '0 0 180px' };
+    static defaultContentStyle = { flex: '1 1 auto' };
     static defaultRowGutter = 24;
     static getDefaultArrayPlaceholder(item) {
         let placeholder;

package/dist/components/MForm/index.js

@@ -32,9 +32,12 @@ function MForm(props) {
         if (item.required) {
             rules.push({ required: true, message: item.required });
         }
+        // antd 6使用styles替代labelCol和wrapperCol
         const formItemLayout = {
-            labelCol: MFormItemConst.labelCol,
-            wrapperCol: MFormItemConst.wrapperCol,
+            styles: {
+                label: MFormItemConst.defaultLabelStyle,
+                content: MFormItemConst.defaultContentStyle,
+            },
             ...itemLayout,
             ...item.itemLayout,
         };

package/dist/components/MForm/type.d.ts

@@ -19,9 +19,9 @@ export declare enum MFormItemTypeEnum {
     Cascader = "cascader",
     TreeSelect = "treeSelect"
 }
-export declare type MFormItemLayout = {
-    span?: number;
-    offset?: number;
+export declare type MFormItemStyle = {
+    flex?: string;
+    [key: string]: any;
 };
 export interface IMFormProps {
     /**
@@ -41,13 +41,14 @@ export interface IMFormProps {
      */
     formProps?: FormProps;
     /**
-     * 全局 MFormItem layout， 默认为 {labelCol:{span: 7}, wrapperCol: {span: 7}}
-     * @type {{labelCol: MFormItemLayout, wrapperCol: MFormItemLayout}}
-     * @memberof MFormItem
+     * 全局 MFormItem layout， antd 6使用styles替代labelCol和wrapperCol
+     * @type {{styles: {label?: MFormItemStyle, content?: MFormItemStyle}}}
      */
     itemLayout?: {
-        labelCol?: MFormItemLayout;
-        wrapperCol?: MFormItemLayout;
+        styles?: {
+            label?: MFormItemStyle;
+            content?: MFormItemStyle;
+        };
     };
     /**
      * Antd Row 的其他属性
@@ -92,13 +93,14 @@ export interface IMFormBaseItem {
      */
     formItemProps?: FormItemProps;
     /**
-     *  MFormItem layout， 默认为 {labelCol:{span: 7}, wrapperCol: {span: 7}}
-     * @type {{labelCol: MFormItemLayout, wrapperCol: MFormItemLayout}}
-     * @memberof MFormItem
+     * MFormItem layout， antd 6使用styles替代labelCol和wrapperCol
+     * @type {{styles: {label?: MFormItemStyle, content?: MFormItemStyle}}}
      */
     itemLayout?: {
-        labelCol?: MFormItemLayout;
-        wrapperCol?: MFormItemLayout;
+        styles?: {
+            label?: MFormItemStyle;
+            content?: MFormItemStyle;
+        };
     };
     /**
      * 当前表单占据行的宽度 1-24 默认 24 / column