Merge remote-tracking branch 'origin/v2'

jd-opensource · Apr 29, 2020 · f634c96 · f634c96
2 parents eda864c + f4b0439
commit f634c96
Show file tree

Hide file tree

Showing 79 changed files with 2,802 additions and 1,035 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,31 @@
+## 2.2.4
+
+`2020-04-29`
+
+- :sparkles: upd(CircleProgress)：新增环形进度条 @layman666
+- :sparkles: upd(Drag)：新增拖拽组件 @zy19940510
+- :sparkles: upd(SideNavBar)：新增侧边栏导航组件 @szg2008
+* :sparkles: upd(ButtonGroup)：优化内部代码，文档优化 @shenqistart
+* :sparkles: upd(Icon)：优化内部代码，文档优化 @linrufeng
+* :sparkles: upd(Uploader)：调整 uploader 上传 form-data 键值顺序 @richard1015
+* :sparkles: upd(InfiniteLoading)：新增 scrollChange、use-capture、use-window 参数，支持固定高度滚动加载 @richard1015
+* :sparkles: upd(Imgpicker)：增加长按时间可配置 @szg2008
+* :sparkles: upd(Stepper)：优化min参数监听问题 @yangxiaolu1993
+* :sparkles: upd(DatePicker)：组件增加秒功能 @irisSong
+* :bug: fix(SearchBar)：修复获取焦点问题 #237 @yangxiaolu1993
+* :bug: fix(Video)：修复视频组件source 数据更新无法切换问题 #234 @vickyYE
+* :bug: fix(Popup)：修复滑动锁定背景部分机型不生效问题 @yangkaixuan
+* :bug: fix(Scroller)：修复组件横向滑动区域,不能上下滑动页面问题 #103 #62 @irisSong
+* :bug: fix(TabSelect)：修复ios下样式问题、多选删除问题，增加isLockBgScroll是否锁定背景滚动配置 @zjyau @dushoujun
+* :zap: doc：新增开发者项目使用案例 @richard1015
+* :zap: doc：修改dialog和textbox文档 @guoxiao158
+
 ## 2.2.3
 
 `2020-04-03`
 
-- :sparkles: upd(Uploader)： 新增 beforeUpload 回调钩子函数、新增selfData自定义增加上传的数据 @linrufeng
-- :bug: fix(Stepper)：关于Tabbar的问题重复点击一个TAB的时候会报错 #231 @zhenyulei
+* :sparkles: upd(Uploader)：新增 beforeUpload 回调钩子函数、新增selfData自定义增加上传的数据 @linrufeng
+* :bug: fix(Stepper)：关于Tabbar的问题重复点击一个TAB的时候会报错 #231 @zhenyulei
 
 ## 2.2.2
 

diff --git a/README-zh_CN.md b/README-zh_CN.md
@@ -57,6 +57,14 @@ https://nutui.jd.com
 * 联系我们：[email protected]
 
 
+## 使用案例
+
+NutUI 已经投入了我们的生产环境中使用，业界也在广泛地使用。
+
+<img src="https://raw.githubusercontent.com/richard1015/nutui-user-cases/master/user-cases.jpg" />
+
+[征集更多优秀案例](https://github.com/richard1015/nutui-user-cases)
+
 ## 开源协议
 
 本项目基于 **MIT** 协议
diff --git a/README.md b/README.md
@@ -57,6 +57,14 @@ Documents：[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutu
 * Contact us：[email protected]
 
 
+## User Cases
+
+NutUI has been put into use in our production environment and is widely used in developing countries at the same time.
+
+<img src="https://raw.githubusercontent.com/richard1015/nutui-user-cases/master/user-cases.jpg" />
+
+[Call for more excellent cases](https://github.com/richard1015/nutui-user-cases)
+
 ## Open Source LICENSE
 
 Based on **MIT** LICENSE
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nutui/nutui",
-    "version": "2.2.3",
+    "version": "2.2.4",
     "description": "一套轻量级移动端Vue组件库",
     "typings": "dist/types/index.d.ts",
     "main": "dist/nutui.js",
@@ -54,6 +54,7 @@
         "intersection-observer": "^0.5.1",
         "os": "^0.1.1",
         "progress-bar-webpack-plugin": "^1.12.1",
+        "vue-qr": "^2.2.1",
         "webpack-build-notifier": "^1.1.1"
     },
     "peerDependencies": {

diff --git a/src/config.json b/src/config.json
@@ -556,13 +556,13 @@
     },
     {
       "version": "1.0.0",
-      "name": "TimeLine",
-      "chnName": "时间轴",
-      "desc": "对一系列数据进行展示，垂直展示",
+      "name": "CircleProgress",
+      "chnName": "圆形进度条",
+      "desc": "显示当前任务的操作进度",
       "type": "component",
-      "sort": "0",
+      "sort": "2",
       "showDemo": true,
-      "author": "yangxiaolu"
+      "author": "zyf"
     },
     {
       "version": "1.0.0",
@@ -573,6 +573,55 @@
       "sort": "0",
       "showDemo": false,
       "author": "yangxiaolu"
+    },
+    {
+      "version": "1.0.0",
+      "name": "TimeLine",
+      "chnName": "时间轴节点",
+      "desc": "定义时间轴节点",
+      "type": "component",
+      "sort": "0",
+      "showDemo": false,
+      "author": "yangxiaolu"
+    },
+    {
+      "version": "1.0.0",
+      "name": "SideNavBar",
+      "chnName": "侧边栏导航",
+      "desc": "侧边栏导航",
+      "type": "component",
+      "sort": "3",
+      "showDemo": true,
+      "author": "szg2008"
+    },
+    {
+      "version": "1.0.0",
+      "name": "SubSideNavBar",
+      "chnName": "侧边栏导航",
+      "desc": "侧边栏导航",
+      "type": "component",
+      "sort": "3",
+      "showDemo": false,
+      "author": "szg2008"
+    },
+    {
+      "version": "1.0.0",
+      "name": "SideNavBarItem",
+      "chnName": "侧边栏导航",
+      "desc": "侧边栏导航",
+      "type": "component",
+      "sort": "3",
+      "showDemo": false,
+      "author": "szg2008"
+    },
+    {
+      "name": "Drag",
+      "chnName": "拖拽",
+      "desc": "实现可拖拽的任意元素",
+      "type": "component",
+      "sort": "5",
+      "showDemo": true,
+      "author": "张宇"
     }
   ]
 }
