@mi-avalon/libs 0.0.27 → 0.0.29

package/dist/components/MForm/index.js

@@ -1,8 +1,8 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 表单组件
  */
-import { Col, Form, Row } from 'antd';
+import { Col, Form, Row, Space } from 'antd';
 import { getClassName } from '../../utils';
 import { CompThemeProvider } from '../ThemeContext';
 import './index.scss';
@@ -38,7 +38,7 @@ function MForm(props) {
             ...itemLayout,
             ...item.itemLayout,
         };
-        return (_jsx(Col, { span: item.span || 24 / column, children: _jsx("div", { className: classname('item-wrapper'), children: _jsx(Form.Item, { label: item.label, name: item.id, rules: rules, initialValue: item.initialValue, ...formItemLayout, ...item.formItemProps, children: renderItem(item, form) }) }) }, `col-${item.id}`));
+        return (_jsx(Col, { span: item.span || 24 / column, children: _jsxs(Space, { className: classname('item-wrapper'), children: [item.prefix, _jsx(Form.Item, { label: item.label, name: item.id, rules: rules, initialValue: item.initialValue, ...formItemLayout, ...item.formItemProps, children: renderItem(item, form) }), item.suffix] }) }, `col-${item.id}`));
     };
     return (_jsx(CompThemeProvider, { children: _jsx(Form, { form: form, ...formProps, className: `${classname()} ${formProps?.className}`, children: _jsx(Row, { gutter: MFormItemConst.defaultRowGutter, ...formRowProps, className: `${classname('grid')} ${formRowProps?.className}`, children: formItems.map(e => renderFormItem(e)) }) }) }));
 }

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

@@ -62,7 +62,7 @@ export interface IMFormBaseItem {
     /**
      * label名称
      */
-    label: string;
+    label: React.ReactNode;
     /**
      * 组件是否禁用
      */
@@ -112,6 +112,14 @@ export interface IMFormBaseItem {
      * item组件的其他属性
      */
     props?: any;
+    /**
+     * 前缀
+     */
+    prefix?: React.ReactNode;
+    /**
+     * 后缀
+     */
+    suffix?: React.ReactNode;
 }
 export interface IMFormInputItem extends IMFormBaseItem {
     type: MFormItemTypeEnum.Input | MFormItemTypeEnum.Password;

package/dist/components/MSearch/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
 import { Button, Card, Form } from 'antd';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { getClassName, removeNull } from '../../utils';
 import MForm from '../MForm';
 import { CompThemeProvider } from '../ThemeContext';
@@ -44,9 +44,9 @@ export const MSearch = props => {
             onSearch?.(values, isReset);
         });
     };
+    const hasMore = useMemo(() => searchItems?.filter(e => e.show != false).length > 2, [searchItems]);
     // 渲染搜索按钮
     const renderSearchButtons = () => {
-        const hasMore = searchItems.length > 2;
         return (_jsxs("div", { className: classname('btn-wrapper'), children: [customButtons?.length > 0 ? (_jsx(_Fragment, { children: customButtons.map((buttonProps, index) => (_jsx(Button, { className: classname('btn'), ...buttonProps, children: buttonProps.children }, `custom-btn-${index}`))) })) : (_jsxs(_Fragment, { children: [_jsx(Button, { className: classname('btn btn-reset'), onClick: reset, children: "\u91CD\u7F6E" }), _jsx(Button, { className: classname('btn btn-search'), onClick: () => search(), type: 'primary', children: "\u641C\u7D22" })] })), hasMore && (_jsxs("div", { className: classname('btn btn-collapse'), onClick: () => setShowAll(!showAll), children: [_jsx("span", { children: showAll ? '收起' : '展开' }), showAll ? _jsx(CaretUpOutlined, {}) : _jsx(CaretDownOutlined, {})] }))] }));
     };
     // 处理搜索项显示/隐藏
@@ -63,6 +63,5 @@ export const MSearch = props => {
         }
         return newItem;
     });
-    const hasMore = searchItems.length > 2;
     return (_jsx(CompThemeProvider, { children: _jsx("div", { className: `${classname('')} ${showAll ? '' : classname('collapsed')} ${className || ''}`, ref: searchWrap, children: _jsxs(Card, { children: [_jsxs("div", { className: classname('form'), children: [_jsx(MForm, { form: form, formItems: processedSearchItems, column: 3 }), (!hasMore || (hasMore && !showAll)) && renderSearchButtons()] }), hasMore && showAll && _jsx("div", { className: classname('footer'), children: renderSearchButtons() })] }) }) }));
 };