2.0.9

- 将Image组件的样式属性由wrapperStyle改为styles
- 更新styles属性值结构，添加root对象包裹样式
- 修正样式生效问题，确保图片边距正确显示

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.3.19",
+  "version": "2.0.9",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
@@ -30,13 +30,13 @@
   },
   "dependencies": {
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@ant-design/icons": "^5.6.1",
+    "@ant-design/icons": "^6.2.5",
-    "@ant-design/pro-components": "^2.8.10",
+    "@ant-design/pro-components": "^3.1.12-0",
     "@cqsjjb/jjb-common-lib": "latest",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",
     "ahooks": "^3.9.5",
-    "antd": "^5.27.6",
+    "antd": "^6.4.4",
     "dayjs": "^1.11.18",
     "lodash-es": "^4.17.21",
     "react": "^18.3.1",

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

@@ -11,8 +11,6 @@ export interface BasicCascaderProps extends Omit<CascaderProps, "fieldNames"> {
   idKey?: string;
   /** 树形数据 children 字段，默认 children */
   childrenKey?: string;
-  /** @deprecated 已弃用，请使用 getNodePathsIsIncludeOneself */
-  onGetNodePathsIsIncludeOneself?: boolean;
   /** 决定 onGetNodePaths 是否包含自身节点，默认 true */
   getNodePathsIsIncludeOneself?: boolean;
   /** 获取父级节点 */

src/components/Cascader/Basic/index.js

@@ -10,7 +10,6 @@ function BasicCascader(props) {
     onGetData,
     onChange,
     onGetNodePaths,
-    onGetNodePathsIsIncludeOneself,
     getNodePathsIsIncludeOneself = true,
     placeholder = "",
     data = [],
@@ -21,14 +20,6 @@ function BasicCascader(props) {
     ...restProps
   } = props;
 
-  // 如果使用了已弃用的参数给出警告
-  if (onGetNodePathsIsIncludeOneself !== undefined) {
-    console.warn("【BasicCascader】 onGetNodePathsIsIncludeOneself 参数已弃用，请使用 getNodePathsIsIncludeOneself 参数");
-  }
-
-  // 向后兼容，如果传入了旧参数，使用旧参数
-  const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself;
-
   // 根据 level 处理树数据
   const processedData = useMemo(() => {
     return level
@@ -43,7 +34,7 @@ function BasicCascader(props) {
 
   const getNodePaths = (selectedOptions) => {
     let nodePaths = selectedOptions;
-    if (!finalGetNodePathsIsIncludeOneself && selectedOptions) {
+    if (!getNodePathsIsIncludeOneself && selectedOptions) {
       nodePaths = selectedOptions.slice(0, -1);
     }
     return nodePaths || [];

src/components/FormBuilder/FormBuilder.d.ts

@@ -44,6 +44,11 @@ export interface FormBuilderProps<Values = any> extends Omit<FormProps, "form" |
   form: FormInstance<Values>;
   /** 表单提交时的回调函数 */
   onFinish?: (values: Values) => void;
+  /** 历史记录对象，用于返回上一页，默认使用 window.history.back */
+  history?: {
+    goBack?: () => void;
+    [key: string]: any;
+  };
 }
 
 /**

src/components/FormBuilder/FormBuilder.js

@@ -21,6 +21,7 @@ const FormBuilder = (props) => {
     showCancelButton = true,
     customActionButtons,
     extraActionButtons,
+    history,
     loading = false,
     ...restProps
   } = props;
@@ -51,7 +52,7 @@ const FormBuilder = (props) => {
   }, [showActionButtons]);
 
   const handleCancel = () => {
-    window.history.back();
+    history?.goBack ? history.goBack() : window.history.back();
   };
 
   return (
@@ -78,7 +79,7 @@ const FormBuilder = (props) => {
           />
         </Row>
         {showActionButtons && (
-          <div style={{ position: "relative", zIndex: "9" }}>
+          <div style={{ position: "relative", zIndex: "99" }}>
             <div style={{ height: "32px" }}></div>
             <Row
               style={{ textAlign: "center", backgroundColor: "rgb(241, 241, 242)", padding: "10px 0", position: "fixed", bottom: "0", width: pageWidth, margin: "0 -44px" }}

src/components/FormBuilder/FormItemsRenderer.d.ts

@@ -1,9 +1,9 @@
+import type { NamePath } from "@rc-component/form/lib/interface";
 import type { ColProps } from "antd/es/col";
 import type { FormItemProps, Rule } from "antd/es/form";
 import type { FormListFieldData } from "antd/es/form/FormList";
 import type { Gutter } from "antd/es/grid/row";
-import type { NamePath } from "rc-field-form/lib/interface";
+import type { CSSProperties, ReactElement, ReactNode } from "react";
-import type { ReactElement, ReactNode } from "react";
 import type { FORM_ITEM_RENDER_TYPE_MAP } from "../../enum/formItemRender";
 import type { DeepPartial } from "./FormBuilder";
 
@@ -131,6 +131,10 @@ export interface FormOptionBase<
   dependencies?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, Dependencies[]>;
   /** 是否仅用于保存标签，不渲染到页面上，只在表单中保存数据，默认 false */
   onlyForLabel?: IsOnlyForLabel;
+  /** Col 的内联样式，会合并到 Col 的 style 上，支持函数动态计算 */
+  colStyle?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, CSSProperties | ((formValues: AllValues) => CSSProperties)>;
+  /** Col 内部、Form.Item 之前渲染的标题节点，支持函数动态计算 */
+  colTitle?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, ReactNode | ((formValues: AllValues) => ReactNode)>;
 }
 
 /**
@@ -157,6 +161,10 @@ export type FormOptionByRender<
   checkboxCol?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "checkbox" ? number : never>;
   /** Form.List 独有的属性 */
   formListUniqueProps?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? FormListUniqueProps | ((formValues: AllValues) => FormListUniqueProps) : never>;
+  /** FormList 每行的内联样式，仅 render 为 formList 时可用，支持函数按行计算 */
+  rowStyle?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? CSSProperties | ((field: FormListFieldData, fieldIndex: number) => CSSProperties) : never>;
+  /** FormList 每行起始位置渲染的标题节点，仅 render 为 formList 时可用，支持函数按行计算 */
+  rowTitle?: FormOptionProperty<IsOnlyForLabel, IsCustomizeRender, RenderType extends "formList" ? ReactNode | ((field: FormListFieldData, fieldIndex: number) => ReactNode) : never>;
 };
 
 /**

src/components/FormBuilder/FormItemsRenderer.js

@@ -84,12 +84,8 @@ const FormItemsRenderer = ({
     };
   };
 
-  // 获取传给formItem的属性
+  // 设置日期组件的属性
-  const getFormItemProps = (option) => {
+  const setDateComponentProps = (option, formItemProps) => {
-    const formItemProps = typeof option.formItemProps === "function"
-      ? option.formItemProps(getFormValues())
-      : (option.formItemProps || {});
-
     // 为日期组件添加特殊处理
     if ([
       FORM_ITEM_RENDER_ENUM.DATE,
@@ -117,6 +113,15 @@ const FormItemsRenderer = ({
       formItemProps.getValueFromEvent = (_, dateString) => dateString;
       formItemProps.getValueProps = value => ({ value: Array.isArray(value) ? value.map(v => v ? dayjs(v) : undefined) : undefined });
     }
+  };
+
+  // 获取传给 formItem 的属性
+  const getFormItemProps = (option) => {
+    const formItemProps = typeof option.formItemProps === "function"
+      ? option.formItemProps(getFormValues())
+      : (option.formItemProps || {});
+
+    setDateComponentProps(option, formItemProps);
 
     return formItemProps;
   };
@@ -218,6 +223,39 @@ const FormItemsRenderer = ({
     return { span: itemSpan, labelCol: itemLabelCol, wrapperCol: itemWrapperCol };
   };
 
+  // 获取 col 样式
+  const getColStyle = (option) => {
+    return typeof option.colStyle === "function"
+      ? option.colStyle(getFormValues())
+      : option.colStyle;
+  };
+
+  // 获取 col 标题（Col 内部、Form.Item 之后）
+  const getColTitle = (option) => {
+    return typeof option.colTitle === "function"
+      ? option.colTitle(getFormValues())
+      : option.colTitle;
+  };
+
+  // 获取 row 样式（FormList 的每一行）
+  const getRowStyle = (option, field, fieldIndex) => {
+    return typeof option.rowStyle === "function"
+      ? option.rowStyle(field, fieldIndex)
+      : option.rowStyle;
+  };
+
+  // 获取 row 标题（FormList 每行末尾）
+  const getRowTitle = (option, field, fieldIndex) => {
+    return typeof option.rowTitle === "function"
+      ? option.rowTitle(field, fieldIndex)
+      : option.rowTitle;
+  };
+
+  // 获取是否动态表单项
+  const getIsDynamicFormItem = (option, formItemProps) => {
+    return (option.shouldUpdate ?? option.dependencies) || (formItemProps.shouldUpdate ?? formItemProps.dependencies);
+  };
+
   // 获取 hidden
   const getHidden = (hidden) => {
     // 支持动态计算 hidden
@@ -264,7 +302,7 @@ const FormItemsRenderer = ({
 
       case FORM_ITEM_RENDER_ENUM.SELECT:
         return (
-          <Select placeholder={placeholder} showSearch allowClear optionFilterProp="children" {...componentProps}>
+          <Select placeholder={placeholder} showSearch={{ optionFilterProp: "children" }} allowClear {...componentProps}>
             {(option.items || []).map((item) => {
               const { value, label, disabled } = getSelectableItemAttributes(item, itemsFieldKey);
               return (
@@ -420,8 +458,12 @@ const FormItemsRenderer = ({
     delete formItemProps.dependencies;
     delete formItemProps.shouldUpdate;
 
+    if (getHidden(option.hidden))
+      return null;
+
     return (
-      <Col key={getKey(option) || index} span={col.span} style={style}>
+      <Col key={getKey(option) || index} span={col.span} style={{ ...style, ...getColStyle(option) }}>
+        {getColTitle(option)}
         <Form.Item
           name={option.name}
           label={renderLabel(option)}
@@ -443,6 +485,9 @@ const FormItemsRenderer = ({
   const renderOtherTypeItem = ({ option, style, col, index, preserve }) => {
     const componentProps = getComponentProps(option);
 
+    if (getHidden(option.hidden))
+      return null;
+
     // 如果是 customizeRender 类型，完全交给外部控制渲染
     if (option.customizeRender) {
       return (
@@ -470,7 +515,7 @@ const FormItemsRenderer = ({
     if (option.render === FORM_ITEM_RENDER_ENUM.DIVIDER) {
       return (
         <Col key={getKey(option) || index} span={col.span} style={style}>
-          <Divider orientation="left" {...componentProps}>{option.label}</Divider>
+          <Divider titlePlacement="start" {...componentProps}>{option.label}</Divider>
         </Col>
       );
     }
@@ -478,43 +523,28 @@ const FormItemsRenderer = ({
     return null;
   };
 
-  // 渲染需要动态更新的表单项
-  const renderDynamicFormItem = ({ option, index, style, col, preserve }) => {
-    const formItemProps = getFormItemProps(option);
-
-    return (
-      <Form.Item
-        key={getKey(option) || index}
-        noStyle
-        preserve={preserve}
-        shouldUpdate={option.shouldUpdate ?? formItemProps.shouldUpdate}
-        dependencies={option.dependencies ?? formItemProps.dependencies}
-      >
-        {() => {
-          return renderFormItem({ option, style, col, index, preserve });
-        }}
-      </Form.Item>
-    );
-  };
-
   // 渲染 Form.List
   const renderFormList = ({ option, index, col, style }) => {
     const formListUniqueProps = getFormListUniqueProps(option);
     const componentProps = getComponentProps(option);
 
+    if (getHidden(option.hidden))
+      return null;
+
     return (
-      <Col key={getKey(option) || index} span={col.span} style={style}>
+      <Col key={getKey(option) || index} span={col.span} style={{ ...style, ...getColStyle(option) }}>
+        {getColTitle(option)}
         <Form.List name={option.name} {...componentProps}>
           {(fields, { add, remove, move }) => (
             <>
               {fields.map((field, fieldIndex) => {
                 const listOptions = getListOptions(formListUniqueProps.options, field, fieldIndex, add, remove, move);
+                const rowStyle = getRowStyle(option, field, fieldIndex);
+                const rowTitle = getRowTitle(option, field, fieldIndex);
                 return (
-                  <Row gutter={gutter} key={field.key}>
+                  <Row gutter={gutter} key={field.key} style={rowStyle}>
+                    {rowTitle}
                     {listOptions.map((listOption, listIndex) => {
-                      if (getHidden(listOption.hidden))
-                        return null;
-
                       const col = getCol(listOption);
                       const formItemProps = getFormItemProps(listOption);
 
@@ -525,6 +555,12 @@ const FormItemsRenderer = ({
                         index: `${fieldIndex}_${listIndex}`,
                         preserve: true,
                       };
+
+                      // 如果配置了 shouldUpdate 或 dependencies，使用 Form.Item 的联动机制
+                      // 注意：动态检测必须在 renderOtherTypeItem 之前，否则特殊类型（customizeRender / onlyForLabel / DIVIDER）无法响应联动
+                      if (getIsDynamicFormItem(listOption, formItemProps))
+                        return renderDynamicFormItem(params);
+
                       const otherTypeItem = renderOtherTypeItem(params);
                       if (otherTypeItem)
                         return otherTypeItem;
@@ -532,9 +568,6 @@ const FormItemsRenderer = ({
                       if (listOption.render === FORM_ITEM_RENDER_ENUM.FORM_LIST)
                         return renderFormList(params);
 
-                      if ((listOption.shouldUpdate ?? listOption.dependencies) || (formItemProps.shouldUpdate ?? formItemProps.dependencies))
-                        return renderDynamicFormItem(params);
-
                       // 判断一个项是否需要显示按钮（不是 onlyForLabel 且不是隐藏的）
                       const isShow = (opt) => {
                         return !getHidden(opt.hidden) && !opt.onlyForLabel;
@@ -562,8 +595,10 @@ const FormItemsRenderer = ({
                       if (listIndex === lastShowIndex || isNextNestedFormList || isNextNoShow) {
                         delete formItemProps.dependencies;
                         delete formItemProps.shouldUpdate;
+
                         return (
-                          <Col key={getKey(listOption) || listIndex} span={col.span} style={style}>
+                          <Col key={getKey(listOption) || listIndex} span={col.span} style={{ ...style, ...getColStyle(listOption) }}>
+                            {getColTitle(listOption)}
                             <Form.Item
                               label={renderLabel(listOption)}
                               labelCol={col.labelCol}
@@ -574,7 +609,7 @@ const FormItemsRenderer = ({
                               {...formItemProps}
                             >
                               <div style={{ display: "flex", gap: 10, alignItems: "center", justifyContent: "space-between" }}>
-                                <div style={{ flex: 1 }}>
+                                <div style={{ flex: 1, minWidth: 0 }}>
                                   <Form.Item
                                     noStyle
                                     rules={getRules(listOption)}
@@ -629,12 +664,35 @@ const FormItemsRenderer = ({
     );
   };
 
+  // 渲染需要动态更新的表单项
+  const renderDynamicFormItem = ({ option, index, style, col, preserve }) => {
+    const formItemProps = getFormItemProps(option);
+
+    return (
+      <Form.Item
+        key={getKey(option) || index}
+        noStyle
+        preserve={preserve}
+        shouldUpdate={option.shouldUpdate ?? formItemProps.shouldUpdate}
+        dependencies={option.dependencies ?? formItemProps.dependencies}
+      >
+        {() => {
+          const otherTypeItem = renderOtherTypeItem({ option, style, col, index, preserve });
+          if (otherTypeItem)
+            return otherTypeItem;
+
+          if (option.render === FORM_ITEM_RENDER_ENUM.FORM_LIST)
+            return renderFormList({ option, index, col, style });
+
+          return renderFormItem({ option, style, col, index, preserve });
+        }}
+      </Form.Item>
+    );
+  };
+
   return (
     <>
       {options.map((option, index) => {
-        if (getHidden(option.hidden))
-          return null;
-
         const col = getCol(option);
         const style = getStyle(index);
         const formItemProps = getFormItemProps(option);
@@ -647,6 +705,10 @@ const FormItemsRenderer = ({
           preserve: false,
         };
 
+        // 如果配置了 shouldUpdate 或 dependencies，使用 Form.Item 的联动机制
+        if (getIsDynamicFormItem(option, formItemProps))
+          return renderDynamicFormItem(params);
+
         // 处理特殊类型的表单项
         const otherTypeItem = renderOtherTypeItem(params);
         if (otherTypeItem)
@@ -656,10 +718,6 @@ const FormItemsRenderer = ({
         if (option.render === FORM_ITEM_RENDER_ENUM.FORM_LIST)
           return renderFormList(params);
 
-        // 如果配置了 shouldUpdate 或 dependencies，使用 Form.Item 的联动机制
-        if ((option.shouldUpdate ?? option.dependencies) || (formItemProps.shouldUpdate ?? formItemProps.dependencies))
-          return renderDynamicFormItem(params);
-
         // 普通表单项（静态配置）
         return renderFormItem(params);
       })}

src/components/HeaderBack/index.js

@@ -17,12 +17,14 @@ function HeaderBack(props) {
             <>
               <div
                 className="back"
-                onClick={() => history?.goBack?.() || window.history.back()}
+                onClick={() => {
+                  history?.goBack ? history.goBack() : window.history.back();
+                }}
               >
                 <ArrowLeftOutlined style={{ fontSize: 14 }} />
                 <span>返回</span>
               </div>
-              <Divider type="vertical" style={{ backgroundColor: "#dcdfe6", marginLeft: 15, marginRight: 15 }} />
+              <Divider orientation="vertical" style={{ backgroundColor: "#dcdfe6", marginLeft: 15, marginRight: 15 }} />
             </>
           )
         }

src/components/HiddenInfo/gwj/index.js

@@ -131,7 +131,7 @@ function HiddenInfo(props) {
   return (
     <div>
       <Spin spinning={loading || downloadFileLoading}>
-        <Divider orientation="left">隐患信息</Divider>
+        <Divider titlePlacement="start">隐患信息</Divider>
         <Descriptions
           bordered
           column={1}
@@ -193,7 +193,7 @@ function HiddenInfo(props) {
         {
           (info.hiddenUserPresetsCO && Object.keys(info.hiddenUserPresetsCO).length > 0) && (
             <>
-              <Divider orientation="left">整改信息（发现人预填）</Divider>
+              <Divider titlePlacement="start">整改信息（发现人预填）</Divider>
               <Descriptions
                 bordered
                 column={1}
@@ -223,7 +223,7 @@ function HiddenInfo(props) {
         {
           (info.hiddenConfirmUserCO && info.hiddenConfirmUserCO.length > 0) && (
             <>
-              <Divider orientation="left">隐患确认</Divider>
+              <Divider titlePlacement="start">隐患确认</Divider>
               {
                 info.hiddenConfirmUserCO.map(item => (
                   <Descriptions
@@ -256,7 +256,7 @@ function HiddenInfo(props) {
         {
           info.hiddenExtensionList && info.hiddenExtensionList.length > 0 && (
             <>
-              <Divider orientation="left">延期信息</Divider>
+              <Divider titlePlacement="start">延期信息</Divider>
               {
                 info.hiddenExtensionList.map(item => (
                   <Descriptions
@@ -319,7 +319,7 @@ function HiddenInfo(props) {
         {
           info.hiddenSpecialList && info.hiddenSpecialList.length > 0 && (
             <>
-              <Divider orientation="left">特殊处置审核信息</Divider>
+              <Divider titlePlacement="start">特殊处置审核信息</Divider>
               {
                 info.hiddenSpecialList.map(item => (
                   <Descriptions
@@ -405,7 +405,7 @@ function HiddenInfo(props) {
         {
           (info.hiddenRectifyUserCO && info.hiddenRectifyUserCO.length > 0) && (
             <>
-              <Divider orientation="left">整改信息</Divider>
+              <Divider titlePlacement="start">整改信息</Divider>
               {
                 info.hiddenRectifyUserCO.map((item, index) => (
                   <Descriptions
@@ -454,7 +454,7 @@ function HiddenInfo(props) {
           info.hiddenAcceptQualifiedUserCO.length > 0
             ? (
                 <>
-                  <Divider orientation="left">验收信息</Divider>
+                  <Divider titlePlacement="start">验收信息</Divider>
                   {
                     info.hiddenAcceptQualifiedUserCO.map((item, index) => (
                       <Descriptions
@@ -482,7 +482,7 @@ function HiddenInfo(props) {
           info.hiddenAcceptUnqualifiedUserCO.length > 0
             ? (
                 <>
-                  <Divider orientation="left">验收打回信息</Divider>
+                  <Divider titlePlacement="start">验收打回信息</Divider>
                   {
                     info.hiddenAcceptUnqualifiedUserCO.map(item => (
                       <Descriptions
@@ -507,7 +507,7 @@ function HiddenInfo(props) {
           (info.hiddenInspecCO && Object.keys(info.hiddenInspecCO).length > 0)
             ? (
                 <>
-                  <Divider orientation="left">安全环保验收信息</Divider>
+                  <Divider titlePlacement="start">安全环保验收信息</Divider>
                   <Descriptions
                     bordered
                     column={1}

src/components/ImportFile/index.js

@@ -53,7 +53,7 @@ const ImportFile = (props) => {
       open={visible}
       onCancel={handleClose}
       width={600}
-      maskClosable={false}
+      mask={{ closable: false }}
       footer={[
         templateUrl && (
           <Button key="export" onClick={handleExportTemplate}>

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

@@ -11,8 +11,6 @@ export interface BasicLeftTreeProps extends Omit<TreeProps, "fieldNames"> {
   idKey?: string;
   /** 树形数据 children 字段，默认 children */
   childrenKey?: string;
-  /** @deprecated 已弃用，请使用 getNodePathsIsIncludeOneself */
-  onGetNodePathsIsIncludeOneself?: boolean;
   /** 决定 onGetNodePaths 是否包含自身节点，默认 true */
   getNodePathsIsIncludeOneself?: boolean;
   /** 获取父级节点 */

src/components/LeftTree/Basic/index.js

@@ -12,7 +12,6 @@ const BasicLeftTree = (props) => {
     onGetData,
     onSelect,
     onGetNodePaths,
-    onGetNodePathsIsIncludeOneself,
     getNodePathsIsIncludeOneself = true,
     expandedKeys: externalExpandedKeys,
     treeData = [],
@@ -22,14 +21,6 @@ const BasicLeftTree = (props) => {
     ...restProps
   } = props;
 
-  // 如果使用了已弃用的参数给出警告
-  if (onGetNodePathsIsIncludeOneself !== undefined) {
-    console.warn("【BasicLeftTree】 onGetNodePathsIsIncludeOneself 参数已弃用，请使用 getNodePathsIsIncludeOneself 参数");
-  }
-
-  // 向后兼容，如果传入了旧参数，使用旧参数
-  const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself;
-
   const [expandedKeys, setExpandedKeys] = useState([]);
   const [searchValue, setSearchValue] = useState("");
   const [autoExpandParent, setAutoExpandParent] = useState(true);
@@ -90,7 +81,7 @@ const BasicLeftTree = (props) => {
         targetId: selectedNodeId,
         idKey,
         childrenKey,
-        isIncludeOneself: finalGetNodePathsIsIncludeOneself,
+        isIncludeOneself: getNodePathsIsIncludeOneself,
       });
       onGetNodePaths?.(parentNodes);
     }

src/components/Map/MapSelector.js

@@ -267,7 +267,7 @@ const MapSelector = (props) => {
       onCancel={handleClose}
       width={1000}
       destroyOnHidden={false}
-      maskClosable={false}
+      mask={{ closable: false }}
       afterClose={handleAfterClose}
       footer={[
         <Button key="back" onClick={handleClose}>

src/components/Page/index.js

@@ -55,13 +55,17 @@ function Page(props) {
           {children && typeof children === "function" ? children() : children}
           {
             (isShowAllAction && isShowFooter) && (
-              <div className="page-layout-footer" style={{ position: "relative", zIndex: "9" }}>
+              <div className="page-layout-footer" style={{ position: "relative", zIndex: "99" }}>
                 <div style={{ height: "52px" }}></div>
                 <div style={{ textAlign: "center", backgroundColor: "rgb(241, 241, 242)", padding: "10px 0", position: "fixed", bottom: "0", width: pageWidth, margin: "0px -20px" }}>
                   {customActionButtons || (
                     <Space>
                       {extraActionButtons}
-                      <Button onClick={() => history?.goBack?.() || window.history.back()}>
+                      <Button
+                        onClick={() => {
+                          history?.goBack ? history.goBack() : window.history.back();
+                        }}
+                      >
                         {backButtonText}
                       </Button>
                     </Space>

src/components/Pdf/index.js

@@ -90,7 +90,7 @@ function Pdf(props) {
       <Modal
         style={{ top: isFullscreen ? 0 : 100, maxWidth: isFullscreen ? "100vw" : "calc(100vw - 32px)", paddingBottom: isFullscreen ? 0 : 24 }}
         open={visible}
-        maskClosable={false}
+        mask={{ closable: false }}
         width={isFullscreen ? "100vw" : pdfWidth + 100}
         title={title}
         onCancel={() => {

src/components/PreviewImg/index.js

@@ -16,7 +16,7 @@ const PreviewImg = (props) => {
           <Image
             key={item[fileUrlKey] || item}
             src={item[fileUrlKey] ? fileUrl + item[fileUrlKey] : fileUrl + item}
-            wrapperStyle={{ marginRight: 10, marginBottom: 10 }}
+            styles={{ root: { marginRight: 10, marginBottom: 10 } }}
             width={100}
             height={100}
             alt=""

src/components/Select/Basic/index.js

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

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

@@ -11,8 +11,6 @@ export interface BasicSelectTreeProps extends Omit<TreeSelectProps, "fieldNames"
   idKey?: string;
   /** 树形数据 children 字段，默认 children */
   childrenKey?: string;
-  /** @deprecated 已弃用，请使用 getNodePathsIsIncludeOneself */
-  onGetNodePathsIsIncludeOneself?: boolean;
   /** 决定 onGetNodePaths 是否包含自身节点，默认 true */
   getNodePathsIsIncludeOneself?: boolean;
   /** 获取父级节点 */

src/components/SelectTree/Basic/index.js

@@ -11,7 +11,6 @@ function BasicSelectTree(props) {
     onChange,
     onGetLabel,
     onGetNodePaths,
-    onGetNodePathsIsIncludeOneself,
     getNodePathsIsIncludeOneself = true,
     placeholder = "",
     treeData = [],
@@ -23,14 +22,6 @@ function BasicSelectTree(props) {
     ...restProps
   } = props;
 
-  // 如果使用了已弃用的参数给出警告
-  if (onGetNodePathsIsIncludeOneself !== undefined) {
-    console.warn("【BasicSelectTree】 onGetNodePathsIsIncludeOneself 参数已弃用，请使用 getNodePathsIsIncludeOneself 参数");
-  }
-
-  // 向后兼容，如果传入了旧参数，使用旧参数
-  const finalGetNodePathsIsIncludeOneself = onGetNodePathsIsIncludeOneself !== undefined ? onGetNodePathsIsIncludeOneself : getNodePathsIsIncludeOneself;
-
   const processedTreeData = useMemo(() => {
     // 根据 level 处理树数据
     let result = level
@@ -64,7 +55,7 @@ function BasicSelectTree(props) {
               targetId,
               idKey,
               childrenKey,
-              isIncludeOneself: finalGetNodePathsIsIncludeOneself,
+              isIncludeOneself: getNodePathsIsIncludeOneself,
             });
             parentNodes.push(...currentParentNodes);
           }
@@ -81,7 +72,7 @@ function BasicSelectTree(props) {
             targetId,
             idKey,
             childrenKey,
-            isIncludeOneself: finalGetNodePathsIsIncludeOneself,
+            isIncludeOneself: getNodePathsIsIncludeOneself,
           });
           onGetNodePaths?.(parentNodes);
           onGetLabel?.(parentNodes[parentNodes.length - 1][nameKey]);

src/components/SelectTree/Department/Gwj/index.d.ts

@@ -30,6 +30,7 @@ export interface Params {
   inType?: InType[];
   /** 企业类型 1-监管 2-企业 3-相关方 */
   enterpriseType?: EnterpriseType | EnterpriseType[];
+  [key: string]: any;
 }
 
 /**

src/components/Signature/index.js

@@ -60,7 +60,7 @@ function Signature(props) {
         title="签字"
         width={800}
         open={signatureModalOpen}
-        maskClosable={false}
+        mask={{ closable: false }}
         onCancel={() => setSignatureModalOpen(false)}
         footer={[
           <Button key="clear" onClick={() => signatureCanvas.current.clear()}>重签</Button>,

src/components/Video/index.js

@@ -92,7 +92,7 @@ const Video = forwardRef(({
             关闭
           </Button>,
         ]}
-        maskClosable={false}
+        mask={{ closable: false }}
         onCancel={() => setVisible(false)}
       >
         {playerElement}

src/enum/uploadFile/aqd/index.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 文件上传类型枚举
+ */
+export declare const UPLOAD_FILE_TYPE_ENUM: {
+  1000: 1000; // template_task - 模板任务附件
+};
+
+/**
+ * 文件上传类型对应的 path 枚举
+ */
+export declare const UPLOAD_FILE_PATH_ENUM: {
+  1000: "template_task";
+};

src/enum/uploadFile/aqd/index.js

@@ -0,0 +1,16 @@
+/**
+ * 文件上传类型枚举
+ */
+/**
+ * 文件上传类型枚举
+ */
+export const UPLOAD_FILE_TYPE_ENUM = {
+  1000: 1000, // template_task - 模板任务附件
+};
+
+/**
+ * 文件上传类型对应的 path 枚举
+ */
+export const UPLOAD_FILE_PATH_ENUM = {
+  1000: "template_task",
+};

src/hooks/useGetFile/index.js

@@ -1,6 +1,7 @@
 import { request } from "@cqsjjb/jjb-common-lib/http.js";
 import { useState } from "react";
-import { UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj";
+import { UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_AQD } from "../../enum/uploadFile/aqd";
+import { UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_GWJ } from "../../enum/uploadFile/gwj";
 import { addingPrefixToFile, getBaseGateway } from "../../utils";
 
 /**
@@ -34,7 +35,8 @@ function useGetFile(returnType = "object") {
       }
 
       // 检查eqType是否在UPLOAD_FILE_TYPE_ENUM中
-      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(eqType)) {
+      const isValidEqType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(eqType) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(eqType);
+      if (!isValidEqType) {
         console.error(`【getFile】 传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中，当前传入的 eqType 是 ${eqType}`);
         return;
       }

src/hooks/useTable/index.d.ts

@@ -18,8 +18,6 @@ export interface UseTableOptions<TData extends Data, TParams extends Params> ext
   params?: Record<string, any> | (() => Record<string, any>);
   /** 表单数据转换函数，在每次请求之前调用，接收当前搜索的表单项，要求返回一个对象 */
   transform?: (formData: FormValues) => FormValues;
-  /** @deprecated 已弃用，请使用 onSuccess */
-  callback?: (list: any[], data: any) => void;
   /** 表单实例（通过 Form.useForm() 创建） */
   form?: FormInstance;
 }

src/hooks/useTable/index.js

@@ -96,13 +96,6 @@ function useTable(service, options) {
     },
   );
 
-  if (restOptions.callback !== undefined) {
-    console.warn("【useTable】 callback 参数已弃用，请使用 onSuccess 参数");
-  }
-
-  // 执行回调函数
-  restOptions.callback && restOptions.callback(res?.data?.list || [], res?.data || {});
-
   // 返回结果
   return {
     ...res,

src/hooks/useUploadFile/index.js

@@ -1,6 +1,7 @@
 import { request } from "@cqsjjb/jjb-common-lib/http.js";
 import { useState } from "react";
-import { UPLOAD_FILE_PATH_ENUM, UPLOAD_FILE_TYPE_ENUM } from "../../enum/uploadFile/gwj";
+import { UPLOAD_FILE_PATH_ENUM as UPLOAD_FILE_PATH_ENUM_AQD, UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_AQD } from "../../enum/uploadFile/aqd";
+import { UPLOAD_FILE_PATH_ENUM as UPLOAD_FILE_PATH_ENUM_GWJ, UPLOAD_FILE_TYPE_ENUM as UPLOAD_FILE_TYPE_ENUM_GWJ } from "../../enum/uploadFile/gwj";
 import { getBaseGateway } from "../../utils";
 
 /**
@@ -46,13 +47,14 @@ function useUploadFile(returnType = "object") {
       }
 
       // 检查type是否在UPLOAD_FILE_TYPE_ENUM中
-      if (!Object.values(UPLOAD_FILE_TYPE_ENUM).includes(params.type)) {
+      const isValidType = Object.values(UPLOAD_FILE_TYPE_ENUM_GWJ).includes(params.type) || Object.values(UPLOAD_FILE_TYPE_ENUM_AQD).includes(params.type);
+      if (!isValidType) {
         console.error(`【uploadFile】 传入的 type 不在 UPLOAD_FILE_TYPE_ENUM 中，当前传入的 type 是 ${params.type}`);
         return;
       }
 
       // 根据type获取对应的path
-      const path = UPLOAD_FILE_PATH_ENUM[params.type];
+      const path = UPLOAD_FILE_PATH_ENUM_GWJ[params.type] || UPLOAD_FILE_PATH_ENUM_AQD[params.type];
       if (!path) {
         console.error(`【uploadFile】未找到 type ${params.type} 对应的 path `);
         return;