alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: add trailingComma

Browse Source
This commit is contained in:
陈嘉涵
2020-01-19 11:57:09 +08:00
parent e841175fe8
commit 389d68884d
269 changed files with 2706 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sku/Sku.js
+25 -25
View File
@@ -48,19 +48,19 @@ export default createComponent({
properties: Array,
quota: {
type: Number,
default: 0
default: 0,
},
quotaUsed: {
type: Number,
default: 0
default: 0,
},
startSaleNum: {
type: Number,
default: 1
default: 1,
},
initialSku: {
type: Object,
default: () => ({})
default: () => ({}),
},
stockThreshold: {
type: Number,
@@ -68,27 +68,27 @@ export default createComponent({
},
showSoldoutSku: {
type: Boolean,
default: true
default: true,
},
showAddCartBtn: {
type: Boolean,
default: true
default: true,
},
bodyOffsetTop: {
type: Number,
default: 200
default: 200,
},
messageConfig: {
type: Object,
default: () => ({
placeholderMap: {},
uploadImg: () => Promise.resolve(),
uploadMaxSize: 5
})
uploadMaxSize: 5,
}),
},
customStepperConfig: {
type: Object,
default: () => ({})
default: () => ({}),
},
},
@@ -97,7 +97,7 @@ export default createComponent({
selectedSku: {},
selectedProp: {},
selectedNum: 1,
show: this.value
show: this.value,
};
},
@@ -108,7 +108,7 @@ export default createComponent({
this.$emit('sku-close', {
selectedSkuValues: this.selectedSkuValues,
selectedNum: this.selectedNum,
selectedSkuComb: this.selectedSkuComb
selectedSkuComb: this.selectedSkuComb,
});
if (this.resetStepperOnHide) {
@@ -138,8 +138,8 @@ export default createComponent({
return [
'van-sku-group-container',
{
'van-sku-group-container--hide-soldout': !this.showSoldoutSku
}
'van-sku-group-container--hide-soldout': !this.showSoldoutSku,
},
];
},
@@ -152,7 +152,7 @@ export default createComponent({
const maxHeight = window.innerHeight - this.bodyOffsetTop;
return {
maxHeight: maxHeight + 'px'
maxHeight: maxHeight + 'px',
};
},
@@ -189,7 +189,7 @@ export default createComponent({
skuComb = {
id: this.sku.collection_id,
price: Math.round(this.sku.price * 100),
stock_num: this.sku.stock_num
stock_num: this.sku.stock_num,
};
}
if (skuComb) {
@@ -272,7 +272,7 @@ export default createComponent({
<span class={bem('stock-num', { highlight: this.stock < this.stockThreshold })}>
{this.stock}
</span>,
` ${t('stockUnit')}`
` ${t('stockUnit')}`,
];
},
@@ -290,7 +290,7 @@ export default createComponent({
.map(item => item.k);
return `${t('select')} ${unselectedSku.concat(unselectedProp).join('；')}`;
}
},
},
created() {
@@ -459,7 +459,7 @@ export default createComponent({
const params = {
index,
imageList: this.imageList,
indexImage
indexImage,
};
this.$emit('open-preview', params);
@@ -470,7 +470,7 @@ export default createComponent({
closeOnPopstate: true,
onClose: () => {
this.$emit('close-preview', params);
}
},
});
},
@@ -541,9 +541,9 @@ export default createComponent({
selectedNum: this.selectedNum,
selectedSkuComb: this.selectedSkuComb,
messages: this.getSkuMessages(),
cartMessages: this.getSkuCartMessages()
cartMessages: this.getSkuCartMessages(),
};
}
},
},
render() {
@@ -561,7 +561,7 @@ export default createComponent({
selectedProp,
selectedNum,
stepperTitle,
selectedSkuComb
selectedSkuComb,
} = this;
const slotsProps = {
@@ -570,7 +570,7 @@ export default createComponent({
selectedNum,
skuEventBus,
selectedSku,
selectedSkuComb
selectedSkuComb,
};
const slots = name => this.slots(name, slotsProps);
@@ -694,5 +694,5 @@ export default createComponent({
{Actions}
</Popup>
);
}
},
});
src/sku/components/SkuActions.tsx
+1 -1
View File
@@ -49,7 +49,7 @@ SkuActions.props = {
buyText: String,
addCartText: String,
skuEventBus: Object,
showAddCartBtn: Boolean
showAddCartBtn: Boolean,
};
export default createComponent<SkuActionsProps>(SkuActions);
src/sku/components/SkuHeader.tsx
+1 -1
View File
@@ -61,7 +61,7 @@ SkuHeader.props = {
sku: Object,
goods: Object,
skuEventBus: Object,
selectedSku: Object
selectedSku: Object,
};
export default createComponent<SkuHeaderProps>(SkuHeader);
src/sku/components/SkuImgUploader.js
+8 -8
View File
@@ -11,15 +11,15 @@ export default createComponent({
uploadImg: Function,
maxSize: {
type: Number,
default: 6
}
default: 6,
},
},
data() {
return {
// 正在上传的图片 base64
paddingImg: '',
uploadFail: false
uploadFail: false,
};
},
@@ -67,14 +67,14 @@ export default createComponent({
? (
[
<Icon name="warning-o" size="20px" />,
<div class={bem('warn-text')} domPropsInnerHTML={t('fail')} />
<div class={bem('warn-text')} domPropsInnerHTML={t('fail')} />,
]
) : (
<Loading type="spinner" size="20px" color="white" />
)}
</div>
);
}
},
},
render() {
@@ -89,7 +89,7 @@ export default createComponent({
onClick={() => {
this.$emit('input', '');
}}
/>
/>,
],
true
)}
@@ -97,7 +97,7 @@ export default createComponent({
{this.paddingImg && this.genUploader(
[
<img src={this.paddingImg} />,
this.genMask()
this.genMask(),
],
!this.uploadFail
)}
@@ -109,5 +109,5 @@ export default createComponent({
)}
</div>
);
}
},
});
src/sku/components/SkuMessages.js
+6 -6
View File
@@ -12,22 +12,22 @@ export default createComponent({
props: {
messages: {
type: Array,
default: () => []
default: () => [],
},
messageConfig: Object,
goodsId: [Number, String]
goodsId: [Number, String],
},
data() {
return {
messageValues: this.resetMessageValues(this.messages)
messageValues: this.resetMessageValues(this.messages),
};
},
watch: {
messages(val) {
this.messageValues = this.resetMessageValues(val);
}
},
},
methods: {
@@ -108,7 +108,7 @@ export default createComponent({
}
}
}
}
},
},
render() {
@@ -142,5 +142,5 @@ export default createComponent({
)))}
</CellGroup>
);
}
},
});
src/sku/components/SkuRow.tsx
+1 -1
View File
@@ -31,7 +31,7 @@ function SkuRow(
}
SkuRow.props = {
skuRow: Object
skuRow: Object,
};
export default createComponent<SkuRowProps>(SkuRow);
src/sku/components/SkuRowItem.js
+9 -9
View File
@@ -11,17 +11,17 @@ export default createComponent({
selectedSku: Object,
skuList: {
type: Array,
default: () => []
}
default: () => [],
},
},
computed: {
choosable() {
return isSkuChoosable(this.skuList, this.selectedSku, {
key: this.skuKeyStr,
valueId: this.skuValue.id
valueId: this.skuValue.id,
});
}
},
},
methods: {
@@ -29,10 +29,10 @@ export default createComponent({
if (this.choosable) {
this.skuEventBus.$emit('sku:select', {
...this.skuValue,
skuKeyStr: this.skuKeyStr
skuKeyStr: this.skuKeyStr,
});
}
}
},
},
render() {
@@ -45,8 +45,8 @@ export default createComponent({
'van-sku-row__item',
{
'van-sku-row__item--active': choosed,
'van-sku-row__item--disabled': !this.choosable
}
'van-sku-row__item--disabled': !this.choosable,
},
]}
onClick={this.onSelect}
>
@@ -54,5 +54,5 @@ export default createComponent({
<span class="van-sku-row__item-name">{this.skuValue.name}</span>
</span>
);
}
},
});
src/sku/components/SkuRowPropItem.js
+2 -2
View File
@@ -29,12 +29,12 @@ export default createComponent({
'van-sku-row__item',
{
'van-sku-row__item--active': choosed,
}
},
]}
onClick={this.onSelect}
>
<span class="van-sku-row__item-name">{this.skuValue.name}</span>
</span>
);
}
},
});
src/sku/components/SkuStepper.js
+5 -5
View File
@@ -19,11 +19,11 @@ export default createComponent({
hideQuotaText: Boolean,
quota: {
type: Number,
default: 0
default: 0,
},
quotaUsed: {
type: Number,
default: 0
default: 0,
},
startSaleNum: {
type: Number,
@@ -35,7 +35,7 @@ export default createComponent({
return {
currentNum: this.selectedNum,
// 购买限制类型: 限购/库存
limitType: STOCK_LIMIT
limitType: STOCK_LIMIT,
};
},
@@ -59,7 +59,7 @@ export default createComponent({
this.currentNum = start;
}
this.checkState(start, this.stepperLimit);
}
},
},
computed: {
@@ -172,5 +172,5 @@ export default createComponent({
</div>
</div>
);
}
},
});
src/sku/constants.js
+2 -2
View File
@@ -1,11 +1,11 @@
export const LIMIT_TYPE = {
QUOTA_LIMIT: 0,
STOCK_LIMIT: 1
STOCK_LIMIT: 1,
};
export const UNSELECTED_SKU_VALUE_ID = '';
export default {
LIMIT_TYPE,
UNSELECTED_SKU_VALUE_ID
UNSELECTED_SKU_VALUE_ID,
};
src/sku/demo/data.ts
+29 -29
View File
@@ -7,7 +7,7 @@ export const skuData = {
title: '测试商品',
picture:
'https://img.yzcdn.cn/upload_files/2017/03/16/Fs_OMbSFPa183sBwvG_94llUYiLa.jpeg?imageView2/2/w/100/h/100/q/75/format/jpg',
price: 1
price: 1,
},
sku: {
price: '1.00',
@@ -24,15 +24,15 @@ export const skuData = {
id: '30349',
name: '天蓝色',
imgUrl:
'https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg'
'https://img.yzcdn.cn/upload_files/2017/02/21/FjKTOxjVgnUuPmHJRdunvYky9OHP.jpg!100x100.jpg',
},
{
id: '1215',
name: '白色'
}
name: '白色',
},
],
k_s: 's1',
count: 2
count: 2,
},
{
k: '尺寸',
@@ -40,16 +40,16 @@ export const skuData = {
v: [
{
id: '1193',
name: '1'
name: '1',
},
{
id: '1194',
name: '2'
}
name: '2',
},
],
k_s: 's2',
count: 2
}
count: 2,
},
],
list: [
{
@@ -63,7 +63,7 @@ export const skuData = {
s4: '0',
s5: '0',
stock_num: 110,
goods_id: 946755
goods_id: 946755,
},
{
id: 2260,
@@ -76,7 +76,7 @@ export const skuData = {
s4: '0',
s5: '0',
stock_num: 0,
goods_id: 946755
goods_id: 946755,
},
{
id: 2257,
@@ -89,7 +89,7 @@ export const skuData = {
s4: '0',
s5: '0',
stock_num: 111,
goods_id: 946755
goods_id: 946755,
},
{
id: 2258,
@@ -102,8 +102,8 @@ export const skuData = {
s4: '0',
s5: '0',
stock_num: 6,
goods_id: 946755
}
goods_id: 946755,
},
],
messages: [
{
@@ -112,7 +112,7 @@ export const skuData = {
multiple: '0',
name: '留言1',
type: 'text',
required: '1'
required: '1',
},
{
datetime: '0',
@@ -120,7 +120,7 @@ export const skuData = {
multiple: 0,
name: '留言2',
type: 'id_no',
required: 0
required: 0,
},
{
datetime: '0',
@@ -128,7 +128,7 @@ export const skuData = {
multiple: 0,
name: '留言3',
type: 'image',
required: 0
required: 0,
},
{
datetime: '0',
@@ -136,7 +136,7 @@ export const skuData = {
multiple: 1,
name: '留言4',
type: 'text',
required: 0
required: 0,
},
{
datetime: '0',
@@ -144,7 +144,7 @@ export const skuData = {
name: '数字',
multiple: 0,
type: 'tel',
required: 0
required: 0,
},
{
datetime: '0',
@@ -152,7 +152,7 @@ export const skuData = {
name: '邮件',
multiple: 0,
type: 'email',
required: 0
required: 0,
},
{
datetime: '0',
@@ -160,7 +160,7 @@ export const skuData = {
name: '日期',
multiple: 0,
type: 'date',
required: 0
required: 0,
},
{
datetime: '0',
@@ -168,7 +168,7 @@ export const skuData = {
name: '时间含日期',
multiple: 0,
type: 'time',
required: 0
required: 0,
},
{
datetime: '0',
@@ -176,8 +176,8 @@ export const skuData = {
name: '时间',
multiple: 0,
type: 'time',
required: 0
}
required: 0,
},
],
},
properties: [
@@ -194,7 +194,7 @@ export const skuData = {
id: 1223,
name: '去冰',
price: 1,
}
},
],
},
{
@@ -205,7 +205,7 @@ export const skuData = {
id: 1244,
name: '分开打包',
price: 9,
}
},
],
},
{
@@ -227,9 +227,9 @@ export const skuData = {
id: 1226,
name: '珍珠',
price: 5,
}
},
],
}
},
],
};
src/sku/demo/index.vue
+8 -8
View File
@@ -164,15 +164,15 @@ export default {
hideSoldoutSku: '隐藏售罄规格',
stepperTitle: '我要买',
button1: '积分兑换',
button2: '买买买'
button2: '买买买',
},
'en-US': {
title2: 'Custom Stepper Related Config',
hideSoldoutSku: 'Hide Soldout Sku',
stepperTitle: 'Stepper title',
button1: 'Button',
button2: 'Button'
}
button2: 'Button',
},
},
data() {
@@ -201,14 +201,14 @@ export default {
this.$toast('库存不够了');
}
}
}
},
},
messageConfig: {
uploadImg: (file, img) => new Promise(resolve => {
setTimeout(() => resolve(img), 1000);
}),
uploadMaxSize: 3
}
uploadMaxSize: 3,
},
};
},
@@ -223,8 +223,8 @@ export default {
onPointClicked() {
this.$toast('积分兑换');
}
}
},
},
};
</script>
src/sku/lang.ts
+8 -8
View File
@@ -16,21 +16,21 @@ export default {
stock: '剩余',
stockUnit: '件',
quotaTip: (quota: number) => `每人限购${quota}件`,
quotaUsedTip: (quota: number, count: number) => `每人限购${quota}件，你已购买${count}件`
quotaUsedTip: (quota: number, count: number) => `每人限购${quota}件，你已购买${count}件`,
},
vanSkuActions: {
buy: '立即购买',
addCart: '加入购物车'
addCart: '加入购物车',
},
vanSkuImgUploader: {
oversize: (maxSize: number) => `最大可上传图片为${maxSize}MB，请尝试压缩图片尺寸`,
fail: '上传失败<br />重新上传'
fail: '上传失败<br />重新上传',
},
vanSkuStepper: {
quotaLimit: (quota: number) => `限购${quota}件`,
quotaStart: (start: number) => `${start}件起售`,
comma: '，',
num: '购买数量'
num: '购买数量',
},
vanSkuMessages: {
fill: '请填写',
@@ -40,7 +40,7 @@ export default {
tel: '请填写正确的数字格式留言',
mobile: '手机号长度为6-20位数字',
email: '请填写正确的邮箱',
id_no: '请填写正确的身份证号码'
id_no: '请填写正确的身份证号码',
},
placeholder: {
id_no: '输入身份证号码',
@@ -50,11 +50,11 @@ export default {
date: '点击选择日期',
time: '点击选择时间',
textarea: '点击填写段落文本',
mobile: '输入手机号码'
}
mobile: '输入手机号码',
},
},
vanSkuRow: {
multiple: '可多选',
},
}
},
};
src/sku/test/index.spec.js
+2 -2
View File
@@ -15,8 +15,8 @@ test('resetSelectedSku method', () => {
goodsId: skuData.goods_id,
quotaUsed: skuData.quota_used,
hideStock: skuData.sku.hide_stock,
startSaleNum: skuData.start_sale_num
}
startSaleNum: skuData.start_sale_num,
},
});
wrapper.find('.van-button--danger').trigger('click');
src/sku/utils/skuHelper.js
+1 -1
View File
@@ -95,7 +95,7 @@ export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
// 先假设sku已选中，拼入已选中sku对象中
const matchedSku = {
...selectedSku,
[key]: valueId
[key]: valueId,
};
// 再判断剩余sku是否全部不可选，若不可选则当前sku不可选中