zy-react-library 1.4.0 → 1.4.2

package/components/FormBuilder/FormItemsRenderer.d.ts

@@ -3,7 +3,7 @@ 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 { CSSProperties, Key, ReactElement, ReactNode } from "react";
 import type { FORM_ITEM_RENDER_TYPE_MAP } from "../../enum/formItemRender";
 import type { DeepPartial } from "./FormBuilder";
 
@@ -98,7 +98,7 @@ export interface FormOptionBase<
   Dependencies = NamePath<Values>,
 > {
   /** React 需要的 key，如果传递了唯一的 name，则不需要 */
-  key?: string;
+  key?: Key;
   /** 表单项字段名 */
   name?: Name;
   /** 表单项标签 */

package/components/Pdf/index.d.ts

@@ -1,22 +1,24 @@
-import type { CSSProperties, FC } from "react";
-
-export interface PdfProps {
-  /** pdf 文件地址 */
-  file: string;
-  /** pdf 文件名 */
-  name?: string;
-  /** 是否显示弹窗 */
-  visible?: boolean;
-  /** 弹窗的标题，默认 ”PDF预览“ */
-  title?: string;
-  /** 关闭弹窗的方法 */
-  onCancel?: () => void;
-  /** 是否使用内联模式，true为不使用弹窗，默认 false */
-  inline?: boolean;
-  /** 内联模式下的样式 */
-  style?: CSSProperties;
-}
-
-declare const Pdf: FC<PdfProps>;
-
-export default Pdf;
+import type { CSSProperties, FC, ReactNode } from "react";
+
+export interface PdfProps {
+  /** pdf 文件地址 */
+  file: string;
+  /** pdf 文件名 */
+  name?: string;
+  /** 是否显示弹窗 */
+  visible?: boolean;
+  /** 弹窗的标题，默认 ”PDF预览“ */
+  title?: string;
+  /** 关闭弹窗的方法 */
+  onCancel?: () => void;
+  /** 是否使用内联模式，true为不使用弹窗，默认 false */
+  inline?: boolean;
+  /** 内联模式下的样式 */
+  style?: CSSProperties;
+  /** 弹窗底部额外的按钮 */
+  extraButtons?: ReactNode;
+}
+
+declare const Pdf: FC<PdfProps>;
+
+export default Pdf;

package/components/Pdf/index.js

@@ -1 +1 @@
-import{useFullscreen as e}from"ahooks";import{Modal as r,Button as o,Spin as i,message as n}from"antd";import{useState as t,useRef as l}from"react";import{pdfjs as a,Document as d,Page as s}from"react-pdf";import c from"../../hooks/useDownloadFile/index.js";import{getFileUrl as p}from"../../utils/index.js";import"react-pdf/dist/Page/AnnotationLayer.css";import"react-pdf/dist/Page/TextLayer.css";import"./index.less";import{jsx as m,Fragment as f}from"react/jsx-runtime";function h(h){const{visible:u=!1,onCancel:x,file:g,name:v,inline:y=!1,title:w="PDF预览",style:k={}}=h,C=p(),[j,F]=t(0),[P,b]=t(600),L=l(null),[S,{enterFullscreen:D,exitFullscreen:A}]=e(L),{downloadFile:N}=c();a.GlobalWorkerOptions.workerSrc=`//unpkg.com/pdfjs-dist@${a.version}/build/pdf.worker.min.mjs`;const W=({numPages:e})=>{F(e)},$=()=>{n.error("加载 PDF 文件失败"),x&&x()},z=({width:e})=>{b(e)},B=()=>m(f,{children:m("div",{style:{height:S?"calc(100vh - 40px - 24px - 8px - 32px - 12px)":"72vh",overflowY:"auto",padding:"24px",...k},children:m(d,{file:g.includes(C)?g:C+g,onLoadSuccess:W,onLoadError:$,loading:m("div",{style:{display:"flex",justifyContent:"center",alignItems:"center",height:"65vh"},children:m(i,{size:"large"})}),children:Array.from({length:j}).map((e,r)=>m(s,{pageNumber:r+1,onLoadSuccess:z},`page_${r+1}`))})})});return y?B():m("div",{ref:L,children:m(r,{style:{top:S?0:100,maxWidth:S?"100vw":"calc(100vw - 32px)",paddingBottom:S?0:24},open:u,maskClosable:!1,width:S?"100vw":P+100,title:w,onCancel:()=>{S&&A(),x()},getContainer:!1,footer:[m(o,{onClick:()=>{S&&A(),x()},children:"关闭"},"cancel"),m(o,{onClick:()=>{S?A():D()},children:S?"退出全屏":"全屏"},"fullScreen"),m(o,{type:"primary",onClick:()=>{S&&A(),N({url:g,name:v})},children:"下载"},"download")],children:B()})})}h.displayName="Pdf";export{h as default};
+import{useFullscreen as e}from"ahooks";import{Modal as r,Button as o,Spin as i,message as n}from"antd";import{useState as t,useRef as l}from"react";import{pdfjs as a,Document as d,Page as s}from"react-pdf";import c from"../../hooks/useDownloadFile/index.js";import{getFileUrl as p}from"../../utils/index.js";import"react-pdf/dist/Page/AnnotationLayer.css";import"react-pdf/dist/Page/TextLayer.css";import"./index.less";import{jsx as m,Fragment as f}from"react/jsx-runtime";function h(h){const{visible:u=!1,onCancel:x,file:g,name:v,inline:y=!1,title:w="PDF预览",style:k={},extraButtons:C}=h,j=p(),[F,P]=t(0),[b,L]=t(600),S=l(null),[D,{enterFullscreen:A,exitFullscreen:B}]=e(S),{downloadFile:N}=c();a.GlobalWorkerOptions.workerSrc=`//unpkg.com/pdfjs-dist@${a.version}/build/pdf.worker.min.mjs`;const W=({numPages:e})=>{P(e)},$=()=>{n.error("加载 PDF 文件失败"),x&&x()},z=({width:e})=>{L(e)},E=()=>m(f,{children:m("div",{style:{height:D?"calc(100vh - 40px - 24px - 8px - 32px - 12px)":"72vh",overflowY:"auto",padding:"24px",...k},children:m(d,{file:g.includes(j)?g:j+g,onLoadSuccess:W,onLoadError:$,loading:m("div",{style:{display:"flex",justifyContent:"center",alignItems:"center",height:"65vh"},children:m(i,{size:"large"})}),children:Array.from({length:F}).map((e,r)=>m(s,{pageNumber:r+1,onLoadSuccess:z},`page_${r+1}`))})})});return y?E():m("div",{ref:S,children:m(r,{style:{top:D?0:100,maxWidth:D?"100vw":"calc(100vw - 32px)",paddingBottom:D?0:24},open:u,maskClosable:!1,width:D?"100vw":b+100,title:w,onCancel:()=>{D&&B(),x()},getContainer:!1,footer:[m(o,{onClick:()=>{D&&B(),x()},children:"关闭"},"cancel"),m(o,{onClick:()=>{D?B():A()},children:D?"退出全屏":"全屏"},"fullScreen"),m(o,{type:"primary",onClick:()=>{D&&B(),N({url:g,name:v})},children:"下载"},"download"),...C||[]],children:E()})})}h.displayName="Pdf";export{h as default};

package/components/Table/index.d.ts

@@ -1,11 +1,33 @@
-import type { ProTableProps } from "@ant-design/pro-table";
-import type { TableProps as AntdTableProps } from "antd";
+import type { ProColumns, ProTableProps } from "@ant-design/pro-components";
+import type { TableProps as AntdTableProps, TableColumnType } from "antd";
 import type { FC } from "react";
 
+/** 保留 Ant Design 推导的嵌套元组路径，移除宽泛字符串和普通数组 */
+type StrictTableDataIndex<DataIndex> = DataIndex extends string
+  ? never
+  : DataIndex extends readonly unknown[]
+    ? number extends DataIndex["length"] ? never : DataIndex
+    : DataIndex extends number ? DataIndex : never;
+
+/** 表格字段索引，支持一级字段和嵌套字段路径提示 */
+export type TableDataIndex<DataSource>
+  = | Extract<keyof DataSource, string | number>
+    | StrictTableDataIndex<NonNullable<TableColumnType<DataSource>["dataIndex"]>>;
+
+/** 表格列配置 */
+export type TableColumn<DataSource, ValueType = "text"> = Omit<ProColumns<DataSource, ValueType>, "children" | "dataIndex"> & {
+  /** 当前列对应的数据字段 */
+  dataIndex?: TableDataIndex<DataSource>;
+  /** 多级表头子列 */
+  children?: TableColumn<DataSource, ValueType>[];
+};
+
 /**
- * TablePro 组件属性
+ * Table 组件属性
  */
-export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, "columns"> & ProTableProps<DataSource, U, ValueType> & {
+export type TableProps<DataSource, U = Record<string, unknown>, ValueType = "text"> = Omit<AntdTableProps<DataSource>, "columns"> & Omit<ProTableProps<DataSource, U, ValueType>, "columns"> & {
+  /** 表格列配置 */
+  columns: TableColumn<DataSource, ValueType>[];
   /** 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖 */
   storeIndex?: string;
   /** 是否禁用内容区滚动，默认 false */
@@ -25,5 +47,5 @@ export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, "columns
 /**
  * 表格组件
  */
-declare const Table: <DataSource, U, ValueType = "text">(props: TableProps<DataSource, U, ValueType>) => ReturnType<FC>;
+declare const Table: <DataSource, U = Record<string, unknown>, ValueType = "text">(props: TableProps<DataSource, U, ValueType>) => ReturnType<FC>;
 export default Table;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.4.0",
+  "version": "1.4.2",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
@@ -72,5 +72,9 @@
     "antd": ">=5.27.6 <6",
     "react": ">=18.3.1 <19",
     "zy-react-data": ">=1.0.0"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
   }
 }