zy-react-library 1.0.179 → 1.1.1

package/components/Map/MapSelector.js

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

package/components/Map/index.js

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

package/components/Page/index.d.ts

@@ -0,0 +1,32 @@
+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;
+  /** 内容区域的padding，默认 "20px" */
+  contentPadding?: string;
+  /** 自定义底部操作按钮组 */
+  customActionButtons?: ReactNode;
+  /** 额外底部操作按钮组 */
+  extraActionButtons?: ReactNode;
+}
+
+/** 页面布局组件 */
+declare const Page: FC<PageProps>;
+
+export default Page;

package/components/Page/index.js

@@ -0,0 +1,50 @@
+import { Button, Space } from "antd";
+import HeaderBack from "../HeaderBack";
+
+/**
+ * 页面布局组件
+ */
+function Page(props) {
+  const {
+    headerTitle,
+    history,
+    isShowHeader = true,
+    headerPrevious = true,
+    isShowFooter = true,
+    isShowAllAction = true,
+    backButtonText = "关闭",
+    contentPadding = "20px",
+    customActionButtons,
+    extraActionButtons,
+  } = props;
+
+  return (
+    <div className="page">
+      {(isShowAllAction && isShowHeader) && <HeaderBack title={headerTitle} history={history} previous={headerPrevious} />}
+      <div style={{ padding: contentPadding }}>
+        {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;

package/components/Pdf/index.d.ts

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

package/components/Pdf/index.js

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

package/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;

package/components/PreviewPdf/index.js

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

package/components/Search/index.js

@@ -83,54 +83,56 @@ const Search = (props) => {
   };
 
   return (
-    <Form
-      form={form}
-      labelCol={labelCol}
-      initialValues={values}
-      {...restProps}
-    >
-      <Row className={classNameRef.current}>
-        <FormItemsRenderer
-          options={options}
-          labelCol={labelCol}
-          span={6}
-          collapse={collapse}
-          useAutoGenerateRequired={false}
-          initialValues={values}
-        />
-        <Col span={showCollapseButton ? (collapse ? 6 : span) : span}>
-          <Form.Item label=" " labelCol={{ span: 2 }} colon={false} style={{ textAlign: "right" }}>
-            {showSearchButton && (
-              <Button type="primary" icon={<SearchIcon />} onClick={handleSubmit}>
-                {searchText}
-              </Button>
-            )}
-            {showResetButton && (
-              <Button style={{ marginLeft: 8 }} icon={<ResetIcon />} onClick={handleReset}>
-                {resetText}
-              </Button>
-            )}
-            {showCollapseButton && (
-              <Button
-                type="link"
-                icon={collapse ? <DownOutlined /> : <UpOutlined />}
-                onClick={toggleCollapse}
-                style={{ marginLeft: 8 }}
-              >
-                {collapse ? "展开" : "收起"}
-              </Button>
-            )}
-          </Form.Item>
-        </Col>
-        {extraButtons && (
-          <Col span={24}>
-            <Form.Item label=" " colon={false} labelCol={{ span: 0 }}>
-              {extraButtons}
+    <div className="search-layout card-layout">
+      <Form
+        form={form}
+        labelCol={labelCol}
+        initialValues={values}
+        {...restProps}
+      >
+        <Row className={classNameRef.current}>
+          <FormItemsRenderer
+            options={options}
+            labelCol={labelCol}
+            span={6}
+            collapse={collapse}
+            useAutoGenerateRequired={false}
+            initialValues={values}
+          />
+          <Col span={showCollapseButton ? (collapse ? 6 : span) : span}>
+            <Form.Item label=" " labelCol={{ span: 2 }} colon={false} style={{ textAlign: "right" }}>
+              {showSearchButton && (
+                <Button type="primary" icon={<SearchIcon />} onClick={handleSubmit}>
+                  {searchText}
+                </Button>
+              )}
+              {showResetButton && (
+                <Button style={{ marginLeft: 8 }} icon={<ResetIcon />} onClick={handleReset}>
+                  {resetText}
+                </Button>
+              )}
+              {showCollapseButton && (
+                <Button
+                  type="link"
+                  icon={collapse ? <DownOutlined /> : <UpOutlined />}
+                  onClick={toggleCollapse}
+                  style={{ marginLeft: 8 }}
+                >
+                  {collapse ? "展开" : "收起"}
+                </Button>
+              )}
             </Form.Item>
           </Col>
-        )}
-      </Row>
-    </Form>
+          {extraButtons && (
+            <Col span={24}>
+              <Form.Item label=" " colon={false} labelCol={{ span: 0 }}>
+                {extraButtons}
+              </Form.Item>
+            </Col>
+          )}
+        </Row>
+      </Form>
+    </div>
   );
 };
 

package/components/Select/Personnel/Gwj/index.js

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

package/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;

package/components/SelectCreate/index.js

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

package/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;

package/components/Signature/index.js

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

package/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 */
-  useAlignCenter?: boolean;
-}
+  /** 列的对齐方式，默认 center */
+  align?: "left" | "right" | "center";
+  /** 超过宽度是否自动省略，默认 true */
+  ellipsis?: boolean;
+};
 
 /**
  * 表格组件

package/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;

package/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;
 }

package/components/TooltipPreviewImg/index.js

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

package/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;

package/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) => {

package/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/package.json

@@ -1,13 +1,14 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.179",
+  "version": "1.1.1",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
   "license": "MIT",
   "files": [
     "components",
+    "css",
     "enum",
     "hooks",
     "json",