添加城市选择器

baidu · May 23, 2019 · a4a3dd2 · a4a3dd2
1 parent a0a4c71
commit a4a3dd2
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/examples/components/Form/Full.jsx b/examples/components/Form/Full.jsx
@@ -993,6 +993,14 @@ export default {
                 {
                     type: "divider"
                 },
+                {
+                    type: "city",
+                    name: "city",
+                    label: "城市选择器"
+                },
+                {
+                    type: "divider"
+                },
                 {
                     type: "matrix",
                     name: "matrix",

diff --git a/scss/components/form/_city.scss b/scss/components/form/_city.scss
@@ -0,0 +1,31 @@
+.#{$ns}CityPicker {
+    .#{$ns}Select + .#{$ns}Select {
+        margin-left: $gap-xs;
+    }
+
+    &-input {
+        outline: none;
+        vertical-align: middle;
+        margin-left: $gap-xs;
+        border: $Form-input-borderWidth solid $Form-input-borderColor;
+        border-radius: $Form-input-borderRadius;
+        // height: $Form-input-height;
+        line-height: $Form-input-lineHeight;
+        padding: $Form-input-paddingY $Form-input-paddingX;
+        font-size: $Form-input-fontSize;
+
+        &::placeholder {
+            color: $Form-input-placeholderColor;
+            user-select: none;
+        }
+
+        &:focus {
+            border-color: $Form-input-onFocused-borderColor;
+            box-shadow: $Form-input-boxShadow;
+
+            @if $Form-input-onFocused-bg !=$Form-input-bg {
+                background-color: $Form-input-onFocused-bg;
+            }
+        }
+    }
+}
diff --git a/scss/components/form/_select.scss b/scss/components/form/_select.scss
@@ -114,6 +114,7 @@
 
     &-arrow {
         margin-right: $gap-xs;
+        margin-left: $gap-xs;
         width: px2rem(20px);
         text-align: center;
         display: flex;
@@ -152,6 +153,7 @@
     &-menu {
         max-height: px2rem(300px);
         overflow: auto;
+        user-select: none;
     }
 
     &-option {

diff --git a/scss/themes/cxd.scss b/scss/themes/cxd.scss
@@ -440,6 +440,7 @@ $TagControl-sugTip-color: $primary;
 @import "../components/form/text";
 @import "../components/form/textarea";
 @import "../components/form/checks";
+@import "../components/form/city";
 @import "../components/form/switch";
 @import "../components/form/number";
 @import "../components/form/select";

diff --git a/scss/themes/default.scss b/scss/themes/default.scss
@@ -67,6 +67,7 @@ $Form-input-borderColor: #cfdadd;
 @import "../components/form/text";
 @import "../components/form/textarea";
 @import "../components/form/checks";
+@import "../components/form/city";
 @import "../components/form/switch";
 @import "../components/form/number";
 @import "../components/form/select";