Merge branch 'master' into develop

src/components/goods/commonAddOrEdit/addOrEditSkuModal/index.tsx

@@ -154,10 +154,10 @@ const AddOrEditSkuModal: React.FC<ModalProps & selfProps> = ({
   // // 根据产品类型获取产品列表
   const handleProdTypeSelect = (id: number) => {
     getProductList(id);
-    // skuForm.setFieldsValue({
-    //   skuId: undefined,
-    //   specIds: undefined,
-    // });
+    skuForm.setFieldsValue({
+      skuId: undefined,
+      specIds: undefined,
+    });
     // getProduct(id);
   };
   //
@@ -228,7 +228,7 @@ const AddOrEditSkuModal: React.FC<ModalProps & selfProps> = ({
           const ids: number[] = result.list.reduce((pre: number[], cur) => {
             return cur.priceList || goodsType === 1 ? [...pre, cur.id] : pre;
           }, []);
-          skuForm.setFieldValue('specIds', ids);
+          skuForm.setFieldValue('specIds', ids.length ? ids : undefined);
         }
       },
     );