@mi-avalon/libs 0.0.26 → 0.0.28

package/dist/components/MForm/MFormItemConst.js

@@ -55,7 +55,7 @@ export class MFormItemConst {
         return _jsx(Checkbox.Group, { disabled: item.disabled, ...item.props });
     };
     static upload = (item) => {
-        return (_jsx(Upload, { defaultFileList: item.initialValue, ...item.props, children: item.children || (_jsxs(Button, { children: [_jsx(UploadOutlined, {}), " \u70B9\u51FB\u4E0A\u4F20"] })) }));
+        return (_jsx(Upload, { ...item.props, children: item.children || (_jsxs(Button, { children: [_jsx(UploadOutlined, {}), " \u70B9\u51FB\u4E0A\u4F20"] })) }));
     };
     static mentions = (item) => {
         return (_jsx(Mentions, { ...item.props, placeholder: item.placeholder || MFormItemConst.getDefaultPlaceholder(item) }));

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

@@ -62,7 +62,7 @@ export interface IMFormBaseItem {
     /**
      * label名称
      */
-    label: string;
+    label: React.ReactNode;
     /**
      * 组件是否禁用
      */

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() })] }) }) }));
 };

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

@@ -1,13 +1,13 @@
 import { ThemeConfig } from 'antd';
 import React, { Component } from 'react';
-import { IModalBaseProps } from '../../utils';
+import { IModalBaseProps, IModalControls } from '../../utils';
 export type IMiModalProps = IModalBaseProps & {
     mode?: string;
 };
 export declare class MiModal extends Component<IMiModalProps> {
     static setMode: (mode: string) => void;
     static setThemeConfig: (fn: (m: string) => ThemeConfig) => void;
-    static open: (props: IMiModalProps) => import("../../utils").IModalControls<IMiModalProps>;
+    static open: (props: IMiModalProps) => IModalControls<IMiModalProps>;
     getTheme(): ThemeConfig;
     handleCancel: (e: React.MouseEvent<HTMLButtonElement>) => void;
     handleOk: (e: React.MouseEvent<HTMLButtonElement>) => void;

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

@@ -1,9 +1,6 @@
-import { ThemeConfig } from 'antd';
-interface ThemeContextType {
-    theme?: ThemeConfig;
-}
-export declare const MiThemeProvider: import("react").Provider<ThemeContextType>;
-export declare function useMiThemeConfig(): ThemeContextType;
+import { ConfigProviderProps } from 'antd';
+export declare const MiThemeProvider: import("react").Provider<ConfigProviderProps>;
+export declare function useMiThemeConfig(): ConfigProviderProps;
 interface IProps {
     children: React.ReactNode;
 }

package/dist/hooks/usePagination.js

@@ -65,8 +65,7 @@ option) => {
             setTotal(_total);
         }
         catch (error) {
-            // eslint-disable-next-line no-console
-            console.error('fetch err', error);
+            console.error('usePagination error', error);
             if (_seq !== seq.current)
                 return;
         }
@@ -105,6 +104,9 @@ option) => {
         current,
         pageSize,
         total,
+        showTotal(t) {
+            return `共 ${t} 条`;
+        },
         onChange,
         onShowSizeChange,
     };

package/dist/hooks/useVirtualList.d.ts

