@mi-avalon/libs 0.0.25 → 0.0.27

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/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/constants/date.d.ts

@@ -8,4 +8,6 @@ export declare const DATE_FORMAT: {
     YMD_000: string;
     YMD_end: string;
     YMD_Hm: string;
+    YMD_SLASH: string;
+    YMD_SLASH_Hms: string;
 };

package/dist/constants/date.js

@@ -8,4 +8,6 @@ export const DATE_FORMAT = {
     YMD_000: 'YYYY-MM-DD 00:00:00',
     YMD_end: 'YYYY-MM-DD 23:59:59',
     YMD_Hm: 'YYYYMMDD HHmm',
+    YMD_SLASH: 'YYYY/MM/DD',
+    YMD_SLASH_Hms: 'YYYY/MM/DD HH:mm:ss',
 };

package/dist/constants/pattern.d.ts

@@ -1,24 +1,90 @@
 export declare class PatternType {
+    /**
+     * 整数
+     */
     static readonly integerRegex: RegExp;
+    /**
+     * 正整数
+     */
     static readonly positiveIntegerRegex: RegExp;
+    /**
+     * 负整数
+     */
     static readonly negativeIntegerRegex: RegExp;
+    /**
+     * 浮点数
+     */
     static readonly floatRegex: RegExp;
+    /**
+     * 字母
+     */
     static readonly letter: RegExp;
+    /**
+     * 汉字
+     */
     static readonly chinese: RegExp;
+    /**
+     * 数字
+     */
     static readonly number: RegExp;
+    /**
+     * 用户名 字母开头，允许字母数字下划线，长度4-16
+     */
     static readonly username: RegExp;
+    /**
+     * 强用户名 必须包含大小写字母和数字，6-20位
+     */
     static readonly strongUsername: RegExp;
+    /**
+     * 密码 至少8位，包含字母和数字
+     */
     static readonly password: RegExp;
+    /**
+     * 强密码 至少8位，包含大小写字母、数字和特殊字符
+     */
     static readonly strongPassword: RegExp;
+    /**
+     * 中国大陆的手机号
+     */
     static readonly phone: RegExp;
+    /**
+     * 带区号的手机号
+     */
     static readonly phoneWithAreaCode: RegExp;
+    /**
+     * 邮箱
+     */
     static readonly email: RegExp;
+    /**
+     * 身份证
+     */
     static readonly idCard: RegExp;
+    /**
+     * 银行卡
+     */
     static readonly bankCard: RegExp;
+    /**
+     * 邮政编码
+     */
     static readonly zipCode: RegExp;
+    /**
+     * IP
+     */
     static readonly ip: RegExp;
+    /**
+     * URL
+     */
     static readonly url: RegExp;
+    /**
+     * 车牌
+     */
     static readonly carNumber: RegExp;
+    /**
+     * 时间 hh:mm:ss
+     */
     static readonly time: RegExp;
+    /**
+     * 日期 YYYY-MM-DD
+     */
     static readonly date: RegExp;
 }

package/dist/constants/pattern.js

@@ -1,46 +1,90 @@
 export class PatternType {
-    // 整数
+    /**
+     * 整数
+     */
     static integerRegex = /^-?\d+$/;
-    // 正整数
+    /**
+     * 正整数
+     */
     static positiveIntegerRegex = /^[1-9]\d*$/;
-    // 负整数
+    /**
+     * 负整数
+     */
     static negativeIntegerRegex = /^-[1-9]\d*$/;
-    // 浮点数
+    /**
+     * 浮点数
+     */
     static floatRegex = /^-?\d+(\.\d+)?$/;
-    // 字母
+    /**
+     * 字母
+     */
     static letter = /^[a-zA-Z]+$/;
-    // 汉字
+    /**
+     * 汉字
+     */
     static chinese = /^[\u4e00-\u9fa5]+$/;
-    // 数字
+    /**
+     * 数字
+     */
     static number = /^[0-9]*$/;
-    // 用户名 字母开头，允许字母数字下划线，长度4-16
+    /**
+     * 用户名 字母开头，允许字母数字下划线，长度4-16
+     */
     static username = /^[a-zA-Z]\w{3,15}$/;
-    // 强用户名 必须包含大小写字母和数字，6-20位
+    /**
+     * 强用户名 必须包含大小写字母和数字，6-20位
+     */
     static strongUsername = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,20}$/;
-    // 密码 至少8位，包含字母和数字
+    /**
+     * 密码 至少8位，包含字母和数字
+     */
     static password = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/;
-    // 强密码 至少8位，包含大小写字母、数字和特殊字符
+    /**
+     * 强密码 至少8位，包含大小写字母、数字和特殊字符
+     */
     static strongPassword = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/;
-    // 中国大陆的手机号
+    /**
+     * 中国大陆的手机号
+     */
     static phone = /^1[3-9]\d{9}$/;
-    // 带区号的手机号
+    /**
+     * 带区号的手机号
+     */
     static phoneWithAreaCode = /^\+?\d{2,3}-?\d{8,11}$/;
-    // 邮箱
+    /**
+     * 邮箱
+     */
     static email = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-    // 身份证
+    /**
+     * 身份证
+     */
     static idCard = /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
-    // 银行卡
+    /**
+     * 银行卡
+     */
     static bankCard = /^[1-9]\d{3,30}$/;
-    // 邮政编码
+    /**
+     * 邮政编码
+     */
     static zipCode = /^[1-9]\d{5}$/;
-    // IP
+    /**
+     * IP
+     */
     static ip = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-    // URL
+    /**
+     * URL
+     */
     static url = /^(https?:\/\/)?([\da-z.-]+)\.([a-z.]{2,6})([/\w .-]*)*\/?$/;
-    // 车牌
+    /**
+     * 车牌
+     */
     static carNumber = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/;
-    // 时间 hh:mm:ss
+    /**
+     * 时间 hh:mm:ss
+     */
     static time = /^([0-1][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])$/;
-    // 日期 YYYY-MM-DD
+    /**
+     * 日期 YYYY-MM-DD
+     */
     static date = /^(\d{4})-(\d{2})-(\d{2})$/;
 }

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,