diff --git a/src/nutui.js b/src/nutui.js
@@ -106,10 +106,20 @@ import Video from "./packages/video/index.js";
 import "./packages/video/video.scss";
 import Signature from "./packages/signature/index.js";
 import "./packages/signature/signature.scss";
+import CircleProgress from "./packages/circleprogress/index.js";
+import "./packages/circleprogress/circleprogress.scss";
 import TimeLine from "./packages/timeline/index.js";
 import "./packages/timeline/timeline.scss";
 import TimeLineItem from "./packages/timelineitem/index.js";
 import "./packages/timelineitem/timelineitem.scss";
+import SideNavBar from "./packages/sidenavbar/index.js";
+import "./packages/sidenavbar/sidenavbar.scss";
+import SubSideNavBar from "./packages/subsidenavbar/index.js";
+import "./packages/subsidenavbar/subsidenavbar.scss";
+import SideNavBarItem from "./packages/sidenavbaritem/index.js";
+import "./packages/sidenavbaritem/sidenavbaritem.scss";
+import Drag from "./packages/drag/index.js";
+import "./packages/drag/drag.scss";
 
 const packages = {
   Cell,
@@ -164,8 +174,13 @@ const packages = {
   LuckDraw: LuckDraw,
   Video: Video,
   Signature: Signature,
+  CircleProgress: CircleProgress,
   TimeLine: TimeLine,
-  TimeLineItem: TimeLineItem
+  TimeLineItem: TimeLineItem,
+  SideNavBar: SideNavBar,
+  SubSideNavBar: SubSideNavBar,
+  SideNavBarItem: SideNavBarItem,
+  Drag: Drag
 };
 
 const components = {};

diff --git a/src/packages/buttongroup/buttongroup.scss b/src/packages/buttongroup/buttongroup.scss
@@ -16,24 +16,7 @@
     }
     &.menu {
         height: $btn-menu-height;
-        font-size: $font-size-small;        
-        .nut-button {
-            position: relative;
-            height: $btn-menu-height;
-            width: 100%;
-            padding: 0;
-            font-size: $btn-icon-height-small;
-        }
-        .txt-icon {
-            display: block;
-            margin: 0 auto;
-            width: $btn-menu-icon-height;
-            height: $btn-menu-icon-height;
-        }
-        .nut-badge {
-            flex: 1;
-            -webkit-flex: 1;
-        }
+        font-size: $font-size-small;
     }
     .nut-button {
         flex: 1;

diff --git a/src/packages/buttongroup/buttongroup.vue b/src/packages/buttongroup/buttongroup.vue
@@ -5,30 +5,24 @@
 </template>
 <script>
 export default {
-    name:'nut-buttongroup',
+    name: "nut-buttongroup",
     props: {
         shape: {
             type: String,
-            default: ''
+            default: ""
         },
         type: {
             type: String,
-            default: ''
-
+            default: ""
         }
     },
     data() {
         return {
-            cls: ''
+            cls: ""
         };
     },
     mounted() {
-        this.initStyle();
-    },
-    methods: {
-        initStyle() {
-            this.cls = `nut-buttongroup ${this.shape} ${this.type}`;
-        }
+        this.cls = `nut-buttongroup ${this.shape} ${this.type}`;
     }
-}
+};
 </script>
