zy-react-library 1.0.63 → 1.0.65

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

@@ -19,6 +19,8 @@ export interface BasicCascaderProps extends CascaderProps {
   placeholder?: string;
   /** 控制只能选择到第几级 */
   level?: number;
+  /** 获取数据 */
+  onGetData?: (data: Record<string, any>[], processedData: Record<string, any>[]) => void;
 }
 
 /**

package/components/Cascader/Basic/index.js

@@ -1,4 +1,5 @@
 import { Cascader } from "antd";
+import { useEffect } from "react";
 import { processTreeDataByLevel } from "../../../utils";
 
 /**
@@ -6,6 +7,7 @@ import { processTreeDataByLevel } from "../../../utils";
  */
 function BasicCascader(props) {
   const {
+    onGetData,
     onChange,
     onGetNodePaths,
     onGetNodePathsIsIncludeOneself = true,
@@ -42,6 +44,10 @@ function BasicCascader(props) {
     onChange?.(value, selectedOptions);
   };
 
+  useEffect(() => {
+    onGetData?.(data, processedData);
+  }, [data, processedData]);
+
   return (
     <Cascader
       options={processedData}

package/components/HiddenInfo/gwj/index.js

@@ -1,5 +1,5 @@
 import { request } from "@cqsjjb/jjb-common-lib/http";
-import { Descriptions, Divider } from "antd";
+import { Descriptions, Divider, Spin } from "antd";
 import dayjs from "dayjs";
 import { useEffect, useState } from "react";
 import HeaderBack from "../../HeaderBack";
@@ -39,12 +39,14 @@ function HiddenInfo(props) {
   const [afterRectificationImageFiles, setAfterRectificationImageFiles] = useState([]);
   const [rectificationPlanImageFiles, setRectificationPlanImageFiles] = useState([]);
   const [acceptImageFiles, setAcceptImageFiles] = useState([]);
+  const [loading, setLoading] = useState(true);
   const { getFile } = useGetFile();
   const query = useGetUrlQuery();
 
   const getData = async () => {
     request(`/hidden/hidden/${id || query[idKey]}`, "get").then((res) => {
       setInfo(res.data);
+      setLoading(false);
     });
     const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: hiddenId || query[hiddenIdKey] });
     setHiddenImageFiles(hiddenImageFiles);
@@ -70,7 +72,8 @@ function HiddenInfo(props) {
   return (
     <div>
       {isShowHeaderBack && <HeaderBack title="查看" />}
-      <div style={{ padding: 20 }}>
+      <Spin spinning={loading}>
+        <div style={{ padding: 20 }}>
         <Divider orientation="left">隐患信息</Divider>
         <Descriptions
           bordered
@@ -126,8 +129,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") },
@@ -135,8 +138,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 },
                       ]
                     : []),
                 ]}
@@ -355,6 +358,7 @@ function HiddenInfo(props) {
           ]}
         />
       </div>
+      </Spin>
     </div>
   );
 }

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

@@ -15,6 +15,8 @@ export interface BasicLeftTreeProps extends TreeProps {
   onGetNodePathsIsIncludeOneself?: boolean;
   /** 获取父级节点 */
   onGetNodePaths?: () => Record<string, any>[];
+  /** 获取数据 */
+  onGetData?: (data: Record<string, any>[]) => void;
 }
 
 /**

package/components/LeftTree/Basic/index.js

@@ -9,6 +9,7 @@ const { Search } = Input;
  */
 const BasicLeftTree = (props) => {
   const {
+    onGetData,
     onSelect,
     onGetNodePaths,
     onGetNodePathsIsIncludeOneself = true,
@@ -141,6 +142,10 @@ const BasicLeftTree = (props) => {
   const filteredTreeData = filterTreeData(treeData, searchValue);
   const processedTreeData = processTreeData(filteredTreeData);
 
+  useEffect(() => {
+    onGetData?.(treeData);
+  }, [treeData]);
+
   return (
     <div style={{ width: 300 }}>
       <Search

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

@@ -15,6 +15,8 @@ export interface BasicSelectProps extends SelectProps {
   placeholder?: string;
   /** 获取 label */
   onGetLabel?: (label: string) => void;
+  /** 获取数据 */
+  onGetData?: (data: Record<string, any>[]) => void;
 }
 
 /**

package/components/Select/Basic/index.js

@@ -1,4 +1,5 @@
 import { Select } from "antd";
+import { useEffect } from "react";
 import { getLabelName } from "../../../utils";
 
 /**
@@ -6,6 +7,7 @@ import { getLabelName } from "../../../utils";
  */
 function BasicSelect(props) {
   const {
+    onGetData,
     onChange,
     onGetLabel,
     placeholder = "",
@@ -23,6 +25,10 @@ function BasicSelect(props) {
     onChange?.(event, option);
   };
 
+  useEffect(() => {
+    onGetData?.(data);
+  }, [data]);
+
   return (
     <Select placeholder={`请选择${placeholder}`} showSearch allowClear onChange={handleChange} {...restProps}>
       {data.map((item) => {

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

@@ -21,6 +21,8 @@ export interface BasicSelectTreeProps extends TreeSelectProps {
   level?: number;
   /** 获取 label */
   onGetLabel?: (label: string) => void;
+  /** 获取数据 */
+  onGetData?: (data: Record<string, any>[], processedData: Record<string, any>[]) => void;
 }
 
 /**

package/components/SelectTree/Basic/index.js

@@ -1,4 +1,5 @@
 import { TreeSelect } from "antd";
+import { useEffect } from "react";
 import { getTreeNodePaths, processTreeDataByLevel } from "../../../utils";
 
 /**
@@ -6,6 +7,7 @@ import { getTreeNodePaths, processTreeDataByLevel } from "../../../utils";
  */
 function BasicSelectTree(props) {
   const {
+    onGetData,
     onChange,
     onGetLabel,
     onGetNodePaths,
@@ -48,6 +50,10 @@ function BasicSelectTree(props) {
     onChange?.(value, label, extra);
   };
 
+  useEffect(() => {
+    onGetData?.(treeData, processedTreeData);
+  }, [treeData, processedTreeData]);
+
   return (
     <TreeSelect
       showSearch

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.63",
+  "version": "1.0.65",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",