Merge remote-tracking branch 'origin/v2'

jd-opensource · Aug 19, 2020 · c7a879d · c7a879d
2 parents 58e1eec + cac5232
commit c7a879d
Show file tree

Hide file tree

Showing 34 changed files with 994 additions and 628 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,6 +31,6 @@ assignees: ''
 ## 相关环境信息
 - **操作系统**：
 - **Node 版本**：
-- **NutUI 版本**：
+- **NutUI 版本**： @nutui/nutui@2.x.x  or @nutui/nutui-jdl@1.x.x
 - **Vue 版本**：
 - **引用方式**：  CDN / NPM ？
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 2.2.9
+
+`2020-08-19`
+
+* :sparkles: upd(Tab)：title支持slot和badge #307 @weiquanju
+* :sparkles: upd(Popup)：新增组合弹框 @yangkaixuan
+* :bug: fix(Countup)：样式修复 @Ymm0008
+* :bug: fix(Switch)：修复 demo 文字不居中问题 @szg2008
+* :bug: fix(Range)：区间选择器滑动异常 @undo03
+* :bug: fix(Picker)：更新 demo 和 doc 文档 @irisSong
+* :bug: fix(Toast)：props 新增 coverClass、coverStyle @yangkaixuan
+* :bug: fix(Swiper)：销毁钩子内计时器清空无效 #262 @richard1015
+* :bug: fix(TextBox)： 修复 demo 示例问题 @guoxiao158
+* :bug: fix(Signature)： 修复的leave事件 @guoxiao158
+* :bug: fix(Stepper)：修复 demo 加减精度问题 @layman666
+* :bug: fix(Cell)：修复 demo 示例头像不居中问题 #295 @zhenyulei
+* :zap: doc：ActionSheet、start article 文档修改 @richard1015 @weiquanju
+
 ## 2.2.8
 
 `2020-07-28`

diff --git a/docs/design.md b/docs/design.md
@@ -9,6 +9,11 @@
 <ul class="article">
 <li>
 
+#### [NutUI 落地实践-让组件库服务慧采协同采购业务](https://jelly.jd.com/article/5f30a8ca645f82014b842b81)  
+<img width="300" src="https://img13.360buyimg.com/ling/jfs/t1/119128/31/14648/534724/5f30b5c3E97731164/b21b7e1e705dd451.png" />
+</li>
+<li>
+
 #### [NutUI 实战--持续升级企业业务之福礼](https://jelly.jd.com/article/5f10308affb8ec014f4f326a)  
 <img width="300" src="https://img30.360buyimg.com/ling/jfs/t1/112680/27/12443/129918/5f10250aEe0c7f88c/8a1c85b3868cf4be.jpg" />
 </li>
@@ -69,3 +74,17 @@
 <img width="300" src="https://img20.360buyimg.com/ling/jfs/t1/19888/36/7120/143703/5c662dcaE11bb07d2/d0f2315dd7228b08.jpg" />
 </li>
 </ul>
+
+# 社区文章
+
+#### [NutUI - 由京东出品，适合快速开发商城类h5、小程序的移动端 UI 组件库](https://zhuanlan.zhihu.com/p/161724686)  
+
+#### [Vue 组件库工程探索与实践——按需加载篇](https://www.jianshu.com/p/a07b1f699c0e)  
+
+#### [读京东 NutUI 框架总结（1）](https://www.jianshu.com/p/a07b1f699c0e)  
+
+#### [Vue 使用 Vant 实现 Tab 切换，使用 NutUI 实现上拉加载下拉刷新](https://baijiahao.baidu.com/s?id=1666288392408654024&wfr=spider&for=pc)  
+
+#### [Vue 引入 NutUI](https://www.cnblogs.com/fqh123/p/12066828.html)
+
+#### [NutUI 上拉刷新下拉加载的使用](https://www.cnblogs.com/fqh123/p/12152981.html)
diff --git a/docs/start.md b/docs/start.md
@@ -157,7 +157,7 @@ npm i @nutui/babel-plugin-separate-import -D
 {
   "plugins": [
     ["@nutui/babel-plugin-separate-import", {
-        "style": "css"
+        "style": "scss"
     }]
   ]
 }
