xmirror-components 1.0.35 → 1.0.37

package/build/es/hooks/useSearchParams/index.d.ts

@@ -1,3 +1,12 @@
 import type { SearchParams, SearchParamsType, UseSearchParamsOptions } from './types.ts';
+declare global {
+    interface Window {
+        routerHistory: Map<string, {
+            path: string;
+            replace: boolean;
+            state?: Record<string, any>;
+        }>;
+    }
+}
 declare const useSearchParams: <T extends SearchParamsType>(initialValue: T, options?: UseSearchParamsOptions) => SearchParams<T>;
 export default useSearchParams;

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

@@ -55,6 +55,8 @@ import { ConfigContext } from '../../components/ConfigProvider';
 var initialSearchParams = {
     y: undefined
 };
+// 确保 routerHistory 已初始化
+window.routerHistory = window.routerHistory || new Map();
 var useSearchParams = function (initialValue, options) {
     var _a;
     var defaultConfigOptions = useContext(ConfigContext).useSearchParams;
@@ -85,17 +87,33 @@ var useSearchParams = function (initialValue, options) {
      * 根据配置更新存储
      */
     var persistParams = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var payload;
-        var _a;
-        return __generator(this, function (_b) {
+        var payload, params_1, search, key, value;
+        var _a, _b;
+        return __generator(this, function (_c) {
             payload = __assign(__assign({}, params), { y: window.scrollY });
             if (storage === 'url') {
-                setUrlParams(encodeParams(payload));
+                params_1 = encodeParams(payload);
+                setUrlParams(params_1);
+                search = '';
+                for (key in params_1) {
+                    value = params_1[key];
+                    search += "".concat(key, "=").concat(value, "&");
+                }
+                search = search.slice(0, -1);
+                window.routerHistory.set(location.pathname, {
+                    path: "".concat(location.pathname, "?").concat(search),
+                    replace: true,
+                });
                 return [2 /*return*/];
             }
+            window.routerHistory.set(location.pathname, {
+                path: location.pathname,
+                replace: true,
+                state: __assign(__assign({}, (location.state || {})), (_a = {}, _a[stateKey] = payload, _a)),
+            });
             navigator(location.pathname, {
                 replace: true,
-                state: __assign(__assign({}, location.state), (_a = {}, _a[stateKey] = payload, _a))
+                state: __assign(__assign({}, location.state), (_b = {}, _b[stateKey] = payload, _b))
             });
             return [2 /*return*/];
         });
@@ -159,6 +177,9 @@ var useSearchParams = function (initialValue, options) {
             !navEndRef.current))) {
             setTimeout(function () {
                 var targetLocation = targetLocationRef.current;
+                if (!targetLocation) {
+                    return;
+                }
                 var path = "".concat(targetLocation.pathname).concat(targetLocation.search);
                 navigator(path, {
                     replace: targetLocation.historyAction !== 'PUSH',

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

@@ -295,6 +295,14 @@ function useTable(request, options) {
         var currentPageSize = (_c = pagination.pageSize) !== null && _c !== void 0 ? _c : paginationRef.current.pageSize;
         initList(currentPage, currentPageSize);
     }, [initList, searchParams]);
+    var reset = function () {
+        setSelectedRows([]);
+        setTableData([]);
+        setPagination(__assign({ current: 1, pageSize: 10, total: 0 }, defaultPagination));
+        setLoading(false);
+        searchParams.pageNum = 1;
+        searchParams.pageSize = (defaultPagination === null || defaultPagination === void 0 ? void 0 : defaultPagination.pageSize) || 10;
+    };
     // 初始化
     useEffect(function () {
         if (immediate) {
@@ -321,7 +329,8 @@ function useTable(request, options) {
             pagination: pagination,
             params: searchParams,
             submit: search,
-            refresh: refresh
+            refresh: refresh,
+            reset: reset
         },
         rowSelection: {
             selectedRows: selectedRows,

package/build/es/hooks/useTable/types.d.ts

@@ -106,6 +106,10 @@ export interface ReturnData<T = AnyObject> {
          * 刷新页面
          */
         refresh: (searchData?: Record<string, unknown>) => void;
+        /**
+         * 重置分页信息
+         */
+        reset: () => void;
     };
     /**
      * 多选条件

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

@@ -60,6 +60,8 @@ var ConfigProvider_1 = require("../../components/ConfigProvider");
 var initialSearchParams = {
     y: undefined
 };
+// 确保 routerHistory 已初始化
+window.routerHistory = window.routerHistory || new Map();
 var useSearchParams = function (initialValue, options) {
     var _a;
     var defaultConfigOptions = (0, react_1.useContext)(ConfigProvider_1.ConfigContext).useSearchParams;
@@ -90,17 +92,33 @@ var useSearchParams = function (initialValue, options) {
      * 根据配置更新存储
      */
     var persistParams = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-        var payload;
-        var _a;
-        return __generator(this, function (_b) {
+        var payload, params_1, search, key, value;
+        var _a, _b;
+        return __generator(this, function (_c) {
             payload = __assign(__assign({}, params), { y: window.scrollY });
             if (storage === 'url') {
-                setUrlParams((0, util_1.encodeParams)(payload));
+                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, "&");
+                }
+                search = search.slice(0, -1);
+                window.routerHistory.set(location.pathname, {
+                    path: "".concat(location.pathname, "?").concat(search),
+                    replace: true,
+                });
                 return [2 /*return*/];
             }
+            window.routerHistory.set(location.pathname, {
+                path: location.pathname,
+                replace: true,
+                state: __assign(__assign({}, (location.state || {})), (_a = {}, _a[stateKey] = payload, _a)),
+            });
             navigator(location.pathname, {
                 replace: true,
-                state: __assign(__assign({}, location.state), (_a = {}, _a[stateKey] = payload, _a))
+                state: __assign(__assign({}, location.state), (_b = {}, _b[stateKey] = payload, _b))
             });
             return [2 /*return*/];
         });
@@ -164,6 +182,9 @@ var useSearchParams = function (initialValue, options) {
             !navEndRef.current))) {
             setTimeout(function () {
                 var targetLocation = targetLocationRef.current;
+                if (!targetLocation) {
+                    return;
+                }
                 var path = "".concat(targetLocation.pathname).concat(targetLocation.search);
                 navigator(path, {
                     replace: targetLocation.historyAction !== 'PUSH',

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

@@ -297,6 +297,14 @@ function useTable(request, options) {
         var currentPageSize = (_c = pagination.pageSize) !== null && _c !== void 0 ? _c : paginationRef.current.pageSize;
         initList(currentPage, currentPageSize);
     }, [initList, searchParams]);
+    var reset = function () {
+        setSelectedRows([]);
+        setTableData([]);
+        setPagination(__assign({ current: 1, pageSize: 10, total: 0 }, defaultPagination));
+        setLoading(false);
+        searchParams.pageNum = 1;
+        searchParams.pageSize = (defaultPagination === null || defaultPagination === void 0 ? void 0 : defaultPagination.pageSize) || 10;
+    };
     // 初始化
     (0, react_1.useEffect)(function () {
         if (immediate) {
@@ -323,7 +331,8 @@ function useTable(request, options) {
             pagination: pagination,
             params: searchParams,
             submit: search,
-            refresh: refresh
+            refresh: refresh,
+            reset: reset
         },
         rowSelection: {
             selectedRows: selectedRows,

package/build/lib/index.d.ts

@@ -345,6 +345,10 @@ declare interface ReturnData<T = AnyObject> {
          * 刷新页面
          */
         refresh: (searchData?: Record<string, unknown>) => void;
+        /**
+         * 重置分页信息
+         */
+        reset: () => void;
     };
     /**
      * 多选条件

package/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",

package/build/types/hooks/useSearchParams/index.d.ts

@@ -1,3 +1,12 @@
 import type { SearchParams, SearchParamsType, UseSearchParamsOptions } from './types.ts';
+declare global {
+    interface Window {
+        routerHistory: Map<string, {
+            path: string;
+            replace: boolean;
+            state?: Record<string, any>;
+        }>;
+    }
+}
 declare const useSearchParams: <T extends SearchParamsType>(initialValue: T, options?: UseSearchParamsOptions) => SearchParams<T>;
 export default useSearchParams;

package/build/types/hooks/useTable/types.d.ts

@@ -106,6 +106,10 @@ export interface ReturnData<T = AnyObject> {
          * 刷新页面
          */
         refresh: (searchData?: Record<string, unknown>) => void;
+        /**
+         * 重置分页信息
+         */
+        reset: () => void;
     };
     /**
      * 多选条件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",