lf

src/pages/carouselFigure/SelectActivity.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import{ Select, Modal } from 'antd';
+import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getActivities = fetch(apis.activity.listSelected)
@@ -18,7 +18,7 @@ export default (props) => {
   const setAct = val => setActivity({ dynamicId: val, title: getActTitle(val) })
 
   const buildingId = props.buildingId()
-  
+
   useEffect(() => {
     getActivities({
       params: {
@@ -44,32 +44,46 @@ export default (props) => {
 
   const handleChange = val => chooseVal = val
 
+  const setData=val=>{
+    setAct(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'dynamicId',
+      align:'center',
+      ellipsis:true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'name',
+      align:'center',
+      width:'20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.dynamicId)} style={{color:'blue'}}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
-    <div>
-      <div onClick={() => setVisible(true)}>{activity.title}</div>
+  <div>
+    <div onClick={() => setVisible(true)}>{activity.title}</div>
       <Modal
-        title="请选择活动"
+        title="请选择H5"
         visible={visible}
-        onOk={() => {
-          setAct(chooseVal)
-          onChange(chooseVal)
-          setVisible(false)
-        }}
-        onCancel={() => setVisible(false)}
+         onCancel={() => setVisible(false)}
+         footer={[]}
       >
-        <Select
-        showSearch
-        filterOption={(input, option) =>
-          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
-        defaultValue={chooseVal} 
-        onChange={handleChange} 
-        style={{ width: '90%' }}>
-          {
-            list.map(x => (<Select.Option key={x.dynamicId} value={x.dynamicId}>{x.title}</Select.Option>))
-          }
-        </Select>
+       <Table rowKey={list => list.dynamicId} columns={columns} dataSource={list} />
       </Modal>
-    </div>
+  </div>
+
   );
 }

src/pages/carouselFigure/SelectGroup.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getGroupList = fetch(apis.groupActivity.EffectiveList)
@@ -10,7 +10,7 @@ export default props => {
     onChange,
     ...rest
   } = props;
-  
+
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
   const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择拼团' })
@@ -44,32 +44,44 @@ export default props => {
       onChange(val)
   }
 
+  const setData=val=>{
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'activityName',
+      key: 'groupActivityId',
+      align:'center',
+      ellipsis:true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align:'center',
+      width:'20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.groupActivityId)} style={{color:'blue'}}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
-    <div>
-      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+  <div>
+    <div onClick={() => setVisible(true)}>{group.groupName}</div>
       <Modal
-        title="请选择拼团"
+        title="请选择H5"
         visible={visible}
-        onOk={() => {
-          updateGroup(value)
-          onChange(value)
-          setVisible(false)
-        }}
-        onCancel={() => setVisible(false)}
+         onCancel={() => setVisible(false)}
+         footer={[]}
       >
-        <Select
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }>
-          {
-            list.map(x => (<Select.Option key={x.groupActivityId} value={x.groupActivityId}>{x.activityName}</Select.Option>))
-          }
-        </Select>
+       <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
       </Modal>
-    </div>
+  </div>
   );
 }

src/pages/carouselFigure/SelectH5.1.jsx

@@ -0,0 +1,88 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal, Button } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择H5' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择H5'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }, []);
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+      onChange(val)
+  }
+
+  const setData=val=>{
+    updateGroup('')
+    onChange('')
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择H5"
+        visible={visible}
+         onCancel={() => setVisible(false)}
+         footer={[
+            <Button key="back" onClick={() => setVisible(false)}>
+              取消
+            </Button>,
+            <Button key="cancel" onClick={() => setData(value)}>
+              清空
+            </Button>,
+            <Button key="submit" type="primary" onClick={() => {
+              updateGroup(value)
+              onChange(value)
+              setVisible(false)
+            }}>
+              提交
+            </Button>
+          ]}
+      >
+        <Select
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }>
+          {
+            list.map(x => (<Select.Option key={x.drainageId} value={x.drainageId}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectH5.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal, Button } from 'antd';
+import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
+const { Column, ColumnGroup } = Table;
 const getH5List = fetch(apis.h5Activity.EffectiveList)
 
 export default props => {
@@ -43,46 +44,43 @@ export default props => {
   }
 
   const setData=val=>{
-    updateGroup('')
-    onChange('')
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
   }
 
-  return (
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'name',
+      key: 'drainageId',
+      align:'center',
+      ellipsis:true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align:'center',
+      width:'20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.drainageId)} style={{color:'blue'}}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
+  return(
     <div>
       <div onClick={() => setVisible(true)}>{group.groupName}</div>
-      <Modal
-        title="请选择H5"
-        visible={visible}
-         onCancel={() => setVisible(false)}
-         footer={[
-            <Button key="back" onClick={() => setVisible(false)}>
-              取消
-            </Button>,
-            <Button key="cancel" onClick={() => setData(value)}>
-              清空
-            </Button>,
-            <Button key="submit" type="primary" onClick={() => {
-              updateGroup(value)
-              onChange(value)
-              setVisible(false)
-            }}>
-              提交
-            </Button>
-          ]}
-      >
-        <Select
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }>
-          {
-            list.map(x => (<Select.Option key={x.drainageId} value={x.drainageId}>{x.name}</Select.Option>))
-          }
-        </Select>
-      </Modal>
+        <Modal
+          title="请选择H5"
+          visible={visible}
+           onCancel={() => setVisible(false)}
+           footer={[]}
+        >
+         <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+        </Modal>
     </div>
-  );
+  )
 }

src/pages/carouselFigure/SelectHelp.jsx

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+
+import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getHelpList = fetch(apis.helpActivity.effectiveList)
@@ -45,33 +46,44 @@ export default props => {
     onChange(val)
   }
 
+  const setData=val=>{
+    updateHelp(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'helpActivityId',
+      align:'center',
+      ellipsis:true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align:'center',
+      width:'20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.helpActivityId)} style={{color:'blue'}}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
     <div>
       <div onClick={() => setVisible(true)}>{help.helpName}</div>
-      <Modal
-        title="请选择助力"
-        visible={visible}
-        onOk={() => {
-          updateHelp(value)
-          onChange(value)
-          setVisible(false)
-        }}
-        onCancel={() => setVisible(false)}
-      >
-        <Select
-          placeholder="请选择助力"
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }>
-          {
-            list.map(x => (<Select.Option key={x.helpActivityId} value={x.helpActivityId}>{x.title}</Select.Option>))
-          }
-        </Select>
-      </Modal>
+        <Modal
+          title="请选择H5"
+          visible={visible}
+           onCancel={() => setVisible(false)}
+           footer={[]}
+        >
+         <Table rowKey={list => list.helpActivityId} columns={columns} dataSource={list} />
+        </Modal>
     </div>
   );
 }

src/pages/carouselFigure/SelectNews.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+import { Form, Select, Modal, Button,Table, Divider, Tag } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getNewsList = fetch(apis.news.getList)
@@ -42,34 +42,44 @@ export default props => {
     onChange(val)
   }
 
-  console.log(value, typeof value)
+  const setData=val=>{
+    updateNews(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'newsName',
+      key: 'newsId',
+      align:'center',
+      ellipsis:true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align:'center',
+      width:'20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.newsId)} style={{color:'blue'}}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
     <div>
       <div onClick={() => setVisible(true)}>{news.newsName}</div>
-      <Modal
-        title="请选择资讯"
-        visible={visible}
-        onOk={() => {
-          updateNews(value)
-          onChange(value)
-          setVisible(false)
-        }}
-        onCancel={() => setVisible(false)}
-      >
-        <Select
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }
+        <Modal
+          title="请选择H5"
+          visible={visible}
+           onCancel={() => setVisible(false)}
+           footer={[]}
         >
-          {
-            list.map(x => (<Select.Option key={x.newsId} value={x.newsId}>{x.newsName}</Select.Option>))
-          }
-        </Select>
-      </Modal>
+         <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
+        </Modal>
     </div>
   );
 }