fix(Spin): 修复样式设置错误导致大小改变无效

aotuzuche · Jan 21, 2019 · 2f8ba09 · 2f8ba09
1 parent f8314af
commit 2f8ba09
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/layout/style.scss b/packages/layout/style.scss
@@ -148,7 +148,7 @@ body,
       height: 60px;
       margin: -30px 0 0 -30px;
     }
-    .x-loading__spin_path {
+    .auto-ui-loading__spin_path {
       stroke-width: 2px; /*no*/
     }
   }

diff --git a/packages/modal/index.tsx b/packages/modal/index.tsx
@@ -92,7 +92,7 @@ export default class Modal extends React.Component<ModalProps, ModalState> {
         <div
           className="x-modal__inner"
           style={{
-            height: composeHeight ? composeHeight + '%' : 'auto'
+            height: composeHeight ? composeHeight + '%' : ''
           }}
           onAnimationEnd={this._onAnimationEnd}
         >

diff --git a/packages/spin/index.tsx b/packages/spin/index.tsx
@@ -11,8 +11,19 @@ export interface SpinProps {
 const Spin: React.FC<SpinProps> = props => {
   const { className, text, ...otherProps } = props
 
+  let innerClassName
+  let outClassName
+
+  if (text) {
+    innerClassName = cn('auto-ui-loading__spin')
+    outClassName = cn('auto-ui-spin', className)
+  } else {
+    innerClassName = cn('auto-ui-loading__spin', className)
+    outClassName = cn('auto-ui-spin')
+  }
+
   const loadingSpin = (
-    <div className="auto-ui-loading__spin">
+    <div className={innerClassName}>
       <svg className="auto-ui-loading__spin_circular" viewBox="25 25 50 50">
         <circle
           className="auto-ui-loading__spin_path"
@@ -27,10 +38,8 @@ const Spin: React.FC<SpinProps> = props => {
     </div>
   )
 
-  let composeClassName = cn('auto-ui-spin', className)
-
   return (
-    <div {...otherProps} className={composeClassName}>
+    <div {...otherProps} className={outClassName}>
       {loadingSpin}
       {!!text && <p className="auto-ui-spin__text">{text}</p>}
     </div>