zy-react-library 1.0.87 → 1.0.89

package/components/Table/index.d.ts

@@ -1,11 +1,11 @@
 import type { ProTableProps } from "@ant-design/pro-table";
-import type { TableProps } from "antd";
+import type { TableProps as AntdTableProps } from "antd";
 import type { FC } from "react";
 
 /**
  * TablePro 组件属性
  */
-export type TableProProps<DataSource, U, ValueType> = Omit<TableProps, 'columns'> & ProTableProps<DataSource, U, ValueType> & {
+export type TableProps<DataSource, U, ValueType> = Omit<AntdTableProps, 'columns'> & ProTableProps<DataSource, U, ValueType> & {
   /** 当一个路由下存在多个表格的情况下 需要给每一个表格设置一个唯一存储索引 若没有设置则使用默认索引，请注意缓存数据会被覆盖 */
   storeIndex?: string;
   /** 是否禁用内容区滚动，默认 false */
@@ -21,5 +21,5 @@ export type TableProProps<DataSource, U, ValueType> = Omit<TableProps, 'columns'
 /**
  * 表格组件
  */
-declare const TablePro: <DataSource, U, ValueType = "text">(props: TableProProps<DataSource, U, ValueType>) => ReturnType<FC>;
-export default TablePro;
+declare const Table: <DataSource, U, ValueType = "text">(props: TableProps<DataSource, U, ValueType>) => ReturnType<FC>;
+export default Table;

package/components/Table/index.js

@@ -1,8 +1,8 @@
-import Table from "@cqsjjb/jjb-react-admin-component/Table";
+import TablePro from "@cqsjjb/jjb-react-admin-component/Table";
 import { getIndexColumn } from "../../utils/index";
 import "./index.less";
 
-function TablePro(props) {
+function Table(props) {
   const {
     columns = [],
     showIndexColumn = true,
@@ -11,13 +11,11 @@ function TablePro(props) {
     rowKey = "id",
     ...restProps
   } = props;
-
-  const storeIndex = props.storeIndex || `${window.process.env.app.antd["ant-prefix"]}_${Math.random().toString(36).substring(2)}`;
   function calcColumns() {
     showIndexColumn && columns.unshift({...getIndexColumn(props.pagination), fixed: indexColumnFixed});
     return columns.map(item => ({ align: useAlignCenter ? "center" : "left", ...item }));
   }
-  return <Table rowKey={rowKey} storeIndex={storeIndex} columns={calcColumns()} {...restProps} />;
+  return <TablePro rowKey={rowKey} columns={calcColumns()} {...restProps} />;
 }
 
-export default TablePro;
+export default Table;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.87",
+  "version": "1.0.89",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",