From 5f1c66d4ef65a1f407c126a237500cbe5eb8219f Mon Sep 17 00:00:00 2001 From: rex Date: Wed, 24 Jun 2020 17:08:49 +0800 Subject: [PATCH] build: compile 1.3.3 --- dist/calendar/index.js | 2 +- dist/circle/index.js | 48 ++++++++++++++++++------------- dist/field/index.js | 7 ++--- dist/field/index.wxml | 1 + dist/grid-item/index.wxss | 2 +- dist/nav-bar/index.js | 3 +- dist/nav-bar/index.wxml | 54 ++++++++++++++++++----------------- dist/nav-bar/index.wxss | 2 +- dist/steps/index.wxml | 6 ++-- dist/tabbar/index.wxss | 2 +- dist/uploader/index.js | 2 ++ dist/uploader/index.wxml | 13 +++++---- dist/uploader/index.wxss | 2 +- lib/calendar/index.js | 2 +- lib/circle/index.js | 59 ++++++++++++++++++++++----------------- lib/field/index.js | 7 ++--- lib/field/index.wxml | 1 + lib/grid-item/index.wxss | 2 +- lib/nav-bar/index.js | 3 +- lib/nav-bar/index.wxml | 54 ++++++++++++++++++----------------- lib/nav-bar/index.wxss | 2 +- lib/steps/index.wxml | 6 ++-- lib/tabbar/index.wxss | 2 +- lib/uploader/index.js | 2 ++ lib/uploader/index.wxml | 13 +++++---- lib/uploader/index.wxss | 2 +- 26 files changed, 162 insertions(+), 137 deletions(-) diff --git a/dist/calendar/index.js b/dist/calendar/index.js index 47117cbf..e953c6f4 100644 --- a/dist/calendar/index.js +++ b/dist/calendar/index.js @@ -152,7 +152,7 @@ VantComponent({ ]; } if (type === 'multiple') { - return [defaultDate || minDate]; + return defaultDate || [minDate]; } return defaultDate || minDate; }, diff --git a/dist/circle/index.js b/dist/circle/index.js index c11fcf08..3feaa5c8 100644 --- a/dist/circle/index.js +++ b/dist/circle/index.js @@ -39,7 +39,11 @@ VantComponent({ color: { type: [String, Object], value: BLUE, - observer: 'setHoverColor', + observer() { + this.setHoverColor().then(() => { + this.drawCircle(this.currentValue); + }); + }, }, type: { type: String, @@ -59,7 +63,7 @@ VantComponent({ }, methods: { getContext() { - const { type } = this.data; + const { type, size } = this.data; if (type === '') { const ctx = wx.createCanvasContext('van-circle', this); return Promise.resolve(ctx); @@ -69,35 +73,38 @@ VantComponent({ wx.createSelectorQuery() .in(this) .select('#van-circle') - .fields({ node: true, size: true }) + .node() .exec((res) => { const canvas = res[0].node; const ctx = canvas.getContext(type); - canvas.width = res[0].width * dpr; - canvas.height = res[0].height * dpr; - ctx.scale(dpr, dpr); + if (!this.inited) { + this.inited = true; + canvas.width = size * dpr; + canvas.height = size * dpr; + ctx.scale(dpr, dpr); + } resolve(adaptor(ctx)); }); }); }, setHoverColor() { const { color, size } = this.data; - let hoverColor = color; - this.getContext().then((context) => { - if (isObj(color)) { + if (isObj(color)) { + return this.getContext().then((context) => { const LinearColor = context.createLinearGradient(size, 0, 0, 0); Object.keys(color) .sort((a, b) => parseFloat(a) - parseFloat(b)) .map((key) => LinearColor.addColorStop(parseFloat(key) / 100, color[key]) ); - hoverColor = LinearColor; - } - this.setData({ hoverColor }); - }); + this.hoverColor = LinearColor; + }); + } + this.hoverColor = color; + return Promise.resolve(); }, presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) { - const { strokeWidth, lineCap, clockwise, size, type } = this.data; + const { strokeWidth, lineCap, clockwise, size } = this.data; const position = size / 2; const radius = position - strokeWidth / 2; context.setStrokeStyle(strokeStyle); @@ -116,13 +123,13 @@ VantComponent({ this.presetCanvas(context, layerColor, 0, PERIMETER, fill); }, renderHoverCircle(context, formatValue) { - const { clockwise, hoverColor } = this.data; + const { clockwise } = this.data; // 结束角度 const progress = PERIMETER * (formatValue / 100); const endAngle = clockwise ? BEGIN_ANGLE + progress : 3 * Math.PI - (BEGIN_ANGLE + progress); - this.presetCanvas(context, hoverColor, BEGIN_ANGLE, endAngle); + this.presetCanvas(context, this.hoverColor, BEGIN_ANGLE, endAngle); }, drawCircle(currentValue) { const { size } = this.data; @@ -165,10 +172,11 @@ VantComponent({ } }, }, - created() { - const { value } = this.data; - this.currentValue = value; - this.drawCircle(value); + mounted() { + this.currentValue = this.data.value; + this.setHoverColor().then(() => { + this.drawCircle(this.currentValue); + }); }, destroyed() { this.clearInterval(); diff --git a/dist/field/index.js b/dist/field/index.js index 5e7d78a3..6bfade57 100644 --- a/dist/field/index.js +++ b/dist/field/index.js @@ -1,9 +1,8 @@ import { VantComponent } from '../common/component'; import { commonProps, inputProps, textareaProps } from './props'; -import { canIUseModel } from '../common/version'; VantComponent({ field: true, - classes: ['input-class', 'right-icon-class'], + classes: ['input-class', 'right-icon-class', 'label-class'], props: Object.assign( Object.assign( Object.assign(Object.assign({}, commonProps), inputProps), @@ -105,9 +104,7 @@ VantComponent({ this.$emit('keyboardheightchange', event.detail); }, emitChange() { - if (canIUseModel()) { - this.setData({ value: this.value }); - } + this.setData({ value: this.value }); wx.nextTick(() => { this.$emit('input', this.value); this.$emit('change', this.value); diff --git a/dist/field/index.wxml b/dist/field/index.wxml index 140f05b7..c984d897 100644 --- a/dist/field/index.wxml +++ b/dist/field/index.wxml @@ -14,6 +14,7 @@ custom-style="{{ customStyle }}" arrow-direction="{{ arrowDirection }}" custom-class="van-field" + title-class="label-class" > diff --git a/dist/grid-item/index.wxss b/dist/grid-item/index.wxss index b7e0301e..ed7facb8 100644 --- a/dist/grid-item/index.wxss +++ b/dist/grid-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)} \ No newline at end of file +@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file diff --git a/dist/nav-bar/index.js b/dist/nav-bar/index.js index afed24e7..b94132fa 100644 --- a/dist/nav-bar/index.js +++ b/dist/nav-bar/index.js @@ -1,4 +1,5 @@ import { VantComponent } from '../common/component'; +import { getSystemInfoSync } from '../common/utils'; VantComponent({ classes: ['title-class'], props: { @@ -34,7 +35,7 @@ VantComponent({ baseStyle: '', }, created() { - const { statusBarHeight } = wx.getSystemInfoSync(); + const { statusBarHeight } = getSystemInfoSync(); const { safeAreaInsetTop, zIndex } = this.data; const paddingTop = safeAreaInsetTop ? statusBarHeight : 0; const baseStyle = `z-index: ${zIndex};padding-top: ${paddingTop}px;`; diff --git a/dist/nav-bar/index.wxml b/dist/nav-bar/index.wxml index 941bf563..27ba8c96 100644 --- a/dist/nav-bar/index.wxml +++ b/dist/nav-bar/index.wxml @@ -4,36 +4,38 @@ - - - + + + + + {{ leftText }} + + + + + {{ title }} + + + {{ leftText }} - - - - - {{ title }} - - - - {{ rightText }} - + >{{ rightText }} + + diff --git a/dist/nav-bar/index.wxss b/dist/nav-bar/index.wxss index 01fd3bd7..a2331281 100644 --- a/dist/nav-bar/index.wxss +++ b/dist/nav-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)} \ No newline at end of file +@import '../common/index.wxss';.van-nav-bar{text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar,.van-nav-bar__content{position:relative}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)} \ No newline at end of file diff --git a/dist/steps/index.wxml b/dist/steps/index.wxml index af31094f..6180b417 100644 --- a/dist/steps/index.wxml +++ b/dist/steps/index.wxml @@ -17,9 +17,9 @@ - + {{ item.message }} - + > + + @@ -57,7 +58,7 @@ wx:if="{{ showUpload }}" class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}" style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};" - bind:tap="startUpload" + bindtap="startUpload" > {{ uploadText }} diff --git a/dist/uploader/index.wxss b/dist/uploader/index.wxss index da44e472..b1fd9592 100644 --- a/dist/uploader/index.wxss +++ b/dist/uploader/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:8px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff} \ No newline at end of file +@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:0;right:0;z-index:1;display:-webkit-flex;display:flex;padding:10px;border-radius:50%;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%)}.van-uploader__preview-delete__icon{color:#969799;font-size:18px;background-color:#fff;border-radius:50%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:8px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff} \ No newline at end of file diff --git a/lib/calendar/index.js b/lib/calendar/index.js index 699bbd81..e2b2ce13 100644 --- a/lib/calendar/index.js +++ b/lib/calendar/index.js @@ -167,7 +167,7 @@ component_1.VantComponent({ ]; } if (type === 'multiple') { - return [defaultDate || minDate]; + return defaultDate || [minDate]; } return defaultDate || minDate; }, diff --git a/lib/circle/index.js b/lib/circle/index.js index 296011c8..5c34f803 100644 --- a/lib/circle/index.js +++ b/lib/circle/index.js @@ -41,7 +41,12 @@ component_1.VantComponent({ color: { type: [String, Object], value: color_1.BLUE, - observer: 'setHoverColor', + observer: function () { + var _this = this; + this.setHoverColor().then(function () { + _this.drawCircle(_this.currentValue); + }); + }, }, type: { type: String, @@ -62,7 +67,9 @@ component_1.VantComponent({ methods: { getContext: function () { var _this = this; - var type = this.data.type; + var _a = this.data, + type = _a.type, + size = _a.size; if (type === '') { var ctx = wx.createCanvasContext('van-circle', this); return Promise.resolve(ctx); @@ -72,13 +79,16 @@ component_1.VantComponent({ wx.createSelectorQuery() .in(_this) .select('#van-circle') - .fields({ node: true, size: true }) + .node() .exec(function (res) { var canvas = res[0].node; var ctx = canvas.getContext(type); - canvas.width = res[0].width * dpr; - canvas.height = res[0].height * dpr; - ctx.scale(dpr, dpr); + if (!_this.inited) { + _this.inited = true; + canvas.width = size * dpr; + canvas.height = size * dpr; + ctx.scale(dpr, dpr); + } resolve(canvas_1.adaptor(ctx)); }); }); @@ -88,32 +98,31 @@ component_1.VantComponent({ var _a = this.data, color = _a.color, size = _a.size; - var hoverColor = color; - this.getContext().then(function (context) { - if (utils_1.isObj(color)) { - var LinearColor_1 = context.createLinearGradient(size, 0, 0, 0); + if (utils_1.isObj(color)) { + return this.getContext().then(function (context) { + var LinearColor = context.createLinearGradient(size, 0, 0, 0); Object.keys(color) .sort(function (a, b) { return parseFloat(a) - parseFloat(b); }) .map(function (key) { - return LinearColor_1.addColorStop( + return LinearColor.addColorStop( parseFloat(key) / 100, color[key] ); }); - hoverColor = LinearColor_1; - } - _this.setData({ hoverColor: hoverColor }); - }); + _this.hoverColor = LinearColor; + }); + } + this.hoverColor = color; + return Promise.resolve(); }, presetCanvas: function (context, strokeStyle, beginAngle, endAngle, fill) { var _a = this.data, strokeWidth = _a.strokeWidth, lineCap = _a.lineCap, clockwise = _a.clockwise, - size = _a.size, - type = _a.type; + size = _a.size; var position = size / 2; var radius = position - strokeWidth / 2; context.setStrokeStyle(strokeStyle); @@ -134,15 +143,13 @@ component_1.VantComponent({ this.presetCanvas(context, layerColor, 0, PERIMETER, fill); }, renderHoverCircle: function (context, formatValue) { - var _a = this.data, - clockwise = _a.clockwise, - hoverColor = _a.hoverColor; + var clockwise = this.data.clockwise; // 结束角度 var progress = PERIMETER * (formatValue / 100); var endAngle = clockwise ? BEGIN_ANGLE + progress : 3 * Math.PI - (BEGIN_ANGLE + progress); - this.presetCanvas(context, hoverColor, BEGIN_ANGLE, endAngle); + this.presetCanvas(context, this.hoverColor, BEGIN_ANGLE, endAngle); }, drawCircle: function (currentValue) { var _this = this; @@ -189,10 +196,12 @@ component_1.VantComponent({ } }, }, - created: function () { - var value = this.data.value; - this.currentValue = value; - this.drawCircle(value); + mounted: function () { + var _this = this; + this.currentValue = this.data.value; + this.setHoverColor().then(function () { + _this.drawCircle(_this.currentValue); + }); }, destroyed: function () { this.clearInterval(); diff --git a/lib/field/index.js b/lib/field/index.js index d26c164f..764114e5 100644 --- a/lib/field/index.js +++ b/lib/field/index.js @@ -17,10 +17,9 @@ var __assign = Object.defineProperty(exports, '__esModule', { value: true }); var component_1 = require('../common/component'); var props_1 = require('./props'); -var version_1 = require('../common/version'); component_1.VantComponent({ field: true, - classes: ['input-class', 'right-icon-class'], + classes: ['input-class', 'right-icon-class', 'label-class'], props: __assign( __assign( __assign(__assign({}, props_1.commonProps), props_1.inputProps), @@ -126,9 +125,7 @@ component_1.VantComponent({ }, emitChange: function () { var _this = this; - if (version_1.canIUseModel()) { - this.setData({ value: this.value }); - } + this.setData({ value: this.value }); wx.nextTick(function () { _this.$emit('input', _this.value); _this.$emit('change', _this.value); diff --git a/lib/field/index.wxml b/lib/field/index.wxml index 140f05b7..c984d897 100644 --- a/lib/field/index.wxml +++ b/lib/field/index.wxml @@ -14,6 +14,7 @@ custom-style="{{ customStyle }}" arrow-direction="{{ arrowDirection }}" custom-class="van-field" + title-class="label-class" > diff --git a/lib/grid-item/index.wxss b/lib/grid-item/index.wxss index b7e0301e..ed7facb8 100644 --- a/lib/grid-item/index.wxss +++ b/lib/grid-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)} \ No newline at end of file +@import '../common/index.wxss';.van-grid-item{position:relative;float:left;box-sizing:border-box}.van-grid-item--square{height:0}.van-grid-item__content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;box-sizing:border-box;height:100%;padding:16px 8px;padding:var(--grid-item-content-padding,16px 8px);background-color:#fff;background-color:var(--grid-item-content-background-color,#fff)}.van-grid-item__content:after{z-index:1;border-width:0 1px 1px 0;border-bottom-width:var(--border-width-base,1px);border-right-width:var(--border-width-base,1px);border-top-width:0}.van-grid-item__content--surround:after{border-width:1px;border-width:var(--border-width-base,1px)}.van-grid-item__content--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-grid-item__content--square{position:absolute;top:0;right:0;left:0}.van-grid-item__content--horizontal{-webkit-flex-direction:row;flex-direction:row}.van-grid-item__content--horizontal .van-grid-item__icon+.van-grid-item__text{margin-top:0;margin-left:8px}.van-grid-item__content--clickable:active{background-color:#f2f3f5;background-color:var(--grid-item-content-active-color,#f2f3f5)}.van-grid-item__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:26px;font-size:var(--grid-item-icon-size,26px);height:26px;height:var(--grid-item-icon-size,26px)}.van-grid-item__text{word-wrap:break-word;color:#646566;color:var(--grid-item-text-color,#646566);font-size:12px;font-size:var(--grid-item-text-font-size,12px)}.van-grid-item__icon+.van-grid-item__text{margin-top:8px} \ No newline at end of file diff --git a/lib/nav-bar/index.js b/lib/nav-bar/index.js index 2894d294..fb4fd97a 100644 --- a/lib/nav-bar/index.js +++ b/lib/nav-bar/index.js @@ -1,6 +1,7 @@ 'use strict'; Object.defineProperty(exports, '__esModule', { value: true }); var component_1 = require('../common/component'); +var utils_1 = require('../common/utils'); component_1.VantComponent({ classes: ['title-class'], props: { @@ -36,7 +37,7 @@ component_1.VantComponent({ baseStyle: '', }, created: function () { - var statusBarHeight = wx.getSystemInfoSync().statusBarHeight; + var statusBarHeight = utils_1.getSystemInfoSync().statusBarHeight; var _a = this.data, safeAreaInsetTop = _a.safeAreaInsetTop, zIndex = _a.zIndex; diff --git a/lib/nav-bar/index.wxml b/lib/nav-bar/index.wxml index 941bf563..27ba8c96 100644 --- a/lib/nav-bar/index.wxml +++ b/lib/nav-bar/index.wxml @@ -4,36 +4,38 @@ - - - + + + + + {{ leftText }} + + + + + {{ title }} + + + {{ leftText }} - - - - - {{ title }} - - - - {{ rightText }} - + >{{ rightText }} + + diff --git a/lib/nav-bar/index.wxss b/lib/nav-bar/index.wxss index 01fd3bd7..a2331281 100644 --- a/lib/nav-bar/index.wxss +++ b/lib/nav-bar/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)} \ No newline at end of file +@import '../common/index.wxss';.van-nav-bar{text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar,.van-nav-bar__content{position:relative}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)} \ No newline at end of file diff --git a/lib/steps/index.wxml b/lib/steps/index.wxml index af31094f..6180b417 100644 --- a/lib/steps/index.wxml +++ b/lib/steps/index.wxml @@ -17,9 +17,9 @@ - + {{ item.message }} - + > + + @@ -57,7 +58,7 @@ wx:if="{{ showUpload }}" class="van-uploader__upload {{ disabled ? 'van-uploader__upload--disabled': ''}}" style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};" - bind:tap="startUpload" + bindtap="startUpload" > {{ uploadText }} diff --git a/lib/uploader/index.wxss b/lib/uploader/index.wxss index da44e472..b1fd9592 100644 --- a/lib/uploader/index.wxss +++ b/lib/uploader/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:8px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff} \ No newline at end of file +@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa;border-radius:8px}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden;border-radius:8px}.van-uploader__preview-delete{position:absolute;top:0;right:0;z-index:1;display:-webkit-flex;display:flex;padding:10px;border-radius:50%;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%)}.van-uploader__preview-delete__icon{color:#969799;font-size:18px;background-color:#fff;border-radius:50%}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa;border-radius:8px}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88);border-radius:8px}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff} \ No newline at end of file