Merge origin/develop_web into feature/20251219_yjp
- Resolved conflict in web/src/components/RbModal/index.tsx - Combined className and maskClosable properties
This commit is contained in:
@@ -25,9 +25,10 @@ const RbModal: FC<ModalProps> = ({
|
||||
onOk={onOk}
|
||||
destroyOnHidden={true}
|
||||
className={`rb-modal ${className || ''}`}
|
||||
maskClosable={false}
|
||||
{...props}
|
||||
>
|
||||
<div className='rb:max-h-[550px] rb:overflow-y-auto rb:overflow-x-hidden'>
|
||||
<div className='rb:max-h-137.5 rb:overflow-y-auto rb:overflow-x-hidden'>
|
||||
{children}
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
Reference in New Issue
Block a user