xmirror-components 1.0.32 → 1.0.34-alpha.1

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

@@ -0,0 +1,94 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeParams = exports.encodeParams = void 0;
+var lodash_es_1 = require("lodash-es");
+var typeFlags = {
+    Array: 'a',
+    Boolean: 'b',
+    Number: 'n',
+    String: 's',
+    Undefined: 'u',
+    Null: 'N'
+};
+var pack = function (value, array) {
+    var type = Object.prototype.toString.call(value).slice(8, -1);
+    if (type === 'Array') {
+        if (value.length) {
+            return "".concat(typeFlags[type]).concat(pack(value[0], value));
+        }
+        else {
+            return 'u_u';
+        }
+    }
+    var v = array || [value];
+    if (type === 'Boolean') {
+        return "".concat(typeFlags[type], "_").concat(v.map(function (item) { return (item ? 1 : 0); }).join());
+    }
+    if (type === 'String') {
+        return "".concat(typeFlags[type], "_").concat(v.join());
+    }
+    if (type === 'Null') {
+        return "".concat(typeFlags[type], "_").concat(v.map(function () { return 'n'; }).join());
+    }
+    if (type === 'Number') {
+        return "".concat(typeFlags[type], "_").concat(v.join());
+    }
+    return "u_".concat(v.map(function () { return 'u'; }).join());
+};
+var unpack = function (value) {
+    value = decodeURIComponent(value);
+    var _isArray = value.slice(0, 1) === 'a';
+    var type = _isArray ? value.slice(1, 2) : value.slice(0, 1);
+    var _value = _isArray ? value.slice(3).split(',') : value.slice(2);
+    if (type === 'b') {
+        return (0, lodash_es_1.isArray)(_value) ? _value.map(function (item) { return item === '1'; }) : _value === '1';
+    }
+    if (type === 's') {
+        return _value;
+    }
+    if (type === 'n') {
+        return (0, lodash_es_1.isArray)(_value) ? _value.map(function (item) { return (0, lodash_es_1.toNumber)(item); }) : (0, lodash_es_1.toNumber)(_value);
+    }
+    if (type === 'u') {
+        return (0, lodash_es_1.isArray)(_value) ? _value.map(function () { return undefined; }) : undefined;
+    }
+    if (type === 'N') {
+        return (0, lodash_es_1.isArray)(_value) ? _value.map(function () { return null; }) : null;
+    }
+    return _value;
+};
+/**
+ * 加密
+ * @param params
+ */
+var encodeParams = function (params) {
+    return Object.entries(__assign({}, params)).reduce(function (previousValue, _a) {
+        var key = _a[0], value = _a[1];
+        previousValue[key] = pack(value);
+        return previousValue;
+    }, {});
+};
+exports.encodeParams = encodeParams;
+/**
+ * 解密
+ * @param params
+ */
+var decodeParams = function (params) {
+    return Object.entries(__assign({}, params)).reduce(function (previousValue, _a) {
+        var key = _a[0], value = _a[1];
+        previousValue[key] = unpack(value);
+        return previousValue;
+    }, {});
+};
+exports.decodeParams = decodeParams;

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

