fix(select): 修复 select 组件中参数 no-data-text 在没有 option-group 时不显示的问题

DaoCloud · May 15, 2018 · db7357f · db7357f
1 parent e2029a8
commit db7357f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/examples/routers/select.vue b/examples/routers/select.vue
@@ -2,7 +2,7 @@
   <div>
     <h1>simple select</h1>
     <br><hr><br>
-    <dao-select v-model="simple" placeholder="一个简单下拉框" no-data-text="无选项">
+    <dao-select v-model="simple" placeholder="一个简单下拉框"  no-data-text="无选项">
       <dao-option v-for="item in items" :key="item.value" :value="item.value" :label="item.text"></dao-option>
     </dao-select>
     <br>

diff --git a/src/components/dao-select/dao-option-group.scss b/src/components/dao-select/dao-option-group.scss
@@ -10,8 +10,8 @@ $select-default-color: #9ba3af;
     height: 20px;
     line-height: 20px;
   }
-  .dao-select-noOption {
-    padding: 10px 20px 5px 20px;
-    color: $select-default-color;
-  }
-}
+}
+.dao-select-noOption {
+  padding: 5px 20px 5px 20px;
+  color: $select-default-color;
+}
diff --git a/src/components/dao-select/dao-select.vue b/src/components/dao-select/dao-select.vue
@@ -27,7 +27,9 @@
         <input class="dao-control search" type="text" :placeholder="searchPlaceholder" v-model="filter" required>
       </div>
       <div class="option-list">
-        <slot></slot>
+        <slot>
+          <div class="dao-select-noOption">{{ noDataText }}</div>
+        </slot>
       </div>
     </div>
   </div>