zy-react-library 1.0.163 → 1.0.165

package/components/Select/Basic/index.d.ts

@@ -1,5 +1,5 @@
 import type { SelectProps } from "antd/es/select";
-import type { FC } from "react";
+import type { FC, ReactNode } from "react";
 
 /**
  * 组件属性
@@ -19,11 +19,13 @@ export interface BasicSelectProps extends SelectProps {
   onGetOption?: (option: Record<string, any> | Record<string, any>[]) => void;
   /** 获取数据 */
   onGetData?: (data: Record<string, any>[]) => void;
+  /** 自定义 label 的渲染函数 */
+  labelRender?: (item: Record<string, any>) => ReactNode;
 }
 
 /**
  * 基础下拉组件（不建议直接使用此组件，二次继承使用）
  */
-declare const BasicSelectTree: FC<BasicSelectProps>;
+declare const BasicSelect: FC<BasicSelectProps>;
 
-export default BasicSelectTree;
+export default BasicSelect;

package/components/Select/Basic/index.js

@@ -14,6 +14,7 @@ function BasicSelect(props) {
     data = [],
     nameKey = "name",
     idKey = "id",
+    labelRender,
     ...restProps
   } = props;
 
@@ -59,7 +60,7 @@ function BasicSelect(props) {
     <Select placeholder={`请选择${placeholder}`} showSearch allowClear optionFilterProp="children" onChange={handleChange} {...restProps}>
       {data.map((item) => {
         const value = item[idKey];
-        const label = item[nameKey];
+        const label = labelRender ? labelRender(item) : item[nameKey];
         return (
           <Select.Option key={value} value={value}>
             {label}

package/hooks/useUrlQueryCriteria/index.js

@@ -1,12 +1,16 @@
-import { tools } from "@cqsjjb/jjb-common-lib";
-import useGetUrlQuery from "../useGetUrlQuery";
-
-const { query } = tools.router;
+import useUrlState from "@ahooksjs/use-url-state";
 
 /**
  * 处理搜索条件缓存到 URL
  */
 export default function useUrlQueryCriteria() {
+  const [state, setState] = useUrlState({
+    searchFormKeys: "",
+    searchFormValues: "",
+    paginationKeys: "",
+    paginationValues: "",
+  }, { navigateMode: "replace" });
+
   /**
    * 将搜索表单项和分页参数缓存到 URL 中
    */
@@ -35,20 +39,21 @@ export default function useUrlQueryCriteria() {
     const paginationData = getJoinString(pagination);
 
     // 将数据存储到 URL 查询参数中
-    query.searchFormKeys = searchFormData.keys;
-    query.searchFormValues = searchFormData.values;
-    query.paginationKeys = paginationData.keys;
-    query.paginationValues = paginationData.values;
+    setState({
+      searchFormKeys: searchFormData.keys || undefined,
+      searchFormValues: searchFormData.values || undefined,
+      paginationKeys: paginationData.keys || undefined,
+      paginationValues: paginationData.values || undefined,
+    });
   }
 
   /**
    * 从 URL 中获取缓存的查询参数
    */
   function getUrlCriteriaQuery(keysStr, valuesStr) {
-    const query = useGetUrlQuery();
     // 将键值字符串分割为数组
-    const keys = query[keysStr] ? query[keysStr].split(",") : [];
-    const values = query[valuesStr] ? query[valuesStr].split(",") : [];
+    const keys = state[keysStr] ? state[keysStr].split(",") : [];
+    const values = state[valuesStr] ? state[valuesStr].split(",") : [];
 
     // 构建结果对象
     const resultMap = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.163",
+  "version": "1.0.165",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
@@ -22,6 +22,7 @@
     "postinstall": "echo 'Thanks for using our component library!'"
   },
   "dependencies": {
+    "@ahooksjs/use-url-state": "^3.5.1",
     "@ant-design/icons": "^6.1.0",
     "@ant-design/pro-components": "^2.8.10",
     "@cqsjjb/jjb-common-lib": "latest",

package/utils/index.d.ts

@@ -329,14 +329,14 @@ export function processTreeDataForOnlyLastLevel(
 /**
  * 验证结束时间是否大于开始时间
  */
-export function validatorEndTime(timeStart: string, message: string): {
+export function validatorEndTime(timeStart: string, message?: string): {
   validator: (_: any, value: any) => Promise<void | string>;
 };
 
 /**
  * 验证时间是否大于等于当前时间
  */
-export function validatorTimeGTCurrentDay(message: string): {
+export function validatorTimeGTCurrentDay(message?: string): {
   validator: (_: any, value: any) => Promise<void | string>;
 };