@@ -235,9 +235,28 @@ function useTable(request, options) {
     /**
      * 刷新
      */
-    var refresh = (0, react_1.useCallback)(function () {
-        initList(paginationRef.current.current, paginationRef.current.pageSize);
-    }, [initList]);
+    var refresh = (0, react_1.useCallback)(function (searchData) {
+        if (searchData) {
+            var _searchParams = {
+                column: searchParams.column,
+                order: searchParams.order
+            };
+            if (searchData === null || searchData === void 0 ? void 0 : searchData.pageSize) {
+                setPagination(__assign(__assign({}, pagination), { pageSize: searchData.pageSize }));
+            }
+            if (searchData === null || searchData === void 0 ? void 0 : searchData.pageNum) {
+                setPagination(__assign(__assign({}, pagination), { current: searchData.pageNum }));
+            }
+            for (var key in searchParams) {
+                delete searchParams[key];
+            }
+            Object.assign(searchParams, _searchParams, searchData);
+            initList((searchData === null || searchData === void 0 ? void 0 : searchData.pageNum) || pagination.current, (searchData === null || searchData === void 0 ? void 0 : searchData.pageSize) || pagination.pageSize);
+        }
+        else {
+            initList(pagination.current, pagination.pageSize);
+        }
+    }, [initList, pagination, searchParams]);
     /**
      * 列表上的筛选排序执行
      * @param pagination 分页信息

package/build/lib/index.d.ts

@@ -125,6 +125,7 @@ declare interface ConfigContextProps {
     iconButton: IconButtonConfig;
     iconFont: IconFontConfig;
     locale: MessagesKeys;
+    useSearchParams: UseSearchParamsOptions;
 }
 
 export declare function ConfigProvider({ children, config }: ConfigProviderProps): default_2.JSX.Element;
@@ -279,7 +280,7 @@ declare interface OptionsProps<T = AnyObject> {
      * 响应时回调
      * @param response 响应数据
      */
-    onAfterRequest?: <R = T>(response: ResponseType_2<R>) => Promise<ResponseType_2<R> | undefined> | R[] | undefined;
+    onAfterRequest?: <R = T>(response: ResponseJSON) => Promise<ResponseType_2<R> | undefined> | R[] | undefined;
 }
 
 declare interface PaginationResponse<T> {
@@ -343,7 +344,7 @@ declare interface ReturnData<T = AnyObject> {
         /**
          * 刷新页面
          */
-        refresh: () => void;
+        refresh: (searchData?: Record<string, unknown>) => void;
     };
     /**
      * 多选条件
@@ -448,6 +449,17 @@ declare interface ToggleButtonProps {
 
 export declare function useRequest<TData, TParams extends unknown[]>(service: Service<TData, TParams>, options?: Options<TData, TParams>, plugins?: Array<Plugin_2<TData, TParams>>): WrappedResult<TData, TParams>;
 
+declare interface UseSearchParamsOptions {
+    /**
+     * 存储方式：url 参数或路由 state
+     */
+    storage?: 'url' | 'state';
+    /**
+     * 路由 state 模式下存储的 key
+     */
+    stateKey?: string;
+}
+
 export declare function useTable<T = AnyObject, P = RequestParams>(request: RequestFunction<T, P>, options?: OptionsProps<T>): ReturnData<T>;
 
 declare interface WrappedResult<TData, TParams extends unknown[]> extends Omit<Result<TData, TParams>, 'data'> {

package/build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.32",
+  "version": "1.0.34-alpha.1",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",
@@ -29,20 +29,23 @@
     "lodash-es": ">=4.17.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "react-intl": ">=7.0.0",
-    "react-transition-group": ">=4.4.0"
+    "react-intl": "^7.1.14",
+    "react-transition-group": ">=4.4.0",
+    "@ahooksjs/use-url-state": "^3.5.1",
+    "react-router-dom": "^6.30.2"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@types/react-resizable": "^3.0.8",
+    "classnames": "^2.5.1",
     "react-resizable": "^3.0.5"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.10",
-    "@types/react": "^19.0.10",
-    "@types/react-dom": "^19.0.4",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
     "@types/react-transition-group": "^4.4.12",
     "@vitejs/plugin-react-swc": "^3.8.0",
     "eslint": "^9.21.0",

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

@@ -1,6 +1,7 @@
 import React from "react";
 import { IconButtonProps } from "../IconButton";
 import { IconFontProps } from "../IconFont";
+import { UseSearchParamsOptions } from "../../hooks/useSearchParams/types";
 import { type MessagesKeys } from "../../locale";
 type IconButtonConfig = Pick<IconButtonProps, 'size' | 'className' | 'style'> & {
     render: (props: IconButtonProps & {
@@ -12,6 +13,7 @@ export interface ConfigContextProps {
     iconButton: IconButtonConfig;
     iconFont: IconFontConfig;
     locale: MessagesKeys;
+    useSearchParams: UseSearchParamsOptions;
 }
 export type ConfigProviderConfigProps = Partial<ConfigContextProps>;
 export {};

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

@@ -0,0 +1,3 @@
+import type { SearchParams, SearchParamsType, UseSearchParamsOptions } from './types.ts';
+declare const useSearchParams: <T extends SearchParamsType>(initialValue: T, options?: UseSearchParamsOptions) => SearchParams<T>;
+export default useSearchParams;

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

@@ -0,0 +1,31 @@
+/**
+ * 搜索参数类型
+ */
+export type SearchParamsType = Record<string, any>;
+/**
+ * 编码后的搜索参数类型
+ */
+export type EncodeSearchParamsType = Record<string, string>;
+/**
+ * 搜索参数接口
+ */
+export interface SearchParams<T extends SearchParamsType> {
+    /**
+     * 当前搜索参数
+     */
+    searchParams: T;
+    /**
+     * 设置搜索参数
+     */
+    setSearchParams: (value: T | Partial<T> | ((prev: T) => T)) => void;
+}
+export interface UseSearchParamsOptions {
+    /**
+     * 存储方式：url 参数或路由 state
+     */
+    storage?: 'url' | 'state';
+    /**
+     * 路由 state 模式下存储的 key
+     */
+    stateKey?: string;
+}

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

@@ -0,0 +1,11 @@
+import type { EncodeSearchParamsType, SearchParamsType } from './types.ts';
+/**
+ * 加密
+ * @param params
+ */
+export declare const encodeParams: (params: SearchParamsType) => EncodeSearchParamsType;
+/**
+ * 解密
+ * @param params
+ */
+export declare const decodeParams: (params: EncodeSearchParamsType) => SearchParamsType;

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

@@ -70,7 +70,7 @@ export interface OptionsProps<T = AnyObject> {
      * 响应时回调
      * @param response 响应数据
      */
-    onAfterRequest?: <R = T>(response: ResponseType<R>) => Promise<ResponseType<R> | undefined> | R[] | undefined;
+    onAfterRequest?: <R = T>(response: ResponseJSON) => Promise<ResponseType<R> | undefined> | R[] | undefined;
 }
 export interface ReturnData<T = AnyObject> {
     /**
@@ -105,7 +105,7 @@ export interface ReturnData<T = AnyObject> {
         /**
          * 刷新页面
          */
-        refresh: () => void;
+        refresh: (searchData?: Record<string, unknown>) => void;
     };
     /**
      * 多选条件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xmirror-components",
-  "version": "1.0.32",
+  "version": "1.0.34-alpha.1",
   "type": "module",
   "main": "build/lib/index.js",
   "module": "build/es/index.js",
@@ -29,20 +29,23 @@
     "lodash-es": ">=4.17.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "react-intl": ">=7.0.0",
-    "react-transition-group": ">=4.4.0"
+    "react-intl": "^7.1.14",
+    "react-transition-group": ">=4.4.0",
+    "@ahooksjs/use-url-state": "^3.5.1",
+    "react-router-dom": "^6.30.2"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@types/react-resizable": "^3.0.8",
+    "classnames": "^2.5.1",
     "react-resizable": "^3.0.5"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.10",
-    "@types/react": "^19.0.10",
-    "@types/react-dom": "^19.0.4",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
     "@types/react-transition-group": "^4.4.12",
     "@vitejs/plugin-react-swc": "^3.8.0",
     "eslint": "^9.21.0",