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

chore: prettier source code

Browse Source
This commit is contained in:
chenjiahan
2020-04-02 15:36:02 +08:00
parent 340c56b3b5
commit 2fb5cca49a
93 changed files with 272 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sku/Sku.js
+22 -18
View File
@@ -171,7 +171,9 @@ export default createComponent({
}
// 属性未全选
if (
this.propList.some(it => (this.selectedProp[it.k_id] || []).length < 1)
this.propList.some(
(it) => (this.selectedProp[it.k_id] || []).length < 1
)
) {
return false;
}
@@ -258,12 +260,12 @@ export default createComponent({
const imageList = [this.goods.picture];
if (this.skuTree.length > 0) {
this.skuTree.forEach(treeItem => {
this.skuTree.forEach((treeItem) => {
if (!treeItem.v) {
return;
}
treeItem.v.forEach(vItem => {
treeItem.v.forEach((vItem) => {
const img = vItem.previewImgUrl || vItem.imgUrl || vItem.img_url;
if (img) {
imageList.push(img);
@@ -306,15 +308,17 @@ export default createComponent({
selectedText() {
if (this.selectedSkuComb) {
const values = this.selectedSkuValues.concat(this.selectedPropValues);
return `${t('selected')} ${values.map(item => item.name).join('；')}`;
return `${t('selected')} ${values.map((item) => item.name).join('；')}`;
}
const unselectedSku = this.skuTree
.filter(item => this.selectedSku[item.k_s] === UNSELECTED_SKU_VALUE_ID)
.map(item => item.k);
.filter(
(item) => this.selectedSku[item.k_s] === UNSELECTED_SKU_VALUE_ID
)
.map((item) => item.k);
const unselectedProp = this.propList
.filter(item => (this.selectedProp[item.k_id] || []).length < 1)
.map(item => item.k);
.filter((item) => (this.selectedProp[item.k_id] || []).length < 1)
.map((item) => item.k);
return `${t('select')} ${unselectedSku
.concat(unselectedProp)
@@ -363,13 +367,13 @@ export default createComponent({
this.selectedSku = {};
// 重置 selectedSku
this.skuTree.forEach(item => {
this.skuTree.forEach((item) => {
this.selectedSku[item.k_s] =
this.initialSku[item.k_s] || UNSELECTED_SKU_VALUE_ID;
});
// 只有一个 sku 规格值时默认选中
this.skuTree.forEach(item => {
this.skuTree.forEach((item) => {
const key = item.k_s;
const valueId = item.v[0].id;
if (
@@ -396,7 +400,7 @@ export default createComponent({
this.selectedProp = {};
const { selectedProp = {} } = this.initialSku;
// 只有一个属性值时，默认选中，且选中外部传入信息
this.propList.forEach(item => {
this.propList.forEach((item) => {
if (item.v && item.v.length === 1) {
this.selectedProp[item.k_id] = [item.v[0].id];
} else if (selectedProp[item.k_id]) {
@@ -493,7 +497,7 @@ export default createComponent({
onPreviewImage(indexImage) {
const { previewOnClickImage } = this;
const index = this.imageList.findIndex(image => image === indexImage);
const index = this.imageList.findIndex((image) => image === indexImage);
const params = {
index,
@@ -615,7 +619,7 @@ export default createComponent({
selectedSku,
selectedSkuComb,
};
const slots = name => this.slots(name, slotsProps);
const slots = (name) => this.slots(name, slotsProps);
const Header = slots('sku-header') || (
<SkuHeader
@@ -658,9 +662,9 @@ export default createComponent({
slots('sku-group') ||
(this.hasSkuOrAttr && (
<div class={this.skuGroupClass}>
{this.skuTree.map(skuTreeItem => (
{this.skuTree.map((skuTreeItem) => (
<SkuRow skuRow={skuTreeItem}>
{skuTreeItem.v.map(skuValue => (
{skuTreeItem.v.map((skuValue) => (
<SkuRowItem
skuList={sku.list}
skuValue={skuValue}
@@ -671,9 +675,9 @@ export default createComponent({
))}
</SkuRow>
))}
{this.propList.map(skuTreeItem => (
{this.propList.map((skuTreeItem) => (
<SkuRow skuRow={skuTreeItem}>
{skuTreeItem.v.map(skuValue => (
{skuTreeItem.v.map((skuValue) => (
<SkuRowPropItem
skuValue={skuValue}
skuKeyStr={skuTreeItem.k_id + ''}
@@ -701,7 +705,7 @@ export default createComponent({
disableStepperInput={this.disableStepperInput}
customStepperConfig={this.customStepperConfig}
hideQuotaText={this.hideQuotaText}
onChange={event => {
onChange={(event) => {
this.$emit('stepper-change', event);
}}
/>
src/sku/components/SkuHeader.tsx
+3 -2
View File
@@ -27,11 +27,12 @@ function getSkuImg(
): string | undefined {
let img;
sku.tree.some(item => {
sku.tree.some((item) => {
const id = selectedSku[item.k_s];
if (id && item.v) {
const matchedSku = item.v.filter(skuValue => skuValue.id === id)[0] || {};
const matchedSku =
item.v.filter((skuValue) => skuValue.id === id)[0] || {};
img = matchedSku.previewImgUrl || matchedSku.imgUrl || matchedSku.img_url;
return img;
}
src/sku/components/SkuImgUploader.js
+1 -1
View File
@@ -32,7 +32,7 @@ export default createComponent({
this.paddingImg = file.content;
this.uploadFail = false;
this.uploadImg(file.file, file.content)
.then(img => {
.then((img) => {
this.$emit('input', img);
this.$nextTick(() => {
this.paddingImg = '';
src/sku/components/SkuMessages.js
+1 -1
View File
@@ -37,7 +37,7 @@ export default createComponent({
resetMessageValues(messages) {
const { messageConfig } = this;
const { initialMessages = {} } = messageConfig;
return (messages || []).map(message => ({
return (messages || []).map((message) => ({
value: initialMessages[message.name] || '',
}));
},
src/sku/demo/index.vue
+3 -3
View File
@@ -180,8 +180,8 @@ export default {
customSkuValidator: () => '请选择xxx',
customStepperConfig: {
quotaText: '单次限购100件',
stockFormatter: stock => `剩余${stock}件`,
handleOverLimit: data => {
stockFormatter: (stock) => `剩余${stock}件`,
handleOverLimit: (data) => {
const { action, limitType, quota, startSaleNum = 1 } = data;
if (action === 'minus') {
@@ -202,7 +202,7 @@ export default {
留言1: '商品留言',
},
uploadImg: (file, img) =>
new Promise(resolve => {
new Promise((resolve) => {
setTimeout(() => resolve(img), 1000);
}),
uploadMaxSize: 3,
src/sku/utils/sku-helper.js
+15 -15
View File
@@ -34,19 +34,19 @@ import { UNSELECTED_SKU_VALUE_ID } from '../constants';
...
}
*/
export const normalizeSkuTree = skuTree => {
export const normalizeSkuTree = (skuTree) => {
const normalizedTree = {};
skuTree.forEach(treeItem => {
skuTree.forEach((treeItem) => {
normalizedTree[treeItem.k_s] = treeItem.v;
});
return normalizedTree;
};
export const normalizePropList = propList => {
export const normalizePropList = (propList) => {
const normalizedProp = {};
propList.forEach(item => {
propList.forEach((item) => {
const itemObj = {};
item.v.forEach(it => {
item.v.forEach((it) => {
itemObj[it.id] = it;
});
normalizedProp[item.k_id] = itemObj;
@@ -58,16 +58,16 @@ export const normalizePropList = propList => {
export const isAllSelected = (skuTree, selectedSku) => {
// 筛选selectedSku对象中key值不为空的值
const selected = Object.keys(selectedSku).filter(
skuKeyStr => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID
(skuKeyStr) => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID
);
return skuTree.length === selected.length;
};
// 根据已选择的 sku 获取 skuComb
export const getSkuComb = (skuList, selectedSku) => {
const skuComb = skuList.filter(item =>
const skuComb = skuList.filter((item) =>
Object.keys(selectedSku).every(
skuKeyStr => String(item[skuKeyStr]) === String(selectedSku[skuKeyStr])
(skuKeyStr) => String(item[skuKeyStr]) === String(selectedSku[skuKeyStr])
)
);
return skuComb[0];
@@ -81,7 +81,7 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
const skuValueId = selectedSku[skuKeyStr];
if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
const skuValue = skuValues.filter(value => value.id === skuValueId)[0];
const skuValue = skuValues.filter((value) => value.id === skuValueId)[0];
skuValue && selectedValues.push(skuValue);
}
return selectedValues;
@@ -100,12 +100,12 @@ export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
// 再判断剩余sku是否全部不可选，若不可选则当前sku不可选中
const skusToCheck = Object.keys(matchedSku).filter(
skuKey => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID
(skuKey) => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID
);
const filteredSku = skuList.filter(sku =>
const filteredSku = skuList.filter((sku) =>
skusToCheck.every(
skuKey => String(matchedSku[skuKey]) === String(sku[skuKey])
(skuKey) => String(matchedSku[skuKey]) === String(sku[skuKey])
)
);
@@ -119,7 +119,7 @@ export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
export const getSelectedPropValues = (propList, selectedProp) => {
const normalizeProp = normalizePropList(propList);
return Object.keys(selectedProp).reduce((acc, cur) => {
selectedProp[cur].forEach(it => {
selectedProp[cur].forEach((it) => {
acc.push({
...normalizeProp[cur][it],
});
@@ -130,10 +130,10 @@ export const getSelectedPropValues = (propList, selectedProp) => {
export const getSelectedProperties = (propList, selectedProp) => {
const list = [];
(propList || []).forEach(prop => {
(propList || []).forEach((prop) => {
if (selectedProp[prop.k_id] && selectedProp[prop.k_id].length > 0) {
const v = [];
prop.v.forEach(it => {
prop.v.forEach((it) => {
if (selectedProp[prop.k_id].indexOf(it.id) > -1) {
v.push({ ...it });
}