一系列优化

components/Cascader/Area/index.d.ts

@@ -5,7 +5,7 @@ import type { BasicCascaderProps } from "../Basic";
  * 组件属性
  */
 export interface AreaCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-  /** 占位符，默认为"属地" */
+  /** 占位符，默认 "属地" */
   placeholder?: string;
 }
 

components/Cascader/Industry/index.d.ts

@@ -5,7 +5,7 @@ import type { BasicCascaderProps } from "../Basic";
  * 组件属性
  */
 export interface IndustryCascaderProps extends Omit<BasicCascaderProps, "options" | "placeholder" | "nameKey" | "idKey" | "childrenKey"> {
-  /** 占位符，默认为"行业类型" */
+  /** 占位符，默认 "行业类型" */
   placeholder?: string;
 }
 

components/FormBuilder/FormBuilder.d.ts

@@ -19,9 +19,9 @@ export interface FormBuilderProps extends FormProps {
   useAutoGenerateRequired?: boolean;
   /** 是否显示操作按钮区域，默认 true */
   showActionButtons?: boolean;
-  /** 提交按钮文字，默认为"提交" */
+  /** 提交按钮文字，默认 "提交" */
   submitButtonText?: string;
-  /** 取消按钮文字，默认为"取消" */
+  /** 取消按钮文字，默认 "取消" */
   cancelButtonText?: string;
   /** 是否显示提交按钮，默认 true */
   showSubmitButton?: boolean;

components/FormBuilder/FormBuilder.js

@@ -51,7 +51,12 @@ const FormBuilder = (props) => {
           />
         </Row>
         {showActionButtons && (
-          <Row gutter={gutter} style={{ marginTop: 24 }}>
+          <>
+            <div style={{ height: "52px" }}></div>
+            <Row
+              gutter={gutter}
+              style={{ textAlign: "center", backgroundColor: "rgb(241, 241, 242)", margin: "0px -44px", padding: "10px 0", position: "fixed", bottom: "0", width: "100%" }}
+            >
               <Col span={24} style={{ textAlign: "center" }}>
                 {customActionButtons || (
                   <Space>
@@ -70,6 +75,7 @@ const FormBuilder = (props) => {
                 )}
               </Col>
             </Row>
+          </>
         )}
       </Form>
     </Spin>

components/FormBuilder/FormItemsRenderer.d.ts

@@ -21,9 +21,9 @@ export interface OptionItem {
  * 字段键配置
  */
 export interface itemsFieldConfig {
-  /** 值字段的键名，默认为 'bianma' */
+  /** 值字段的键名，默认 'bianma' */
   valueKey?: string;
-  /** 标签字段的键名，默认为 'name' */
+  /** 标签字段的键名，默认 'name' */
   labelKey?: string | ((item: Record<string, any>) => ReactNode);
 }
 
@@ -106,7 +106,7 @@ export interface FormOption<T extends keyof FORM_ITEM_RENDER_TYPE_MAP = keyof FO
   formItemProps?: FormItemProps | ((formValues: FormValues) => FormItemProps);
   /** label 栅格配置，默认直接使用外层的 labelCol，如果 span 等于 24，是外层的 labelCol.span 一半 */
   labelCol?: ColProps;
-  /** wrapper 栅格配置，默认为 24 - labelCol.span */
+  /** wrapper 栅格配置，默认 24 - labelCol.span */
   wrapperCol?: ColProps;
   /** 是否应该更新（用于表单联动） */
   shouldUpdate?: boolean | ((prevValues: FormValues, nextValues: FormValues, info: { source?: string }) => boolean);

components/HeaderBack/index.d.ts

@@ -1,4 +1,4 @@
-import type { CSSProperties, FC, ReactNode } from "react";
+import type { FC, ReactNode } from "react";
 
 export interface HeaderBackProps {
   /** 标题 */
@@ -8,10 +8,8 @@ export interface HeaderBackProps {
     goBack?: () => void;
     [key: string]: any;
   };
-  /** 是否显示返回按钮，默认为 true */
+  /** 是否显示返回按钮，默认 true */
   previous?: boolean;
-  /** 自定义样式 */
-  style?: CSSProperties;
 }
 
 /** 头部返回组件 */

components/HeaderBack/index.js

@@ -6,10 +6,10 @@ import "./index.less";
  * 头部返回组件
  */
 function HeaderBack(props) {
-  const { title, history, previous = true, style = {} } = props;
+  const { title, history, previous = true } = props;
 
   return (
-    <div className="header-back" style={style}>
+    <div className="header-back">
       <div className="action">
         {
           previous

components/HeaderBack/index.less

@@ -1,7 +1,7 @@
 .header-back {
   padding: 10px 20px;
   border-bottom: 1px solid #dcdfe6;
-  margin-bottom: 10px;
+  margin-bottom: 0;
   position: sticky;
   top: 0;
   background-color: #fff;

components/HiddenInfo/gwj/index.d.ts

@@ -12,8 +12,6 @@ export interface HiddenInfoProps {
   hiddenId?: string;
   /** hiddenId 的字段，默认 hiddenId */
   hiddenIdKey?: string;
-  /** 是否显示头部的返回，默认 true */
-  isShowHeaderBack?: boolean;
   /** 是否是过往记录，后端会返回详细的步骤信息，默认 false */
   history?: boolean;
   /** 获取数据 */

components/HiddenInfo/gwj/index.js

@@ -8,7 +8,6 @@ import useDownloadFile from "../../../hooks/useDownloadFile";
 import useGetFile from "../../../hooks/useGetFile";
 import useGetUrlQuery from "../../../hooks/useGetUrlQuery";
 import { getFileName, getFileSuffix, getLabelName } from "../../../utils";
-import HeaderBack from "../../HeaderBack";
 import VideoIcon from "../../Icon/VideoIcon";
 import PreviewImg from "../../PreviewImg";
 import PreviewPdf from "../../PreviewPdf";
@@ -23,7 +22,6 @@ function HiddenInfo(props) {
     idKey = "id",
     hiddenId = "",
     hiddenIdKey = "hiddenId",
-    isShowHeaderBack = true,
     history = false,
     onGetData,
   } = props;
@@ -116,9 +114,7 @@ function HiddenInfo(props) {
 
   return (
     <div>
-      {isShowHeaderBack && <HeaderBack title="查看" />}
       <Spin spinning={loading || downloadFileLoading}>
-        <div style={{ padding: 20 }}>
         <Divider orientation="left">隐患信息</Divider>
         <Descriptions
           bordered
@@ -143,10 +139,12 @@ function HiddenInfo(props) {
                   ]
                 : []
             ),
-              ...(info.longitude ? [{
+            ...(info.longitude
+              ? [{
                   label: "隐患上报位置（经纬度）",
                   children: [info.longitude && `经度:${info.longitude}`, info.latitude && `纬度:${info.latitude}`].filter(Boolean).join(" "),
-              }] : []),
+                }]
+              : []),
             ...(info.positionDesc ? [{ label: "隐患位置描述", children: info.positionDesc }] : []),
             { label: "隐患发现人", children: info.creatorName },
             { label: "隐患发现时间", children: dayjs(info.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") },
@@ -161,7 +159,7 @@ function HiddenInfo(props) {
                 status: info.isRelated,
               }),
             },
-              ...(info.isRelated === 1 ? [{ label:'相关方项目',children:info.projectName }] : []),
+            ...(info.isRelated === 1 ? [{ label: "相关方项目", children: info.projectName }] : []),
             { label: "隐患图片", children: <PreviewImg files={hiddenImageFiles} /> },
             ...(hiddenVideoFiles.length > 0
               ? [{
@@ -257,7 +255,8 @@ function HiddenInfo(props) {
                       ...(item.state === 3
                         ? [
                             ...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
-                              ...(item.disposalFile ? [{
+                            ...(item.disposalFile
+                              ? [{
                                   label: "处置方案附件",
                                   children: (
                                     getFileSuffix(item.disposalFile) === "pdf"
@@ -275,7 +274,8 @@ function HiddenInfo(props) {
                                           </Space>
                                         )
                                   ),
-                              }] : []),
+                                }]
+                              : []),
                           ]
                         : []),
                       {
@@ -326,7 +326,8 @@ function HiddenInfo(props) {
                       ...(item.state === 3
                         ? [
                             ...(item.disposalPlan ? [{ label: "处置方案", children: item.disposalPlan }] : []),
-                              ...(item.disposalFile ? [{
+                            ...(item.disposalFile
+                              ? [{
                                   label: "处置方案附件",
                                   children: (
                                     getFileSuffix(item.disposalFile) === "pdf"
@@ -344,7 +345,8 @@ function HiddenInfo(props) {
                                           </Space>
                                         )
                                   ),
-                              }] : []),
+                                }]
+                              : []),
                             {
                               label: "是否更换整改负责人",
                               children: item.rectifyUserCO && Object.keys(item.rectifyUserCO).length > 0 ? "是" : "否",
@@ -395,12 +397,13 @@ function HiddenInfo(props) {
                       ...(info.tempSafeMeasure ? [{ label: "临时安全措施", children: info.tempSafeMeasure }] : []),
                       { label: "整改后图片", children: <PreviewImg files={afterRectificationImageFiles[index]} /> },
                       {
-                          label: "整改方案", children: (
+                        label: "整改方案",
+                        children: (
                           <>
                             {item.isRectificationScheme === 0 && <span>无</span>}
                             {item.isRectificationScheme === 1 && <span>有</span>}
                           </>
-                          )
+                        ),
                       },
                       ...((item.isRectificationScheme === 1 && item.hiddenSchemeCO && Object.keys(item.hiddenSchemeCO).length > 0)
                         ? [
@@ -495,7 +498,6 @@ function HiddenInfo(props) {
               )
             : null
         }
-        </div>
       </Spin>
       {
         videoModalOpen && (
@@ -511,4 +513,6 @@ function HiddenInfo(props) {
   );
 }
 
+HiddenInfo.displayName = "HiddenInfo";
+
 export default HiddenInfo;

components/Map/MapSelector.js

@@ -249,4 +249,6 @@ const MapSelector = (props) => {
   );
 };
 
+MapSelector.displayName = "MapSelector";
+
 export default MapSelector;

components/Map/index.js

@@ -72,4 +72,6 @@ const Map = (props) => {
   );
 };
 
+Map.displayName = "Map";
+
 export default Map;

components/Page/index.d.ts

@@ -0,0 +1,30 @@
+import type { FC, ReactNode } from "react";
+
+export interface PageProps {
+  /** 头部返回组件的标题 */
+  headerTitle?: ReactNode;
+  /** 历史记录对象，用于返回上一页，默认使用 window.history.back */
+  history?: {
+    goBack?: () => void;
+    [key: string]: any;
+  };
+  /** 是否显示头部组件，默认 true */
+  isShowHeader?: boolean;
+  /** 是否显示头部组件返回按钮，默认 true */
+  headerPrevious?: boolean;
+  /** 是否显示底部组件，默认 true */
+  isShowFooter?: boolean;
+  /** 是否显示头部和底部组件，默认 true */
+  isShowAllAction?: boolean;
+  /** 取消按钮文字，默认 "关闭" */
+  backButtonText?: string;
+  /** 自定义底部操作按钮组 */
+  customActionButtons?: ReactNode;
+  /** 额外底部操作按钮组 */
+  extraActionButtons?: ReactNode;
+}
+
+/** 页面布局组件 */
+declare const Page: FC<PageProps>;
+
+export default Page;

components/Page/index.js

@@ -0,0 +1,49 @@
+import { Button, Space } from "antd";
+import HeaderBack from "../HeaderBack";
+
+/**
+ * 页面布局组件
+ */
+function Page(props) {
+  const {
+    headerTitle,
+    history,
+    isShowHeader = true,
+    headerPrevious = true,
+    isShowFooter = true,
+    isShowAllAction = true,
+    backButtonText = "关闭",
+    customActionButtons,
+    extraActionButtons,
+  } = props;
+
+  return (
+    <div className="page">
+      {(isShowAllAction && isShowHeader) && <HeaderBack title={headerTitle} history={history} previous={headerPrevious} />}
+      <div style={{ padding: 20 }}>
+        {props.children}
+      </div>
+      {
+        (isShowAllAction && isShowFooter) && (
+          <>
+            <div style={{ height: "52px" }}></div>
+            <div style={{ textAlign: "center", backgroundColor: "rgb(241, 241, 242)", margin: "0 -20px", padding: "10px 0", position: "fixed", bottom: "0", width: "100%" }}>
+              {customActionButtons || (
+                <Space>
+                  {extraActionButtons}
+                  <Button onClick={() => history?.goBack?.() || window.history.back()}>
+                    {backButtonText}
+                  </Button>
+                </Space>
+              )}
+            </div>
+          </>
+        )
+      }
+    </div>
+  );
+}
+
+Page.displayName = "Page";
+
+export default Page;

components/Pdf/index.d.ts

@@ -9,7 +9,7 @@ export interface PdfProps {
   visible?: boolean;
   /** 关闭弹窗的方法 */
   onCancel?: () => void;
-  /** 是否使用内联模式，true为不使用弹窗，默认为false */
+  /** 是否使用内联模式，true为不使用弹窗，默认 false */
   inline?: boolean;
   /** 内联模式下的样式 */
   style?: CSSProperties;

components/Pdf/index.js

@@ -110,14 +110,16 @@ function Pdf(props) {
           >
             关闭
           </Button>,
-          !loading && <Button
+          !loading && (
+            <Button
               key="fullScreen"
               onClick={() => {
                 isFullscreen ? exitFullscreen() : enterFullscreen();
               }}
             >
               {isFullscreen ? "退出全屏" : "全屏"}
-          </Button>,
+            </Button>
+          ),
           <Button key="download" type="primary" onClick={onDownloadFile}>下载</Button>,
         ]}
       >
@@ -127,4 +129,6 @@ function Pdf(props) {
   );
 }
 
+Pdf.displayName = "Pdf";
+
 export default Pdf;

components/PreviewImg/index.js

@@ -12,7 +12,7 @@ const PreviewImg = (props) => {
   return (
     <Image.PreviewGroup>
       {
-        files.filter(Boolean).map((item) => (
+        files.filter(Boolean).map(item => (
           <Image
             key={item[fileUrlKey] || item}
             src={item[fileUrlKey] ? fileUrl + item[fileUrlKey] : fileUrl + item}
@@ -27,4 +27,6 @@ const PreviewImg = (props) => {
   );
 };
 
+PreviewImg.displayName = "PreviewImg";
+
 export default PreviewImg;

components/PreviewPdf/index.js

@@ -81,4 +81,6 @@ const PreviewPdf = (props) => {
   return null;
 };
 
+PreviewPdf.displayName = "PreviewPdf";
+
 export default PreviewPdf;

components/Search/index.js

@@ -83,6 +83,7 @@ const Search = (props) => {
   };
 
   return (
+    <div className="search-layout card-layout">
       <Form
         form={form}
         labelCol={labelCol}
@@ -131,6 +132,7 @@ const Search = (props) => {
           )}
         </Row>
       </Form>
+    </div>
   );
 };
 

components/Select/Personnel/Gwj/index.js

@@ -12,7 +12,7 @@ function PersonnelSelect(props) {
     isNeedCorpInfoId = false,
     isNeedDepartmentId = true,
     isNeedPostId = false,
-    extraParams= {
+    extraParams = {
       noMain: "",
       eqEmploymentFlag: 1,
     },

components/SelectCreate/index.d.ts

@@ -13,7 +13,7 @@ export interface SelectCreateOption {
 export interface SelectCreateProps extends SelectProps {
   /** 选项列表 */
   items: SelectCreateOption[];
-  /** 是否显示删除图标，默认为 true */
+  /** 是否显示删除图标，默认 true */
   showDelete?: boolean;
   /** 标签名称，用于占位符显示 */
   label?: string;

components/SelectCreate/index.js

@@ -50,4 +50,6 @@ function SelectCreate(props) {
   );
 }
 
+SelectCreate.displayName = "SelectCreate";
+
 export default SelectCreate;

components/Signature/index.d.ts

@@ -12,9 +12,9 @@ export interface SignatureValue {
 export interface SignatureProps {
   /** 确认签字回调 */
   onConfirm: (value: SignatureValue) => void;
-  /** 签字区域宽度，默认为 752 */
+  /** 签字区域宽度，默认 752 */
   width?: number;
-  /** 签字区域高度，默认为 300 */
+  /** 签字区域高度，默认 300 */
   height?: number;
   /** 回显的签字图片 */
   url?: string;

components/Signature/index.js

@@ -89,4 +89,6 @@ function Signature(props) {
   );
 }
 
+Signature.displayName = "Signature";
+
 export default Signature;

components/Table/index.d.ts

@@ -5,7 +5,7 @@ import type { FC } from "react";
 /**
  * TablePro 组件属性
  */
-export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, 'columns'> & ProTableProps<DataSource, U, ValueType> & {
+export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, "columns"> & ProTableProps<DataSource, U, ValueType> & {
   /** 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖 */
   storeIndex?: string;
   /** 是否禁用内容区滚动，默认 false */
@@ -14,9 +14,11 @@ export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, 'columns
   showIndexColumn?: boolean;
   /** 索引列是否固定，默认 left */
   indexColumnFixed?: "left" | "right" | boolean;
-  /** 是否使用居中布局，默认 true */
+  /** 列的对齐方式，默认 center */
-  useAlignCenter?: boolean;
+  align?: "left" | "right" | "center";
-}
+  /** 超过宽度是否自动省略，默认 true */
+  ellipsis?: boolean;
+};
 
 /**
  * 表格组件

components/Table/index.js

@@ -1,28 +1,73 @@
 import TablePro from "@cqsjjb/jjb-react-admin-component/Table";
 import { getIndexColumn } from "../../utils/index";
+import dayjs from 'dayjs';
 import "./index.less";
 
+const CLEANUP_INTERVAL_DAYS = 10; // 清理间隔天数
+const LAST_CLEANUP_KEY = 'tableLocalStorageLastCleanup'; // 最后清理时间存储key
+
+// 清理本地存储中特定后缀的key
+function cleanupTableLocalStorage() {
+  const now = dayjs();
+  const lastCleanupStr = localStorage.getItem(LAST_CLEANUP_KEY);
+  const lastCleanup = lastCleanupStr ? dayjs(lastCleanupStr) : null;
+
+  // 如果没有上次清理时间或距离上次清理已超过10天
+  if (!lastCleanup || now.diff(lastCleanup, 'day') >= CLEANUP_INTERVAL_DAYS) {
+    // 查找并清理符合条件的key
+    const keysToRemove = [];
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key && (key.endsWith('#columnState') ||
+        key.endsWith('#size') ||
+        key.endsWith('#resizable'))) {
+        keysToRemove.push(key);
+      }
+    }
+
+    // 删除匹配的key
+    keysToRemove.forEach(key => {
+      localStorage.removeItem(key);
+    });
+
+    // 更新最后清理时间
+    localStorage.setItem(LAST_CLEANUP_KEY, now.toISOString());
+  }
+}
+
 function Table(props) {
   const {
     columns = [],
     showIndexColumn = true,
-    useAlignCenter = true,
+    ellipsis = true,
+    align = "center",
     indexColumnFixed = "left",
     rowKey = "id",
     ...restProps
   } = props;
-  function calcColumns() {
-    showIndexColumn && columns.unshift({...getIndexColumn(props.pagination), fixed: indexColumnFixed});
 
-    const setAlign = (column) => ({
+  // 组件初始化时执行清理
-      align: useAlignCenter ? "center" : "left",
+  cleanupTableLocalStorage();
+
+  function settingColumns() {
+    showIndexColumn && columns.unshift({ ...getIndexColumn(props.pagination), fixed: indexColumnFixed });
+
+    const setAlign = column => ({
+      align,
+      ellipsis,
       ...column,
-      ...(column.children ? { children: column.children.map(setAlign) } : {})
+      ...(column.children ? { children: column.children.map(setAlign) } : {}),
     });
 
     return columns.map(setAlign);
   }
-  return <TablePro rowKey={rowKey} columns={calcColumns()} bordered {...restProps} />;
+  return (
+    <div className="table-layout card-layout">
+      <TablePro rowKey={rowKey} columns={settingColumns()} bordered size="small" {...restProps} />
+    </div>
+  );
 }
 
+Table.displayName = "Table";
+
 export default Table;

components/Table/index.less

@@ -9,5 +9,6 @@
 }
 
 .@{ant-prefix}-pro-table-list-toolbar-container {
-  padding-block: 16px !important;
+  padding-top: 26px !important;
+  padding-bottom: 16px;
 }

components/TooltipPreviewImg/index.js

@@ -22,4 +22,6 @@ const TooltipPreviewImg = (props) => {
   );
 };
 
+TooltipPreviewImg.displayName = "TooltipPreviewImg";
+
 export default TooltipPreviewImg;

components/Upload/index.d.ts

@@ -17,7 +17,7 @@ export interface UploadProps extends Omit<AntUploadProps, "fileList"> {
   tipContent?: ReactNode;
   /** listType 为 text 时上传按钮文本 */
   uploadButtonText?: string;
-  /** 要上传的文件类型，默认为 image */
+  /** 要上传的文件类型，默认 image */
   fileType?: "image" | "video" | "document";
   /** 获取上传过服务器删除的附件 */
   onGetRemoveFile?: (file: Omit<UploadFile, "originFileObj">) => void;

components/Upload/index.js

@@ -132,7 +132,7 @@ const Upload = (props) => {
 
   const handleBeforeUpload = (file, fileList) => {
     if (beforeUpload)
-      return beforeUpload(file, fileList)
+      return beforeUpload(file, fileList);
     return false;
   };
 
@@ -196,7 +196,7 @@ const Upload = (props) => {
     if (!file.originFileObj)
       onGetRemoveFile?.(file);
     return onRemove?.(file);
-  }
+  };
 
   // 预览文件
   const handlePreview = (file) => {

css/common.less

@@ -0,0 +1,31 @@
+.@{ant-prefix}-modal-header {
+  border-bottom: 1px solid #ccc !important;
+  margin: 0 -24px 15px -24px !important;
+  padding: 0 24px 15px 24px !important;
+}
+
+.@{ant-prefix}-modal-footer {
+  text-align: center !important;
+}
+
+.search-layout {
+  position: relative;
+
+  &::after {
+    content: '';
+    position: absolute;
+    bottom: -10px;
+    left: -20px;
+    right: -20px;
+    height: 10px;
+    background-color: rgb(241, 241, 242);
+  }
+}
+
+.table-layout {
+}
+
+.card-layout {
+  background-color: #fff;
+  border-radius: 6px;
+}

package.json

@@ -8,6 +8,7 @@
   "license": "MIT",
   "files": [
     "components",
+    "css",
     "enum",
     "hooks",
     "json",