blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

build: compile 1.4.4

Browse Source
This commit is contained in:
zhongnan 2020-08-12 16:46:28 +08:00
parent 9def27291a
commit afae7b3c5d
11 changed files with 116 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/common/utils.d.ts vendored
View File

@ -6,3 +6,6 @@ export declare function range(num: number, min: number, max: number): number;
export declare function nextTick(fn: Function): void; export declare function nextTick(fn: Function): void;
export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSyncResult; export declare function getSystemInfoSync(): WechatMiniprogram.GetSystemInfoSyncResult;
export declare function addUnit(value?: string | number): string | undefined; export declare function addUnit(value?: string | number): string | undefined;
export declare function requestAnimationFrame(
cb: Function
): void | WechatMiniprogram.NodesRef;

47
dist/common/utils.js vendored
View File

@ -1,32 +1,45 @@
export function isDef(value) { export function isDef(value) {
return value !== undefined && value !== null; return value !== undefined && value !== null;
} }
export function isObj(x) { export function isObj(x) {
const type = typeof x; const type = typeof x;
return x !== null && (type === 'object' || type === 'function'); return x !== null && (type === 'object' || type === 'function');
} }
export function isNumber(value) { export function isNumber(value) {
return /^\d+(\.\d+)?$/.test(value); return /^\d+(\.\d+)?$/.test(value);
} }
export function range(num, min, max) { export function range(num, min, max) {
return Math.min(Math.max(num, min), max); return Math.min(Math.max(num, min), max);
} }
export function nextTick(fn) { export function nextTick(fn) {
setTimeout(() => { setTimeout(() => {
fn(); fn();
}, 1000 / 30); }, 1000 / 30);
} }
let systemInfo = null; let systemInfo = null;
export function getSystemInfoSync() { export function getSystemInfoSync() {
if (systemInfo == null) { if (systemInfo == null) {
systemInfo = wx.getSystemInfoSync(); systemInfo = wx.getSystemInfoSync();
} }
return systemInfo; return systemInfo;
} }
export function addUnit(value) { export function addUnit(value) {
if (!isDef(value)) { if (!isDef(value)) {
return undefined; return undefined;
} }
value = String(value); value = String(value);
return isNumber(value) ? `${value}px` : value; return isNumber(value) ? `${value}px` : value;
}
export function requestAnimationFrame(cb) {
const systemInfo = getSystemInfoSync();
if (systemInfo.platform === 'devtools') {
return nextTick(cb);
}
return wx
.createSelectorQuery()
.selectViewport()
.boundingClientRect()
.exec(() => {
cb();
});
} }

2
dist/info/index.wxss vendored
View File

@ -1 +1 @@
@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);line-height:14px;line-height:calc(var(--info-size, 16px) - var(--info-border-width, 1px)*2);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)} @import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;line-height:1.2;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}

63
dist/mixins/transition.js vendored
View File

