Merge pull request #167 from TuSimple/freestyle

Freestyle

CHANGELOG.en-US.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 1.5.3 (2020-07-23)
+### Fixes
+- Fix the problem that `n-select` display with mistakes when `placeholder` is empty.
+
 ## 1.5.2 (2020-07-22)
 ### Fixes
 - Fix the problem that `n-radio` can be focused.

CHANGELOG.zh-CN.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 1.5.3 (2020-07-23)
+### Fixes
+- 修正了 `n-select` 在 `placeholder` 为空的时候显示出错的问题
+
 ## 1.5.2 (2020-07-22)
 ### Fixes
 - 修正了 `n-radio` 无法聚焦的问题

demo/documentation/components/select/zhCN/index.md

@@ -18,6 +18,7 @@ custom-option
 action
 fallback-option
 change-debug
+placeholder-debug
 ```
 ## V-model
 |prop|event|

demo/documentation/components/select/zhCN/placeholderDebug.md

@@ -0,0 +1,40 @@
+# Placehoder Debug
+```html
+<n-select
+  v-model="value2"
+  placeholder=""
+  :options="options"
+  style="width:200px;"
+/>
+
+<n-select
+  v-model="value3"
+  multiple
+  placeholder=""
+  :options="options"
+  style="width:200px;"
+/>
+```
+```js
+export default {
+  data () {
+    return {
+      options: [
+        {
+          value: '1',
+          label: '1',
+        }
+      ],
+      value1: null,
+      value2: null,
+      value3: null
+    }
+  }
+}
+```
+```css
+.n-select {
+  width: 180px;
+  margin: 0 12px 8px 0;
+}
+```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "A Vue UI Framework. Caring About Styles, Themed, Batteries Included, Not Rather Slow.",
   "main": "lib/index.js",
   "module": "es/index.js",

src/_base/selection/src/styles/themed-size.js

@@ -1,7 +1,6 @@
 import { cTB, c, cB, cE, cM } from '../../../../_utils/cssr'
 import formatLength from '../../../../_utils/css/formatLength'
 
-// TODO split form-item styles out
 export default c([
   ({ props }) => {
     const size = props.$instance.size
@@ -17,7 +16,7 @@ export default c([
           height,
           lineHeight: height
         }),
-        cB('base-selection-babel', {
+        cB('base-selection-label', {
           height,
           lineHeight: height
         }),

src/version.js

@@ -1 +1 @@
-export default '1.5.2'
+export default '1.5.3'