fix: 修复 ant 、 default 主题下 Modal.show 缺少 padding 样式的问题 (#1511)

Co-authored-by: leo <chenlihao@shein.com>
sheinsight · Feb 24, 2022 · 75fe0cb · 75fe0cb
1 parent 54ccc13
commit 75fe0cb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/site/pages/documentation/changelog/1.x.x.md b/site/pages/documentation/changelog/1.x.x.md
@@ -2,6 +2,7 @@
 ### 1.8.7
 - EditableArea 优化内部 delay 逻辑
 - 修复 Tab 内嵌 Table 切换 Tab 后 Table 列错位的问题
+- 修复 ant 、 default 主题下 Modal.show 缺少 padding 样式的问题
 
 ### 1.8.6
 - 新增 Popover.Content 组件 ，默认有 padding 和 maxWidth 样式

diff --git a/src/Modal/Panel.js b/src/Modal/Panel.js
@@ -162,9 +162,9 @@ export default class Panel extends PureComponent {
   }
 
   renderContent() {
-    const { children, noPadding, padding, position, bodyStyle, from = null, type } = this.props
+    const { children, noPadding, padding, position, bodyStyle, from = null } = this.props
 
-    let style = { padding: noPadding === true || (from === 'method' && type === 'normal') ? 0 : padding }
+    let style = { padding: noPadding === true ? 0 : padding }
     if (position) style.overflow = 'auto'
 
     if (bodyStyle) style = Object.assign(style, bodyStyle)

diff --git a/src/Modal/styles/modal.less b/src/Modal/styles/modal.less
@@ -302,6 +302,18 @@
         }
       }
     }
+    > .@{card-prefix}.@{modal-prefix}-normal {
+      .@{modal-prefix}-body {
+          padding-left: @modal-icon-body-padding-right;
+        }
+      &.@{modal-prefix}-rtl {
+        .@{modal-prefix}-body {
+          padding-right: @modal-icon-body-padding-right;
+        }
+      }
+    }
+
+
 
 
     > .@{card-prefix}.@{modal-prefix}-rtl {

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@
 import './styles/normalize.less'
 import * as utils from './utils'
 
-export default { utils, version: '1.8.0-rc.4' }
+export default { utils, version: '1.8.7' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'