Merge pull request #105 from TuSimple/freestyle

Freestyle

CHANGELOG.en-US.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 1.0.6 （2020-04-03）
+### Fixes
+- Fix the problem that all the `console` statements are stripped in the bundle.
+
 ## 1.0.5 (2020-03-27)
 ### Features
 - Change the data type of `n-data-table`'s filters from Array to Object.

CHANGELOG.zh-CN.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 1.0.6 （2020-04-03）
+### Fixes
+- 解决了所有的 `console` 语句都在打包中被删除了的问题
+
 ## 1.0.5 (2020-03-27)
 ### Features
 - 改变 `n-data-table` 的 filters 的数据类型从数组改变成对象

demo/documentation/components/modal/enUS/index.md

@@ -23,6 +23,7 @@ preset-confirm-slot
 |show|`boolean`|`false`||
 |mask-closable|`boolean`|`true`|Whether to emit `hide` event when click mask.|
 |preset|`'card' \| 'confirm'`|`null`||
+|overlay-style|`object`|`null`|The content style when use `preset`.|
 
 ### Modal with Preset Card
 See [Card props](n-card#Props)

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

@@ -27,6 +27,7 @@ dark4-debug
 |show|`boolean`|`false`||
 |mask-closable|`boolean`|`true`|点击遮罩时是否发出 `hide` 事件|
 |preset|`'card' \| 'confirm'`|`null`||
+|overlay-style|`object`|`null`|当使用 `preset` 时候内部内容的样式|
 
 ### Modal（Card 预设）
 参考 [Card props](n-card#Props)

package.json

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

rollup.config.js

@@ -1,6 +1,5 @@
 const vue = require('rollup-plugin-vue')
 const resolve = require('@rollup/plugin-node-resolve')
-const strip = require('@rollup/plugin-strip')
 const { terser } = require('rollup-plugin-terser')
 const naiveSCSSVariable = require('./build/naiveSCSSVarPlugin')
 
@@ -33,7 +32,6 @@ module.exports = {
       }
     }),
     naiveSCSSVariable(),
-    strip(),
     terser({
       mangle: false,
       output: {

src/Tree/src/Tree.js

@@ -152,7 +152,7 @@ export default {
     this.internalSelectedKeys = this.defaultSelectedKeys || []
     if (this.defaultExpandAll) {
       this.internalExpandedKeys = getAllKeys(this.data)
-      console.log('getAllKeys(this.data)', getAllKeys(this.data))
+      // console.log('getAllKeys(this.data)', getAllKeys(this.data))
     }
   },
   data () {
@@ -189,7 +189,7 @@ export default {
           this.filter
         )
         this.highlightKeys = highlightKeys
-        console.log(highlightKeys)
+        // console.log(highlightKeys)
         if (!this.hasExpandedKeys) {
           this.internalExpandedKeys = expandedKeysAfterChange
         }

styles/Button.scss

@@ -495,6 +495,15 @@
             }
           }
         }
+        @include m(warning-type) {
+          & + {
+            @include b(button) {
+              @include m(info-type) {
+                border-left-width: 0px;
+              }
+            }
+          }
+        }
       }
     }
   }
@@ -502,14 +511,14 @@
     display: inline-flex;
     flex-direction: column;
     @include b(button) {
-      &:first-child {
+      &:first-child:not(:last-child) {
         margin-bottom: 0!important;
         margin-left: 0!important;
         margin-right: 0!important;
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
       }
-      &:last-child {
+      &:last-child:not(:first-child) {
         margin-top: 0!important;
         margin-left: 0!important;
         margin-right: 0!important;