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

Merge branch 'feature/update_sku_doc' into dev

Browse Source
This commit is contained in:
niunai
2017-09-19 18:17:45 +08:00
parent 6dbc9b6da9 3ba8b84d08
commit a574ee29f1
9 changed files with 230 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/sku/components/SkuMessages.vue
+8 -22
View File
@@ -1,12 +1,12 @@
<template>
<van-cell-group>
<van-cell-group class="van-sku-messages">
<template v-for="(message, index) in internalMessages">
<template v-if="message.type === 'image'"></template>
<van-field v-else-if="message.multiple == '1'"
:key="index"
:required="message.required == '1'"
:label="message.name"
placeholder="点击填写段落文本"
:placeholder="placeholderMap.textarea"
type="textarea"
v-model="messageValues[index]">
</van-field>
@@ -14,7 +14,7 @@
:key="index"
:required="message.required == '1'"
:label="message.name"
:placeholder="PLACEHOLDER_MAP[message.type]"
:placeholder="placeholderMap[message.type]"
:type="getType(message)"
v-model="messageValues[index]">
</van-field>
@@ -23,20 +23,11 @@
</template>
<script>
import isEmpty from 'lodash/isEmpty';
import Field from '../../field';
import CellGroup from '../../cell-group';
import validateEmail from 'zan-utils/validate/email';
import validateNumber from 'zan-utils/validate/number';
const PLACEHOLDER_MAP = {
'id_no': '输入18位身份证号码',
text: '输入文本',
tel: '输入数字',
email: '输入邮箱',
date: '点击选择日期',
time: '点击选择时间'
};
import { DEFAULT_PLACEHOLDER_MAP } from '../constants';
export default {
name: 'van-sku-messages',
@@ -47,12 +38,13 @@ export default {
},
props: {
messages: Array
messages: Array,
messagePlaceholderMap: Object
},
data() {
return {
PLACEHOLDER_MAP
placeholderMap: Object.assign({}, DEFAULT_PLACEHOLDER_MAP, this.messagePlaceholderMap)
};
},
@@ -117,7 +109,7 @@ export default {
const value = values[i];
const message = this.internalMessages[i];
if (isEmpty(value)) {
if (value === '') {
// 必填字段的校验
if (message.required == '1') { // eslint-disable-line
if (message.type === 'image') {
@@ -128,12 +120,6 @@ export default {
}
}
} else {
// if (message.type == 'image') {
// loaded = _this.$el.find('#ipt-' + j).data('uploaded');
// if (loaded == 'false' || !loaded) {
// return '图片还在上传中，请稍等。。';
// }
// }
if (message.type === 'tel' && !validateNumber(value)) {
return '请填写正确的数字格式留言';
}
packages/sku/components/SkuRow.vue
+1 -19
View File
@@ -2,33 +2,15 @@
<div class="van-sku-row">
<div class="van-sku-row__title">{{ skuRow.k }}：</div>
<div class="van-sku-row__items">
<slot name="sku-row-items">
<van-sku-row-item
v-for="(skuValue, index) in skuRow.v"
:key="index"
:skuKeyStr="skuRow.k_s"
:skuValue="skuValue"
:skuEventBus="$attrs.skuEventBus"
:selectedSku="$attrs.selectedSku"
:skuList="$attrs.skuList">
</van-sku-row-item>
</slot>
<slot></slot>
</div>
</div>
</template>
<script>
import SkuRowItem from './SkuRowItem';
export default {
name: 'van-sku-row',
inheritAttrs: false,
components: {
[SkuRowItem.name]: SkuRowItem
},
props: {
skuRow: Object
}
packages/sku/components/SkuRowItem.vue
+5 -10
View File
@@ -8,11 +8,6 @@
</template>
<script>
import assign from 'lodash/assign';
import filter from 'lodash/filter';
import keys from 'lodash/keys';
import every from 'lodash/every';
export default {
name: 'van-sku-row-item',
@@ -29,12 +24,12 @@ export default {
return this.skuValue.id === this.selectedSku[this.skuKeyStr];
},
isChoosable() {
const matchedSku = assign({}, this.selectedSku, {
const matchedSku = Object.assign({}, this.selectedSku, {
[this.skuKeyStr]: this.skuValue.id
});
const skusToCheck = filter(keys(matchedSku), skuKey => matchedSku[skuKey] !== '');
const filteredSku = filter(this.skuList, sku => {
return every(skusToCheck, function(skuKey) {
const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== '');
const filteredSku = this.skuList.filter(sku => {
return skusToCheck.every(skuKey => {
// 后端给的skuValue.id有时候是数字有时候是字符串，全等会匹配不上
return matchedSku[skuKey] == sku[skuKey]; // eslint-disable-line
});
@@ -47,7 +42,7 @@ export default {
methods: {
onSkuSelected() {
this.skuEventBus.$emit('sku:select', assign({}, this.skuValue, { skuKeyStr: this.skuKeyStr }));
this.skuEventBus.$emit('sku:select', Object.assign({}, this.skuValue, { skuKeyStr: this.skuKeyStr }));
}
}
};
packages/sku/components/SkuStepper.vue
+4 -4
View File
@@ -11,7 +11,7 @@
<script>
import Stepper from '../../stepper';
import { LIMIT_TYPE } from '../constants';
import { LIMIT_TYPE, DEFAULT_BUY_TEXT } from '../constants';
const { QUOTA_LIMIT, STOCK_LIMIT } = LIMIT_TYPE;
@@ -24,7 +24,7 @@ export default {
props: {
skuEventBus: Object,
sku: Object,
skuStockNum: Number,
selectedSku: Object,
selectedSkuComb: Object,
selectedNum: Number,
@@ -36,7 +36,7 @@ export default {
},
stepperTitle: {
type: String,
default: '购买数量'
default: DEFAULT_BUY_TEXT
}
},
@@ -64,7 +64,7 @@ export default {
if (this.selectedSkuComb) {
return this.selectedSkuComb.stock_num;
}
return this.sku.stock_num;
return this.skuStockNum;
},
stepperLimit() {
const quotaLimit = this.quota - this.quotaUsed;
packages/sku/constants.js
+14
View File
@@ -2,3 +2,17 @@ export const LIMIT_TYPE = {
QUOTA_LIMIT: 0,
STOCK_LIMIT: 1
};
export const DEFAULT_BUY_TEXT = '立即购买';
export const DEFAULT_STEPPER_TITLE = '购买数量';
export const DEFAULT_PLACEHOLDER_MAP = {
'id_no': '输入18位身份证号码',
text: '输入文本',
tel: '输入数字',
email: '输入邮箱',
date: '点击选择日期',
time: '点击选择时间',
textarea: '点击填写段落文本'
};
packages/sku/containers/SkuContainer.vue
+41 -19
View File
@@ -1,5 +1,5 @@
<template>
<van-popup v-model="show" position="bottom" :lock-scroll="true">
<van-popup v-model="show" v-if="!isSkuEmpty" position="bottom" :lock-scroll="true">
<div class="van-sku-container">
<div class="van-sku-layout">
<slot name="sku-header" :skuEventBus="skuEventBus" :selectedSku="selectedSku" :selectedSkuComb="selectedSkuComb">
@@ -14,15 +14,21 @@
<div class="van-sku-body scroller" :style="bodyStyle">
<slot name="sku-group" :selectedSku="selectedSku">
<div v-if="hasSku" class="van-sku-group-container">
<div v-for="(skutreeItem, index) in skuTree"
<div v-for="(skuTreeItem, index) in skuTree"
class="van-sku-row-group"
:key="index">
<van-sku-row
v-bind="$attrs"
:skuEventBus="skuEventBus"
:skuRow="skutreeItem"
:skuList="sku.list"
:selectedSku="selectedSku">
:skuRow="skuTreeItem">
<van-sku-row-item
v-for="(skuValue, index) in skuTreeItem.v"
:key="index"
:skuKeyStr="skuTreeItem.k_s"
:skuValue="skuValue"
:skuEventBus="skuEventBus"
:selectedSku="selectedSku"
:skuList="sku.list">
</van-sku-row-item>
</van-sku-row>
</div>
</div>
@@ -36,7 +42,7 @@
:selectedSkuComb="selectedSkuComb"
:selectedNum="selectedNum"
:stepperTitle="stepperTitle"
:sku="sku"
:skuStockNum="sku.stock_num"
:quota="quota"
:quotaUsed="quotaUsed"
:hideStock="hideStock">
@@ -45,17 +51,18 @@
<slot name="sku-messages">
<van-sku-messages
ref="skuMessages"
:messagePlaceholderMap="messagePlaceholderMap"
:messages="sku.messages">
</van-sku-messages>
</slot>
<slot name="sku-actions" :skuEventBus="skuEventBus">
<van-sku-actions
:skuEventBus="skuEventBus"
:buyText="buyText"
:showAddCartBtn="showAddCartBtn">
</van-sku-actions>
</slot>
</div>
<slot name="sku-actions" :skuEventBus="skuEventBus">
<van-sku-actions
:skuEventBus="skuEventBus"
:buyText="buyText"
:showAddCartBtn="showAddCartBtn">
</van-sku-actions>
</slot>
</div>
</div>
</van-popup>
@@ -67,11 +74,12 @@ import Popup from '../../popup';
import Toast from '../../toast';
import SkuHeader from '../components/SkuHeader';
import SkuRow from '../components/SkuRow';
import SkuRowItem from '../components/SkuRowItem';
import SkuStepper from '../components/SkuStepper';
import SkuMessages from '../components/SkuMessages';
import SkuActions from '../components/SkuActions';
import { isAllSelected, getSkuComb, getSelectedSkuValues } from '../utils/skuHelper';
import { LIMIT_TYPE } from '../constants';
import { LIMIT_TYPE, DEFAULT_STEPPER_TITLE } from '../constants';
const { QUOTA_LIMIT } = LIMIT_TYPE;
@@ -82,6 +90,7 @@ export default {
[Popup.name]: Popup,
[SkuHeader.name]: SkuHeader,
[SkuRow.name]: SkuRow,
[SkuRowItem.name]: SkuRowItem,
[SkuStepper.name]: SkuStepper,
[SkuMessages.name]: SkuMessages,
[SkuActions.name]: SkuActions
@@ -115,13 +124,19 @@ export default {
buyText: String,
stepperTitle: {
type: String,
default: '购买数量'
default: DEFAULT_STEPPER_TITLE
},
bodyOffsetTop: {
type: Number,
default: 150
default: 200
},
resetStepperOnHide: Boolean,
messagePlaceholderMap: {
type: Object,
default() {
return {};
}
},
value: Boolean
},
@@ -161,7 +176,7 @@ export default {
computed: {
bodyStyle() {
const windowHeight = window.innerHeight;
// header高度大概82px
// header高度82px, sku actions高度50px，如果改动了样式自己传下bodyOffsetTop调整下
const maxHeight = windowHeight - this.bodyOffsetTop;
return {
@@ -171,6 +186,13 @@ export default {
isSkuCombSelected() {
return isAllSelected(this.sku.tree, this.selectedSku);
},
// sku数据不存在时不渲染模板
isSkuEmpty() {
for (var key in this.sku) {
if (Object.prototype.hasOwnProperty.call(this.sku, key)) return false;
}
return true;
},
hasSku() {
return !this.sku.none_sku;
},
@@ -242,7 +264,7 @@ export default {
if (this.isSkuCombSelected) {
const error = this.validateSkuMessages();
// sku留言没有错误则校验通过
return error ? error : '';
return error;
} else {
return '请选择完整的规格';
}
packages/sku/utils/skuHelper.js
+5 -17
View File
@@ -1,10 +1,4 @@
import isArray from 'lodash/isArray';
import keys from 'lodash/keys';
import filter from 'lodash/filter';
import find from 'lodash/find';
import isObject from 'lodash/isObject';
import every from 'lodash/every';
/*
normalize sku tree
@@ -49,21 +43,15 @@ export const normalizeSkuTree = (skuTree) => {
// 判断是否所有的sku都已经选中
export const isAllSelected = (skuTree, selectedSku) => {
if (!isArray(skuTree)) {
throw new Error('skuTree must be array');
}
if (!isObject(selectedSku)) {
throw new Error('selectedSku must be object');
}
const selected = filter(keys(selectedSku), skuKeyStr => selectedSku[skuKeyStr] !== '');
// 筛选selectedSku对象中key值不为空的值
const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr] !== '');
return skuTree.length === selected.length;
};
// 根据已选择的sku获取skuComb
export const getSkuComb = (skuList, selectedSku) => {
const skuComb = find(skuList, (skuComb) => {
return every(keys(selectedSku), skuKeyStr => {
const skuComb = find(skuList, skuComb => {
return Object.keys(selectedSku).every(skuKeyStr => {
// 后端给的key有时数字有时字符串，需要兼容=。=
return skuComb[skuKeyStr] == selectedSku[skuKeyStr]; // eslint-disable-line
});
@@ -74,7 +62,7 @@ export const getSkuComb = (skuList, selectedSku) => {
// 获取已选择的sku名称
export const getSelectedSkuValues = (skuTree, selectedSku) => {
const normalizedTree = normalizeSkuTree(skuTree);
return keys(selectedSku).reduce((selectedValues, skuKeyStr) => {
return Object.keys(selectedSku).reduce((selectedValues, skuKeyStr) => {
const skuValues = normalizedTree[skuKeyStr];
const skuValueId = selectedSku[skuKeyStr];