@teamias/rex-pro 0.1.1 → 0.1.3

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: {
@@ -68,9 +72,11 @@ export default (function () {
       id: 1075,
       detail_id: 1102,
       status_name: [{
-        type: 'text',
+        type: 'link',
         props: {
-          value: 1075
+          value: 1075,
+          label: '1075',
+          action: 'custom'
         },
         extra: {
           rowSpan: 2
@@ -681,6 +687,9 @@ export default (function () {
                     // tableHeaderUrl: '/tableProps',
                     // tableHeaderParams?: Record<string, unknown>;
                     tableHeaderConfig: [{
+                      title: 'qweqwe',
+                      dataIndex: 'qweqwe'
+                    }, {
                       title: '编号/状态',
                       dataIndex: 'status_name',
                       key: 'status_name'
@@ -1159,6 +1168,12 @@ export default (function () {
                 x: 1000,
                 y: h
               };
+            },
+            // onDataCellClick: (...data) => {
+            //   console.log('onDataCellClick', data);
+            // },
+            onDataCellClickV2: function onDataCellClickV2(data) {
+              console.log('onDataCellClickV2', data);
             }
           }
           // listTableProps={{

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

@@ -25,7 +25,7 @@ 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,
@@ -37,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;
@@ -238,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,
@@ -271,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), {}, {
@@ -328,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
         },
@@ -354,7 +360,7 @@ var InlineRexProTable = function InlineRexProTable(_ref) {
           change();
         }
       }) : /*#__PURE__*/_jsx(_Fragment, {})]
-    })]
+    }))]
   });
 };
 export var RexProTable = function RexProTable(props) {
@@ -418,8 +424,8 @@ export var RexProTable = function RexProTable(props) {
     });
   }
   return /*#__PURE__*/_jsx(InlineRexProTable, _objectSpread(_objectSpread({}, props), {}, {
-    tableProps: _objectSpread(_objectSpread({}, props.tableProps), {}, {
-      onDataCellClickV2: function onDataCellClickV2(topConfig) {
+    tableProps: _objectSpread(_objectSpread({}, props.tableProps), function (_props$tableProps2, _props$tableProps3, _props$tableProps4) {
+      var onDataCellClickV2 = function onDataCellClickV2(topConfig) {
         var _props$tableProps, _props$tableProps$onD;
         // 主要兼容 来自低代码的数据源
         var item = topConfig.item,
@@ -453,8 +459,21 @@ export var RexProTable = function RexProTable(props) {
           }
         }
         (_props$tableProps = props.tableProps) === null || _props$tableProps === void 0 || (_props$tableProps$onD = _props$tableProps.onDataCellClickV2) === null || _props$tableProps$onD === void 0 || _props$tableProps$onD.call(_props$tableProps, topConfig);
+      };
+
+      // 优先级处理，如果没有任何点击事件才使用新的 onDataCellClickV2, 作为兼容处理低代码的情况
+      if (!((_props$tableProps2 = props.tableProps) !== null && _props$tableProps2 !== void 0 && _props$tableProps2.onDataCellClickV2) && !((_props$tableProps3 = props.tableProps) !== null && _props$tableProps3 !== void 0 && _props$tableProps3.onDataCellClick)) {
+        return {
+          onDataCellClickV2: onDataCellClickV2
+        };
       }
-    }),
+      if ((_props$tableProps4 = props.tableProps) !== null && _props$tableProps4 !== void 0 && _props$tableProps4.onDataCellClickV2) {
+        return {
+          onDataCellClickV2: onDataCellClickV2
+        };
+      }
+      return {};
+    }()),
     reload: reload
   }));
 };

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.1",
+  "version": "0.1.3",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -15,7 +15,9 @@
     "deploy": "changeset && changeset version && npm publish && npm run docs:deploy",
     "dev": "dumi dev",
     "docs:build": "dumi build",
-    "docs:deploy": "vercel --prod",
+    "docs:deploy": "npm run docs:deploy:wrangler && npm run docs:deploy:vercel",
+    "docs:deploy:vercel": "vercel --prod",
+    "docs:deploy:wrangler": "cross-env DOCS_DEPLOY=wrangler CLOUDFLARE_ACCOUNT_ID=0ea1eadbf2a2483b37c6044cc0dcb010 dumi build && wrangler pages deploy docs-dist --project-name=rex-pro",
     "docs:preview": "dumi preview",
     "doctor": "father doctor",
     "lint": "npm run lint:es",
@@ -51,7 +53,7 @@
   "dependencies": {
     "@ant-design/icons": "^6.1.0",
     "@ant-design/pro-components": "^2.8.10",
-    "@teamias/rex-design": "^0.1.4",
+    "@teamias/rex-design": "^0.1.12",
     "ahooks": "^3.9.6",
     "antd": "^5.26.7",
     "classnames": "^2.5.1",
@@ -73,6 +75,7 @@
     "@types/react": "^18.3.27",
     "@types/react-dom": "^18.3.7",
     "@umijs/lint": "^4.0.0",
+    "cross-env": "^10.1.0",
     "dumi": "^2.4.13",
     "eslint": "^8.57.1",
     "father": "^4.1.0",
@@ -81,7 +84,8 @@
     "prettier": "^3.7.4",
     "prettier-plugin-organize-imports": "^4.3.0",
     "prettier-plugin-packagejson": "^2.5.20",
-    "stylelint": "^14.9.1"
+    "stylelint": "^14.9.1",
+    "wrangler": "^4.58.0"
   },
   "peerDependencies": {
     "@ant-design/icons": ">=5.0.0",