提交 8271f13a 编写于 作者: D Drjingfubo

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

......@@ -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'
}
]
},
......
......@@ -263,7 +263,6 @@ export default createDemo({
</script>
<style lang="scss">
.demo-list {
padding-top: 100px;
h4 {
font-size: 15px;
padding: 0 16px;
......
<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>
# 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 |
\ No newline at end of file
<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>
......@@ -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>
......
......@@ -30,9 +30,27 @@
<div class="content unicode" style="display: block;">
<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">
......
此差异已折叠。
因为 它太大了无法显示 source diff 。你可以改为 查看blob
......@@ -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
},
......
......@@ -20,7 +20,16 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="more1" unicode="&#59066;" d="M176 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0zM456 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0zM736 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0z" horiz-adv-x="1024" />
<glyph glyph-name="share-n" unicode="&#59069;" d="M744.727273-96.969697H279.272727c-155.151515 0-279.272727 124.121212-279.272727 279.272727V585.69697c0 155.151515 124.121212 279.272727 279.272727 279.272727h108.606061c24.824242 0 46.545455-21.721212 46.545454-46.545455S412.70303 771.878788 387.878788 771.878788H279.272727c-102.4 0-186.181818-83.781818-186.181818-186.181818v-403.39394c0-102.4 83.781818-186.181818 186.181818-186.181818h465.454546c102.4 0 186.181818 83.781818 186.181818 186.181818V582.593939c0 24.824242 21.721212 46.545455 46.545454 46.545455s46.545455-21.721212 46.545455-46.545455V182.30303c0-155.151515-124.121212-279.272727-279.272727-279.272727z m170.666666 868.848485h-248.242424c-24.824242 0-46.545455 21.721212-46.545454 46.545454S642.327273 864.969697 667.151515 864.969697h248.242424c24.824242 0 46.545455-21.721212 46.545455-46.545455S940.218182 771.878788 915.393939 771.878788zM515.10303 275.393939h-9.309091c-24.824242 6.206061-40.339394 27.927273-37.236363 55.854546 43.442424 232.727273 201.69697 425.115152 428.218182 530.618182 24.824242 9.309091 49.648485 0 62.060606-21.721212 9.309091-24.824242 0-49.648485-21.721212-62.060607-201.69697-93.090909-338.230303-260.654545-378.569697-465.454545-3.10303-21.721212-21.721212-37.236364-43.442425-37.236364z" horiz-adv-x="1024" />
<glyph glyph-name="horizontal-n" unicode="&#59068;" d="M977.454545 771.878788h-930.90909C21.721212 771.878788 0 793.6 0 818.424242S21.721212 864.969697 46.545455 864.969697h930.90909c24.824242 0 46.545455-21.721212 46.545455-46.545455S1002.278788 771.878788 977.454545 771.878788zM977.454545-96.969697h-930.90909C21.721212-96.969697 0-75.248485 0-50.424242S21.721212-3.878788 46.545455-3.878788h930.90909c24.824242 0 46.545455-21.721212 46.545455-46.545454s-21.721212-46.545455-46.545455-46.545455zM977.454545 337.454545h-620.60606c-24.824242 0-46.545455 21.721212-46.545455 46.545455s21.721212 46.545455 46.545455 46.545455h620.60606c24.824242 0 46.545455-21.721212 46.545455-46.545455s-21.721212-46.545455-46.545455-46.545455z" horiz-adv-x="1024" />
<glyph glyph-name="more-x" unicode="&#59067;" d="M937.115152 467.781818c-43.442424 0-80.678788-37.236364-80.678788-80.678788s37.236364-80.678788 80.678788-80.678788c43.442424 0 80.678788 37.236364 80.678787 80.678788s-34.133333 80.678788-80.678787 80.678788M508.89697 520.5333330000001c-74.472727 0-133.430303-58.957576-133.430303-133.430303s58.957576-133.430303 133.430303-133.430303 133.430303 58.957576 133.430303 133.430303-58.957576 133.430303-133.430303 133.430303M83.781818 467.781818C40.339394 467.781818 3.10303 430.545455 3.10303 387.10303S37.236364 306.42424200000005 83.781818 306.42424200000005s80.678788 37.236364 80.678788 80.678788-37.236364 80.678788-80.678788 80.678788" horiz-adv-x="1024" />
<glyph glyph-name="more-s" unicode="&#59066;" d="M176 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0zM456 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0zM736 385a56 56 0 1 1 112 0 56 56 0 1 1-112 0z" horiz-adv-x="1024" />
<glyph glyph-name="star-fill1" unicode="&#59064;" d="M908.1 542.9l-253.9 36.9L540.7 809.9c-3.1 6.3-8.2 11.4-14.5 14.5-15.8 7.8-35 1.3-42.9-14.5L369.8 579.8l-253.9-36.9c-7-1-13.4-4.3-18.3-9.3-12.3-12.7-12.1-32.9 0.6-45.3l183.7-179.1-43.4-252.9c-1.2-6.9-0.1-14.1 3.2-20.3 8.2-15.6 27.6-21.7 43.2-13.4L512 142l227.1-119.4c6.2-3.3 13.4-4.4 20.3-3.2 17.4 3 29.1 19.5 26.1 36.9l-43.4 252.9 183.7 179.1c5 4.9 8.3 11.3 9.3 18.3 2.7 17.5-9.5 33.7-27 36.3z" horiz-adv-x="1024" />
......@@ -206,7 +215,7 @@ Created by iconfont
<glyph glyph-name="refresh2" unicode="&#59010;" d="M771.938462 580.923077H971.487179l-13.128205-154.912821-199.548718 105.025641c-13.128205 7.876923-18.379487 23.630769-10.502564 36.758975 2.625641 7.876923 13.128205 13.128205 23.63077 13.128205zM236.307692 187.076923H44.635897l13.128206 154.912821 191.671794-105.025641c13.128205-7.876923 18.379487-23.630769 10.502565-36.758975-5.251282-7.876923-15.753846-13.128205-23.63077-13.128205zM509.374359-128C257.312821-128 44.635897 50.54359 5.251282 299.979487c-5.251282 21.005128 10.502564 39.384615 31.507692 44.635898 21.005128 2.625641 42.010256-10.502564 44.635898-31.507693 34.133333-210.051282 215.302564-362.338462 427.979487-362.338461 191.671795 0 362.338462 128.65641 417.476923 312.451282 5.251282 21.005128 28.882051 34.133333 49.88718 26.25641 21.005128-5.251282 34.133333-28.882051 26.25641-49.887179-65.641026-215.302564-267.815385-367.589744-493.620513-367.589744z m467.364103 551.384615c-18.379487 0-36.758974 13.128205-39.384616 34.133334C903.220513 664.94359 722.051282 817.230769 509.374359 817.230769 317.702564 817.230769 147.035897 688.574359 94.523077 504.779487c-5.251282-21.005128-28.882051-34.133333-49.88718-26.25641-21.005128 5.251282-34.133333 28.882051-26.25641 49.887179C81.394872 743.712821 283.569231 896 509.374359 896 761.435897 896 974.112821 717.45641 1013.497436 468.020513c2.625641-21.005128-10.502564-42.010256-31.507692-44.635898h-5.251282z" horiz-adv-x="1024" />
<glyph glyph-name="horizontal" unicode="&#59001;" d="M1040.516129 796.903226h-990.967742C23.122581 796.903226 0 820.025806 0 846.451613S23.122581 896 49.548387 896h990.967742c26.425806 0 49.548387-23.122581 49.548387-49.548387S1066.941935 796.903226 1040.516129 796.903226zM1040.516129-128h-990.967742C23.122581-128 0-104.877419 0-78.451613S23.122581-28.903226 49.548387-28.903226h990.967742c26.425806 0 49.548387-23.122581 49.548387-49.548387s-23.122581-49.548387-49.548387-49.548387zM1040.516129 334.451613h-660.645161c-26.425806 0-49.548387 23.122581-49.548387 49.548387s23.122581 49.548387 49.548387 49.548387h660.645161c26.425806 0 49.548387-23.122581 49.548387-49.548387s-23.122581-49.548387-49.548387-49.548387z" horiz-adv-x="1090" />
<glyph glyph-name="horizontal" unicode="&#59001;" d="M977.454545 771.878788h-930.90909C21.721212 771.878788 0 793.6 0 818.424242S21.721212 864.969697 46.545455 864.969697h930.90909c24.824242 0 46.545455-21.721212 46.545455-46.545455S1002.278788 771.878788 977.454545 771.878788zM977.454545-96.969697h-930.90909C21.721212-96.969697 0-75.24848499999996 0-50.42424200000005S21.721212-3.878787999999986 46.545455-3.878787999999986h930.90909c24.824242 0 46.545455-21.721212 46.545455-46.545454s-21.721212-46.545455-46.545455-46.545455zM977.454545 337.45454500000005h-620.60606c-24.824242 0-46.545455 21.721212-46.545455 46.545455s21.721212 46.545455 46.545455 46.545455h620.60606c24.824242 0 46.545455-21.721212 46.545455-46.545455s-21.721212-46.545455-46.545455-46.545455z" horiz-adv-x="1090" />
<glyph glyph-name="date" unicode="&#59002;" d="M774.918919-128H249.081081c-138.378378 0-249.081081 110.702703-249.081081 249.081081V591.567568c0 138.378378 110.702703 249.081081 249.081081 249.081081h525.837838c138.378378 0 249.081081-110.702703 249.081081-249.081081v-470.486487c0-138.378378-110.702703-249.081081-249.081081-249.081081zM249.081081 757.621622c-91.32973 0-166.054054-74.724324-166.054054-166.054054v-470.486487c0-91.32973 74.724324-166.054054 166.054054-166.054054h525.837838c91.32973 0 166.054054 74.724324 166.054054 166.054054V591.567568c0 91.32973-74.724324 166.054054-166.054054 166.054054H249.081081zM968.648649 453.189189H41.513514C19.372973 453.189189 0 472.562162 0 494.702703S19.372973 536.216216 41.513514 536.216216H968.648649c22.140541 0 41.513514-19.372973 41.513513-41.513513S990.789189 453.189189 968.648649 453.189189zM595.027027 176.432432h-166.054054c-22.140541 0-41.513514 19.372973-41.513514 41.513514s19.372973 41.513514 41.513514 41.513513h166.054054c22.140541 0 41.513514-19.372973 41.513514-41.513513s-19.372973-41.513514-41.513514-41.513514zM332.108108 702.27027c-22.140541 0-41.513514 19.372973-41.513513 41.513514v110.702702c0 22.140541 19.372973 41.513514 41.513513 41.513514s41.513514-19.372973 41.513514-41.513514v-110.702702c0-22.140541-19.372973-41.513514-41.513514-41.513514zM664.216216 702.27027c-22.140541 0-41.513514 19.372973-41.513513 41.513514v110.702702c0 22.140541 19.372973 41.513514 41.513513 41.513514s41.513514-19.372973 41.513514-41.513514v-110.702702c0-22.140541-19.372973-41.513514-41.513514-41.513514z" horiz-adv-x="1024" />
......@@ -275,7 +284,7 @@ Created by iconfont
<glyph glyph-name="search" unicode="&#58979;" d="M512-128C231.131429-128 0 103.131429 0 384S231.131429 896 512 896 1024 664.868571 1024 384 792.868571-128 512-128z m0 936.228571C277.942857 808.228571 87.771429 618.057143 87.771429 384S277.942857-40.228571 512-40.228571 936.228571 149.942857 936.228571 384 746.057143 808.228571 512 808.228571zM980.114286-128c-11.702857 0-23.405714 2.925714-32.182857 11.702857l-117.028572 117.028572c-17.554286 17.554286-17.554286 43.885714 0 61.44s43.885714 17.554286 61.44 0l117.028572-117.028572c17.554286-17.554286 17.554286-43.885714 0-61.44-5.851429-8.777143-17.554286-11.702857-29.257143-11.702857z" horiz-adv-x="1024" />
<glyph glyph-name="share" unicode="&#58980;" d="M792.369318-128H297.138494c-165.076941 0-297.138494 132.061553-297.138494 297.138494V598.338542c0 165.076941 132.061553 297.138494 297.138494 297.138494h115.553859c26.412311 0 49.523082-23.110772 49.523083-49.523082S439.104664 796.430871 412.692353 796.430871H297.138494C188.187713 796.430871 99.046165 707.289323 99.046165 598.338542v-429.200048c0-108.950781 89.141548-198.09233 198.092329-198.092329h495.230824c108.950781 0 198.09233 89.141548 198.09233 198.092329V595.037003c0 26.412311 23.110772 49.523082 49.523082 49.523082s49.523082-23.110772 49.523083-49.523082V169.138494c0-165.076941-132.061553-297.138494-297.138495-297.138494z m181.584636 924.430871h-264.123106c-26.412311 0-49.523082 23.110772-49.523083 49.523083S683.418537 895.477036 709.830848 895.477036h264.123106c26.412311 0 49.523082-23.110772 49.523082-49.523082S1000.366264 796.430871 973.953954 796.430871zM548.055445 268.184659h-9.904616c-26.412311 6.603078-42.920005 29.713849-39.618466 59.427699C544.753906 575.22777 713.132387 779.923177 954.144721 892.175497c26.412311 9.904616 52.824621 0 66.030776-23.110771 9.904616-26.412311 0-52.824621-23.110771-66.030777-214.600024-99.046165-359.867732-277.329261-402.787737-495.230824-3.301539-23.110772-23.110772-39.618466-46.221544-39.618466z" horiz-adv-x="1090" />
<glyph glyph-name="share" unicode="&#58980;" d="M744.727273-96.969697H279.272727c-155.151515 0-279.272727 124.121212-279.272727 279.272727V585.69697c0 155.151515 124.121212 279.272727 279.272727 279.272727h108.606061c24.824242 0 46.545455-21.721212 46.545454-46.545455S412.70303 771.878788 387.878788 771.878788H279.272727c-102.4 0-186.181818-83.781818-186.181818-186.181818v-403.39394c0-102.4 83.781818-186.181818 186.181818-186.181818h465.454546c102.4 0 186.181818 83.781818 186.181818 186.181818V582.593939c0 24.824242 21.721212 46.545455 46.545454 46.545455s46.545455-21.721212 46.545455-46.545455V182.30303000000004c0-155.151515-124.121212-279.272727-279.272727-279.272727z m170.666666 868.848485h-248.242424c-24.824242 0-46.545455 21.721212-46.545454 46.545454S642.327273 864.969697 667.151515 864.969697h248.242424c24.824242 0 46.545455-21.721212 46.545455-46.545455S940.218182 771.878788 915.393939 771.878788zM515.10303 275.39393900000005h-9.309091c-24.824242 6.206061-40.339394 27.927273-37.236363 55.854546 43.442424 232.727273 201.69697 425.115152 428.218182 530.618182 24.824242 9.309091 49.648485 0 62.060606-21.721212 9.309091-24.824242 0-49.648485-21.721212-62.060607-201.69697-93.090909-338.230303-260.654545-378.569697-465.454545-3.10303-21.721212-21.721212-37.236364-43.442425-37.236364z" horiz-adv-x="1090" />
<glyph glyph-name="follow" unicode="&#58981;" d="M1120.193939 529.842424h-93.090909c0 136.533333-111.709091 245.139394-245.139394 245.139394-65.163636 0-124.121212-24.824242-170.666666-68.266666l-3.103031-3.103031c-24.824242-24.824242-65.163636-24.824242-89.987878 0l-6.206061 6.206061c-46.545455 43.442424-105.50303 68.266667-170.666667 68.266666C204.8 778.084848 96.193939 666.375758 96.193939 532.945455H3.10303C3.10303 719.127273 155.151515 871.175758 341.333333 871.175758c80.678788 0 158.254545-27.927273 220.315152-80.678788C623.709091 843.248485 701.284848 871.175758 781.963636 871.175758c186.181818-3.10303 338.230303-155.151515 338.230303-341.333334zM89.987879 250.569697c-3.10303 6.206061-9.309091 12.412121-12.412121 18.618182-49.648485 77.575758-77.575758 167.563636-77.575758 260.654545h93.090909c0-74.472727 21.721212-148.945455 62.060606-211.00606 3.10303-6.206061 6.206061-9.309091 9.309091-12.412122l-74.472727-55.854545z m946.424242 6.206061l-77.575757 52.751515c43.442424 65.163636 68.266667 142.739394 68.266666 220.315151h93.090909c0-99.29697-27.927273-192.387879-83.781818-273.066666zM561.648485-118.690909c-9.309091 0-21.721212 3.10303-31.030303 6.206061-9.309091 3.10303-15.515152 6.206061-18.618182 9.30909-173.769697 77.575758-319.612121 201.69697-425.115152 359.951516l77.575758 52.751515c96.193939-142.739394 229.624242-257.551515 387.878788-325.818182l3.10303-3.10303s3.10303-3.10303 6.206061-3.103031l12.412121 6.206061c155.151515 71.369697 288.581818 183.078788 384.775758 328.921212l77.575757-52.751515c-105.50303-158.254545-251.345455-282.375758-425.115151-363.054546l-18.618182-9.30909c-9.309091-3.10303-21.721212-6.206061-31.030303-6.206061z" horiz-adv-x="1120" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册