Merge branch 'dev' into test

src/pages/commodity/products/addProducts.tsx

@@ -202,14 +202,19 @@ const AddProducts: React.FC<{}> = (props) => {
                   _item.goods = { id: _item.goodsId }  // id为0表示无货品
                   delete _item.goodsId
 
+                  // 过滤掉上传失败时 返回null等无效数据
                   if (_item.commodityPic.length > 0) {
                     // 编辑情况下兼顾手动添加图片列表属性
                     _item.commodityPic = _item.commodityPic.map(__item => __item?.response?.data || __item?.url)
+                    if(_item.commodityPic.filter(Boolean).length === 0){
+                      throw new Error('每项请至少上传一张商品图片！')
+                    }
                     // 多种属性组合 所有属性共用的情况下 每一行都是用第一项
-                    if (isAllAttributePic)
+                    if (isAllAttributePic){
                       _item.commodityPic = _productAttributeAndImageParams[0].commodityPic
+                    }
                   } else {
-                    if (isAllAttributePic && _productAttributeAndImageParams[0].commodityPic.length > 0) { //处理所有属性共用
+                    if (isAllAttributePic && _productAttributeAndImageParams[0].commodityPic.length > 0 && _productAttributeAndImageParams[0].commodityPic.filter(Boolean).length > 0) { //处理所有属性共用
                       _item.commodityPic = _productAttributeAndImageParams[0].commodityPic
                     }
                     else

src/pages/transaction/transactionRules/components/RuleSetting.tsx

-import React, {useEffect, useState} from 'react'
+import React, {useEffect, useRef, useState} from 'react'
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
 import { useInitValue } from '@/formSchema/effects/useInitValue'
 import EyePreview from '@/components/EyePreview'
@@ -35,6 +35,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
   const [productRowSelection, productRowCtl] = useRowSelectionTable({customKey: 'id'})
   const [productsLength, setProductsLength] = useState(0)
   const [initValue, setInitialValue] = useState({})
+  const [idNotInList, setIdNotInList] = useState([])
 
   const {
     id,
@@ -51,6 +52,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
         ...params,
         shopType: shopInfo[0].type,
         environment: shopInfo[0].environment,
+        idNotInList: idNotInList,
       })
       return res.data
     }else{
@@ -266,6 +268,14 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
     }
   }
 
+  // // 查询已设置交易规则的列表
+  const fatchSetedProducts = (id) => {
+    PublicApi.getOrderTradingRulesProductIdList({shopId: id}).then(res => {
+      const { data, code } = res
+      setIdNotInList(() => data?.productIds || [])
+    })
+  }
+
   return (
     <>
       <NiceForm
@@ -295,6 +305,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
             setFieldState('isTacitlyApprove', state => {
               state.value = 1
             })
+            fatchSetedProducts(parentState.value[0])
           })
         }}
         onSubmit={handleSubmit}

src/pages/transaction/transactionRules/schema/index.tsx

@@ -173,7 +173,8 @@ export const ruleDetailSchema: ISchema = padRequiredMessage({
                   "x-component-props": {
                     rowKey: 'id',
                     columns: "{{tableColumns}}",
-                    prefix: "{{tableAddButton}}"
+                    prefix: "{{tableAddButton}}",
+                    idNotList: []
                   }
                 }
               }