fix: 修改属性失效校验

src/pages/GoodsManage/createModal/index.jsx

@@ -69,6 +69,7 @@ class goodsManage extends Component {
     productType: 1,
     confirmLoading: false,
     afterAddressList: {},
+    isAttrLoading: false,
     categoryAttrs: [], // 获取类目下属性
   };
 
@@ -79,7 +80,10 @@ class goodsManage extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.visible && this.state.categoryAttrs.length < 1) {
+    if (nextProps.visible && !this.state.isAttrLoading) {
+      this.setState({
+        isAttrLoading: true,
+      });
       const { initData = {} } = this.props;
       const isEdit = Object.keys(initData).length !== 0;
       if (isEdit) {
@@ -217,9 +221,7 @@ class goodsManage extends Component {
 
   // 获取属性
   getAttribute = async categoryId => {
-    console.log('categoryId :>> ', categoryId);
     const res = await apiGetAttribute(categoryId);
-    console.log('res :>> ', res);
     let categoryAttrs = [];
     if (res && res.data && res.data.length) {
       categoryAttrs = res.data;
@@ -231,7 +233,6 @@ class goodsManage extends Component {
 
   treeChange = value => {
     const cid = value[value.length - 1];
-    console.log('cid :>> ', cid);
     this.setState({ categoryId: cid, initCascader: value });
     this.getAttribute(cid);
   };
@@ -425,16 +426,23 @@ class goodsManage extends Component {
             const key = Object.keys(item)[0];
             let attrs = item[key];
             if (Array.isArray(item[key])) {
-              attrs = item[key].map(attr => {
+              attrs = [];
+              item[key].forEach(attr => {
                 try {
-                  return JSON.parse(attr);
+                  const json = JSON.parse(attr);
+                  if (this.checkInAttrList(json.attributeId)) {
+                    attrs.push(json);
+                  }
                 } catch {
-                  return { attributeValueName: attr };
+                  attrs.push({ attributeValueName: attr });
                 }
               });
             } else {
               try {
-                attrs = [JSON.parse(item[key])];
+                const json = JSON.parse(item[key]);
+                if (this.checkInAttrList(json.attributeId)) {
+                  attrs = [json];
+                }
               } catch {
                 attrs = [{ attributeValueName: item[key] }];
               }
@@ -464,7 +472,6 @@ class goodsManage extends Component {
             attributeApplyList,
           },
         }));
-        console.log('this.state.createData :>> ', this.state.createData);
         const data = initData.id
           ? await editGoods(this.state.createData)
           : await addGoods(this.state.createData);
@@ -547,13 +554,16 @@ class goodsManage extends Component {
     return 'default';
   };
 
+  // 验证是否失效属性（已失效的商品不显示）
+  checkInAttrList = id =>
+    this.state.categoryAttrs.some(item => item.valueList.some(v => +v.id === +id));
+
   getInitAttrValue = (id, supportCustomValue, optionType) => {
-    console.log('id :>> ', id, supportCustomValue.code, optionType.code);
     const skuAttr = this.props.initData.productAttributeApplyList?.productAttributeApplyList || [];
     const v = skuAttr.filter(item => id === item.productAttributeId);
     if (v.length) {
       const values = v[0].productAttributeApplyValueList.map(attr => {
-        if (+attr.attributeValueId) {
+        if (+attr.attributeValueId && this.checkInAttrList(attr.attributeValueId)) {
           return JSON.stringify({
             attributeValueId: attr.attributeValueId,
             attributeValueName: attr.attributeValueName,
@@ -579,7 +589,6 @@ class goodsManage extends Component {
     if (+optionType.code === 2) {
       return [];
     }
-    console.log('111 :>> ', 111);
     return '';
   };
 
@@ -883,14 +892,27 @@ class goodsManage extends Component {
                     </Col>
                   ))}
               </Row>
-              <Row>
-                {skuOldAttr.length > 0 &&
-                  skuOldAttr.map(s => (
-                    <FormItem label={s.productAttributeName} required={false} key={s.id}>
-                      {s.value}
-                    </FormItem>
-                  ))}
-              </Row>
+              {skuOldAttr.length > 0 && (
+                <div>
+                  <Row>注：以下商品属性已失效，请使用新的属性</Row>
+                  <Row>
+                    {skuOldAttr.map(s => (
+                      <Col span={12} key={s.id}>
+                        <FormItem
+                          label={s.productAttributeName}
+                          {...formItemAttr}
+                          required={false}
+                          key={s.id}
+                        >
+                          {s.productAttributeApplyValueList
+                            .map(item => item.attributeValueName)
+                            .join('；')}
+                        </FormItem>
+                      </Col>
+                    ))}
+                  </Row>
+                </div>
+              )}
             </Card>
 
             <Card className={styles.card} bordered={false}>