@@ -173,7 +173,7 @@ import { Dialog,Picker } from '@nutui/nutui';
 Dialog.install(Vue);
 Picker.install(Vue);
 ```
-如果需要按需加载 scss 文件（如需要自定义主题）时，除了需要把 style 选项值设为为 **scss** 外，还需要修改 webpack 配置文件的 sass-loader 配置，如下所示：
+如果需要按需加载 scss 文件（如需要自定义主题）时，除了需要把 style 选项值设为 **scss** 外，还需要修改 webpack 配置文件的 sass-loader 配置，如下所示：
 
 ``` bash
 {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "一套轻量级移动端Vue组件库",
   "typings": "dist/types/index.d.ts",
   "main": "dist/nutui.js",
@@ -56,7 +56,6 @@
     "babel-plugin-istanbul": "^6.0.0",
     "gsap": "^3.2.6",
     "hammerjs": "^2.0.8",
-    "husky": "^3.0.0",
     "vue-lazyload": "^1.3.3",
     "vue-qr": "^2.2.1"
   },
@@ -66,13 +65,14 @@
   "devDependencies": {
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
-    "@nutui/cli": "^0.3.6",
+    "@nutui/cli": "^0.3.8",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-vue": "^6.1.2",
     "lint-staged": "^10.2.11",
+    "husky": "^3.0.0",
     "stylelint-config-standard": "^19.0.0"
   },
   "nyc": {

diff --git a/src/assets/img/QQ-friends-icon.png b/src/assets/img/QQ-friends-icon.png
diff --git a/src/assets/img/circle-friends-icon.png b/src/assets/img/circle-friends-icon.png
diff --git a/src/assets/img/wechat-icon.png b/src/assets/img/wechat-icon.png
diff --git a/src/packages/actionsheet/doc.md b/src/packages/actionsheet/doc.md
@@ -189,7 +189,7 @@ export default {
     chooseTagValue="确定"
     cancelTxt="取消"
     @close="switchActionSheet"
-    @choos="choose"
+    @choose="choose"
 >
     <span slot="title"><label>确定删除吗？</label></span>
     <span slot="sub-title">删除之后不能，描述信息，删除之后不能，描述信息</span>

diff --git a/src/packages/address/doc.md b/src/packages/address/doc.md
@@ -1,5 +1,7 @@
 # Address 地址选择
 
+> 按需加载请加载对应依赖组件 Icon Popup
+
 ## 选择自定义地址
 
 ```html

diff --git a/src/packages/cell/demo.vue b/src/packages/cell/demo.vue
@@ -15,7 +15,7 @@
         <nut-icon type="tick" slot="icon" size="15px" color="#848484"></nut-icon>
       </nut-cell>
       <nut-cell :show-icon="true" title="我是标题" sub-title="我是副标题" desc="展示默认ICON">
-        <div slot="avatar"><nut-avatar></nut-avatar></div>
+        <nut-avatar slot="avatar"></nut-avatar>
       </nut-cell>
     </div>
   </div>

diff --git a/src/packages/countup/countup.scss b/src/packages/countup/countup.scss
@@ -9,14 +9,15 @@
     margin: 0 auto;
     padding: 0;
     overflow: hidden;
-    height: 50px;
-    line-height: 50px;
+    // height: 50px;
+    // line-height: 50px;
     text-align: center;
     font-weight: bold;
     position: relative;
     li {
       position: absolute;
       transition: none;
+      list-style: none;
       // transition: all linear .1s;
       // animation: myMove 1s linear infinite;
       // animation-fill-mode: forwards;

diff --git a/src/packages/countup/countup.vue b/src/packages/countup/countup.vue
@@ -49,7 +49,7 @@
       </template>
     </template>
     <template v-else>
-      <ul v-if="scrolling" class="run-number" :style="{ height: numHeight + 'px' }">
+      <ul v-if="scrolling" class="run-number" :style="{ height: numHeight + 'px', lineHeight: numHeight + 'px' }">
         <li
           ref="numberItem"
           v-for="(val, index) of num_total_len"

diff --git a/src/packages/countup/demo.vue b/src/packages/countup/demo.vue
@@ -33,7 +33,7 @@
       >
       </nut-countup>
       <nut-button @click="startRole" :disabled="startFlag">抽奖</nut-button>
-      <nut-button @click="startRole2" :disabled="startFlag2">不中奖</nut-button>
+      <nut-button @click="startRole2" :disabled="startFlag">不中奖</nut-button>
     </div>
   </div>
 </template>
@@ -70,15 +70,15 @@ export default {
     startRole2() {
       this.prizeLevel = -1;
       console.log(this.prizeLevel, '不中奖');
-      this.startFlag2 = true;
+      this.startFlag = true;
       setTimeout(() => {
         this.$refs['countup-machine'].machineLuck();
       }, 500);
     },
     scrollAniEnd(val) {
       this.$toast.text(val ? '恭喜中奖！！！' : '很遗憾！没有中奖');
       setTimeout(() => {
-        val ? (this.startFlag = false) : (this.startFlag2 = false);
+        this.startFlag = false;
       }, 300);
     }
   },