Merge branch 'v2-dev' of https://github.com/jdf2e/nutui into v2-dev

Author: shenqistart

CHANGELOG.md

@@ -1,3 +1,23 @@
+## 2.2.6
+
+`2020-06-19`
+
+* :sparkles: feat(CountUp)：新增数字滚动组件 @Ymm0008
+* :sparkles: upd(LuckDraw)：优化抽奖组件，增加单独设置颜色区块、奖品列表 @Ymm0008
+* :sparkles: upd(Uploader)：优化内部代码 @linrufeng
+* :sparkles: upd(LeftSlip)：新增禁用属性 @vickyYE
+* :sparkles: upd(Popup)：z-index层级处理、禁止滑动逻辑优化、测试用例补充 @yangkaixuan
+* :sparkles: upd(TabBar)：优化默认选中页签激活状态 @zhenyulei
+* :sparkles: upd(Tabs)：新增滚动居中功能 @zhenyulei
+* :bug: fix(Uploader)：修复文件上传组件可以调用移动端摄像头 #212 @linrufeng
+* :bug: fix(SearchBar)：修复 input 边框样式 @yangxiaolu1993
+* :bug: fix(TextBox)： 修复 输入时 waring @guoxiao158
+* :bug: fix(SubSideNavBar)：修复 offset 计算错误问题 @szg2008
+* :bug: fix(ImagePicker)：修复 多张上传触发多次emit的问题 @szg2008
+* :bug: fix(Swiper)：销毁钩子内计时器清空无效 #262 @richard1015
+* :bug: fix(Calendar)：增加监听默认值修改功能 @irisSong
+* :bug: fix(Switch)：新增内嵌文字标签,如ON|OFF或开|关 @zjyau
+
 ## 2.2.5
 
 `2020-05-25`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "一套轻量级移动端Vue组件库",
   "typings": "dist/types/index.d.ts",
   "main": "dist/nutui.js",
@@ -48,7 +48,7 @@
     "@babel/plugin-transform-runtime": "^7.9.6",
     "@commitlint/cli": "^8.0.0",
     "@commitlint/config-conventional": "^8.0.0",
-    "@nutui/cli": "^0.2.1",
+    "@nutui/cli": "^0.2.2",
     "babel-plugin-istanbul": "^6.0.0",
     "gsap": "^3.2.6",
     "husky": "^3.0.0",
@@ -79,4 +79,4 @@
     "instrument": false,
     "sourceMap": false
   }
-}
+}

src/config.json

@@ -642,6 +642,15 @@
       "sort": "2",
       "showDemo": true,
       "author": "wangyue217"
+    },
+    {
+      "name": "CountUp",
+      "type": "component",
+      "chnName": "数字滚动",
+      "desc": "用于数据展示",
+      "sort": "0",
+      "showDemo": true,
+      "author": "yumingming"
     }
   ]
 }

src/nutui.js

@@ -126,6 +126,8 @@ import Address from './packages/address/index.js';
 import './packages/address/address.scss';
 import Notify from "./packages/notify/index.js";
 import "./packages/notify/notify.scss";
+import CountUp from "./packages/countup/index.js";
+import "./packages/countup/countup.scss";
 
 const packages = {
   Cell,
@@ -188,7 +190,8 @@ const packages = {
   SideNavBarItem: SideNavBarItem,
   Drag: Drag,
   Address: Address,
-  Notify: Notify
+  Notify: Notify,
+  CountUp: CountUp
 };
 
 const components = {};

src/packages/countup/countup.scss

@@ -0,0 +1,50 @@
+.nut-countup{
+    display:inline-block;
+    width: 100%;
+    padding:5px;
+    color: #000;
+	font-weight:bold;
+	// text-align:center;
+    .run-number{
+        margin: 0 auto;
+        padding: 0;
+        overflow: hidden;
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+        font-weight: bold;
+        position: relative;
+        li {
+            position: absolute;
+            transition: none;
+            // transition: all linear .1s;
+            // animation: myMove 1s linear infinite;
+            // animation-fill-mode: forwards;
+            // @keyframes myMove {
+            //     0% {
+            //       transform: translateY(0);
+            //     }
+            //     100% {
+            //       transform: translateY(-50px);
+            //     }
+            // }
+            span {
+                display: block;
+            }
+        }
+    }
+    .pointstyl {
+        position: absolute;
+        display: block;
+    }
+    .run-number-img {
+        position: relative;
+        li {
+            position: absolute;
+            transition: none;
+            display: inline-block;
+            background-position: 0 0;
+            background-repeat: no-repeat;
+        }
+    }
+}