[improvement] update eslint config (#2288)
This commit is contained in:
@@ -57,8 +57,8 @@
|
||||
:sku-row="skuTreeItem"
|
||||
>
|
||||
<sku-row-item
|
||||
v-for="(skuValue, index) in skuTreeItem.v"
|
||||
:key="index"
|
||||
v-for="(skuValue, valueIndex) in skuTreeItem.v"
|
||||
:key="valueIndex"
|
||||
:sku-key-str="skuTreeItem.k_s"
|
||||
:sku-value="skuValue"
|
||||
:sku-event-bus="skuEventBus"
|
||||
@@ -274,7 +274,8 @@ export default create({
|
||||
price: Math.round(this.sku.price * 100),
|
||||
stock_num: this.sku.stock_num
|
||||
};
|
||||
} else if (this.isSkuCombSelected) {
|
||||
}
|
||||
if (this.isSkuCombSelected) {
|
||||
return getSkuComb(this.sku.list, this.selectedSku);
|
||||
}
|
||||
return null;
|
||||
@@ -295,7 +296,7 @@ export default create({
|
||||
imageList() {
|
||||
const imageList = [this.goods.picture];
|
||||
if (this.skuTree.length > 0) {
|
||||
const treeItem = this.skuTree.filter(treeItem => treeItem.k_s === 's1')[0] || {};
|
||||
const treeItem = this.skuTree.filter(item => item.k_s === 's1')[0] || {};
|
||||
|
||||
if (!treeItem.v) {
|
||||
return;
|
||||
@@ -406,9 +407,7 @@ export default create({
|
||||
},
|
||||
|
||||
onPreviewImage(indexImage) {
|
||||
const index = this.imageList.findIndex(image => {
|
||||
return image === indexImage;
|
||||
});
|
||||
const index = this.imageList.findIndex(image => image === indexImage);
|
||||
|
||||
const cbParams = {
|
||||
index,
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
:class="b('img-wrap')"
|
||||
@click="previewImage"
|
||||
>
|
||||
<img :src="goodsImg" >
|
||||
<img :src="goodsImg">
|
||||
</div>
|
||||
<div :class="b('goods-info')">
|
||||
<div class="van-sku__goods-name van-ellipsis">{{ goods.title }}</div>
|
||||
@@ -49,7 +49,7 @@ export default create({
|
||||
if (!id) return;
|
||||
|
||||
// 目前skuImg都挂载在skuTree中s1那类sku上
|
||||
const treeItem = this.sku.tree.filter(treeItem => treeItem.k_s === 's1')[0] || {};
|
||||
const treeItem = this.sku.tree.filter(item => item.k_s === 's1')[0] || {};
|
||||
|
||||
if (!treeItem.v) {
|
||||
return;
|
||||
|
||||
@@ -98,7 +98,7 @@ export default create({
|
||||
const messages = {};
|
||||
|
||||
this.messageValues.forEach((item, index) => {
|
||||
let value = item.value;
|
||||
let { value } = item;
|
||||
if (this.messages[index].datetime > 0) {
|
||||
value = value.replace(/T/g, ' ');
|
||||
}
|
||||
@@ -112,7 +112,7 @@ export default create({
|
||||
const messages = {};
|
||||
|
||||
this.messageValues.forEach((item, index) => {
|
||||
let value = item.value;
|
||||
let { value } = item;
|
||||
const message = this.messages[index];
|
||||
if (message.datetime > 0) {
|
||||
value = value.replace(/T/g, ' ');
|
||||
@@ -132,7 +132,7 @@ export default create({
|
||||
const values = this.messageValues;
|
||||
|
||||
for (let i = 0; i < values.length; i++) {
|
||||
const value = values[i].value;
|
||||
const { value } = values[i];
|
||||
const message = this.messages[i];
|
||||
|
||||
if (value === '') {
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
|
||||
<script>
|
||||
import skuData from './data';
|
||||
import { LIMIT_TYPE } from '../../../packages/sku/constants';
|
||||
import { LIMIT_TYPE } from '../constants';
|
||||
|
||||
export default {
|
||||
i18n: {
|
||||
@@ -145,9 +145,7 @@ export default {
|
||||
s1: '30349',
|
||||
s2: '1193'
|
||||
},
|
||||
customSkuValidator: (component) => {
|
||||
return '请选择xxx';
|
||||
},
|
||||
customSkuValidator: () => '请选择xxx',
|
||||
customStepperConfig: {
|
||||
quotaText: '单次限购100件',
|
||||
stockFormatter: (stock) => `剩余${stock}件`,
|
||||
@@ -166,11 +164,9 @@ export default {
|
||||
}
|
||||
},
|
||||
messageConfig: {
|
||||
uploadImg: (file, img) => {
|
||||
return new Promise(resolve => {
|
||||
setTimeout(() => resolve(img), 1000);
|
||||
});
|
||||
},
|
||||
uploadImg: (file, img) => new Promise(resolve => {
|
||||
setTimeout(() => resolve(img), 1000);
|
||||
}),
|
||||
uploadMaxSize: 3
|
||||
}
|
||||
};
|
||||
|
||||
@@ -4,27 +4,21 @@ exports[`renders demo correctly 1`] = `
|
||||
<div>
|
||||
<div>
|
||||
<div class="sku-container">
|
||||
<!---->
|
||||
<button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
<!----> <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
基础用法
|
||||
</span></button>
|
||||
</div>
|
||||
</span></button></div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="sku-container">
|
||||
<!---->
|
||||
<button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
<!----> <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
自定义步进器相关配置
|
||||
</span></button>
|
||||
</div>
|
||||
</span></button></div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="sku-container">
|
||||
<!---->
|
||||
<button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
<!----> <button class="van-button van-button--primary van-button--normal van-button--block"><span class="van-button__text">
|
||||
高级用法
|
||||
</span></button>
|
||||
</div>
|
||||
</span></button></div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -34,7 +34,7 @@ import { UNSELECTED_SKU_VALUE_ID } from '../constants';
|
||||
...
|
||||
}
|
||||
*/
|
||||
export const normalizeSkuTree = (skuTree) => {
|
||||
export const normalizeSkuTree = skuTree => {
|
||||
const normalizedTree = {};
|
||||
skuTree.forEach(treeItem => {
|
||||
normalizedTree[treeItem.k_s] = treeItem.v;
|
||||
@@ -45,17 +45,19 @@ export const normalizeSkuTree = (skuTree) => {
|
||||
// 判断是否所有的sku都已经选中
|
||||
export const isAllSelected = (skuTree, selectedSku) => {
|
||||
// 筛选selectedSku对象中key值不为空的值
|
||||
const selected = Object.keys(selectedSku).filter(skuKeyStr => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID);
|
||||
const selected = Object.keys(selectedSku).filter(
|
||||
skuKeyStr => selectedSku[skuKeyStr] !== UNSELECTED_SKU_VALUE_ID
|
||||
);
|
||||
return skuTree.length === selected.length;
|
||||
};
|
||||
|
||||
// 根据已选择的sku获取skuComb
|
||||
// 根据已选择的 sku 获取 skuComb
|
||||
export const getSkuComb = (skuList, selectedSku) => {
|
||||
const skuComb = skuList.filter(skuComb => {
|
||||
return Object.keys(selectedSku).every(skuKeyStr => {
|
||||
return String(skuComb[skuKeyStr]) === String(selectedSku[skuKeyStr]); // eslint-disable-line
|
||||
});
|
||||
});
|
||||
const skuComb = skuList.filter(item => (
|
||||
Object.keys(selectedSku).every(
|
||||
skuKeyStr => String(item[skuKeyStr]) === String(selectedSku[skuKeyStr])
|
||||
)
|
||||
));
|
||||
return skuComb[0];
|
||||
};
|
||||
|
||||
@@ -67,7 +69,7 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
|
||||
const skuValueId = selectedSku[skuKeyStr];
|
||||
|
||||
if (skuValueId !== UNSELECTED_SKU_VALUE_ID) {
|
||||
const skuValue = skuValues.filter(skuValue => skuValue.id === skuValueId)[0];
|
||||
const skuValue = skuValues.filter(value => value.id === skuValueId)[0];
|
||||
skuValue && selectedValues.push(skuValue);
|
||||
}
|
||||
return selectedValues;
|
||||
@@ -77,19 +79,27 @@ export const getSelectedSkuValues = (skuTree, selectedSku) => {
|
||||
// 判断sku是否可选
|
||||
export const isSkuChoosable = (skuList, selectedSku, skuToChoose) => {
|
||||
const { key, valueId } = skuToChoose;
|
||||
|
||||
// 先假设sku已选中,拼入已选中sku对象中
|
||||
const matchedSku = Object.assign({}, selectedSku, {
|
||||
[key]: valueId
|
||||
});
|
||||
// 再判断剩余sku是否全部不可选,若不可选则当前sku不可选中
|
||||
const skusToCheck = Object.keys(matchedSku).filter(skuKey => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID);
|
||||
const filteredSku = skuList.filter(sku => {
|
||||
return skusToCheck.every(skuKey => {
|
||||
return String(matchedSku[skuKey]) === String(sku[skuKey]);
|
||||
});
|
||||
});
|
||||
|
||||
const stock = filteredSku.reduce((total, sku) => (total += sku.stock_num), 0);
|
||||
// 再判断剩余sku是否全部不可选,若不可选则当前sku不可选中
|
||||
const skusToCheck = Object.keys(matchedSku).filter(
|
||||
skuKey => matchedSku[skuKey] !== UNSELECTED_SKU_VALUE_ID
|
||||
);
|
||||
|
||||
const filteredSku = skuList.filter(sku => (
|
||||
skusToCheck.every(
|
||||
skuKey => String(matchedSku[skuKey]) === String(sku[skuKey])
|
||||
)
|
||||
));
|
||||
|
||||
const stock = filteredSku.reduce((total, sku) => {
|
||||
total += sku.stock_num;
|
||||
return total;
|
||||
}, 0);
|
||||
return stock > 0;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user