xmirror-components 1.0.39 → 1.0.40-alpha.2

package/build/lib/hooks/useSearchParams/index.js

@@ -46,13 +46,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var react_router_dom_1 = require("react-router-dom");
-var use_url_state_1 = __importDefault(require("@ahooksjs/use-url-state"));
 var ahooks_1 = require("ahooks");
 var lodash_es_1 = require("lodash-es");
 var util_1 = require("./util");
@@ -69,9 +65,29 @@ var useSearchParams = function (initialValue, options) {
     var update = (0, ahooks_1.useUpdate)();
     var navigator = (0, react_router_dom_1.useNavigate)();
     var location = (0, react_router_dom_1.useLocation)();
-    var _e = (0, use_url_state_1.default)((0, util_1.encodeParams)(__assign(__assign({}, initialSearchParams), initialValue)), {
-        navigateMode: 'replace'
-    }), urlParams = _e[0], setUrlParams = _e[1];
+    var _e = (0, react_router_dom_1.useSearchParams)(), routerSearchParams = _e[0], setRouterSearchParams = _e[1];
+    var urlParams = (0, react_1.useMemo)(function () {
+        var params = {};
+        routerSearchParams.forEach(function (value, key) {
+            params[key] = value;
+        });
+        return params;
+    }, [routerSearchParams]);
+    var setUrlParams = (0, react_1.useCallback)(function (params) {
+        var nextParams = new URLSearchParams(routerSearchParams);
+        Object.entries(params).forEach(function (_a) {
+            var key = _a[0], value = _a[1];
+            if (value === undefined || value === null || value === '') {
+                nextParams.delete(key);
+            }
+            else {
+                nextParams.set(key, String(value));
+            }
+        });
+        setRouterSearchParams(nextParams, {
+            replace: true
+        });
+    }, [routerSearchParams, setRouterSearchParams]);
     var initialDecodedParams = storage === 'url'
         ? (0, util_1.decodeParams)(urlParams)
         : (((_a = location.state) === null || _a === void 0 ? void 0 : _a[stateKey]) || {});
@@ -92,21 +108,23 @@ var useSearchParams = function (initialValue, options) {
      * 根据配置更新存储
      */
     var persistParams = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var payload, params_1, search, key, value;
-        var _a, _b;
-        return __generator(this, function (_c) {
+        var payload, params_1, urlSearchParams, _i, _a, _b, key, value, search;
+        var _c, _d;
+        return __generator(this, function (_e) {
             payload = __assign(__assign({}, params), { y: window.scrollY });
             if (storage === 'url') {
                 params_1 = (0, util_1.encodeParams)(payload);
                 setUrlParams(params_1);
-                search = '';
-                for (key in params_1) {
-                    value = params_1[key];
-                    search += "".concat(key, "=").concat(value, "&");
+                urlSearchParams = new URLSearchParams();
+                for (_i = 0, _a = Object.entries(params_1); _i < _a.length; _i++) {
+                    _b = _a[_i], key = _b[0], value = _b[1];
+                    if (value !== undefined && value !== null && value !== '') {
+                        urlSearchParams.set(key, String(value));
+                    }
                 }
-                search = search.slice(0, -1);
+                search = urlSearchParams.toString();
                 window.routerHistory.set(location.pathname, {
-                    path: "".concat(location.pathname, "?").concat(search),
+                    path: search ? "".concat(location.pathname, "?").concat(search) : location.pathname,
                     replace: true,
                 });
                 return [2 /*return*/];
@@ -114,11 +132,11 @@ var useSearchParams = function (initialValue, options) {
             window.routerHistory.set(location.pathname, {
                 path: location.pathname,
                 replace: true,
-                state: __assign(__assign({}, (location.state || {})), (_a = {}, _a[stateKey] = payload, _a)),
+                state: __assign(__assign({}, (location.state || {})), (_c = {}, _c[stateKey] = payload, _c)),
             });
             navigator(location.pathname, {
                 replace: true,
-                state: __assign(__assign({}, location.state), (_b = {}, _b[stateKey] = payload, _b))
+                state: __assign(__assign({}, location.state), (_d = {}, _d[stateKey] = payload, _d))
             });
             return [2 /*return*/];
         });

package/build/lib/hooks/useTable/index.js

@@ -87,6 +87,7 @@ function useTable(request, options) {
     var intl = (0, IntlProvider_1.useIntl)();
     var _a = __assign(__assign({}, defaultOptions), options), rowKey = _a.rowKey, interval = _a.interval, immediate = _a.immediate, defaultPagination = _a.defaultPagination, showRowSelection = _a.showRowSelection, multiPageSelection = _a.multiPageSelection, onBeforeRequest = _a.onBeforeRequest, onAfterRequest = _a.onAfterRequest;
     var tableTimerRef = (0, react_1.useRef)(null);
+    var latestRequestIdRef = (0, react_1.useRef)(0);
     var _b = (0, react_1.useState)(false), loading = _b[0], setLoading = _b[1];
     var _c = (0, react_1.useState)([]), tableData = _c[0], setTableData = _c[1];
     var _d = (0, react_1.useState)(__assign({ current: 1, pageSize: 10, total: 0 }, defaultPagination)), pagination = _d[0], setPagination = _d[1];
@@ -112,7 +113,7 @@ function useTable(request, options) {
             args_1[_i] = arguments[_i];
         }
         return __awaiter(_this, __spreadArray([], args_1, true), void 0, function (page, pageSize, auto) {
-            var requestParams, params, finalParams, response, _a, records, total, current, size, data, list, maxPage, error_1, errorMessage;
+            var requestId, requestParams, params, finalParams, response, _a, records, total_1, current_1, size_1, data, list, maxPage, error_1, errorMessage;
             if (page === void 0) { page = 1; }
             if (pageSize === void 0) { pageSize = 10; }
             return __generator(this, function (_b) {
@@ -126,6 +127,7 @@ function useTable(request, options) {
                             resetTableTimer(page, pageSize);
                             return [2 /*return*/];
                         }
+                        requestId = ++latestRequestIdRef.current;
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 5, 6, 7]);
@@ -137,35 +139,48 @@ function useTable(request, options) {
                         return [4 /*yield*/, request(finalParams)];
                     case 3:
                         response = _b.sent();
-                        _a = response.data, records = _a.records, total = _a.total, current = _a.current, size = _a.size;
+                        _a = response.data, records = _a.records, total_1 = _a.total, current_1 = _a.current, size_1 = _a.size;
                         return [4 /*yield*/, (onAfterRequest === null || onAfterRequest === void 0 ? void 0 : onAfterRequest(response))];
                     case 4:
                         data = _b.sent();
                         list = Array.isArray(data) ? data : records;
-                        setTableData(list);
-                        if (current !== pagination.current ||
-                            pageSize !== pagination.pageSize ||
-                            total !== pagination.total) {
-                            setPagination({
-                                current: current,
-                                pageSize: size,
-                                total: total
-                            });
+                        // 仅处理最新请求，避免并发请求导致旧数据覆盖新状态
+                        if (requestId !== latestRequestIdRef.current) {
+                            return [2 /*return*/];
                         }
-                        if (list.length === 0 && current && current > 1 && total && total > 0) {
-                            maxPage = Math.ceil(total / size);
+                        setTableData(list);
+                        setPagination(function (prev) {
+                            if (current_1 === prev.current &&
+                                size_1 === prev.pageSize &&
+                                total_1 === prev.total) {
+                                return prev;
+                            }
+                            return {
+                                current: current_1,
+                                pageSize: size_1,
+                                total: total_1
+                            };
+                        });
+                        if (list.length === 0 && current_1 && current_1 > 1 && total_1 && total_1 > 0) {
+                            maxPage = Math.ceil(total_1 / size_1);
                             initList(maxPage, pageSize, auto);
                         }
                         else {
-                            resetTableTimer(current, size);
+                            resetTableTimer(current_1, size_1);
                         }
                         return [3 /*break*/, 7];
                     case 5:
                         error_1 = _b.sent();
+                        if (requestId !== latestRequestIdRef.current) {
+                            return [2 /*return*/];
+                        }
                         errorMessage = error_1 instanceof Error ? error_1.message : '请求失败';
                         AntdApp_1.message.error(errorMessage);
                         return [3 /*break*/, 7];
                     case 6:
+                        if (requestId !== latestRequestIdRef.current) {
+                            return [2 /*return*/];
+                        }
                         if (!multiPageSelection) {
                             setSelectedRows([]);
                         }
@@ -295,6 +310,7 @@ function useTable(request, options) {
         // 使用当前分页值作为默认值，处理可能为 undefined 的情况
         var currentPage = (_b = pagination.current) !== null && _b !== void 0 ? _b : paginationRef.current.current;
         var currentPageSize = (_c = pagination.pageSize) !== null && _c !== void 0 ? _c : paginationRef.current.pageSize;
+        setPagination(function (prev) { return (__assign(__assign({}, prev), { current: currentPage, pageSize: currentPageSize })); });
         initList(currentPage, currentPageSize);
     }, [initList, searchParams]);
     var reset = function () {

package/build/lib/index.d.ts

@@ -7,6 +7,7 @@ import { ColumnTitleProps } from 'antd/es/table/interface';
 import { default as default_2 } from 'react';
 import { FormItemProps } from 'antd';
 import { FormProps } from 'antd';
+import { JSX } from 'react/jsx-runtime';
 import { MessageInstance } from 'antd/es/message/interface';
 import { ModalStaticFunctions } from 'antd/es/modal/confirm';
 import { NotificationInstance } from 'antd/es/notification/interface';
@@ -21,7 +22,7 @@ import { TableProps } from 'antd';
 
 export declare function App({ children, config, ...props }: AppProps & {
     config?: ConfigProviderConfigProps;
-}): default_2.JSX.Element;
+}): JSX.Element;
 
 declare interface ButtonTooltipProps {
     /**
@@ -47,7 +48,7 @@ declare interface ButtonTooltipProps {
     children?: default_2.ReactNode;
 }
 
-export declare const CheckboxValue: <T = any, F = any>({ checked, onChange, trueValue, falseValue, trueLabel, falseLabel, children, ...props }: CheckboxValueProps<T, F>) => default_2.JSX.Element;
+export declare const CheckboxValue: <T = any, F = any>({ checked, onChange, trueValue, falseValue, trueLabel, falseLabel, children, ...props }: CheckboxValueProps<T, F>) => JSX.Element;
 
 /**
  * checkbox 可自定义 value 和 label
@@ -128,7 +129,7 @@ declare interface ConfigContextProps {
     useSearchParams: UseSearchParamsOptions;
 }
 
-export declare function ConfigProvider({ children, config }: ConfigProviderProps): default_2.JSX.Element;
+export declare function ConfigProvider({ children, config }: ConfigProviderProps): JSX.Element;
 
 declare type ConfigProviderConfigProps = Partial<ConfigContextProps>;
 
@@ -137,7 +138,7 @@ declare interface ConfigProviderProps {
     config: ConfigProviderConfigProps;
 }
 
-export declare function GlobalLoading(): default_2.JSX.Element;
+export declare function GlobalLoading(): JSX.Element;
 
 export declare const IconButton: default_2.ForwardRefExoticComponent<IconButtonProps & default_2.RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
 
@@ -210,10 +211,11 @@ declare type IconFontProps = (IconFontCommonProps & default_2.SVGProps<SVGSVGEle
 /**
  * 筛选项
  * @param props
+ * @param children
  * @return {JSX.Element}
  * @constructor
  */
-declare function Index({ children, ...props }: FormItemProps): default_2.JSX.Element;
+declare function Index({ children, ...props }: FormItemProps): JSX.Element;
 
 declare interface InternalSearchAreaProps extends FormProps<any> {
     loading?: boolean;
@@ -400,7 +402,7 @@ export declare let setGlobalLoading: (_value: boolean) => void;
 /**
  * Switch 可自定义 value
  */
-export declare const SwitchValue: ({ checked, onChange, trueValue, falseValue, ...props }: SwitchValueProps) => default_2.JSX.Element;
+export declare const SwitchValue: ({ checked, onChange, trueValue, falseValue, ...props }: SwitchValueProps) => JSX.Element;
 
 /**
  * Switch 可自定义 value
@@ -460,7 +462,7 @@ declare interface TableComponentProps<RecordType = AnyObject> extends Omit<Table
  * @return {JSX.Element}
  * @constructor
  */
-declare function ToggleButton({ panel, onChange }: ToggleButtonProps): default_2.JSX.Element;
+declare function ToggleButton({ panel, onChange }: ToggleButtonProps): JSX.Element;
 
 declare interface ToggleButtonProps {
     panel: {

package/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.39",
+  "version": "1.0.40-alpha.2",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",
@@ -23,16 +23,15 @@
     "publish:dev": "npm publish --access public --tag dev"
   },
   "peerDependencies": {
-    "@ahooksjs/use-url-state": "^3.5.1",
     "@ant-design/icons": ">=5.0.0",
-    "ahooks": ">=3.0.0",
-    "antd": "^5.29.2",
+    "ahooks": ">=3.9.7",
+    "antd": "^6.3.4",
     "lodash-es": ">=4.17.0",
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "react-intl": "^7.1.14",
+    "react": ">=19.0.0",
+    "react-dom": ">=19.0.0",
+    "react-intl": "^10.1.0",
     "react-router-dom": "^6.30.2",
-    "react-transition-group": ">=4.4.0"
+    "react-transition-group": ">=4.4.5"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
@@ -44,18 +43,20 @@
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.10",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
     "@types/react-transition-group": "^4.4.12",
-    "@vitejs/plugin-react-swc": "^3.8.0",
+    "@vitejs/plugin-react-swc": "^4.3.0",
     "eslint": "^9.21.0",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.19",
     "globals": "^15.15.0",
     "less": "^4.3.0",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "typescript": "~5.7.2",
     "typescript-eslint": "^8.24.1",
-    "vite": "^6.2.0",
+    "vite": "^8.0.3",
     "vite-plugin-dts": "^4.5.3"
   },
   "keywords": [

package/build/types/components/AntdApp/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { type AppProps } from 'antd';
 import { type MessageInstance } from 'antd/es/message/interface';
 import { type NotificationInstance } from 'antd/es/notification/interface';
@@ -9,6 +8,6 @@ declare let notification: NotificationInstance;
 declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 declare function Index({ children, config, ...props }: AppProps & {
     config?: ConfigProviderConfigProps;
-}): React.JSX.Element;
+}): import("react/jsx-runtime").JSX.Element;
 export { message, notification, modal };
 export default Index;

package/build/types/components/CheckboxValue/index.d.ts

@@ -36,5 +36,5 @@ interface CheckboxValueProps<T = any, F = any> extends Omit<React.ComponentProps
      */
     children?: React.ReactNode;
 }
-declare const CheckboxValue: <T = any, F = any>({ checked, onChange, trueValue, falseValue, trueLabel, falseLabel, children, ...props }: CheckboxValueProps<T, F>) => React.JSX.Element;
+declare const CheckboxValue: <T = any, F = any>({ checked, onChange, trueValue, falseValue, trueLabel, falseLabel, children, ...props }: CheckboxValueProps<T, F>) => import("react/jsx-runtime").JSX.Element;
 export default CheckboxValue;

package/build/types/components/ConfigProvider/index.d.ts

@@ -6,4 +6,4 @@ interface ConfigProviderProps {
     children: React.ReactNode;
     config: ConfigProviderConfigProps;
 }
-export default function ConfigProvider({ children, config }: ConfigProviderProps): React.JSX.Element;
+export default function ConfigProvider({ children, config }: ConfigProviderProps): import("react/jsx-runtime").JSX.Element;

package/build/types/components/GlobalLoading/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 declare let setGlobalLoading: (_value: boolean) => void;
-declare function GlobalLoading(): React.JSX.Element;
+declare function GlobalLoading(): import("react/jsx-runtime").JSX.Element;
 export { setGlobalLoading };
 export default GlobalLoading;

package/build/types/components/IntlProvider/index.d.ts

@@ -8,5 +8,5 @@ interface IntlProviderProps {
     children: React.ReactNode;
     config: IntlProviderConfigProps;
 }
-export default function IntlProvider({ children, config }: IntlProviderProps): React.JSX.Element;
+export default function IntlProvider({ children, config }: IntlProviderProps): import("react/jsx-runtime").JSX.Element;
 export { FormattedMessage, useIntl };

package/build/types/components/SearchArea/Item/index.d.ts

@@ -1,10 +1,10 @@
-import React from 'react';
 import { type FormItemProps } from 'antd';
 /**
  * 筛选项
  * @param props
+ * @param children
  * @return {JSX.Element}
  * @constructor
  */
-declare function Index({ children, ...props }: FormItemProps): React.JSX.Element;
+declare function Index({ children, ...props }: FormItemProps): import("react/jsx-runtime").JSX.Element;
 export default Index;

package/build/types/components/SearchArea/ToggleButton/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 interface ToggleButtonProps {
     panel: {
         show: boolean;
@@ -11,5 +10,5 @@ interface ToggleButtonProps {
  * @return {JSX.Element}
  * @constructor
  */
-declare function ToggleButton({ panel, onChange }: ToggleButtonProps): React.JSX.Element;
+declare function ToggleButton({ panel, onChange }: ToggleButtonProps): import("react/jsx-runtime").JSX.Element;
 export default ToggleButton;

package/build/types/components/SwitchValue/index.d.ts

@@ -26,5 +26,5 @@ interface SwitchValueProps<T = boolean | string | number, F = boolean | string |
 /**
  * Switch 可自定义 value
  */
-declare const Index: ({ checked, onChange, trueValue, falseValue, ...props }: SwitchValueProps) => React.JSX.Element;
+declare const Index: ({ checked, onChange, trueValue, falseValue, ...props }: SwitchValueProps) => import("react/jsx-runtime").JSX.Element;
 export default Index;

package/build/types/components/Table/Footer/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { TableComponentProps } from '../types';
-declare function Index(props: TableComponentProps): React.JSX.Element;
+declare function Index(props: TableComponentProps): import("react/jsx-runtime").JSX.Element;
 export default Index;

package/build/types/components/Table/PopoverSetColumns/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { type TableComponentProps } from '../types';
 interface PopoverSetColumnsProps {
     order: string[];
@@ -9,5 +8,5 @@ interface PopoverSetColumnsProps {
     columnsSort: TableComponentProps['columnsSort'];
     onChangeVisible: (newVisibleItems: string[]) => void;
 }
-declare function PopoverSetColumns({ order, visibleItems, columns, onChangeOrder, columnsVisible, columnsSort, onChangeVisible }: PopoverSetColumnsProps): React.JSX.Element;
+declare function PopoverSetColumns({ order, visibleItems, columns, onChangeOrder, columnsVisible, columnsSort, onChangeVisible }: PopoverSetColumnsProps): import("react/jsx-runtime").JSX.Element;
 export default PopoverSetColumns;

package/build/types/components/Table/PopoverSetColumns/styles.d.ts

@@ -1,7 +1,3 @@
-export declare const PopoverWrapper: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme;
-    as?: React.ElementType;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare const ColumnsSettingWrapper: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme;
     as?: React.ElementType;

package/build/types/components/TagGroup/index.d.ts

@@ -0,0 +1,40 @@
+import React from 'react';
+import { Checkbox } from 'antd';
+import { type CheckboxChangeEvent } from 'antd/es/checkbox';
+/**
+ * checkbox 可自定义 value 和 label
+ * 使用场景：
+ * 1. 需要自定义 value 和 label
+ */
+interface CheckboxValueProps<T = any, F = any> extends Omit<React.ComponentProps<typeof Checkbox>, 'checked' | 'onChange'> {
+    /**
+     * 选中值
+     */
+    trueValue?: T;
+    /**
+     * 未选中值
+     */
+    falseValue?: F;
+    /**
+     * 选中值
+     */
+    checked?: T | F;
+    /**
+     * 选中事件
+     */
+    onChange?: (value: T | F, event: CheckboxChangeEvent) => void;
+    /**
+     * 选中标签
+     */
+    trueLabel?: string;
+    /**
+     * 未选中标签
+     */
+    falseLabel?: string;
+    /**
+     * 子元素
+     */
+    children?: React.ReactNode;
+}
+declare const CheckboxValue: <T = any, F = any>({ checked, onChange, trueValue, falseValue, trueLabel, falseLabel, children, ...props }: CheckboxValueProps<T, F>) => import("react/jsx-runtime").JSX.Element;
+export default CheckboxValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.39",
+  "version": "1.0.40-alpha.2",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",
@@ -23,16 +23,15 @@
     "publish:dev": "npm publish --access public --tag dev"
   },
   "peerDependencies": {
-    "@ahooksjs/use-url-state": "^3.5.1",
     "@ant-design/icons": ">=5.0.0",
-    "ahooks": ">=3.0.0",
-    "antd": "^5.29.2",
+    "ahooks": ">=3.9.7",
+    "antd": "^6.3.4",
     "lodash-es": ">=4.17.0",
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "react-intl": "^7.1.14",
+    "react": ">=19.0.0",
+    "react-dom": ">=19.0.0",
+    "react-intl": "^10.1.0",
     "react-router-dom": "^6.30.2",
-    "react-transition-group": ">=4.4.0"
+    "react-transition-group": ">=4.4.5"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
@@ -44,18 +43,20 @@
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.10",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
     "@types/react-transition-group": "^4.4.12",
-    "@vitejs/plugin-react-swc": "^3.8.0",
+    "@vitejs/plugin-react-swc": "^4.3.0",
     "eslint": "^9.21.0",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.19",
     "globals": "^15.15.0",
     "less": "^4.3.0",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "typescript": "~5.7.2",
     "typescript-eslint": "^8.24.1",
-    "vite": "^6.2.0",
+    "vite": "^8.0.3",
     "vite-plugin-dts": "^4.5.3"
   },
   "keywords": [