diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js
index 225b463a..49b4e96b 100644
--- a/dist/action-sheet/index.js
+++ b/dist/action-sheet/index.js
@@ -21,6 +21,10 @@ VantComponent({
closeOnClickOverlay: {
type: Boolean,
value: true
+ },
+ closeOnClickAction: {
+ type: Boolean,
+ value: true
}
},
methods: {
@@ -29,6 +33,9 @@ VantComponent({
const item = this.data.actions[index];
if (item && !item.disabled && !item.loading) {
this.$emit('select', item);
+ if (this.data.closeOnClickAction) {
+ this.onClose();
+ }
}
},
onCancel() {
@@ -36,6 +43,10 @@ VantComponent({
},
onClose() {
this.$emit('close');
+ },
+ onClickOverlay() {
+ this.$emit('click-overlay');
+ this.onClose();
}
}
});
diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml
index 5f6d33f8..2ddb8635 100644
--- a/dist/action-sheet/index.wxml
+++ b/dist/action-sheet/index.wxml
@@ -8,7 +8,7 @@
custom-class="van-action-sheet"
safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
close-on-click-overlay="{{ closeOnClickOverlay }}"
- bind:close="onClose"
+ bind:close="onClickOverlay"
>
diff --git a/dist/checkbox/index.wxss b/dist/checkbox/index.wxss
index f623e17c..f731f1e2 100644
--- a/dist/checkbox/index.wxss
+++ b/dist/checkbox/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:block;width:20px;height:20px;font-size:14px;color:transparent;text-align:center;border:1px solid #e5e5e5;box-sizing:border-box;transition:.2s}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;background-color:#1989fa;border-color:#1989fa}.van-checkbox__icon--disabled{background-color:#eee;border-color:#c9c9c9}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c9c9c9}.van-checkbox__label{margin-left:10px;color:#333;word-break:break-all}.van-checkbox__label--left{float:left;margin:0 10px 0 0}.van-checkbox__label--disabled{color:#c9c9c9}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:block;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #e5e5e5;border:1px solid var(--checkbox-border-color,#e5e5e5);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#eee;background-color:var(--checkbox-disabled-background-color,#eee);border-color:#c9c9c9;border-color:var(--checkbox-disabled-icon-color,#c9c9c9)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c9c9c9;color:var(--checkbox-disabled-icon-color,#c9c9c9)}.van-checkbox__label{word-wrap:break-word;margin-left:10px;margin-left:var(--checkbox-label-margin,10px);color:#333;color:var(--checkbox-label-color,#333)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c9c9c9;color:var(--checkbox-disabled-label-color,#c9c9c9)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
diff --git a/dist/badge-group/index.d.ts b/dist/circle/index.d.ts
similarity index 100%
rename from dist/badge-group/index.d.ts
rename to dist/circle/index.d.ts
diff --git a/dist/circle/index.js b/dist/circle/index.js
new file mode 100644
index 00000000..08c7eb4d
--- /dev/null
+++ b/dist/circle/index.js
@@ -0,0 +1,158 @@
+import { VantComponent } from '../common/component';
+import { isObj } from '../common/utils';
+import { BLUE, WHITE } from '../common/color';
+function format(rate) {
+ return Math.min(Math.max(rate, 0), 100);
+}
+const PERIMETER = 2 * Math.PI;
+const BEGIN_ANGLE = -Math.PI / 2;
+const STEP = 1;
+VantComponent({
+ props: {
+ text: String,
+ lineCap: {
+ type: String,
+ value: 'round'
+ },
+ value: {
+ type: Number,
+ value: 0,
+ observer: 'reRender'
+ },
+ speed: {
+ type: Number,
+ value: 50
+ },
+ size: {
+ type: Number,
+ value: 100,
+ observer: 'setStyle'
+ },
+ fill: String,
+ layerColor: {
+ type: String,
+ value: WHITE
+ },
+ color: {
+ type: [String, Object],
+ value: BLUE,
+ observer: 'setHoverColor'
+ },
+ strokeWidth: {
+ type: Number,
+ value: 4
+ },
+ clockwise: {
+ type: Boolean,
+ value: true
+ }
+ },
+ data: {
+ style: 'width: 100px; height: 100px;',
+ hoverColor: BLUE
+ },
+ methods: {
+ getContext() {
+ if (!this.ctx) {
+ this.ctx = wx.createCanvasContext('van-circle', this);
+ }
+ return this.ctx;
+ },
+ setHoverColor() {
+ const context = this.getContext();
+ const { color, size } = this.data;
+ let hoverColor = color;
+ if (isObj(color)) {
+ 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 });
+ },
+ setStyle() {
+ const { size } = this.data;
+ const style = `width: ${size}px; height: ${size}px;`;
+ this.setData({ style });
+ },
+ presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) {
+ const { strokeWidth, lineCap, clockwise, size } = this.data;
+ const position = size / 2;
+ const radius = position - strokeWidth / 2;
+ context.setStrokeStyle(strokeStyle);
+ context.setLineWidth(strokeWidth);
+ context.setLineCap(lineCap);
+ context.beginPath();
+ context.arc(position, position, radius, beginAngle, endAngle, !clockwise);
+ context.stroke();
+ if (fill) {
+ context.setFillStyle(fill);
+ context.fill();
+ }
+ },
+ renderLayerCircle(context) {
+ const { layerColor, fill } = this.data;
+ this.presetCanvas(context, layerColor, 0, PERIMETER, fill);
+ },
+ renderHoverCircle(context, formatValue) {
+ const { clockwise, hoverColor } = 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);
+ },
+ drawCircle(currentValue) {
+ const context = this.getContext();
+ const { size } = this.data;
+ context.clearRect(0, 0, size, size);
+ this.renderLayerCircle(context);
+ const formatValue = format(currentValue);
+ if (formatValue !== 0) {
+ this.renderHoverCircle(context, formatValue);
+ }
+ context.draw();
+ },
+ reRender() {
+ // tofector 动画暂时没有想到好的解决方案
+ const { value, speed } = this.data;
+ if (speed <= 0 || speed > 1000) {
+ this.drawCircle(value);
+ return;
+ }
+ this.clearInterval();
+ this.currentValue = this.currentValue || 0;
+ this.interval = setInterval(() => {
+ if (this.currentValue !== value) {
+ if (this.currentValue < value) {
+ this.currentValue += STEP;
+ }
+ else {
+ this.currentValue -= STEP;
+ }
+ this.drawCircle(this.currentValue);
+ }
+ else {
+ this.clearInterval();
+ }
+ }, 1000 / speed);
+ },
+ clearInterval() {
+ if (this.interval) {
+ clearInterval(this.interval);
+ this.interval = null;
+ }
+ }
+ },
+ created() {
+ const { value } = this.data;
+ this.currentValue = value;
+ this.drawCircle(value);
+ },
+ destroyed() {
+ this.ctx = null;
+ this.clearInterval();
+ }
+});
diff --git a/dist/badge-group/index.json b/dist/circle/index.json
similarity index 100%
rename from dist/badge-group/index.json
rename to dist/circle/index.json
diff --git a/dist/circle/index.wxml b/dist/circle/index.wxml
new file mode 100644
index 00000000..215122ff
--- /dev/null
+++ b/dist/circle/index.wxml
@@ -0,0 +1,7 @@
+
+
+
+
+
+ {{ text }}
+
\ No newline at end of file
diff --git a/dist/circle/index.wxss b/dist/circle/index.wxss
new file mode 100644
index 00000000..c7eaacbb
--- /dev/null
+++ b/dist/circle/index.wxss
@@ -0,0 +1 @@
+@import '../common/index.wxss';.van-circle{position:relative;display:inline-block;text-align:center}.van-circle__text{position:absolute;top:50%;left:0;width:100%;-webkit-transform:translateY(-50%);transform:translateY(-50%);color:#333;color:var(--circle-text-color,#333)}
\ No newline at end of file
diff --git a/dist/col/index.js b/dist/col/index.js
index 8976a5fc..2d1d85ee 100644
--- a/dist/col/index.js
+++ b/dist/col/index.js
@@ -16,7 +16,7 @@ VantComponent({
const padding = `${gutter / 2}px`;
const style = gutter ? `padding-left: ${padding}; padding-right: ${padding};` : '';
if (style !== this.data.style) {
- this.set({ style });
+ this.setData({ style });
}
}
}
diff --git a/dist/collapse-item/index.js b/dist/collapse-item/index.js
index 596350ea..a869be00 100644
--- a/dist/collapse-item/index.js
+++ b/dist/collapse-item/index.js
@@ -39,7 +39,7 @@ VantComponent({
if (this.data.expanded) {
data.contentHeight = 'auto';
}
- this.set(data);
+ this.setData(data);
});
},
methods: {
@@ -87,7 +87,7 @@ VantComponent({
},
onTransitionEnd() {
if (this.data.expanded) {
- this.set({
+ this.setData({
contentHeight: 'auto'
});
}
diff --git a/dist/collapse-item/index.wxss b/dist/collapse-item/index.wxss
index 2ed46f0f..77187938 100644
--- a/dist/collapse-item/index.wxss
+++ b/dist/collapse-item/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:.3s}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c9c9c9!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__wrapper--transition{transition:height .3s ease-in-out}.van-collapse-item__content{padding:15px;font-size:13px;line-height:1.5;color:#999;background-color:#fff}
\ No newline at end of file
+@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c9c9c9!important;color:var(--collapse-item-title-disabled-color,#c9c9c9)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__wrapper--transition{transition:height .3s ease-in-out}.van-collapse-item__content{padding:15px;padding:var(--collapse-item-content-padding,15px);color:#999;color:var(--collapse-item-content-text-color,#999);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}
\ No newline at end of file
diff --git a/dist/common/color.d.ts b/dist/common/color.d.ts
index 98552be1..386f3077 100644
--- a/dist/common/color.d.ts
+++ b/dist/common/color.d.ts
@@ -1,3 +1,7 @@
export declare const RED = "#ee0a24";
export declare const BLUE = "#1989fa";
+export declare const WHITE = "#fff";
export declare const GREEN = "#07c160";
+export declare const ORANGE = "#ff976a";
+export declare const GRAY = "#323233";
+export declare const GRAY_DARK = "#969799";
diff --git a/dist/common/color.js b/dist/common/color.js
index 6869afc3..6b285bd6 100644
--- a/dist/common/color.js
+++ b/dist/common/color.js
@@ -1,3 +1,7 @@
export const RED = '#ee0a24';
export const BLUE = '#1989fa';
+export const WHITE = '#fff';
export const GREEN = '#07c160';
+export const ORANGE = '#ff976a';
+export const GRAY = '#323233';
+export const GRAY_DARK = '#969799';
diff --git a/dist/common/component.d.ts b/dist/common/component.d.ts
index 2c47a09a..307a96cc 100644
--- a/dist/common/component.d.ts
+++ b/dist/common/component.d.ts
@@ -1,3 +1,3 @@
-import { VantComponentOptions, CombinedComponentInstance } from 'definitions/index';
-declare function VantComponent(vantOptions?: VantComponentOptions>): void;
+import { VantComponentOptions, CombinedComponentInstance } from '../definitions/index';
+declare function VantComponent(vantOptions?: VantComponentOptions>): void;
export { VantComponent };
diff --git a/dist/common/index.wxss b/dist/common/index.wxss
index 1b5b4ee2..6e6891ff 100644
--- a/dist/common/index.wxss
+++ b/dist/common/index.wxss
@@ -1 +1 @@
-.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{content:"";display:table;clear:both}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{content:" ";position:absolute;pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);border:0 solid #eee}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}.van-clearfix:after{display:table;clear:both;content:""}.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/dist/common/style/clearfix.wxss b/dist/common/style/clearfix.wxss
index 8d6328c2..a0ca8384 100644
--- a/dist/common/style/clearfix.wxss
+++ b/dist/common/style/clearfix.wxss
@@ -1 +1 @@
-.van-clearfix:after{content:"";display:table;clear:both}
\ No newline at end of file
+.van-clearfix:after{display:table;clear:both;content:""}
\ No newline at end of file
diff --git a/dist/common/style/ellipsis.wxss b/dist/common/style/ellipsis.wxss
index a829a98f..1e9dbc9e 100644
--- a/dist/common/style/ellipsis.wxss
+++ b/dist/common/style/ellipsis.wxss
@@ -1 +1 @@
-.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}
\ No newline at end of file
+.van-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.van-multi-ellipsis--l2{-webkit-line-clamp:2}.van-multi-ellipsis--l2,.van-multi-ellipsis--l3{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-box-orient:vertical}.van-multi-ellipsis--l3{-webkit-line-clamp:3}
\ No newline at end of file
diff --git a/dist/common/style/hairline.wxss b/dist/common/style/hairline.wxss
index 53508ad9..f64e2f83 100644
--- a/dist/common/style/hairline.wxss
+++ b/dist/common/style/hairline.wxss
@@ -1 +1 @@
-.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{content:" ";position:absolute;pointer-events:none;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;top:-50%;left:-50%;right:-50%;bottom:-50%;-webkit-transform:scale(.5);transform:scale(.5);border:0 solid #eee}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
+.van-hairline,.van-hairline--bottom,.van-hairline--left,.van-hairline--right,.van-hairline--surround,.van-hairline--top,.van-hairline--top-bottom{position:relative}.van-hairline--bottom:after,.van-hairline--left:after,.van-hairline--right:after,.van-hairline--surround:after,.van-hairline--top-bottom:after,.van-hairline--top:after,.van-hairline:after{position:absolute;box-sizing:border-box;-webkit-transform-origin:center;transform-origin:center;content:" ";pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid #eee;-webkit-transform:scale(.5);transform:scale(.5)}.van-hairline--top:after{border-top-width:1px}.van-hairline--left:after{border-left-width:1px}.van-hairline--right:after{border-right-width:1px}.van-hairline--bottom:after{border-bottom-width:1px}.van-hairline--top-bottom:after{border-width:1px 0}.van-hairline--surround:after{border-width:1px}
\ No newline at end of file
diff --git a/dist/common/style/theme.wxss b/dist/common/style/theme.wxss
new file mode 100644
index 00000000..e69de29b
diff --git a/dist/common/utils.d.ts b/dist/common/utils.d.ts
index 32fc1bab..9fad27d9 100644
--- a/dist/common/utils.d.ts
+++ b/dist/common/utils.d.ts
@@ -1,5 +1,8 @@
+///
export declare function isDef(value: any): boolean;
export declare function isObj(x: any): boolean;
export declare function isNumber(value: any): boolean;
export declare function range(num: number, min: number, max: number): number;
export declare function nextTick(fn: Function): void;
+export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSuccessCallbackResult;
+export declare function addUnit(value?: string | number): string | undefined;
diff --git a/dist/common/utils.js b/dist/common/utils.js
index f08d8d35..5ded1690 100644
--- a/dist/common/utils.js
+++ b/dist/common/utils.js
@@ -16,3 +16,17 @@ export function nextTick(fn) {
fn();
}, 1000 / 30);
}
+let systemInfo = null;
+export function getSystemInfoSync() {
+ if (systemInfo == null) {
+ systemInfo = wx.getSystemInfoSync();
+ }
+ return systemInfo;
+}
+export function addUnit(value) {
+ if (!isDef(value)) {
+ return undefined;
+ }
+ value = String(value);
+ return isNumber(value) ? `${value}px` : value;
+}
diff --git a/dist/datetime-picker/index.js b/dist/datetime-picker/index.js
index e615f1b0..3498eaeb 100644
--- a/dist/datetime-picker/index.js
+++ b/dist/datetime-picker/index.js
@@ -33,15 +33,15 @@ function getMonthEndDay(year, month) {
const defaultFormatter = (_, value) => value;
VantComponent({
classes: ['active-class', 'toolbar-class', 'column-class'],
- props: Object.assign({}, pickerProps, { formatter: {
- type: Function,
- value: defaultFormatter
- }, value: null, type: {
+ props: Object.assign(Object.assign({}, pickerProps), { value: null, filter: null, type: {
type: String,
value: 'datetime'
}, showToolbar: {
type: Boolean,
value: true
+ }, formatter: {
+ type: null,
+ value: defaultFormatter
}, minDate: {
type: Number,
value: new Date(currentYear - 10, 0, 1).getTime()
@@ -100,15 +100,25 @@ VantComponent({
},
updateColumns() {
const { formatter = defaultFormatter } = this.data;
+ const results = this.getOriginColumns().map(column => ({
+ values: column.values.map(value => formatter(column.type, value))
+ }));
+ return this.set({ columns: results });
+ },
+ getOriginColumns() {
+ const { filter } = this.data;
const results = this.getRanges().map(({ type, range }) => {
- const values = times(range[1] - range[0] + 1, index => {
+ let values = times(range[1] - range[0] + 1, index => {
let value = range[0] + index;
value = type === 'year' ? `${value}` : padZero(value);
- return formatter(type, value);
+ return value;
});
- return { values };
+ if (filter) {
+ values = filter(type, values);
+ }
+ return { type, values };
});
- return this.set({ columns: results });
+ return results;
},
getRanges() {
const { data } = this;
diff --git a/dist/definitions/index.d.ts b/dist/definitions/index.d.ts
index e63c4a83..3a8fc167 100644
--- a/dist/definitions/index.d.ts
+++ b/dist/definitions/index.d.ts
@@ -3,20 +3,16 @@ import { Weapp } from './weapp';
declare type RecordToAny = {
[K in keyof T]: any;
};
-declare type RecordToReturn = {
- [P in keyof T]: T[P] extends (...args: any[]) => any ? ReturnType : T[P];
+export declare type CombinedComponentInstance = Methods & WechatMiniprogram.Component.TrivialInstance & Weapp.FormField & {
+ data: Data & RecordToAny;
};
-export declare type CombinedComponentInstance = Methods & WechatMiniprogram.Component.TrivialInstance & Weapp.FormField & {
- data: Data & RecordToReturn & RecordToAny;
-};
-export interface VantComponentOptions {
+export interface VantComponentOptions {
data?: Data;
field?: boolean;
classes?: string[];
mixins?: string[];
props?: Props & Weapp.PropertyOption;
watch?: Weapp.WatchOption;
- computed?: Computed & Weapp.ComputedOption;
relation?: Weapp.RelationOption & {
name: string;
};
diff --git a/dist/definitions/weapp.d.ts b/dist/definitions/weapp.d.ts
index 9b18ea80..5fb00609 100644
--- a/dist/definitions/weapp.d.ts
+++ b/dist/definitions/weapp.d.ts
@@ -1,6 +1,6 @@
///
export declare namespace Weapp {
- interface FormField {
+ export interface FormField {
data: {
name: string;
value: any;
@@ -13,7 +13,7 @@ export declare namespace Weapp {
[key: string]: any;
};
}
- interface Event {
+ export interface Event {
/**
* 代表事件的类型。
*/
@@ -57,14 +57,14 @@ export declare namespace Weapp {
*/
clientY: number;
}
- interface TouchEvent extends Event {
+ export interface TouchEvent extends Event {
touches: Array;
changedTouches: Array;
}
/**
* relation定义，miniprogram-api-typings缺少this定义
*/
- interface RelationOption {
+ export interface RelationOption {
/** 目标组件的相对关系 */
type: 'parent' | 'child' | 'ancestor' | 'descendant';
/** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
@@ -83,20 +83,20 @@ export declare namespace Weapp {
/**
* watch定义
*/
- interface WatchOption {
+ export interface WatchOption {
[name: string]: string | Observer;
}
/**
* methods定义，miniprogram-api-typings缺少this定义
*/
- interface MethodOption {
+ export interface MethodOption {
[name: string]: (this: Instance, ...args: any[]) => any;
}
- interface ComputedOption {
+ export interface ComputedOption {
[name: string]: (this: Instance) => any;
}
type PropertyType = StringConstructor | NumberConstructor | BooleanConstructor | ArrayConstructor | ObjectConstructor | FunctionConstructor | null;
- interface PropertyOption {
+ export interface PropertyOption {
[name: string]: PropertyType | PropertyType[] | {
/** 属性类型 */
type: PropertyType | PropertyType[];
@@ -108,4 +108,5 @@ export declare namespace Weapp {
optionalTypes?: PropertyType[];
};
}
+ export {};
}
diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js
index 51902e6c..5f55f3d2 100644
--- a/dist/dialog/dialog.js
+++ b/dist/dialog/dialog.js
@@ -4,14 +4,14 @@ function getContext() {
return pages[pages.length - 1];
}
const Dialog = options => {
- options = Object.assign({}, Dialog.currentOptions, options);
+ options = Object.assign(Object.assign({}, Dialog.currentOptions), options);
return new Promise((resolve, reject) => {
const context = options.context || getContext();
const dialog = context.selectComponent(options.selector);
delete options.context;
delete options.selector;
if (dialog) {
- dialog.set(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
+ dialog.setData(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
queue.push(dialog);
}
else {
diff --git a/dist/dialog/index.js b/dist/dialog/index.js
index bbbbff23..fc300bd3 100644
--- a/dist/dialog/index.js
+++ b/dist/dialog/index.js
@@ -1,6 +1,7 @@
import { VantComponent } from '../common/component';
import { button } from '../mixins/button';
import { openType } from '../mixins/open-type';
+import { GRAY, BLUE } from '../common/color';
VantComponent({
mixins: [button, openType],
props: {
@@ -12,6 +13,7 @@ VantComponent({
customStyle: String,
asyncClose: Boolean,
messageAlign: String,
+ useTitleSlot: Boolean,
showCancelButton: Boolean,
closeOnClickOverlay: Boolean,
confirmButtonOpenType: String,
@@ -27,6 +29,14 @@ VantComponent({
type: String,
value: '取消'
},
+ confirmButtonColor: {
+ type: String,
+ value: BLUE
+ },
+ cancelButtonColor: {
+ type: String,
+ value: GRAY
+ },
showConfirmButton: {
type: Boolean,
value: true
@@ -63,19 +73,19 @@ VantComponent({
},
handleAction(action) {
if (this.data.asyncClose) {
- this.set({
+ this.setData({
[`loading.${action}`]: true
});
}
this.onClose(action);
},
close() {
- this.set({
+ this.setData({
show: false
});
},
stopLoading() {
- this.set({
+ this.setData({
loading: {
confirm: false,
cancel: false
diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml
index 13a77d16..1f02b3d8 100644
--- a/dist/dialog/index.wxml
+++ b/dist/dialog/index.wxml
@@ -9,10 +9,11 @@
bind:close="onClickOverlay"
>
@@ -20,7 +21,7 @@
wx:elif="{{ message }}"
class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
>
- {{ message }}
+ {{ message }}