Merge branch 'dev' into release_v1.3.0

* dev: docs: 更新 Changelog 文档
justindeng0405 · Sep 30, 2018 · 4f29fb5 · 4f29fb5
2 parents 7a3f373 + 0ccc7a7
commit 4f29fb5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/docs/markdown/changelog.md b/docs/markdown/changelog.md
@@ -7,6 +7,41 @@
 
 <div class="row changelog">
   <div class="at-timeline">
+    <div class="at-timeline__item at-timeline__item--default">
+      <div class="at-timeline__tail"></div>
+      <div class="at-timeline__dot"></div>
+      <div class="at-timeline__content">
+        <p class="head">v1.2.3</p>
+        <p class="time">
+          <span>2018-09-30</span>
+        </p>
+        <ul class="content">
+          <li><span>AtListItem</span> 组件新增 <span>disabled</span> 属性（<a href="https://github.com/NervJS/taro-ui/issues/90">#90</a>）</li>
+          <li>开放 <span>AtButton</span> 小程序开放能力的回调</li>
+          <li>完善声明文件 <span>.d.ts</span></li>
+          <li>修复 <span>AtActionSheet</span> 组件的样式问题（<a href="https://github.com/NervJS/taro-ui/issues/78">#78</a>）</li>
+          <li>修复 <span>style prop</span> 传空时报错的问题（<a href="https://github.com/NervJS/taro-ui/issues/84">#84</a>） </li>
+          <li>修复 <span>AtToast</span> 无法自动关闭的问题</li>
+          <li>修复组件参数报 <span>warning</span> 的问题</li>
+        </ul>
+      </div>
+    </div>
+    <div class="at-timeline__item at-timeline__item--default">
+      <div class="at-timeline__tail"></div>
+      <div class="at-timeline__dot"></div>
+      <div class="at-timeline__content">
+        <p class="head">v1.2.2</p>
+        <p class="time">
+          <span>2018-09-20</span>
+        </p>
+        <ul class="content">
+          <li><span>AtInput</span> 组件添加 <span>name</span> 参数支持</li>
+          <li>修复 <span>AtFlex</span> 无法换行的问题</li>
+          <li>修复 <span>AtToast</span> 组件的遮罩层无效的问题 </li>
+          <li>跳转 <span>AtToast</span> 组件的样式层级 </li>
+        </ul>
+      </div>
+    </div>
     <div class="at-timeline__item at-timeline__item--default">
       <div class="at-timeline__tail"></div>
       <div class="at-timeline__dot"></div>

diff --git a/docs/markdown/introduction.md b/docs/markdown/introduction.md
@@ -13,7 +13,7 @@ Taro 是由 [京东·凹凸实验室](https://aotu.io) 倾力打造的多端开
 ## 特性
 
 - 基于 `Taro` 开发 UI 组件
-- 一套组件可以在 `微信小程序`，`H5`，`ReactNative` 等多端适配运行
+- 一套组件可以在 `微信小程序`，`H5` 等多端适配运行（`ReactNative` 端暂不支持）
 - 提供友好的 API，可灵活的使用组件
 
 ## 体验