From 90eb79757d8fe496458180c7a4c7171f9afc7809 Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Sat, 16 May 2020 20:48:52 +0800
Subject: [PATCH] chore

---
 demo/documentation/components/button/zhCN/shape.md | 1 -
 demo/utils/DocumentationWrapper.vue                | 2 +-
 package.json                                       | 4 ++--
 rollup.config.js                                   | 4 +++-
 think.md                                           | 4 +++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/demo/documentation/components/button/zhCN/shape.md b/demo/documentation/components/button/zhCN/shape.md
index e1fe56da8c3..2fc94a9b24b 100644
--- a/demo/documentation/components/button/zhCN/shape.md
+++ b/demo/documentation/components/button/zhCN/shape.md
@@ -1,6 +1,5 @@
 # 形状
 按钮拥有不同的形状。
-Button has different shapes.
 ```html
 <n-button circle>
   <template v-slot:icon>
diff --git a/demo/utils/DocumentationWrapper.vue b/demo/utils/DocumentationWrapper.vue
index 43f836c66f7..8c3aa9f27c1 100644
--- a/demo/utils/DocumentationWrapper.vue
+++ b/demo/utils/DocumentationWrapper.vue
@@ -7,7 +7,7 @@ export default {
   },
   render (h, context) {
     const locale = this.$i18n.locale
-    const defaultSlot = this.$slots.default || []
+    const defaultSlot = (this.$scopedSlots.default && this.$scopedSlots.default()) || []
     const index = defaultSlot.findIndex(VNode => VNode.componentOptions.tag === locale)
     // console.log(locale, defaultSlot[0].componentOptions.tag)
     // console.log(index)
diff --git a/package.json b/package.json
index f6a8c2476b2..979485ffd8b 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.8.4",
     "@babel/preset-env": "^7.8.4",
+    "@css-render/plugin-bem": "^0.7.5",
     "@kazupon/vue-i18n-loader": "^0.4.1",
     "@rollup/plugin-node-resolve": "^6.1.0",
     "@rollup/plugin-strip": "^1.3.2",
@@ -62,6 +63,7 @@
     "cors": "^2.8.5",
     "cross-env": "^5.2.1",
     "css-loader": "^2.1.1",
+    "css-render": "^0.7.5",
     "cssnano": "^4.1.10",
     "emoji-regex": "^8.0.0",
     "emoji-unicode": "^1.1.0",
@@ -120,9 +122,7 @@
     "webpack-dev-server": "^3.10.3"
   },
   "dependencies": {
-    "@css-render/plugin-bem": "^0.7.3",
     "async-validator": "^1.11.5",
-    "css-render": "^0.7.3",
     "date-fns": "^2.9.0",
     "highlight.js": "^9.18.1",
     "lodash-es": "^4.17.15",
diff --git a/rollup.config.js b/rollup.config.js
index fcec6db8b9d..e2fe7f223de 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -46,6 +46,8 @@ module.exports = {
     'async-validator',
     'vue-virtual-scroller',
     'lodash-es',
-    'resize-observer-polyfill'
+    'resize-observer-polyfill',
+    'css-render',
+    '@css-render/plugin-bem'
   ])
 }
diff --git a/think.md b/think.md
index 23666a60fac..30ba6a41714 100644
--- a/think.md
+++ b/think.md
@@ -226,7 +226,9 @@ zindex 的问题解决了，虽然很简单，在 static 元素上设定 zindex
 86. <del>文件上传的回调方式改成传对象</del>
 87. 抵御外界 CSS 变化，比如 line-height 之类的
 88. <del>CSS Font 选择</del> 对英文应该没有那么麻烦，走系统字体就好了，然而对中文又没什么好的解决方案，so 先这个样子，之后再琢磨琢磨
-89. 把所有用 $slots 判断的地方都改成 $scopedSlots，[原因](https://vuejs.org/v2/api/#vm-scopedSlots)
+89. <del>把所有用 $slots 判断的地方都改成 $scopedSlots，[原因](https://vuejs.org/v2/api/#vm-scopedSlots)<del> done
+90. 调整默认状态下 button 的 icon 的颜色
+91. 优化 button 的样式，现在太冗余了，关键是怎么同步按钮的主题变量呢...
 
 ```
 Done