Skip to content

Commit 9347bc5

Browse files
yangxiaolu1993richard1015Ymm0008wlchnDrjingfubo
authored
feat: infiniteloading 与 NoticeBar 进行国际化修改 (#1246)
* feat: 冲突解决 (#2) * fix(uploader): taro h5 env upload error #1096 * fix: taro 3.4.6 sass calc error #1200 * fix(uploader): taro env formdata type error * chore: add international components signature * chore: add international components ecard * chore: add international components timeselect * chore: add international components sku * fix: demo textarea 自适应 (#1201) * feat: add translations chinese traditional * docs: open international * fix: input show-word-limit default false (#1203) * refactor(circleprogress): add features (#1204) * fix(popup): 修复popup在Taro转H5下的渲染问题 * feat: avatar能力补齐、input doc文档更新 (#1195) * fix: 修改input单元测试 * fix: 增加avatar group * fix: 更新input md * fix: avatar能力补齐 * fix: avatar能力补齐、适配taro * feat: 迁移 AddressList、Category 组件,适配taro * fix: 修改input md Co-authored-by: richard1015 <[email protected]> * chore: add international components addresslist Co-authored-by: richard1015 <[email protected]> Co-authored-by: Ymm <[email protected]> Co-authored-by: Lei Wang <[email protected]> Co-authored-by: Drjingfubo <[email protected]> Co-authored-by: suzigang <[email protected]> Co-authored-by: ailululu <[email protected]> * feat: picker与DatePicker新增slot插槽 * fix: datepicker 问题修改 * fix: infiniteloading issue 问题修改(#1189) * fix: countdown 问题修改 * feat: 冲突解决 * feat: 初版 * feat: countdown 单元测试 * feat: 文档补齐 * fix: datepicker 初始化时平铺展示 bug 修改 * feat: git action 增加 doc.en-US 文件复制 * fix: 单元测试 * fix: cascader 组件完善 * feat: cascader taro 适配 * feat: infiniteloading 国际化修改 * feat: 通告栏 * feat: infiniteloading 增加slot * feat: infiniteloading 添加 slot Co-authored-by: richard1015 <[email protected]> Co-authored-by: Ymm <[email protected]> Co-authored-by: Lei Wang <[email protected]> Co-authored-by: Drjingfubo <[email protected]> Co-authored-by: suzigang <[email protected]> Co-authored-by: ailululu <[email protected]>
1 parent 61b1cc4 commit 9347bc5

File tree

13 files changed

+719
-100
lines changed

13 files changed

+719
-100
lines changed

src/packages/__VUE/infiniteloading/demo.vue

Lines changed: 64 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,73 @@
11
<template>
22
<div class="demo">
3-
<h2>基础用法</h2>
4-
<nut-cell>
5-
<ul class="infiniteUl" id="scroll">
6-
<nut-infiniteloading container-id="scroll" :use-window="false" :has-more="hasMore" @load-more="loadMore">
7-
<li class="infiniteLi" v-for="(item, index) in defultList" :key="index">{{ item }}</li>
8-
</nut-infiniteloading>
9-
</ul>
10-
</nut-cell>
11-
12-
<h2>下拉刷新</h2>
13-
<nut-cell>
14-
<ul class="infiniteUl" id="refreshScroll">
15-
<nut-infiniteloading
16-
pull-icon="JD"
17-
container-id="refreshScroll"
18-
:use-window="false"
19-
:is-open-refresh="true"
20-
:has-more="refreshHasMore"
21-
@load-more="refreshLoadMore"
22-
@refresh="refresh"
23-
>
24-
<li class="infiniteLi" v-for="(item, index) in refreshList" :key="index">{{ item }}</li>
25-
</nut-infiniteloading>
26-
</ul>
27-
</nut-cell>
28-
29-
<h2>自定义加载文案</h2>
30-
<nut-cell>
31-
<ul class="infiniteUl" id="customScroll">
32-
<nut-infiniteloading
33-
load-txt="loading"
34-
load-more-txt="没有啦~"
35-
container-id="customScroll"
36-
:use-window="false"
37-
:has-more="customHasMore"
38-
@load-more="customLoadMore"
39-
>
40-
<li class="infiniteLi" v-for="(item, index) in customList" :key="index">{{ item }}</li>
41-
</nut-infiniteloading>
42-
</ul>
43-
</nut-cell>
3+
<nut-cell-group :title="translate('basic')">
4+
<nut-cell>
5+
<ul class="infiniteUl" id="scroll">
6+
<nut-infiniteloading container-id="scroll" :use-window="false" :has-more="hasMore" @load-more="loadMore">
7+
<li class="infiniteLi" v-for="(item, index) in defultList" :key="index">{{ item }}</li>
8+
</nut-infiniteloading>
9+
</ul>
10+
</nut-cell>
11+
</nut-cell-group>
12+
<nut-cell-group :title="translate('pullRefresh')">
13+
<nut-cell>
14+
<ul class="infiniteUl" id="refreshScroll">
15+
<nut-infiniteloading
16+
pull-icon="JD"
17+
container-id="refreshScroll"
18+
:use-window="false"
19+
:is-open-refresh="true"
20+
:has-more="refreshHasMore"
21+
@load-more="refreshLoadMore"
22+
@refresh="refresh"
23+
>
24+
<li class="infiniteLi" v-for="(item, index) in refreshList" :key="index">{{ item }}</li>
25+
</nut-infiniteloading>
26+
</ul>
27+
</nut-cell>
28+
</nut-cell-group>
29+
<nut-cell-group :title="translate('customTxt')">
30+
<nut-cell>
31+
<ul class="infiniteUl" id="customScroll">
32+
<nut-infiniteloading
33+
load-txt="loading"
34+
:load-more-txt="translate('none')"
35+
container-id="customScroll"
36+
:use-window="false"
37+
:has-more="customHasMore"
38+
@load-more="customLoadMore"
39+
>
40+
<li class="infiniteLi" v-for="(item, index) in customList" :key="index">{{ item }}</li>
41+
</nut-infiniteloading>
42+
</ul>
43+
</nut-cell>
44+
</nut-cell-group>
4445
</div>
4546
</template>
4647

4748
<script lang="ts">
4849
import { onMounted, ref, reactive, toRefs, getCurrentInstance } from 'vue';
4950
import { createComponent } from '@/packages/utils/create';
50-
const { createDemo } = createComponent('infiniteloading');
51+
const { createDemo, translate } = createComponent('infiniteloading');
52+
import { useTranslate } from '@/sites/assets/util/useTranslate';
53+
54+
useTranslate({
55+
'zh-CN': {
56+
basic: '基础用法',
57+
pullRefresh: '下拉刷新',
58+
customTxt: '自定义加载文案',
59+
none: '没有啦~',
60+
success: '刷新成功'
61+
},
62+
'en-US': {
63+
basic: 'Basic Usage',
64+
pullRefresh: 'Pull to refresh',
65+
customTxt: 'Custom loading copywriting',
66+
none: 'No more',
67+
success: 'Refresh success'
68+
}
69+
});
70+
5171
export default createDemo({
5272
props: {},
5373
setup() {
@@ -90,7 +110,6 @@ export default createDemo({
90110
91111
const refreshLoadMore = (done) => {
92112
setTimeout(() => {
93-
console.log('demo 加载更多');
94113
const curLen = data.refreshList.length;
95114
for (let i = curLen; i < curLen + 10; i++) {
96115
data.refreshList.push(`${i}`);
@@ -102,7 +121,7 @@ export default createDemo({
102121
103122
const refresh = (done) => {
104123
setTimeout(() => {
105-
proxy.$toast.text('刷新成功');
124+
proxy.$toast.text(translate('success'));
106125
data.refreshList = data.refreshList.slice(0, 10);
107126
refreshHasMore.value = true;
108127
done();
@@ -128,6 +147,7 @@ export default createDemo({
128147
refreshHasMore,
129148
refreshLoadMore,
130149
refresh,
150+
translate,
131151
...toRefs(data)
132152
};
133153
}

0 commit comments

Comments
 (0)