Merge pull request #136 from XiaoMi/hotfix/select-style

Hotfix/select style
XiaoMi · Mar 25, 2019 · 174317d · 174317d
2 parents a360568 + 869a96c
commit 174317d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/components/cascader/Cascader.js b/components/cascader/Cascader.js
@@ -282,6 +282,10 @@ class Cascader extends Component {
   }
 
   handleClick (e) {
+    if (this.state.popperShow) {
+      this.hidePopper()
+      return
+    }
     // e.stopPropagation()
     if (!this.props.disabled) {
       this.showPopper()

diff --git a/components/popover/style/index.scss b/components/popover/style/index.scss
@@ -3,8 +3,6 @@ $popper-arrow-gap: -5px !default;
 
 .hi-popover {
   position: relative;
-  line-height: 30px;
-  font-size: 16px;
   display: inline-block;
 }
 

diff --git a/components/select/Select.js b/components/select/Select.js
@@ -263,18 +263,19 @@ class Select extends Component {
   }
 
   handleInputClick (e) {
-    this.selectInput.focus()
-    // if (e) {
-    //   e.stopPropagation()
-    // }
+    let {
+      dropdownShow
+    } = this.state
 
-    if (this.props.disabled) {
+    if (dropdownShow) {
+      this.hideDropdown()
       return
     }
 
-    let {
-      dropdownShow
-    } = this.state
+    this.selectInput.focus()
+    if (this.props.disabled) {
+      return
+    }
 
     if (!dropdownShow) {
       this.showDropdown()

diff --git a/components/select/style/index.scss b/components/select/style/index.scss
@@ -5,6 +5,7 @@ $selectColor:#f7f7f7 !default;
   display: inline-block;
   width: 100%;
   font-size: 14px;
+  overflow: hidden;
 
   &.is-disabled {
     opacity: 0.4;

diff --git a/site/view/Home/style/index.scss b/site/view/Home/style/index.scss
@@ -1,7 +1,9 @@
 @import './variable';
 
 /* common */
-
+.header {
+  z-index: 1999;
+}
 .container {
   width: 1177px;
   margin: 0 auto;