Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 公告栏demo修改 #2105

Merged
merged 36 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
63a97cc
feat: tour更新
yangxiaolu1993 Jan 11, 2023
88ec556
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
0734bc6
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
ed5b3bd
feat: 文档修改
yangxiaolu1993 Jan 11, 2023
0ed6793
feat: 插槽修改
yangxiaolu1993 Jan 11, 2023
f782c04
feat: slot修改
yangxiaolu1993 Jan 11, 2023
0afc1f3
feat: noticebar发布
yangxiaolu1993 Jan 11, 2023
fe93b0b
feat: 文档更新
yangxiaolu1993 Jan 11, 2023
8c9283f
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
e4b2071
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
a9fdab7
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
b20176b
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
22cdd5e
fix: ellipsis修改
yangxiaolu1993 Jan 12, 2023
14133b0
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 12, 2023
5c8c2d2
fix: 修改 ellipsis
yangxiaolu1993 Jan 12, 2023
17a2b5b
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
e0ae98e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
534308e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
0e20c21
feat: tour修改
yangxiaolu1993 Jan 13, 2023
fe63b0f
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
240e74f
fix: 地址组件问题修改
yangxiaolu1993 Jan 13, 2023
6e5f6ff
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
8e2702d
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 16, 2023
8b8576a
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 18, 2023
3fc5263
fix: imagepreview修改
yangxiaolu1993 Jan 18, 2023
ea1f94d
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 18, 2023
9e3b84f
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 18, 2023
03faeb3
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 18, 2023
819992e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Feb 1, 2023
cac8ecd
feat: 新增4.0介绍
yangxiaolu1993 Feb 1, 2023
7f6e2f2
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Feb 2, 2023
5fbf8a5
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Feb 7, 2023
b794ebd
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Feb 10, 2023
c7dfdf2
fix: 公告栏修改插槽使用不更新问题
yangxiaolu1993 Feb 10, 2023
ad56508
fix: 公告栏组件 demo 修改
yangxiaolu1993 Feb 10, 2023
3efd07c
feat: 冲突解决
yangxiaolu1993 Feb 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/packages/__VUE/noticebar/demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default createDemo({
text: translate('text')
});

const data1 = ref(['Noticebar 公告栏1', 'Cascader 级联选择', 'DatePicker 日期选择器', 'CheckBox 复选按钮']);
const data1 = ref(['Noticebar 公告栏', 'Cascader 级联选择', 'DatePicker 日期选择器', 'CheckBox 复选按钮']);

const closeFun = () => {
console.log('hello world');
Expand All @@ -135,7 +135,7 @@ export default createDemo({
};

setTimeout(() => {
data1.value = ['Noticebar 11111', 'Cascader 2222择', 'DatePicker 日期选择器', 'CheckBox 复选按钮'];
data1.value = ['公告栏 Noticebar', '级联选择 Cascader', '日期选择器 DatePicker', '复选按钮 CheckBox'];
}, 2000);

return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default {
const data1 = ref(['Noticebar 公告栏1', 'Cascader 级联选择', 'DatePicker 日期选择器', 'CheckBox 复选按钮']);

setTimeout(() => {
data1.value = ['Noticebar 11111', 'Cascader 2222择', 'DatePicker 日期选择器', 'CheckBox 复选按钮'];
data1.value = ['公告栏 Noticebar', '级联选择 Cascader', '日期选择器 DatePicker', '复选按钮 CheckBox'];
}, 2000);

const hello = () => {
Expand Down