listpage-next 0.0.229 → 0.0.231

package/dist/components/Menu/utils.js

@@ -1,5 +1,4 @@
 function detectActiveMenu(pathname, menus) {
-    debugger;
     const activeMenu = menus.filter((item)=>item && pathname.startsWith(item.key)).sort((a, b)=>b.key.length - a.key.length)?.[0];
     if (!activeMenu) return;
     if (!activeMenu.children?.length) return activeMenu.key;

package/dist/components/PageLayout/components/PageModal/useActions.js

@@ -1,8 +1,9 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "antd";
-import { AsyncButton } from "../../../AsyncButton/index.js";
 import { useMemo } from "react";
 import { styled } from "styled-components";
+import { CloseOutlined } from "@ant-design/icons";
+import { AsyncButton } from "../../../AsyncButton/index.js";
 function useActions(props) {
     const { actionPosition = 'bottom', okText, cancelText, onOk, icon, title, onCancel, extraActions } = props;
     const actions = 'none' === actionPosition ? null : /*#__PURE__*/ jsxs(Fragment, {
@@ -28,7 +29,7 @@ function useActions(props) {
                 /*#__PURE__*/ jsx(FlexContainer, {
                     children: extraActions
                 }),
-                /*#__PURE__*/ jsx("div", {
+                /*#__PURE__*/ jsx(Fragment, {
                     children: actions
                 })
             ]
@@ -48,7 +49,7 @@ function useActions(props) {
                         title
                     ]
                 }),
-                /*#__PURE__*/ jsxs("div", {
+                /*#__PURE__*/ jsxs(FlexContainer, {
                     children: [
                         extraActions,
                         actions
@@ -56,6 +57,26 @@ function useActions(props) {
                 })
             ]
         });
+        if ('none' === actionPosition) return /*#__PURE__*/ jsxs(HeaderContainer, {
+            children: [
+                /*#__PURE__*/ jsxs(FlexContainer, {
+                    children: [
+                        icon,
+                        title
+                    ]
+                }),
+                /*#__PURE__*/ jsxs(FlexContainer, {
+                    children: [
+                        extraActions,
+                        /*#__PURE__*/ jsx(Button, {
+                            type: "text",
+                            icon: /*#__PURE__*/ jsx(CloseOutlined, {}),
+                            onClick: onCancel
+                        })
+                    ]
+                })
+            ]
+        });
         return /*#__PURE__*/ jsxs(FlexContainer, {
             children: [
                 icon,

package/dist/features/ListPage/components/DataTable/index.js

@@ -7,15 +7,17 @@ import { useSelectionTools } from "../../hooks/useSelectionTools.js";
 import { useListPageStore } from "../../context/index.js";
 import { TableContainer } from "../../styles.js";
 const DataTable = observer((props)=>{
-    const { title, extra, columns = [], rowTitleKey, rowSelectionType, tableProps } = props;
+    const { title, extra, columns = [], rowTitleKey, rowSelectionType, tableProps, variant, style } = props;
     const store = useListPageStore();
     const paginationEle = usePagination(tableProps?.pagination);
     const newColumns = useColumns(columns);
     const extraEle = 'function' == typeof extra ? extra(store) : extra;
     const selectionToolEle = useSelectionTools(rowTitleKey);
     return /*#__PURE__*/ jsxs(Card, {
+        variant: variant,
         title: selectionToolEle || title,
         extra: extraEle,
+        style: style,
         styles: {
             body: {
                 padding: 0

package/dist/features/ListPage/components/DataTable/types.d.ts

@@ -1,6 +1,6 @@
 import { TableProps, TagProps, TypographyProps } from 'antd';
 import { ColumnType } from 'antd/es/table';
-import { HTMLAttributeAnchorTarget, ReactNode } from 'react';
+import { CSSProperties, HTMLAttributeAnchorTarget, ReactNode } from 'react';
 import { ListPageStore } from '../../context';
 export type ComponentType = 'text' | 'time' | 'tag' | 'link' | 'switch';
 export type ComponentProps<RecordValue extends Record<string, any> = any> = {
@@ -34,6 +34,8 @@ export interface DataTableProps<FilterValue = any, RecordValue extends Record<st
     rowSelectionType?: 'checkbox' | 'radio';
     rowTitleKey?: string;
     columns?: ListPageTableColumn<FilterValue, RecordValue>[];
+    variant?: 'borderless' | 'outlined';
+    style?: CSSProperties;
     tableProps?: Omit<TableProps<RecordValue>, 'dataSource' | 'title' | 'columns'>;
 }
 export type ColumnRender<Type extends ComponentType, R extends Record<string, any> = any, K extends string = any> = (value: R[K], record: R, index: number, props: ComponentProps<R>[Type]) => ReactNode;

package/dist/features/ListPage/components/ListPageContainer/index.d.ts

@@ -4,6 +4,7 @@ import { ListPageContext } from '../..';
 export interface ListPageProps<FilterValue = any, RecordValue extends Record<string, any> = any> {
     styles?: {
         page?: React.CSSProperties;
+        table?: React.CSSProperties;
     };
     pageRef?: React.RefObject<ListPageContext<FilterValue, RecordValue>>;
     request: ListPageRequest<FilterValue, RecordValue>;

package/dist/features/ListPage/components/ListPageContainer/index.js

@@ -41,7 +41,11 @@ const ListPageContainerComponent = observer((props)=>{
                 children: toolbar.render(store)
             }),
             /*#__PURE__*/ jsx(DataTable, {
-                ...table
+                ...table,
+                style: {
+                    ...styles?.table,
+                    ...table.style
+                }
             }),
             floatEle
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.229",
+  "version": "0.0.231",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",