Merge branch 'next' of https://github.com/jdf2e/nutui into next

package.json

@@ -49,8 +49,8 @@
     "vue-router": "^4.0.0-rc.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
+    "@commitlint/cli": "^10.0.0",
+    "@commitlint/config-conventional": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
     "@vue/cli-plugin-babel": "~4.5.8",

src/config.js

@@ -303,6 +303,16 @@ module.exports = {
           sort: 14,
           show: true,
           author: 'szg2008'
+        },
+        {
+          version: '3.0.0',
+          name: 'InfiniteLoading',
+          type: 'component',
+          cName: '滚动加载',
+          desc: '列表滚动到底部自动加载更多数据',
+          sort: 15,
+          show: true,
+          author: 'yangxiaolu'
         }
       ]
     },

src/packages/dialog/demo.vue

@@ -263,7 +263,6 @@ export default createDemo({
 </script>
 <style lang="scss">
 .demo-list {
-  padding-top: 100px;
   h4 {
     font-size: 15px;
     padding: 0 16px;

src/packages/infiniteloading/demo.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="demo">
+    <h2>基础用法</h2>
+    <nut-cell>
+      <nut-temp name="wifi"></nut-temp>
+      <nut-temp name="mail" txt="test txt"></nut-temp>
+    </nut-cell>
+  </div>
+</template>
+
+<script lang="ts">
+import { createComponent } from '@/utils/create';
+const { createDemo } = createComponent('infiniteloading');
+export default createDemo({
+  props: {},
+  setup() {
+    return {};
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.nut-temp {
+}
+</style>

src/packages/infiniteloading/doc.md

@@ -0,0 +1,34 @@
+#  infiniteloading组件
+
+    ### 介绍
+    
+    基于 xxxxxxx
+    
+    ### 安装
+    
+    
+    
+    ## 代码演示
+    
+    ### 基础用法1
+    
+
+    
+    ## API
+    
+    ### Props
+    
+    | 参数         | 说明                             | 类型   | 默认值           |
+    |--------------|----------------------------------|--------|------------------|
+    | name         | 图标名称或图片链接               | String | -                |
+    | color        | 图标颜色                         | String | -                |
+    | size         | 图标大小，如 '20px' '2em' '2rem' | String | -                |
+    | class-prefix | 类名前缀，用于使用自定义图标     | String | 'nutui-iconfont' |
+    | tag          | HTML 标签                        | String | 'i'              |
+    
+    ### Events
+    
+    | 事件名 | 说明           | 回调参数     |
+    |--------|----------------|--------------|
+    | click  | 点击图标时触发 | event: Event |
+    

src/packages/infiniteloading/index.scss

@@ -0,0 +1,2 @@
+.nut-infiniteloading {
+}

src/packages/infiniteloading/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <view :class="classes" @click="handleClick">
+    <view>{{ name }}</view>
+    <view>{{ txt }}</view>
+  </view>
+</template>
+<script lang="ts">
+import { toRefs } from 'vue';
+import { createComponent } from '@/utils/create';
+const { componentName, create } = createComponent('infiniteloading');
+
+export default create({
+  props: {
+    name: {
+      type: String,
+      default: ''
+    },
+    txt: {
+      type: String,
+      default: ''
+    }
+  },
+  components: {},
+  emits: ['click'],
+
+  setup(props, { emit }) {
+    console.log('componentName', componentName);
+
+    const { name, txt } = toRefs(props);
+
+    const handleClick = (event: Event) => {
+      emit('click', event);
+    };
+
+    return { name, txt, handleClick };
+  }
+});
+</script>
+
+<style lang="scss">
+@import 'index.scss';
+</style>

src/packages/navbar/demo.vue

@@ -6,7 +6,7 @@
       @on-click-title="title"
       @on-click-send="send"
       title="订单详情"
-      icon="share"
+      icon="share-n"
     ></nut-navbar>
     <nut-navbar
       @on-click-back="back"
@@ -24,7 +24,7 @@
       title="购物车"
       titIcon="locationg3"
       desc="编辑"
-      icon="nut-icon-more1"
+      icon="more-x"
     ></nut-navbar>
 
     <h2>增加tab及右侧按钮</h2>
@@ -46,7 +46,7 @@
       @on-click-clear="edit"
       @on-click-send="list"
       desc="编辑"
-      icon="horizontal"
+      icon="horizontal-n"
     >
     </nut-navbar>
 
@@ -61,7 +61,7 @@
       <template #icons>
         <nut-icon
           class="icon"
-          name="nut-icon-more1"
+          name="more-x"
           @on-click-slot-send="morelist"
         ></nut-icon>
       </template>

src/styles/font/demo_index.html

@@ -31,8 +31,26 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon nutui-iconfont">&#xe6bd;</span>
+                <div class="name">share-n</div>
+                <div class="code-name">&amp;#xe6bd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon nutui-iconfont">&#xe6bc;</span>
+                <div class="name">horizontal-n</div>
+                <div class="code-name">&amp;#xe6bc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon nutui-iconfont">&#xe6bb;</span>
+                <div class="name">more-x</div>
+                <div class="code-name">&amp;#xe6bb;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon nutui-iconfont">&#xe6ba;</span>
-                <div class="name">more</div>
+                <div class="name">more-s</div>
                 <div class="code-name">&amp;#xe6ba;</div>
               </li>
           
@@ -651,11 +669,38 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
-            <span class="icon nutui-iconfont nut-icon-more1"></span>
+            <span class="icon nutui-iconfont nut-icon-share-n"></span>
             <div class="name">
-              more
+              share-n
+            </div>
+            <div class="code-name">.nut-icon-share-n
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon nutui-iconfont nut-icon-horizontal-n"></span>
+            <div class="name">
+              horizontal-n
+            </div>
+            <div class="code-name">.nut-icon-horizontal-n
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon nutui-iconfont nut-icon-more-x"></span>
+            <div class="name">
+              more-x
             </div>
-            <div class="code-name">.nut-icon-more1
+            <div class="code-name">.nut-icon-more-x
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon nutui-iconfont nut-icon-more-s"></span>
+            <div class="name">
+              more-s
+            </div>
+            <div class="code-name">.nut-icon-more-s
             </div>
           </li>
           
@@ -1536,10 +1581,34 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#nut-icon-more1"></use>
+                  <use xlink:href="#nut-icon-share-n"></use>
                 </svg>
-                <div class="name">more</div>
-                <div class="code-name">#nut-icon-more1</div>
+                <div class="name">share-n</div>
+                <div class="code-name">#nut-icon-share-n</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#nut-icon-horizontal-n"></use>
+                </svg>
+                <div class="name">horizontal-n</div>
+                <div class="code-name">#nut-icon-horizontal-n</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#nut-icon-more-x"></use>
+                </svg>
+                <div class="name">more-x</div>
+                <div class="code-name">#nut-icon-more-x</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#nut-icon-more-s"></use>
+                </svg>
+                <div class="name">more-s</div>
+                <div class="code-name">#nut-icon-more-s</div>
             </li>
           
             <li class="dib">

src/styles/font/iconfont.json

@@ -6,9 +6,30 @@
   "description": "nutui 3.0字体管理",
   "glyphs": [
     {
-      "icon_id": "19531928",
-      "name": "more",
-      "font_class": "more1",
+      "icon_id": "19593347",
+      "name": "share-n",
+      "font_class": "share-n",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+    {
+      "icon_id": "19593318",
+      "name": "horizontal-n",
+      "font_class": "horizontal-n",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+    {
+      "icon_id": "19589181",
+      "name": "more-x",
+      "font_class": "more-x",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+    {
+      "icon_id": "19576313",
+      "name": "more-s",
+      "font_class": "more-s",
       "unicode": "e6ba",
       "unicode_decimal": 59066
     },