Merge branch 'cherry-pick-190fa9a9' into 'v2-220418'

src/pages/pageCustomized/categoryNavigation/components/EditPanel/editPanel.tsx

@@ -145,6 +145,7 @@ const EditPanel = () => {
 
       if (type !== 3 && componentType === 'suggestProductItem') {
         message.info("当前商品展示类型为自动排序，不能进行单个商品设置");
+        setVisible(false);
         return;
       }
       setFormValue(tempFormValue[componentType]);
@@ -233,7 +234,7 @@ const EditPanel = () => {
     };
 
     const currentProps = type === 0 && componentType.includes('suggestProduct') ? formValueToProps['suggestProduct'] : formValueToProps[componentType];
-    if (componentType.includes('suggestProduct') && type === 0) {
+    if (componentType === 'suggestProduct' && typeof values.type !== 'undefined') {
       setType(values.type);
     }
     changeProps({