listpage-next 0.0.232 → 0.0.234

package/dist/components/PageLayout/components/PageModal/index.d.ts

@@ -1,14 +1,8 @@
 import { ModalProps } from 'antd';
 import { ReactNode } from 'react';
-export interface PageModalProps extends Omit<ModalProps, 'visible' | 'open' | 'onOk' | 'onCancel' | 'footer' | 'title' | 'children' | 'okText' | 'cancelText' | 'closeIcon' | 'closeable'> {
-    visible: boolean;
-    onOk?: () => void;
-    onCancel?: () => void;
-    okText?: string;
-    cancelText?: string;
+export interface PageModalProps extends Omit<ModalProps, 'footer' | 'title'> {
     icon?: ReactNode;
     title: string;
-    children?: ReactNode;
     actionPosition?: 'top' | 'bottom' | 'none';
     extraActions?: ReactNode;
 }

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

@@ -3,15 +3,13 @@ import { Modal } from "antd";
 import styled_components from "styled-components";
 import { useActions } from "./useActions.js";
 const PageModal = (props)=>{
-    const { icon, visible, children, extraActions, actionPosition = 'bottom', ...modalProps } = props;
+    const { icon, children, extraActions, actionPosition = 'bottom', ...modalProps } = props;
     const { footer, header } = useActions(props);
     return /*#__PURE__*/ jsx(ModalStyled, {
         ...modalProps,
-        open: visible,
         title: header,
-        closeIcon: null,
         footer: footer,
-        closable: 'top' !== actionPosition,
+        closable: false,
         children: children
     });
 };

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

@@ -7,14 +7,14 @@ import { AsyncButton } from "../../../AsyncButton/index.js";
 function useActions(props) {
     const { actionPosition = 'bottom', okText, cancelText, onOk, icon, title, onCancel, extraActions, closable = true } = props;
     const closeButton = useMemo(()=>{
-        if (true === closable) return /*#__PURE__*/ jsx(Button, {
+        if (true === closable) return /*#__PURE__*/ jsx(CloseButton, {
             type: "text",
             icon: /*#__PURE__*/ jsx(CloseOutlined, {}),
             onClick: onCancel
         });
         if (false === closable) return null;
         const { closeIcon, disabled } = closable;
-        return /*#__PURE__*/ jsx(Button, {
+        return /*#__PURE__*/ jsx(CloseButton, {
             type: "text",
             disabled: disabled,
             icon: closeIcon || /*#__PURE__*/ jsx(CloseOutlined, {}),
@@ -32,9 +32,6 @@ function useActions(props) {
                 children: cancelText || '取消'
             }),
             /*#__PURE__*/ jsx(AsyncButton, {
-                style: {
-                    marginLeft: '0.65rem'
-                },
                 type: "primary",
                 onClick: onOk,
                 children: okText || '确定'
@@ -126,7 +123,13 @@ const ExtraContainer = styled.div`
   flex-shrink: 0;
   display: flex;
   align-items: center;
-  gap: 4px;
+  gap: 8px;
   justify-content: flex-end;
 `;
+const CloseButton = styled(Button)`
+  color: rgba(0, 0, 0, 0.45);
+  :hover {
+    color: rgba(0, 0, 0, 0.88);
+  }
+`;
 export { useActions };

package/package.json

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