@ -1,11 +1,10 @@
import { isObj } from '../common/utils'; import { isObj, requestAnimationFrame } from '../common/utils';
const getClassNames = (name) => ({ const getClassNames = (name) => ({
enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`, enter: `van-${name}-enter van-${name}-enter-active enter-class enter-active-class`,
'enter-to': `van-${name}-enter-to van-${name}-enter-active enter-to-class enter-active-class`, 'enter-to': `van-${name}-enter-to van-${name}-enter-active enter-to-class enter-active-class`,
leave: `van-${name}-leave van-${name}-leave-active leave-class leave-active-class`, leave: `van-${name}-leave van-${name}-leave-active leave-class leave-active-class`,
'leave-to': `van-${name}-leave-to van-${name}-leave-active leave-to-class leave-active-class`, 'leave-to': `van-${name}-leave-to van-${name}-leave-active leave-to-class leave-active-class`,
}); });
const nextTick = () => new Promise((resolve) => setTimeout(resolve, 1000 / 30));
export const transition = function (showDefaultValue) { export const transition = function (showDefaultValue) {
return Behavior({ return Behavior({
properties: { properties: {
@ -45,27 +44,21 @@ export const transition = function (showDefaultValue) {
const currentDuration = isObj(duration) ? duration.enter : duration; const currentDuration = isObj(duration) ? duration.enter : duration;
this.status = 'enter'; this.status = 'enter';
this.$emit('before-enter'); this.$emit('before-enter');
Promise.resolve() requestAnimationFrame(() => {
.then(nextTick) this.checkStatus('enter');
.then(() => { this.$emit('enter');
this.checkStatus('enter'); this.setData({
this.$emit('enter'); inited: true,
this.setData({ display: true,
inited: true, classes: classNames.enter,
display: true, currentDuration,
classes: classNames.enter, });
currentDuration, requestAnimationFrame(() => {
});
})
.then(nextTick)
.then(() => {
this.checkStatus('enter'); this.checkStatus('enter');
this.transitionEnded = false; this.transitionEnded = false;
this.setData({ this.setData({ classes: classNames['enter-to'] });
classes: classNames['enter-to'], });
}); });
})
.catch(() => {});
}, },
leave() { leave() {
if (!this.data.display) { if (!this.data.display) {
@ -76,26 +69,20 @@ export const transition = function (showDefaultValue) {
const currentDuration = isObj(duration) ? duration.leave : duration; const currentDuration = isObj(duration) ? duration.leave : duration;
this.status = 'leave'; this.status = 'leave';
this.$emit('before-leave'); this.$emit('before-leave');
Promise.resolve() requestAnimationFrame(() => {
.then(nextTick) this.checkStatus('leave');
.then(() => { this.$emit('leave');
this.checkStatus('leave'); this.setData({
this.$emit('leave'); classes: classNames.leave,
this.setData({ currentDuration,
classes: classNames.leave, });
currentDuration, requestAnimationFrame(() => {
});
})
.then(nextTick)
.then(() => {
this.checkStatus('leave'); this.checkStatus('leave');
this.transitionEnded = false; this.transitionEnded = false;
setTimeout(() => this.onTransitionEnd(), currentDuration); setTimeout(() => this.onTransitionEnd(), currentDuration);
this.setData({ this.setData({ classes: classNames['leave-to'] });
classes: classNames['leave-to'], });
}); });
})
.catch(() => {});
}, },
checkStatus(status) { checkStatus(status) {
if (status !== this.status) { if (status !== this.status) {

8
dist/tabs/index.js vendored
View File

@ -205,7 +205,8 @@ VantComponent({
lineWidth, lineWidth,
lineHeight, lineHeight,
} = this.data; } = this.data;
this.getRect(`.van-tab--${currentIndex}`).then((rect) => { this.getRect('.van-tab', true).then((rects = []) => {
const rect = rects[currentIndex];
if (rect == null) { if (rect == null) {
return; return;
} }
@ -216,7 +217,10 @@ VantComponent({
lineHeight lineHeight
)};` )};`
: ''; : '';
const left = rect.left + (rect.width - width) / 2; let left = rects
.slice(0, currentIndex)
.reduce((prev, curr) => prev + curr.width, 0);
left += (rect.width - width) / 2;
const transition = skipTransition const transition = skipTransition
? '' ? ''
: `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`; : `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`;

2
dist/tabs/index.wxml vendored
View File

@ -25,7 +25,7 @@
wx:for="{{ tabs }}" wx:for="{{ tabs }}"
wx:key="index" wx:key="index"
data-index="{{ index }}" data-index="{{ index }}"
class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', ['' + index, { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }]) }}" class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}" style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}"
bind:tap="onTap" bind:tap="onTap"
> >

16
lib/common/utils.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
Object.defineProperty(exports, '__esModule', { value: true }); Object.defineProperty(exports, '__esModule', { value: true });
exports.addUnit = exports.getSystemInfoSync = exports.nextTick = exports.range = exports.isNumber = exports.isObj = exports.isDef = void 0; exports.requestAnimationFrame = exports.addUnit = exports.getSystemInfoSync = exports.nextTick = exports.range = exports.isNumber = exports.isObj = exports.isDef = void 0;
function isDef(value) { function isDef(value) {
return value !== undefined && value !== null; return value !== undefined && value !== null;
} }
@ -40,3 +40,17 @@ function addUnit(value) {
return isNumber(value) ? value + 'px' : value; return isNumber(value) ? value + 'px' : value;
} }
exports.addUnit = addUnit; exports.addUnit = addUnit;
function requestAnimationFrame(cb) {
var systemInfo = getSystemInfoSync();
if (systemInfo.platform === 'devtools') {
return nextTick(cb);
}
return wx
.createSelectorQuery()
.selectViewport()
.boundingClientRect()
.exec(function () {
cb();
});
}
exports.requestAnimationFrame = requestAnimationFrame;

2
lib/info/index.wxss
View File

@ -1 +1 @@
@import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);line-height:14px;line-height:calc(var(--info-size, 16px) - var(--info-border-width, 1px)*2);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)} @import '../common/index.wxss';.van-info{position:absolute;top:0;right:0;box-sizing:border-box;line-height:1.2;white-space:nowrap;text-align:center;-webkit-transform:translate(50%,-50%);transform:translate(50%,-50%);-webkit-transform-origin:100%;transform-origin:100%;min-width:16px;min-width:var(--info-size,16px);padding:0 3px;padding:var(--info-padding,0 3px);color:#fff;color:var(--info-color,#fff);font-weight:500;font-weight:var(--info-font-weight,500);font-size:12px;font-size:var(--info-font-size,12px);font-family:-apple-system-font,Helvetica Neue,Arial,sans-serif;font-family:var(--info-font-family,-apple-system-font,Helvetica Neue,Arial,sans-serif);background-color:#ee0a24;background-color:var(--info-background-color,#ee0a24);border:1px solid #fff;border:var(--info-border-width,1px) solid var(--white,#fff);border-radius:16px;border-radius:var(--info-size,16px)}.van-info--dot{min-width:0;border-radius:100%;width:8px;width:var(--info-dot-size,8px);height:8px;height:var(--info-dot-size,8px);background-color:#ee0a24;background-color:var(--info-dot-color,#ee0a24)}

65
lib/mixins/transition.js
View File

@ -30,11 +30,6 @@ var getClassNames = function (name) {
'-leave-active leave-to-class leave-active-class', '-leave-active leave-to-class leave-active-class',
}; };
}; };
var nextTick = function () {
return new Promise(function (resolve) {
return setTimeout(resolve, 1000 / 30);
});
};
exports.transition = function (showDefaultValue) { exports.transition = function (showDefaultValue) {
return Behavior({ return Behavior({
properties: { properties: {
@ -79,27 +74,21 @@ exports.transition = function (showDefaultValue) {
: duration; : duration;
this.status = 'enter'; this.status = 'enter';
this.$emit('before-enter'); this.$emit('before-enter');
Promise.resolve() utils_1.requestAnimationFrame(function () {
.then(nextTick) _this.checkStatus('enter');
.then(function () { _this.$emit('enter');
_this.checkStatus('enter'); _this.setData({
_this.$emit('enter'); inited: true,
_this.setData({ display: true,
inited: true, classes: classNames.enter,
display: true, currentDuration: currentDuration,
classes: classNames.enter, });
currentDuration: currentDuration, utils_1.requestAnimationFrame(function () {
});
})
.then(nextTick)
.then(function () {
_this.checkStatus('enter'); _this.checkStatus('enter');
_this.transitionEnded = false; _this.transitionEnded = false;
_this.setData({ _this.setData({ classes: classNames['enter-to'] });
classes: classNames['enter-to'], });
}); });
})
.catch(function () {});
}, },
leave: function () { leave: function () {
var _this = this; var _this = this;
@ -115,28 +104,22 @@ exports.transition = function (showDefaultValue) {
: duration; : duration;
this.status = 'leave'; this.status = 'leave';
this.$emit('before-leave'); this.$emit('before-leave');
Promise.resolve() utils_1.requestAnimationFrame(function () {
.then(nextTick) _this.checkStatus('leave');
.then(function () { _this.$emit('leave');
_this.checkStatus('leave'); _this.setData({
_this.$emit('leave'); classes: classNames.leave,
_this.setData({ currentDuration: currentDuration,
classes: classNames.leave, });
currentDuration: currentDuration, utils_1.requestAnimationFrame(function () {
});
})
.then(nextTick)
.then(function () {
_this.checkStatus('leave'); _this.checkStatus('leave');
_this.transitionEnded = false; _this.transitionEnded = false;
setTimeout(function () { setTimeout(function () {
return _this.onTransitionEnd(); return _this.onTransitionEnd();
}, currentDuration); }, currentDuration);
_this.setData({ _this.setData({ classes: classNames['leave-to'] });
classes: classNames['leave-to'], });
}); });
})
.catch(function () {});
}, },
checkStatus: function (status) { checkStatus: function (status) {
if (status !== this.status) { if (status !== this.status) {

11
lib/tabs/index.js
View File

@ -223,7 +223,11 @@ component_1.VantComponent({
currentIndex = _a.currentIndex, currentIndex = _a.currentIndex,
lineWidth = _a.lineWidth, lineWidth = _a.lineWidth,
lineHeight = _a.lineHeight; lineHeight = _a.lineHeight;
this.getRect('.van-tab--' + currentIndex).then(function (rect) { this.getRect('.van-tab', true).then(function (rects) {
if (rects === void 0) {
rects = [];
}
var rect = rects[currentIndex];
if (rect == null) { if (rect == null) {
return; return;
} }
@ -236,7 +240,10 @@ component_1.VantComponent({
utils_1.addUnit(lineHeight) + utils_1.addUnit(lineHeight) +
';' ';'
: ''; : '';
var left = rect.left + (rect.width - width) / 2; var left = rects.slice(0, currentIndex).reduce(function (prev, curr) {
return prev + curr.width;
}, 0);
left += (rect.width - width) / 2;
var transition = skipTransition var transition = skipTransition
? '' ? ''
: 'transition-duration: ' + : 'transition-duration: ' +

2
lib/tabs/index.wxml
View File

@ -25,7 +25,7 @@
wx:for="{{ tabs }}" wx:for="{{ tabs }}"
wx:key="index" wx:key="index"
data-index="{{ index }}" data-index="{{ index }}"
class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', ['' + index, { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }]) }}" class="{{ getters.tabClass(index === currentIndex, ellipsis) }} {{ utils.bem('tab', { active: index === currentIndex, disabled: item.disabled, complete: !ellipsis }) }}"
style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}" style="{{ getters.tabStyle(index === currentIndex, ellipsis, color, type, item.disabled, titleActiveColor, titleInactiveColor, swipeThreshold, scrollable) }}"
bind:tap="onTap" bind:tap="onTap"
> >