Merge remote-tracking branch 'origin/master' into feature_20170803_view

# Conflicts: # src/js/components/layout/KLSearch/index.md
kaola-fed · Aug 28, 2017 · 5652539 · 5652539
2 parents 7931ee5 + a3b24c4
commit 5652539
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/js/components/form/KLDatePicker/TimePicker/index.mcss b/src/js/components/form/KLDatePicker/TimePicker/index.mcss
@@ -24,6 +24,7 @@
     }
     .u-input {
         display: inline-block;
+        box-sizing: content-box;
     }
     .u-numberinput {
         .u-btn  {

diff --git a/src/js/components/layout/KLSearch/index.html b/src/js/components/layout/KLSearch/index.html
@@ -10,7 +10,7 @@
     <div class="kl-search_ft">
         <kl-button type="secondary" title={searchText} on-click={this.search()} class="kl-search_btn"></kl-button>
         <kl-button title={resetText} on-click={this.reset()}></kl-button>
-        {#if isShowToggle}
+        {#if this.$more && isShowToggle}
             <a href="javascript: void(0);" on-click={this.toggle()} class="f-ml10">
                  {toggleText}<i class="u-icon u-icon-angle-{isShowMore ? 'up' : 'down'}"></i>
             </a> 

diff --git a/src/js/components/layout/KLSearch/index.md b/src/js/components/layout/KLSearch/index.md
@@ -12,25 +12,25 @@ title: 筛选区
     <kl-row>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="付款类型">
-                <kl-input placeholder="付款类型" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="支付方式">
-                <kl-input placeholder="支付方式" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="订单号">
-                <kl-input placeholder="订单号" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
     </kl-row>
     <kl-search-more>
         <kl-row>
             <kl-col span="4">
                 <kl-form-item labelSize="60" title="合同编号">
-                    <kl-input placeholder="合同编号" />
+                    <kl-input type="text"></kl-input>
                 </kl-form-item>
             </kl-col>
         </kl-row>
@@ -45,21 +45,21 @@ title: 筛选区
 <div class="m-example"></div>
 
 ```xml
-<kl-search isShowToggle={false}>
+<kl-search>
     <kl-row>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="付款类型">
-                <kl-input placeholder="付款类型" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="支付方式">
-                <kl-input placeholder="支付方式" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="订单号">
-                <kl-input placeholder="订单号" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
     </kl-row>
@@ -68,20 +68,20 @@ title: 筛选区
 <!-- demo_end -->
 
 <!-- demo_start -->
-### 不显示Footer
+### 不显示Footer（根据交互规范，一行没有填满的按钮要跟在后面）
 <div class="m-example"></div>
 
 ```xml
 <kl-search isShowFooter={false}>
     <kl-row>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="付款类型">
-                <kl-input placeholder="付款类型" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">
             <kl-form-item labelSize="60" title="支付方式">
-                <kl-input placeholder="支付方式" />
+                <kl-input type="text"></kl-input>
             </kl-form-item>
         </kl-col>
         <kl-col span="4">