Skip to content

bugfix: 1.解决toast垂直居中时模糊的问题; 2.cascader组件销毁时移除事件 #11

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

bugfix: 1.解决toast垂直居中时模糊的问题; 2.cascader组件销毁时移除事件 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2ac8aa
1.解决toast垂直居中时模糊的问题;2.cascader组件销毁时移除事件
TGuoW May 21, 2019
e31dfbb
修改文档内容
TGuoW May 23, 2019
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
11 changes: 6 additions & 5 deletions docs/.vuepress/components/sakura-card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<div class="card">
<div class="card-content">
<slot></slot>
<div>
<div v-if="codeVisible"><slot name="code"></slot></div>
<div class="card-content">
<slot></slot>
<div>
<div v-show="codeVisible"><slot name="code"></slot></div>
</div>
</div>
<div class="card-operation" @click="toggle">
{{msg}}
{{msg}}
</div>
</div>
</template>
Expand Down Expand Up @@ -37,6 +37,7 @@ export default {
border-bottom:1px solid #ccc;
}
.card-operation{
cursor: pointer;
height: 40px;
display: flex;
align-items: center;
Expand Down
68 changes: 38 additions & 30 deletions docs/.vuepress/components/sakura-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,41 +70,49 @@ export default {
export default {
data () {
var checkName = (val) => {
if (val === 'Bingo') {
throw new Error('被骗了哈哈哈~')
} else { return true }
if (val === 'Bingo') {
throw new Error('被骗了哈哈哈~')
} else { return true }
}
var checkAge = (val) => {
if (parseInt(val) > 30) {
throw new Error('不能超过30岁')
} else { return true }
if (parseInt(val) > 30) {
throw new Error('不能超过30岁')
} else { return true }
}
return {
user: {
name: '',
age: '',
count:''
},
rules: {
name: [
{ required: true, message: '请输入名字', trigger: 'blur' },
{ lengthControl: [3, 5], message: '长度在 3 到 5 个字符', trigger: 'blur' },
{ pattern: /^(\D)+$/, message: '内容不能有数字', trigger: 'blur' },
{ validator: checkName, trigger: 'blur' }
],
age: [
{ required: true, message: '请输入年龄', trigger: 'blur' },
{ lengthControl: [ null, 2 ], message: '长度不能超过2', trigger: 'blur' },
{ pattern: /\d/, message: '必须是数字', trigger: 'blur' },
{ validator: checkAge, trigger: 'blur' }
],
count: [
{ lengthControl: [ null, 4 ], message: '长度不能超过4', trigger: 'blur' }
]
}

return {
user: {
name: '',
age: '',
count:''
},
rules: {
name: [
{ required: true, message: '请输入名字', trigger: 'blur' },
{ lengthControl: [3, 5], message: '长度在 3 到 5 个字符', trigger: 'blur' },
{ pattern: /^(\D)+$/, message: '内容不能有数字', trigger: 'blur' },
{ validator: checkName, trigger: 'blur' }
],
age: [
{ required: true, message: '请输入年龄', trigger: 'blur' },
{ lengthControl: [ null, 2 ], message: '长度不能超过2', trigger: 'blur' },
{ pattern: /\d/, message: '必须是数字', trigger: 'blur' },
{ validator: checkAge, trigger: 'blur' }
],
count: [
{ lengthControl: [ null, 4 ], message: '长度不能超过4', trigger: 'blur' }
]
}
}
},
methods: {
submit () {
this.$refs.form.validate(this.user)
},
reset(){
this.$refs.form.reset(this.user)
}
}
}
`.replace(/^ {8}/gm, "").trim(),
user: {
name: '',
Expand Down
16 changes: 8 additions & 8 deletions src/cascader/cascader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ export default {
created () {
},
mounted () {
this.addDocumentListener()
window.document.addEventListener('click', this.docClickHandler)
},
beforeDestroy () {
window.document.removeEventListener('click', this.docClickHandler)
},
computed: {
content () {
return this.selected.map(x => x.label).join('/')
}
},
methods: {
addDocumentListener () {
let docClickHandler = (e) => {
if ((this.$refs.popper && this.$refs.popper.contains(e.target)) || this.$refs.content.contains(e.target)) {
return false
}
this.popoverVisible = false
docClickHandler (e) {
if ((this.$refs.popper && this.$refs.popper.contains(e.target)) || this.$refs.content.contains(e.target)) {
return false
}
window.document.addEventListener('click', docClickHandler)
this.popoverVisible = false
},
onItemUpdateSelected (newSelected) {
this.$emit('update:selected', newSelected)
Expand Down
23 changes: 13 additions & 10 deletions src/notice/toast.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ export default {
return ['top', 'middle', 'bottom'].includes(val)
}
},
type:{
type: {
type: String,
default: 'info',
validator(val){
return ['info','warning','success', 'error'].includes(val)
validator (val) {
return ['info', 'warning', 'success', 'error'].includes(val)
}
}
},
components:{
components: {
's-icon': Icon
},
mounted () {
Expand Down Expand Up @@ -99,18 +99,21 @@ export default {
.outer{
z-index: 30;
position: fixed;
left:50%;
transform: translate(-50%);

left: 0;
right: 0;
margin: auto;
width: fit-content;
height: fit-content;

&.show-on-top{
top: 20px;
.toast-wrapper{
animation:slide-down 0.5s;
}
}
&.show-on-middle{
top:50%;
transform: translate(-50%,-50%);
top: 0;
bottom: 0;
.toast-wrapper{
animation:fade-in 0.5s;
}
Expand Down Expand Up @@ -151,7 +154,7 @@ export default {
/deep/ .s-icon{
margin-right:10px;
}

}
.close-btn{
padding: 0 1.2em;
Expand Down