@teamias/rex-pro 0.1.0 → 0.1.2

package/dist/components/rex-pro-table/v1/demo/BasicRexProTable.js

@@ -31,6 +31,10 @@ export default (function () {
   var tableData = {
     items: [{
       key: 'parent_1075',
+      qweqwe: [{
+        type: 'group',
+        props: []
+      }],
       id: [{
         type: 'text',
         props: {
@@ -681,6 +685,9 @@ export default (function () {
                     // tableHeaderUrl: '/tableProps',
                     // tableHeaderParams?: Record<string, unknown>;
                     tableHeaderConfig: [{
+                      title: 'qweqwe',
+                      dataIndex: 'qweqwe'
+                    }, {
                       title: '编号/状态',
                       dataIndex: 'status_name',
                       key: 'status_name'

package/dist/components/rex-pro-table/v1/rex-pro-table.d.ts

@@ -1,4 +1,4 @@
 import { IRexProTableProps, IRexProTableRef } from './types';
-export declare const RexProTable: <TF extends Record<string, unknown>, TT extends Record<string, unknown>>({ toolbar, filterFormProps, tableProps, listTableProps, request, defaultPageSize, autoInitRequest, hidePagination, actionConfig, proTableRef, reload, }: IRexProTableProps<TF, TT> & {
+export declare const RexProTable: <TF extends Record<string, unknown>, TT extends Record<string, unknown>>({ toolbar, filterFormProps, tableProps, listTableProps, request, defaultPageSize, autoInitRequest, hidePagination, pageSizeOptions, cardProps, actionConfig, proTableRef, reload, }: IRexProTableProps<TF, TT> & {
     reload?: ((wait?: number | undefined) => Promise<void>) | undefined;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/components/rex-pro-table/v1/rex-pro-table.js

@@ -19,14 +19,13 @@ import { BaseListTable, BaseTable, useRequestFieldsConfig, useRexProConfigProvid
 import { Card, Pagination, Skeleton, Space } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useImperativeHandle, useRef } from 'react';
-import { Navigate } from 'react-router';
 import { ActionButtons } from "./components/ActionButtons";
 import { TableActionButtonGroup, ToolbarBox, Wrapper } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var InlineRexProTable = function InlineRexProTable(_ref) {
-  var _state$dataSource;
+  var _cardProps$form, _cardProps$form2, _cardProps$form3, _cardProps$table, _cardProps$table2, _state$dataSource;
   var toolbar = _ref.toolbar,
     filterFormProps = _ref.filterFormProps,
     tableProps = _ref.tableProps,
@@ -38,6 +37,9 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
     autoInitRequest = _ref$autoInitRequest === void 0 ? false : _ref$autoInitRequest,
     _ref$hidePagination = _ref.hidePagination,
     hidePagination = _ref$hidePagination === void 0 ? false : _ref$hidePagination,
+    _ref$pageSizeOptions = _ref.pageSizeOptions,
+    pageSizeOptions = _ref$pageSizeOptions === void 0 ? [10, 20, 50, 100] : _ref$pageSizeOptions,
+    cardProps = _ref.cardProps,
     actionConfig = _ref.actionConfig,
     proTableRef = _ref.proTableRef,
     _reload = _ref.reload;
@@ -239,16 +241,17 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
   });
   return /*#__PURE__*/_jsxs(Wrapper, {
     className: "pro-rex-table-box",
-    children: [/*#__PURE__*/_jsx(Card, {
-      size: "small",
-      style: {
+    children: [/*#__PURE__*/_jsx(Card, _objectSpread(_objectSpread({
+      size: "small"
+    }, cardProps === null || cardProps === void 0 ? void 0 : cardProps.form), {}, {
+      style: _objectSpread({
         display: filterFormProps !== null && filterFormProps !== void 0 && filterFormProps.hidden ? 'none' : undefined
-      },
-      styles: {
-        body: {
+      }, cardProps === null || cardProps === void 0 || (_cardProps$form = cardProps.form) === null || _cardProps$form === void 0 ? void 0 : _cardProps$form.style),
+      styles: _objectSpread(_objectSpread({}, cardProps === null || cardProps === void 0 || (_cardProps$form2 = cardProps.form) === null || _cardProps$form2 === void 0 ? void 0 : _cardProps$form2.styles), {}, {
+        body: _objectSpread({
           padding: 10
-        }
-      },
+        }, cardProps === null || cardProps === void 0 || (_cardProps$form3 = cardProps.form) === null || _cardProps$form3 === void 0 || (_cardProps$form3 = _cardProps$form3.styles) === null || _cardProps$form3 === void 0 ? void 0 : _cardProps$form3.body)
+      }),
       children: /*#__PURE__*/_jsx(FilterForm, _objectSpread(_objectSpread({}, filterFormProps), {}, {
         loading: state.loading,
         form: form,
@@ -272,22 +275,23 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
           }
         }
       }))
-    }), listTableProps ? /*#__PURE__*/_jsx(_Fragment, {}) : /*#__PURE__*/_jsx(ToolbarBox, {
+    })), listTableProps ? /*#__PURE__*/_jsx(_Fragment, {}) : /*#__PURE__*/_jsx(ToolbarBox, {
       className: "pro-rex-toolbar-box",
       style: {
         marginBottom: 0
       },
       children: batchActionNodeFn()
-    }), /*#__PURE__*/_jsxs(Card, {
+    }), /*#__PURE__*/_jsxs(Card, _objectSpread(_objectSpread({
       size: "small",
-      rootClassName: "pro-rex-table-card",
-      styles: {
-        body: {
+      rootClassName: "pro-rex-table-card"
+    }, cardProps === null || cardProps === void 0 ? void 0 : cardProps.table), {}, {
+      styles: _objectSpread(_objectSpread({}, cardProps === null || cardProps === void 0 || (_cardProps$table = cardProps.table) === null || _cardProps$table === void 0 ? void 0 : _cardProps$table.styles), {}, {
+        body: _objectSpread({
           display: 'flex',
           flexDirection: 'column',
           padding: 10
-        }
-      },
+        }, cardProps === null || cardProps === void 0 || (_cardProps$table2 = cardProps.table) === null || _cardProps$table2 === void 0 || (_cardProps$table2 = _cardProps$table2.styles) === null || _cardProps$table2 === void 0 ? void 0 : _cardProps$table2.body)
+      }),
       children: [listTableProps ? /*#__PURE__*/_jsx(BaseListTable, _objectSpread(_objectSpread({
         dataSource: state.dataSource
       }, listTableProps), {}, {
@@ -329,6 +333,7 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
           action.getList(1);
         }
       })), (_state$dataSource = state.dataSource) !== null && _state$dataSource !== void 0 && _state$dataSource.length && !hidePagination ? /*#__PURE__*/_jsx(Pagination, {
+        pageSizeOptions: pageSizeOptions,
         style: {
           marginTop: 10
         },
@@ -355,10 +360,12 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
           change();
         }
       }) : /*#__PURE__*/_jsx(_Fragment, {})]
-    })]
+    }))]
   });
 };
 export var RexProTable = function RexProTable(props) {
+  var _useRexProConfigProvi2 = useRexProConfigProvider(),
+    systemHistory = _useRexProConfigProvi2.systemHistory;
   var _useStateData2 = useStateData(function () {
       return {
         /** 用于 reload */
@@ -426,15 +433,10 @@ export var RexProTable = function RexProTable(props) {
         var handleLink = function handleLink(target, url) {
           if (target === '_blank') {
             window.open(url, target);
+          } else if (systemHistory) {
+            systemHistory.push(url);
           } else {
-            try {
-              Navigate({
-                to: url,
-                replace: false
-              });
-            } catch (error) {
-              window.location.href = url;
-            }
+            window.location.href = url;
           }
         };
         if (item.type === 'link' || item.type === 'icon') {

package/dist/components/rex-pro-table/v1/types.d.ts

@@ -1,6 +1,6 @@
 import { FilterForm, IFilterFormProps } from "../../filter-form";
 import { BaseListTable, BaseTable, RequestFieldsContainer, TButtonFilterItem } from '@teamias/rex-design';
-import { Button, DrawerProps, DropDownProps, FormInstance, GetProps, ModalProps } from 'antd';
+import { Button, Card, DrawerProps, DropDownProps, FormInstance, GetProps, ModalProps } from 'antd';
 import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { MutableRefObject, ReactNode } from 'react';
 /** 组件props */
@@ -24,6 +24,16 @@ export interface IRexProTableProps<TF extends Record<string, unknown> = Record<s
      * @default false
      */
     autoInitRequest?: boolean;
+    /**
+     * 每页条数配置
+     * @default [10, 20, 50, 100]
+     */
+    pageSizeOptions?: number[];
+    /** card props */
+    cardProps?: {
+        form?: GetProps<typeof Card>;
+        table?: GetProps<typeof Card>;
+    };
     /** 隐藏分页 */
     hidePagination?: boolean;
     /** proTable 操作对象 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-pro",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -51,7 +51,7 @@
   "dependencies": {
     "@ant-design/icons": "^6.1.0",
     "@ant-design/pro-components": "^2.8.10",
-    "@teamias/rex-design": "^0.1.3",
+    "@teamias/rex-design": "^0.1.12",
     "ahooks": "^3.9.6",
     "antd": "^5.26.7",
     "classnames": "^2.5.1",
@@ -61,7 +61,6 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
-    "react-router": "6",
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
@@ -91,8 +90,7 @@
     "antd": ">=5.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "react-intl": ">=3.0.0",
-    "react-router": ">=6"
+    "react-intl": ">=3.0.0"
   },
   "packageManager": "pnpm@9.15.9",
   "publishConfig": {