Merge remote-tracking branch 'origin/v2'

.eslintrc.js

@@ -1,11 +1,8 @@
 module.exports = {
-    extends: [
-        'plugin:vue/essential'
-    ],
-    rules: {
-    },
-    parserOptions: {
-        parser: "babel-eslint",
-        ecmaVersion: 2017
-    }
-}
+  extends: ['plugin:vue/essential'],
+  rules: {},
+  parserOptions: {
+    parser: 'babel-eslint',
+    ecmaVersion: 2017
+  }
+};

.gitignore

@@ -4,8 +4,8 @@ dist/
 npm-debug.log
 yarn-error.log
 .nyc_output/
-.vscode/
 coverage/
+.vscode/
 sites/doc/view
 sites/doc/page
 package-lock.json
@@ -17,3 +17,8 @@ localdocs.cache
 cache/src.cache
 cache/mdToVue.cache
 cache/docs.cache
+lib/plugin/cli/dist_cli/
+lib/plugin/cli/site/doc/view/
+lib/plugin/cli/site/doc/page/
+yarn.lock
+/test_script

.postcssrc.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "plugins": {
-    "postcss-import": {},
-    "postcss-url": {},
-    "autoprefixer": {}
+  plugins: {
+    'postcss-import': {},
+    'postcss-url': {},
+    autoprefixer: {}
   }
-}
+};

.prettierignore

@@ -0,0 +1,11 @@
+**/*.html
+**/*.txt
+**/*.md
+**/*.svg
+**/*.ttf
+**/*.woff
+**/*.eot
+package.json
+lib/plugin/cli/site/doc/page
+lib/plugin/cli/site/doc/view
+node_modules

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "singleQuote": true,
+  "semi": true,
+  "bracketSpacing": true,
+  "tabWidth": 2,
+  "printWidth": 150,
+  "useTabs": false,
+  "htmlWhitespaceSensitivity": "strict"
+}

.travis.yml

@@ -4,4 +4,4 @@ node_js:
   - '10'
 script:
   - npm test
-  - npm run coveralls
+  - npm run coveralls

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`

babel.config.js

@@ -0,0 +1,22 @@
+const presets = [
+  [
+    '@babel/preset-env',
+    {
+      loose: false,
+      modules: false,
+      targets: {
+        browsers: ['Android >= 4', 'iOS >= 8']
+      }
+    }
+  ]
+];
+
+const plugins = [
+  '@babel/plugin-transform-runtime',
+  '@babel/plugin-syntax-dynamic-import',
+  '@babel/plugin-proposal-object-rest-spread',
+  '@babel/plugin-transform-object-assign',
+  'istanbul'
+];
+
+module.exports = { presets, plugins };