zy-react-library 1.0.62 → 1.0.64

package/components/HiddenInfo/gwj/index.js

@@ -10,6 +10,7 @@ import { UPLOAD_FILE_TYPE_ENUM } from "../../../enum/uploadFile/gwj";
 import useGetFile from "../../../hooks/useGetFile";
 import { getLabelName } from "../../../utils";
 import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "../../../enum/hidden/gwj";
+import useGetUrlQuery from "../../../hooks/useGetUrlQuery";
 
 /**
  * 隐患查看组件（港务局版本）
@@ -39,29 +40,27 @@ function HiddenInfo(props) {
   const [rectificationPlanImageFiles, setRectificationPlanImageFiles] = useState([]);
   const [acceptImageFiles, setAcceptImageFiles] = useState([]);
   const { getFile } = useGetFile();
+  const query = useGetUrlQuery();
 
   const getData = async () => {
-    const urlParams = new URLSearchParams(window.location.search);
-    const queryId = urlParams.get(idKey);
-    const queryHiddenId = urlParams.get(hiddenIdKey);
-    request(`/hidden/hidden/${id || queryId}`, "get").then((res) => {
+    request(`/hidden/hidden/${id || query[idKey]}`, "get").then((res) => {
       setInfo(res.data);
     });
-    const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: hiddenId || queryHiddenId });
+    const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: hiddenId || query[hiddenIdKey] });
     setHiddenImageFiles(hiddenImageFiles);
-    const hiddenVideoFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["102"], eqForeignKey: hiddenId || queryHiddenId });
+    const hiddenVideoFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["102"], eqForeignKey: hiddenId || query[hiddenIdKey] });
     setHiddenVideoFiles(hiddenVideoFiles);
     const afterRectificationImageFiles = await getFile({
       eqType: UPLOAD_FILE_TYPE_ENUM["4"],
-      eqForeignKey: hiddenId || queryHiddenId,
+      eqForeignKey: hiddenId || query[hiddenIdKey],
     });
     setAfterRectificationImageFiles(afterRectificationImageFiles);
     const rectificationPlanImageFiles = await getFile({
       eqType: UPLOAD_FILE_TYPE_ENUM["8"],
-      eqForeignKey: hiddenId || queryHiddenId,
+      eqForeignKey: hiddenId || query[hiddenIdKey],
     });
     setRectificationPlanImageFiles(rectificationPlanImageFiles);
-    const acceptImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["5"], eqForeignKey: hiddenId || queryHiddenId });
+    const acceptImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["5"], eqForeignKey: hiddenId || query[hiddenIdKey] });
     setAcceptImageFiles(acceptImageFiles);
   };
   useEffect(() => {
@@ -127,8 +126,8 @@ function HiddenInfo(props) {
                 column={1}
                 labelStyle={{ width: 200 }}
                 items={[
-                  { label: "整改部门", children: info.hiddenUserPresetsCO.deptName },
-                  { label: "整改人", children: info.hiddenUserPresetsCO.userName },
+                  { label: "整改部门", children: info.hiddenUserPresetsCO.rectifyDeptName },
+                  { label: "整改人", children: info.hiddenUserPresetsCO.rectifyUserName },
                   ...(info.rectificationType === 2
                     ? [
                         { label: "整改期限", children: dayjs(info.hiddenUserPresetsCO.rectifyDeadline).format("YYYY-MM-DD") },
@@ -136,8 +135,8 @@ function HiddenInfo(props) {
                     : []),
                   ...(info.rectificationType === 1
                     ? [
-                        { label: "验收部门", children: info.hiddenUserPresetsCO.deptName },
-                        { label: "验收人", children: info.hiddenUserPresetsCO.userName },
+                        { label: "验收部门", children: info.hiddenUserPresetsCO.checkDeptName },
+                        { label: "验收人", children: info.hiddenUserPresetsCO.checkUserName },
                       ]
                     : []),
                 ]}

package/hooks/useGetUrlQuery/index.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 获取路由参数
+ */
+export default function useGetUrlQuery(): Record<string, any>;

package/hooks/useGetUrlQuery/index.js

@@ -0,0 +1,16 @@
+/**
+ * 获取路由参数
+ */
+function useGetUrlQuery() {
+  const urlQuery = new URLSearchParams(window.location.search);
+
+  // 直接返回包含所有参数的对象
+  const queryParams = {};
+  for (const [key, value] of urlQuery.entries()) {
+    queryParams[key] = value;
+  }
+
+  return queryParams;
+}
+
+export default useGetUrlQuery;

package/hooks/useTable/index.js

@@ -1,5 +1,6 @@
 import { tools } from "@cqsjjb/jjb-common-lib";
 import { useAntdTable } from "ahooks";
+import useGetUrlQuery from "../useGetUrlQuery";
 
 const { query } = tools.router;
 
@@ -75,9 +76,10 @@ function setQuery(searchForm, pagination) {
  * 从 URL 中获取查询参数
  */
 function getQuery(keysStr, valuesStr) {
+  const query = useGetUrlQuery();
   // 将键值字符串分割为数组
-  const keys = keysStr ? keysStr.split(",") : [];
-  const values = valuesStr ? valuesStr.split(",") : [];
+  const keys = query[keysStr] ? query[keysStr].split(",") : [];
+  const values = query[valuesStr] ? query[valuesStr].split(",") : [];
 
   // 构建结果对象
   const resultMap = {};
@@ -119,8 +121,8 @@ function useTable(service, options) {
   } = restOptions;
 
   // 获取存储的查询条件
-  const storageQueryCriteriaSearchForm = useStorageQueryCriteria ? getQuery(query.searchFormKeys, query.searchFormValues) : {};
-  const storageQueryCriteriaPagination = useStorageQueryCriteria && usePagination ? getQuery(query.paginationKeys, query.paginationValues) : {};
+  const storageQueryCriteriaSearchForm = useStorageQueryCriteria ? getQuery("searchFormKeys", "searchFormValues") : {};
+  const storageQueryCriteriaPagination = useStorageQueryCriteria && usePagination ? getQuery("paginationKeys", "paginationValues") : {};
 
   // 确定实际使用的搜索表单和分页参数
   const actualSearchForm = Object.keys(storageQueryCriteriaSearchForm).length > 0 ? storageQueryCriteriaSearchForm : {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.62",
+  "version": "1.0.64",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",