@@ -1,38 +1,13 @@
 import { DependencyList } from 'react';
 export interface IPaginationResult<T> {
-    /**
-     * 数据
-     *
-     * @memberof IPaginationResult
-     */
     dataSource: T[];
-    /**
-     * 加载状态
-     *
-     * @memberof IPaginationResult
-     */
     loading?: boolean;
-    /**
-     * 是否完成了一次请求
-     *
-     * @memberof IPaginationResult
-     */
     isFirstComplete: boolean;
-    /**
-     * 分页信息
-     *
-     * @memberof IPaginationResult
-     */
     paginationProps: {
         current: number;
         pageSize: number;
         total: number;
     };
-    /**
-     * reset 是否重置查询
-     *
-     * @memberof IPaginationResult
-     */
     refresh: (reset?: boolean) => Promise<void>;
     debounceRefresh: (reset?: boolean) => void;
     setDataSource: (data: T[]) => void;
@@ -70,6 +45,5 @@ interface IInfoOption<T> {
      */
     pageSize?: number;
 }
-export declare const useVirtualList: <T>(server: IInfoServer<T>, deps?: DependencyList, // 依赖条件 数据更新默认执行server
-option?: IInfoOption<T>) => IPaginationResult<T>;
+export declare const useVirtualList: <T>(server: IInfoServer<T>, deps?: DependencyList, option?: IInfoOption<T>) => IPaginationResult<T>;
 export {};

package/dist/hooks/useVirtualList.js

@@ -1,33 +1,31 @@
 // 虚拟列表加载
-import { useCallback, useEffect, useRef, useState, } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { PAGE_SIZE } from '../constants';
 import { debounce } from '../utils';
-export const useVirtualList = (server, deps, // 依赖条件 数据更新默认执行server
-option) => {
+export const useVirtualList = (server, deps, option) => {
     const { isReady = true, dataSource: propDataSource = [], current: propCurrent = 1, pageSize: propPageSize = PAGE_SIZE, } = option || {};
-    // 是否完成了一次请求
     const [isFirstComplete, setIsFirstComplete] = useState(false);
-    // 分页
     const [current, setCurrent] = useState(propCurrent);
     const [pageSize, setPageSize] = useState(propPageSize);
     const [total, setTotal] = useState(0);
-    // 表格
     const [isLoading, setIsLoading] = useState(false);
-    const [dataSource, setDataSource] = useState(propDataSource);
+    const [dataSource, setDataSourceState] = useState(propDataSource);
     const currentRef = useRef(current);
     const pageSizeRef = useRef(pageSize);
+    const seq = useRef(0);
     // 在状态更新时同步更新ref
-    const setCurrentAndRef = (val) => {
+    const setCurrentAndRef = useCallback((val) => {
         setCurrent(val);
         currentRef.current = val;
-    };
-    const setPageSizeAndRef = (val) => {
+    }, []);
+    const setPageSizeAndRef = useCallback((val) => {
         setPageSize(val);
         pageSizeRef.current = val;
-    };
-    // 计数器
-    const seq = useRef(0);
-    const doSearch = async (reset) => {
+    }, []);
+    const setDataSource = useCallback((data) => {
+        setDataSourceState(data);
+    }, []);
+    const doSearch = useCallback(async (reset) => {
         if (!isReady) {
             return;
         }
@@ -37,51 +35,54 @@ option) => {
         seq.current += 1;
         const _seq = seq.current;
         try {
-            // 发送请求
-            let offset = Math.round((_current - 1) * _pageSize);
-            if (offset < 0) {
-                offset = 0;
-            }
-            if (_pageSize < 1) {
-                _pageSize = 1;
-            }
-            let { dataSource: data0, total: total0 } = await server({
+            let offset = Math.max(0, Math.round((_current - 1) * _pageSize));
+            _pageSize = Math.max(1, _pageSize);
+            let result = await server({
                 limit: _pageSize,
                 offset,
                 current: _current,
             });
             if (_seq !== seq.current)
                 return;
+            let { dataSource: data0, total: total0 } = result;
+            // 处理数据源变化的情况
             if (pageSize * (_current - 1) >= total0 && _current !== 1) {
-                const totalPage = Math.ceil(total0 / pageSize);
-                ({ dataSource: data0, total: total0 } = await server({
+                const totalPage = Math.max(1, Math.ceil(total0 / pageSize));
+                offset = Math.max(0, Math.round((totalPage - 1) * _pageSize));
+                result = await server({
                     limit: _pageSize,
-                    offset: Math.round((totalPage - 1) * _pageSize),
-                    current: _current,
-                }));
+                    offset,
+                    current: totalPage,
+                });
                 if (_seq !== seq.current)
                     return;
+                data0 = result.dataSource;
+                total0 = result.total;
                 _current = totalPage;
-                // message.error('数据源发生变化，该页没有数据，自动加载最后一页');
             }
-            const d = reset ? data0 : dataSource.concat(data0);
-            setDataSource(d);
+            const newData = reset ? data0 : [...dataSource, ...data0];
+            // 批量更新状态以减少渲染次数
+            setDataSourceState(newData);
             setCurrentAndRef(_current);
             setPageSizeAndRef(_pageSize);
             setTotal(total0);
+            setIsFirstComplete(true);
         }
         catch (error) {
-            console.error('fetch err', error);
+            console.error('useVirtualList error', error);
             if (_seq !== seq.current)
                 return;
         }
-        setIsFirstComplete(true);
-        setIsLoading(false);
-    };
+        finally {
+            if (_seq === seq.current) {
+                setIsLoading(false);
+            }
+        }
+    }, [isReady, server, dataSource, setCurrentAndRef, setPageSizeAndRef]);
     // 加载下一页数据
-    const refresh = async (reset) => {
+    const refresh = useCallback(async (reset) => {
         if (reset) {
-            setDataSource([]);
+            setDataSourceState([]);
             setCurrentAndRef(propCurrent);
             setPageSizeAndRef(propPageSize);
         }
@@ -92,16 +93,27 @@ option) => {
             setCurrentAndRef(current + 1);
         }
         await doSearch(reset);
-    };
-    // 防抖 加载下一页数据
-    const debounceRefresh = useCallback(debounce(refresh, 500), [refresh]);
-    /* 重置逻辑 */
-    const _deps = [...(deps || []), isReady];
+    }, [
+        current,
+        doSearch,
+        pageSize,
+        propCurrent,
+        propPageSize,
+        setCurrentAndRef,
+        setPageSizeAndRef,
+        total,
+    ]);
+    // 防抖刷新函数
+    const debounceRefresh = useCallback(debounce((reset) => {
+        refresh(reset);
+    }, 500), [refresh]);
+    // 使用useMemo优化依赖项
+    const memoizedDeps = useMemo(() => [...(deps || []), isReady], [deps, isReady]);
     useEffect(() => {
         if (!isReady)
             return;
         debounceRefresh(true);
-    }, _deps);
+    }, memoizedDeps); // 使用memoized依赖项
     return {
         loading: isLoading,
         dataSource,
@@ -111,9 +123,7 @@ option) => {
             total,
         },
         isFirstComplete,
-        refresh: async (reset) => {
-            await refresh(reset);
-        },
+        refresh,
         debounceRefresh,
         setDataSource,
         setTotal,