diff --git a/src/packages/buttongroup/demo.vue b/src/packages/buttongroup/demo.vue
@@ -1,31 +1,50 @@
 <template>
     <div>
-      <h4>常规按钮组</h4>
-      <nut-buttongroup>
-        <nut-button type="light">重置</nut-button>
-        <nut-button>确定</nut-button>
-      </nut-buttongroup>
-    <h4>圆角按钮组</h4>
-    <nut-buttongroup shape="circle">
-      <nut-button type="light">重置</nut-button>
-      <nut-button>确定</nut-button>
-    </nut-buttongroup>
-    <h4>页面底部功能，配合Badge使用</h4>
-      <nut-buttongroup type="menu">
-        <nut-button type="light" icon="action" color="#000">关于</nut-button>
-        <nut-button type="light" icon="more" color="#000">更多</nut-button>
-        <nut-button type="light" icon="search" color="#000">关闭</nut-button>
-        <nut-badge value="2" top="0.5rem" right="2rem"><nut-button type="light" icon="trolley" color="#f00">购物车</nut-button></nut-badge>      
-        <nut-button type="light" icon="tick" color="#000">成功</nut-button>
-      </nut-buttongroup>
+        <h4>常规按钮组</h4>
+        <nut-buttongroup>
+            <nut-button type="light">重置</nut-button>
+            <nut-button>确定</nut-button>
+        </nut-buttongroup>
+        <h4>圆角按钮组</h4>
+        <nut-buttongroup shape="circle">
+            <nut-button type="light">重置</nut-button>
+            <nut-button>确定</nut-button>
+        </nut-buttongroup>
+        <h4>页面底部功能，配合Badge使用</h4>
+        <nut-buttongroup type="menu">
+            <nut-button type="light" icon="action" color="#000">关于</nut-button>
+            <nut-button type="light" icon="more" color="#000">更多</nut-button>
+            <nut-button type="light" icon="search" color="#000">关闭</nut-button>
+            <nut-badge value="2" top="0.5rem" right="2rem">
+                <nut-button type="light" icon="trolley" color="#f00">购物车</nut-button>
+            </nut-badge>
+            <nut-button type="light" icon="tick" color="#000">成功</nut-button>
+        </nut-buttongroup>
     </div>
 </template>
 
 <script>
-export default {
-};
+export default {};
 </script>
 
 <style lang="scss" scoped>
-
+/deep/.menu {
+    .nut-button {
+        position: relative;
+        height: $btn-menu-height;
+        width: 100%;
+        padding: 0;
+        font-size: $btn-icon-height-small;
+    }
+    .txt-icon {
+        display: block;
+        margin: 0 auto;
+        width: $btn-menu-icon-height;
+        height: $btn-menu-icon-height;
+    }
+    .nut-badge {
+        flex: 1;
+        -webkit-flex: 1;
+    }
+}
 </style>
diff --git a/src/packages/buttongroup/doc.md b/src/packages/buttongroup/doc.md
@@ -83,10 +83,31 @@
   </nut-button>
 </nut-buttongroup>
 ```
+``` style
+/deep/.menu {
+    .nut-button {
+        position: relative;
+        height: $btn-menu-height;
+        width: 100%;
+        padding: 0;
+        font-size: $btn-icon-height-small;
+    }
+    .txt-icon {
+        display: block;
+        margin: 0 auto;
+        width: $btn-menu-icon-height;
+        height: $btn-menu-icon-height;
+    }
+    .nut-badge {
+        flex: 1;
+        -webkit-flex: 1;
+    }
+}
 
+```
 ## Prop
 
-| 字段 | 说明 | 类型 | 默认值
-|----- | ----- | ----- | ----- 
-| shape | 设置按钮组形状，可选值：circle、无 | String | 无
-| type | 设置按钮样式，可选值为：menu、无 | String | 无
+| 字段  | 说明                           | 类型   | 默认值 |
+| ----- | ------------------------------ | ------ | ------ |
+| shape | 设置按钮组形状，可选值：circle | String | 无     |
+| type  | 设置按钮样式，可选值为：menu   | String | 无     |
diff --git a/src/packages/circleprogress/circleprogress.scss b/src/packages/circleprogress/circleprogress.scss
@@ -0,0 +1,9 @@
+.nut-circleprogress{
+    position: relative;
+    .nut-circleprogress-content {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%,-50%);
+    }
+}