bug

src/pages/carouselFigure/SelectH5.1.jsx

@@ -65,7 +65,7 @@ export default props => {
 
   return (
     <div>
-      <div onClick={() => setVisible(true)} style={{ color: 'red' }}>{group.groupName}</div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
       <Modal
         title="请选择"
         visible={visible}

src/pages/carouselFigure/SelectH5.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input, Row, Col } from 'antd';
 import { apis, fetch } from '../../utils/request';
 import Navigate from '@/components/Navigate';
 
@@ -17,6 +17,7 @@ export default props => {
   const [visible, setVisible] = useState(false);
   const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
   const getGroupTitle = val => {
+    console.log(val, (list.filter(x => x.drainageId == val)[0] || {}).name, '========')
     return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
@@ -33,6 +34,11 @@ export default props => {
         buildingId,
       },
     }).then(data => {
+      const getGroupTitle = val => {
+        console.log(val, (data.records.filter(x => x.drainageId == val)[0] || {}).name, '========')
+        return (data.records.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+      }
+      const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
       setList(data.records || [])
 
       updateGroup(buildingId ? undefined : value);
@@ -113,7 +119,7 @@ export default props => {
             />
           </Col>
           <Col span={4} offset={1}>
-            <Button type="primary" onClick={()=>clearVal('')}>清除选择</Button>
+            <Button type="primary" onClick={() => clearVal('')}>清除选择</Button>
           </Col>
         </Row>
 

src/pages/carouselFigure/editAdvertising.jsx

@@ -53,6 +53,12 @@ const createEditor = () => {
       isHavePosition = false;
     }
 
+    // if (data.contentType == 'h5' || data.contentType=='live') {
+    //   isHaveActive = true;
+    // } else {
+    //   isHaveActive = false;
+    // }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
@@ -66,14 +72,20 @@ const createEditor = () => {
     buildingId = data.buildingId
   }
 
-  const setExtraData1 = (data) => {
-    console.log(data.buildingId, "data.buildingIddata.buildingId2")
-    if ((data.contentType == 'h5' && data.buildingId == null) || data.contentType == '' || data.contentType == 'nothing' || (data.contentType == 'live' && data.buildingId == null)) {
+  const setExtraData1 = data => {
+    console.log(data, "data.buildingIddata.buildingId2")
+    if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
       isHaveActive = false
     } else {
       isHaveActive = true
     }
 
+    if (data.showPosition == 'index') {
+      isHavePosition = true;
+    } else {
+      isHavePosition = false;
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
@@ -92,7 +104,7 @@ const createEditor = () => {
   const XForm = createForm({ onValuesChange: handleFormValueChange })
 
   return (props) => {
-    const [tab, changeTab] = useState('basic')
+    // const [tab, changeTab] = useState('basic')
     const contentId = props.location.query.contentId
     const [data, setData] = useState({})
     const formRef = useRef(null);
@@ -129,7 +141,7 @@ const createEditor = () => {
         props: {
           onChange: () => {
             const type = formRef.current.props.form.getFieldValue('contentType')
-            if (formRef.current && (type !== 'live' && type !== 'h5' )) {
+            if (formRef.current && (type !== 'live' && type !== 'h5')) {
               console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
               formRef.current.props.form.resetFields(['contentType', []]);
             }