diff --git a/src/components/SearchForm/index.jsx b/src/components/SearchForm/index.jsx new file mode 100644 index 0000000..1e91dc7 --- /dev/null +++ b/src/components/SearchForm/index.jsx @@ -0,0 +1,196 @@ +import React, { useState, useRef, useEffect } from "react"; +import { Form, Button, Space, Row, Col } from "antd"; +import { + SearchOutlined, + DoubleRightOutlined, + UndoOutlined, +} from "@ant-design/icons"; + +/** + * 搜索表单组件 + * @param {import("antd").FormInstance | React.RefObject} form - form 实例或 ref + * @param {React.CSSProperties} style - 样式 + * @param {boolean} expand - 是否展开(受控模式) + * @param {boolean} defaultExpand - 内部默认展开状态,仅在 expand 未传入时生效 + * @param {boolean} loading - 查询 loading 状态 + * @param {React.ReactNode[]} formLine - 表单行节点数组 + * @param {Record} initialValues - 表单初始值 + * @param {(form: React.RefObject) => void} onRef - 获取 form 实例回调(已废弃) + * @param {(values: Record) => void} onReset - 重置回调 + * @param {(values: Record) => void} onFinish - 提交回调 + * @param {(open: boolean) => void} onExpand - 展开/收起状态变化回调 + * @param {boolean} openFormItemStyle - 是否开启 Form.Item 样式(默认关闭,自动添加 noStyle) + */ +const SearchForm = ({ + form: externalForm, + style, + expand, + defaultExpand = false, + loading = false, + formLine = [], + initialValues = {}, + onRef = () => {}, + onReset = () => {}, + onFinish = () => {}, + onExpand, + openFormItemStyle = false, +}) => { + const [internalFormInstance] = Form.useForm(); + const internalFormRef = useRef(internalFormInstance); + + // 判断外部传入的是 ref 还是 form 实例(ref 有 current 属性) + const isExternalRef = externalForm && "current" in externalForm; + + useEffect(() => { + if (isExternalRef) { + console.warn( + "[SearchForm] 警告:通过 ref 传入 form 的方式已废弃,将在后续版本中移除。" + + "请使用 Form.useForm() 创建 form 实例并直接传入,例如:\n" + + " const [form] = Form.useForm();\n" + + " ", + ); + } + }, [isExternalRef]); + + // 获取实际的 form 实例(兼容 ref 和直接传入实例) + const getFormInstance = () => { + if (externalForm) { + return isExternalRef ? externalForm.current : externalForm; + } + return internalFormInstance; + }; + + // 兼容 ref 用法 + const formRef = externalForm && isExternalRef ? externalForm : internalFormRef; + + useEffect(() => { + if (!isExternalRef && externalForm) { + internalFormRef.current = externalForm; + } + }, [externalForm, isExternalRef]); + + const [internalOpen, setInternalOpen] = useState(defaultExpand); + + useEffect(() => { + if (onRef) { + onRef(formRef); + } + }, [formRef, onRef]); + + const isControlled = expand !== undefined; + const isOpen = isControlled ? expand : internalOpen; + + const handleToggle = () => { + if (isControlled) { + onExpand?.(!expand); + } else { + setInternalOpen((prev) => { + const next = !prev; + onExpand?.(next); + return next; + }); + } + }; + + // 查询/重置/展开 按钮 + const getButtons = () => ( + + + + {formLine.length > 3 && ( + + )} + + ); + + /** + * 处理 formLine,确保所有 Form.Item 都有 noStyle 属性 + * 仅在 openFormItemStyle 为 false 时执行 + */ + const processFormLine = (nodes) => + nodes.map((node) => { + if (React.isValidElement(node) && node.type === Form.Item) { + if (!node.props.noStyle) { + return React.cloneElement(node, { noStyle: true }); + } + } + return node; + }); + + // 计算显示列表(收起时只显示前 2 项) + const groupsList = () => { + const processedFormLine = openFormItemStyle + ? formLine + : processFormLine(formLine); + const arr = processedFormLine.map((node) => ({ show: true, node })); + if (isOpen || arr.length <= 3) return arr; + return arr.map((item, index) => + index > 2 ? { ...item, show: false } : item, + ); + }; + + const formItemList = groupsList(); + + if (formItemList.length === 0) return null; + + return ( +
onFinish(values)} + > + + {formItemList.map((item, index) => ( + + {item.node} + + ))} + + + {getButtons()} + + + +
+ ); +}; + +export default SearchForm; diff --git a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js index e6116af..0181e12 100644 --- a/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js +++ b/src/pages/Container/EnterpriseInfo/DepartmentPosition/index.js @@ -17,7 +17,7 @@ import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { useEffect, useMemo, useRef, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import { NS_ORG_DEPARTMENT, diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index bf1682c..fd58eb6 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -17,7 +17,7 @@ import { import { PlusOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js index 32fe0a5..9c24f18 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelChange/index.js @@ -3,7 +3,7 @@ import { Button, Descriptions, Form, Input, message, Modal, Select, Space, Table import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js index b2ee51b..da0884e 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js @@ -14,7 +14,7 @@ import { import { useEffect, useState } from "react"; import dayjs from "dayjs"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index 05e6ccf..08265a0 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -22,7 +22,7 @@ import { Get } from "@cqsjjb/jjb-common-lib/http"; import { useEffect, useMemo, useRef, useState } from "react"; import dayjs from "dayjs"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js index a456ab2..1f79361 100644 --- a/src/pages/Container/EnterpriseInfo/QualificationCert/index.js +++ b/src/pages/Container/EnterpriseInfo/QualificationCert/index.js @@ -16,7 +16,7 @@ import AttachmentUpload from "~/components/AttachmentUpload"; import { PlusOutlined } from "@ant-design/icons"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js index adf7103..16f5106 100644 --- a/src/pages/Container/EnterpriseInfo/ResignationApply/index.js +++ b/src/pages/Container/EnterpriseInfo/ResignationApply/index.js @@ -15,7 +15,7 @@ import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import AttachmentUpload from "~/components/AttachmentUpload"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/InspNoticeManage/InspectionNotice/index.js b/src/pages/Container/InspNoticeManage/InspectionNotice/index.js index d6f4d5f..5d16b66 100644 --- a/src/pages/Container/InspNoticeManage/InspectionNotice/index.js +++ b/src/pages/Container/InspNoticeManage/InspectionNotice/index.js @@ -12,7 +12,7 @@ import { } from "antd"; import { UploadOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; diff --git a/src/pages/Container/MonitorManage/EvalProjectMonitor/List/index.js b/src/pages/Container/MonitorManage/EvalProjectMonitor/List/index.js index 219f451..b01eff8 100644 --- a/src/pages/Container/MonitorManage/EvalProjectMonitor/List/index.js +++ b/src/pages/Container/MonitorManage/EvalProjectMonitor/List/index.js @@ -14,7 +14,7 @@ import { import dayjs from "dayjs"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; diff --git a/src/pages/Container/MonitorManage/QualMonitor/index.js b/src/pages/Container/MonitorManage/QualMonitor/index.js index f0af144..cc434d3 100644 --- a/src/pages/Container/MonitorManage/QualMonitor/index.js +++ b/src/pages/Container/MonitorManage/QualMonitor/index.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import { Button, Form, Table, Tag, Modal } from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/MonitorManage/RiskCenter/index.js b/src/pages/Container/MonitorManage/RiskCenter/index.js index d18e7c1..ada9220 100644 --- a/src/pages/Container/MonitorManage/RiskCenter/index.js +++ b/src/pages/Container/MonitorManage/RiskCenter/index.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import dayjs from "dayjs"; import { Button, Form, Table, Tag, Modal, Select, DatePicker, Input, Space, message } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/MonitorManage/SurveyMonitor/index.js b/src/pages/Container/MonitorManage/SurveyMonitor/index.js index 63f97d2..e2d4b31 100644 --- a/src/pages/Container/MonitorManage/SurveyMonitor/index.js +++ b/src/pages/Container/MonitorManage/SurveyMonitor/index.js @@ -16,7 +16,7 @@ import { } from "antd"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; diff --git a/src/pages/Container/QualApplication/FilingListTable.jsx b/src/pages/Container/QualApplication/FilingListTable.jsx index 9019e5b..15e5f98 100644 --- a/src/pages/Container/QualApplication/FilingListTable.jsx +++ b/src/pages/Container/QualApplication/FilingListTable.jsx @@ -1,5 +1,5 @@ import { Button, Form, Tag, Table, Typography, Select, Modal, Empty, message } from "antd"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { useState } from "react"; diff --git a/src/pages/Container/QualApplication/SiteReviewNotice/index.js b/src/pages/Container/QualApplication/SiteReviewNotice/index.js index 1a3ab1d..4486b4f 100644 --- a/src/pages/Container/QualApplication/SiteReviewNotice/index.js +++ b/src/pages/Container/QualApplication/SiteReviewNotice/index.js @@ -11,7 +11,7 @@ import { } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/QualificationReview/ExpertVerification/index.js b/src/pages/Container/QualificationReview/ExpertVerification/index.js index 19711e8..6f2960f 100644 --- a/src/pages/Container/QualificationReview/ExpertVerification/index.js +++ b/src/pages/Container/QualificationReview/ExpertVerification/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { Button, Form, Select, Table, Tag } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/QualificationReview/QualChange/index.js b/src/pages/Container/QualificationReview/QualChange/index.js index 39f405e..b11e333 100644 --- a/src/pages/Container/QualificationReview/QualChange/index.js +++ b/src/pages/Container/QualificationReview/QualChange/index.js @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { Button, Form, Select, Table, Tag } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/QualificationReview/QualConfirm/index.js b/src/pages/Container/QualificationReview/QualConfirm/index.js index 4092e39..79cf513 100644 --- a/src/pages/Container/QualificationReview/QualConfirm/index.js +++ b/src/pages/Container/QualificationReview/QualConfirm/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import { Button, Form, Select, Table, Tag } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/QualificationReview/QualPublicity/index.js b/src/pages/Container/QualificationReview/QualPublicity/index.js index 1a24c6e..90b0464 100644 --- a/src/pages/Container/QualificationReview/QualPublicity/index.js +++ b/src/pages/Container/QualificationReview/QualPublicity/index.js @@ -11,7 +11,7 @@ import { DatePicker, } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/QualificationReview/QualReview/index.js b/src/pages/Container/QualificationReview/QualReview/index.js index 3b1e6a3..0b92280 100644 --- a/src/pages/Container/QualificationReview/QualReview/index.js +++ b/src/pages/Container/QualificationReview/QualReview/index.js @@ -2,7 +2,7 @@ import React, { useEffect } from "react"; import { Button, Form, Select, Table, Tag } from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/QualificationReview/SiteReviewNotice/index.js b/src/pages/Container/QualificationReview/SiteReviewNotice/index.js index 7e32ac7..d0b0ad9 100644 --- a/src/pages/Container/QualificationReview/SiteReviewNotice/index.js +++ b/src/pages/Container/QualificationReview/SiteReviewNotice/index.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import dayjs from "dayjs"; import { Form, Table, Button, Modal, Input, Select, DatePicker, Card, Row, Col, Statistic, message, Tag } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.js b/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.js index 0aebf01..7cab6e3 100644 --- a/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.js +++ b/src/pages/Container/SafetyEvalBusiness/BusinessReminder/index.js @@ -12,7 +12,7 @@ import { } from "antd"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; import { WARING_STATUS_MAP, WARING_STATUS_OPTIONS } from "~/enumerate/constant"; diff --git a/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js b/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js index 0153d4a..9cc97ba 100644 --- a/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js +++ b/src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js @@ -17,7 +17,7 @@ import { import { PlusOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; diff --git a/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js b/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js index 84cf830..6b37a01 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalProject/List/index.js @@ -15,7 +15,7 @@ import { DeleteOutlined, } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; diff --git a/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js b/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js index 0757989..5d6273d 100644 --- a/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js +++ b/src/pages/Container/SafetyEvalBusiness/EvalReportLibrary/index.js @@ -20,7 +20,7 @@ import { } from "antd"; import { PlusOutlined, UploadOutlined, SendOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import PreviewUrlButton from "~/components/PreviewUrlButton"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/SafetyEvalBusiness/MyProject/index.js b/src/pages/Container/SafetyEvalBusiness/MyProject/index.js index d5951a1..e4aa017 100644 --- a/src/pages/Container/SafetyEvalBusiness/MyProject/index.js +++ b/src/pages/Container/SafetyEvalBusiness/MyProject/index.js @@ -3,7 +3,7 @@ import { Form, Table, Tag, Button, Card, Row, Col, Statistic, Select, Modal, message, Tooltip, } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; diff --git a/src/pages/Container/SafetyEvalBusiness/Progress/index.js b/src/pages/Container/SafetyEvalBusiness/Progress/index.js index c426c0b..978b4bb 100644 --- a/src/pages/Container/SafetyEvalBusiness/Progress/index.js +++ b/src/pages/Container/SafetyEvalBusiness/Progress/index.js @@ -15,7 +15,7 @@ import { } from "antd"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; import { diff --git a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js index 5b8746b..20ee6a2 100644 --- a/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js +++ b/src/pages/Container/SafetyEvalBusiness/ProjectDocLibrary/index.js @@ -13,7 +13,7 @@ import { } from "antd"; import { PlusOutlined, UploadOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; diff --git a/src/pages/Container/SafetyEvalBusiness/RiskWarning/index.js b/src/pages/Container/SafetyEvalBusiness/RiskWarning/index.js index aafd889..8ba3141 100644 --- a/src/pages/Container/SafetyEvalBusiness/RiskWarning/index.js +++ b/src/pages/Container/SafetyEvalBusiness/RiskWarning/index.js @@ -14,7 +14,7 @@ import { } from "antd"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace"; import { RISK_LEVEL_MAP, RISK_STATUS_MAP } from "~/enumerate/constant"; diff --git a/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js b/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js index caab052..bb9de93 100644 --- a/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js +++ b/src/pages/Container/Supervision/BasicInfo/EnterprisePortrait/index.js @@ -1,7 +1,7 @@ import { Button, Card, Col, Descriptions, Form, Modal, Row, Statistic, Table, Tag } from "antd"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { CHONGQING_DISTRICTS } from "~/enumerate/enterpriseOptions"; diff --git a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js index f49dcc0..3f2a988 100644 --- a/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js +++ b/src/pages/Container/Supervision/BasicInfo/EvaluatorInfo/index.js @@ -3,7 +3,7 @@ import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { useEffect, useState } from "react"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import { getEvaluatorDetail, queryEvaluatorPage } from "~/mock/regulator/basicInfo"; diff --git a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js index 13ae837..c6f6855 100644 --- a/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js +++ b/src/pages/Container/Supervision/BasicInfo/OrgAccount/index.js @@ -19,7 +19,7 @@ import { tools } from "@cqsjjb/jjb-common-lib"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { useEffect, useState } from "react"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { isOrgAccountEnabled } from "~/utils/enterpriseInfo/adapter"; diff --git a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js index b2616e5..8d83a7e 100644 --- a/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js +++ b/src/pages/Container/Supervision/BasicInfo/RegisteredOrg/List/index.js @@ -5,7 +5,7 @@ import { Get } from "@cqsjjb/jjb-common-lib/http"; import { useEffect, useState } from "react"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions"; import { QUAL_FILING_STATUS_OPTIONS } from "~/enumerate/qualFilingOptions"; import { NS_ORG_INFO } from "~/enumerate/namespace"; diff --git a/src/pages/Container/Supervision/EvalPortrait/index.js b/src/pages/Container/Supervision/EvalPortrait/index.js index 72deced..60bf81b 100644 --- a/src/pages/Container/Supervision/EvalPortrait/index.js +++ b/src/pages/Container/Supervision/EvalPortrait/index.js @@ -9,7 +9,7 @@ import { message, } from "antd"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { diff --git a/src/pages/Container/Supervision/EvalReportDatabase/index.js b/src/pages/Container/Supervision/EvalReportDatabase/index.js index f188ea7..3a7d408 100644 --- a/src/pages/Container/Supervision/EvalReportDatabase/index.js +++ b/src/pages/Container/Supervision/EvalReportDatabase/index.js @@ -17,7 +17,7 @@ import { import { DownloadOutlined, ExportOutlined } from "@ant-design/icons"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { NS_REGULATOR_EVAL_REPORT, NS_ORG_INFO } from "~/enumerate/namespace"; diff --git a/src/pages/Container/Supervision/ExperManage/index.js b/src/pages/Container/Supervision/ExperManage/index.js index f81df32..072e0d3 100644 --- a/src/pages/Container/Supervision/ExperManage/index.js +++ b/src/pages/Container/Supervision/ExperManage/index.js @@ -11,7 +11,7 @@ import { } from "antd"; import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { tools } from "@cqsjjb/jjb-common-lib"; diff --git a/src/pages/Container/Supervision/InspectionNotice/index.js b/src/pages/Container/Supervision/InspectionNotice/index.js index 8575119..79f942c 100644 --- a/src/pages/Container/Supervision/InspectionNotice/index.js +++ b/src/pages/Container/Supervision/InspectionNotice/index.js @@ -13,7 +13,7 @@ import { } from "antd"; import { UploadOutlined } from "@ant-design/icons"; import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout"; -import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm"; +import SearchForm from "~/components/SearchForm"; import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper"; import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd"; import { Connect } from "@cqsjjb/jjb-dva-runtime";