提交

src/components/XForm/WrapperItem.jsx

@@ -12,7 +12,7 @@ import {
 } from 'antd';
 import ImageUploader from './ImageUpload';
 
-const Item = Form.Item
+const {Item} = Form
 const { Option } = Select;
 const { MonthPicker, RangePicker } = DatePicker
 
@@ -42,7 +42,7 @@ const tailFormItemLayout = {
   },
 };
 
-const WrapperItem = (props) => {
+const WrapperItem = props => {
   const {
     form,
     label,
@@ -56,6 +56,7 @@ const WrapperItem = (props) => {
     action,
     props: fieldProps,
     hidden = false,
+    help,
     ...restProps
   } = props;
 
@@ -63,7 +64,7 @@ const WrapperItem = (props) => {
 
   let config = {
     rules,
-    initialValue: value
+    initialValue: value,
   }
 
   if (type === FieldTypes.Switch) {
@@ -72,7 +73,7 @@ const WrapperItem = (props) => {
       valuePropName: 'checked',
     };
   }
-  
+
   if (type === FieldTypes.ImageUploader) {
     config = {
       ...config,
@@ -130,13 +131,17 @@ const WrapperItem = (props) => {
 
   const visible = typeof hidden === 'function' ? !hidden() : !hidden;
 
-  if (!label && !name && !action) return visible ? Field : null;
-  
+  if (!label && !name && !action && !help) return visible ? Field : null;
+
   const itemProps = action ? { ...restProps, ...tailFormItemLayout } : restProps
   const labelNode = typeof label === 'function' ? label() : label;
+  const helpNode = typeof help === 'function' ? help() : help;
+
+  const newItemProps = { ...itemProps, help: helpNode }
+  console.log('newItemProps: ', newItemProps)
 
   return visible && (
-    <Item label={labelNode} {...itemProps}>
+    <Item label={labelNode} { ...newItemProps }>
       {action ? Field : getFieldDecorator(name, config)(Field)}
     </Item>
   )

src/pages/carouselFigure/editCarousel.jsx

@@ -37,21 +37,20 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
-    
+
     buildingId = data.buildingId
     locationType = data.showPosition === 'mall';
     console.log(locationType, 'locationType');
   }
 
-    
+
   const handleFormValueChange = (props, changedValues, allValues) => {
     setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
 
-  return (props) => {
-
+  return props => {
     const [tab, changeTab] = useState('basic')
     const { contentId } = props.location.query
     const [data, setData] = useState({})
@@ -85,11 +84,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           value: data.buildingId,
         },
         {
-          label: locationType ? '积分商城轮播图' : '首页轮播图',
+          label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播':'建议图片尺寸：750*600px，比例5:4,格式：jpg，用于首页顶部banner轮播',
+          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于首页顶部banner轮播'),
         },
         {
           label: '标题',
@@ -187,7 +186,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           {
             label: '停用',
             value: 0,
-          } ],
+          }],
           value: data.status != null ? data.status : 1,
         },
       ]
@@ -195,13 +194,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       const handleSubmit = val => {
         val.showType = 'banner'
         if (contentId) {
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val  }).then(data => {
+          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()
           }).catch(err => {
             message.info(err.msg || err.message)
           })
-        } else{
-          request({ ...apis.carsuseFigure.addExtendContent, data: val  }).then(data => {
+        } else {
+          request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
             cancelPage()
           }).catch(err => {
             message.info(err.msg || err.message)