blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-08-07 13:49:48 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into upgrade_to_custom_component

Browse Source
This commit is contained in:
pangxie1991 2018-03-28 19:37:30 +08:00
commit e8b0cd091e
6 changed files with 2436 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/dialog/index.wxss vendored
View File

@ -1 +1 @@
.zan-dialog--container{position:fixed;top:45%;left:50%;width:80%;height:0;font-size:16px;overflow:hidden;transition:all .2s linear;border-radius:4px;background-color:#fff;transform:translate3d(-50%,-50%,0);color:#333;opacity:0}.zan-dialog--mask{position:fixed;width:100%;height:100%;top:0;left:0;background-color:rgba(0,0,0,.6);transition:.3s;display:none}.zan-dialog__header{padding:15px 0 0;text-align:center}.zan-dialog__content{position:relative;padding:15px 20px;line-height:1.5;min-height:40px}.zan-dialog__content::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;transform:scale(.5);transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px}.zan-dialog__content--title{color:#999;font-size:14px}.zan-dialog__footer{overflow:hidden}.zan-dialog__button{line-height:50px;height:50px;padding:0 5px;border-radius:0;margin-bottom:0}.zan-dialog__button::after{border-width:0;border-radius:0}.zan-dialog--show .zan-dialog--container{opacity:1;height:auto}.zan-dialog--show .zan-dialog--mask{display:block}.zan-dialog__footer--horizon{display:flex}.zan-dialog__footer--horizon .zan-dialog__button{flex:1}.zan-dialog__footer--horizon .zan-dialog__button::after{border-right-width:1px}.zan-dialog__footer--horizon .zan-dialog__button:last-child::after{border-right-width:0}.zan-dialog__footer--vertical .zan-dialog__button{flex:1}.zan-dialog__footer--vertical .zan-dialog__button::after{border-bottom-width:1px}.zan-dialog__footer--vertical .zan-dialog__button:last-child::after{border-bottom-width:0}
.zan-dialog--container{position:fixed;top:45%;left:50%;width:80%;height:0;font-size:16px;overflow:hidden;transition:all .2s linear;border-radius:4px;background-color:#fff;transform:translate3d(-50%,-50%,0);color:#333;opacity:0;z-index:1}.zan-dialog--mask{position:fixed;width:100%;height:100%;top:0;left:0;background-color:rgba(0,0,0,.6);transition:.3s;display:none;z-index:1}.zan-dialog__header{padding:15px 0 0;text-align:center}.zan-dialog__content{position:relative;padding:15px 20px;line-height:1.5;min-height:40px}.zan-dialog__content::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;transform:scale(.5);transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px}.zan-dialog__content--title{color:#999;font-size:14px}.zan-dialog__footer{overflow:hidden}.zan-dialog__button{line-height:50px;height:50px;padding:0 5px;border-radius:0;margin-bottom:0}.zan-dialog__button::after{border-width:0;border-radius:0}.zan-dialog--show .zan-dialog--container{opacity:1;height:auto}.zan-dialog--show .zan-dialog--mask{display:block}.zan-dialog__footer--horizon{display:flex}.zan-dialog__footer--horizon .zan-dialog__button{flex:1}.zan-dialog__footer--horizon .zan-dialog__button::after{border-right-width:1px}.zan-dialog__footer--horizon .zan-dialog__button:last-child::after{border-right-width:0}.zan-dialog__footer--vertical .zan-dialog__button{flex:1}.zan-dialog__footer--vertical .zan-dialog__button::after{border-bottom-width:1px}.zan-dialog__footer--vertical .zan-dialog__button:last-child::after{border-bottom-width:0}

6
dist/field/index.wxml vendored
View File

@ -7,8 +7,9 @@
wx:if="{{ type === 'textarea' }}"
auto-height
name="{{ name || componentId || '' }}"
value="{{ value }}"
disabled="{{ disabled }}"
focus="{{ focus }}"
value="{{ value }}"
placeholder="{{ placeholder }}"
class="zan-field__input zan-cell__bd {{ right ? 'zan-field__input--right' : '' }}"
placeholder-class="zan-field__placeholder"
@ -20,8 +21,9 @@
wx:else
type="{{ inputType || 'text' }}"
name="{{ name || componentId || '' }}"
value="{{ value }}"
disabled="{{ disabled }}"
focus="{{ focus }}"
value="{{ value }}"
placeholder="{{ placeholder }}"
class="zan-field__input zan-cell__bd {{ right ? 'zan-field__input--right' : '' }}"
placeholder-class="zan-field__placeholder"

2
dist/index.wxss vendored
View File

File diff suppressed because one or more lines are too long

7
dist/noticebar/index.js vendored
View File

@ -28,6 +28,8 @@ const ZanNoticeBar = {
return;
}
clearTimeout(this.data[componentId].setTimeoutId)
currentComponent.wrapWidth = rect.width;
if (currentComponent.wrapWidth < currentComponent.width) {
var mstime = currentComponent.width / 40 * 1000;
@ -60,9 +62,12 @@ const ZanNoticeBar = {
});
}, 100);
setTimeout(() => {
const setTimeoutId = setTimeout(() => {
this.scrollZanNoticeBar(componentId, mstime);
}, mstime);
this.setData({
[`${componentId}.setTimeoutId`]: setTimeoutId
})
}
};

3147
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -1,6 +1,6 @@
{
"name": "zanui-weapp",
"version": "2.4.6",
"version": "2.4.7",
"description": "高颜值、好用、易扩展的小程序 UI 库，Powered by 有赞",
"main": "app.js",
"directories": {
@ -43,9 +43,7 @@
"postcss-calc": "^6.0.1",
"postcss-easy-import": "^3.0.0",
"precss": "^2.0.0",
"shelljs": "^0.7.8"
},
"dependencies": {
"shelljs": "^0.7.8",
"gh-pages": "^1.1.0",
"wedoc": "0.0.13"
}