feats

src/components/QueryTable/index.jsx

@@ -16,6 +16,7 @@ export default React.forwardRef((props, ref) => {
       }
     },
     getSearchData: searchData,
+    refreshList: tableRef.current.refreshList
   }))
 
   return (

src/components/SelectButton/CitySelect.jsx

@@ -52,14 +52,14 @@ const CitySelect = (props) => {
       placeholder="请选择城市"
       showSearch
       {...props}
-      value={props.value}
+      value={`${props.value || ''}`}
       onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }
       >
           {data.map(city => (
-            <Option key={city.id} value={city.id}>{city.name}</Option>
+            <Option key={city.id} value={`${city.id}`}>{city.name}</Option>
           ))}
       </Select>
   )

src/components/TableList/index.jsx

@@ -35,7 +35,6 @@ export default React.forwardRef((props, ref) => {
   const fetchData = useCallback(() => {
     setLoading(true);
 
-
     const queryParams = {
       pageNum: pageConfig.current,
       pageSize: pageConfig.pageSize,
@@ -90,6 +89,7 @@ export default React.forwardRef((props, ref) => {
   // 透传给父组件部分方法
   useImperativeHandle(ref, () => ({
     reload: fetchData,
+    refreshList: cb => cb(list, setList)
   }));
 
   return (

src/pages/borker/announcement/Edit/index.jsx

@@ -1,9 +1,10 @@
-import React, { useState } from 'react'
-import { Card, Form, Select, Input, Button } from 'antd'
+import React, { useEffect, useState } from 'react'
+import { Row, Col, Card, Form, Select, Input, Button, notification } from 'antd'
 import SelectCity from '@/components/SelectButton/CitySelect'
 import ImageUpload from '@/components/XForm/ImageUpload'
 import Wangedit from '@/components/Wangedit/Wangedit';
-
+import { fetch, apis } from '@/utils/request';
+import { router } from 'umi';
 import { formItemLayout, showTypeList, pages } from '../util'
 
 const FormItem = Form.Item
@@ -25,17 +26,58 @@ const editorMenus = [
 ];
 const fullWidth = { width: '100%' }
 
-const AnnouncementEdit = React.forwardRef((props) => {
+const getFirstScreenDetail = fetch(apis.borker.getFirstScreenDetail)
+const saveFirstScreen = fetch(apis.borker.saveFirstScreen)
+const updateFirstScreen = fetch(apis.borker.updateFirstScreen)
+
+const AnnouncementEdit = React.forwardRef((props, ref) => {
   const { history, form } = props
   const { query } = history.location
   const { id } = query
-  const { getFieldDecorator, getFieldValue, setFieldsValue } = form
+  const { getFieldDecorator, validateFieldsAndScroll, setFieldsValue } = form
 
   const [loading, setLoading] = useState(false)
 
+  const handleSubmit = (e) => {
+    validateFieldsAndScroll((err, values) => {
+      if (err) return;
+
+      setLoading(true)
+      const p = !id ? saveFirstScreen({ data: values }) : updateFirstScreen({ urlData: { id }, data: values })
+      p.then(res => {
+        // setFieldsValue(res)
+        setLoading(false)
+        notification.success({ message: "操作成功" })
+        router.goBack()
+      }).catch(() => {
+        setLoading(false)
+      })
+    })
+  }
+
+  useEffect(() => {
+    if (id) {
+      setLoading(true)
+      getFirstScreenDetail({ urlData: { id } }).then(res => {
+        // ant3 的 form 赋值很诡异
+        const t = setTimeout(() => {
+          clearTimeout(t)
+          setLoading(false)
+          setFieldsValue(res)
+        }, 200)
+      }).catch(() => {
+        setLoading(false)
+      })
+    } else {
+      setFieldsValue({
+        showType: 'first-screen'
+      })
+    }
+  }, [id, setFieldsValue])
+
   return (
-    <Card>
-      <Form {...formItemLayout}>
+    <Card loading={loading}>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
         <FormItem label="公告类型">
           {
             getFieldDecorator('showType', {
@@ -97,6 +139,9 @@ const AnnouncementEdit = React.forwardRef((props) => {
           <Button type="primary" htmlType="submit" loading={loading}>
             提交
           </Button>
+          <Button onClick={router.goBack} style={{ marginLeft: '2em' }}>
+            返回
+          </Button>
         </FormItem>
       </Form>
     </Card>

src/pages/borker/announcement/index.jsx

@@ -5,7 +5,7 @@ import moment from 'moment'
 import QueryTable from '@/components/QueryTable'
 import SelectCity from '@/components/SelectButton/CitySelect'
 import OperButton from '@/components/OperButton'
-import { apis } from '@/utils/request'
+import { fetch, apis } from '@/utils/request';
 
 import { pages } from './util'
 
@@ -18,6 +18,8 @@ const searchFields = [
   },
 ]
 
+const updateFirstScreen = fetch(apis.borker.updateFirstScreen)
+
 const actionRender = () => {
   const gotoAdd = () => router.push('/borker/announcement/edit')
   return (
@@ -37,13 +39,14 @@ export default (props) => {
       key: 'imageUrl',
       align: 'center',
       render: (t) => {
-        return <img src={t} width={72} height={128} style={{borderRadius: '4px'}} alt="" />
+        return <img src={t} width={64} height={96} style={{borderRadius: '4px'}} alt="" />
       }
     },
     {
       title: '标题',
       dataIndex: 'title',
       key: 'title',
+      render: (t, row) => <Button type="link" onClick={() => router.push(`/borker/announcement/edit?id=${row.screenId}`)}>{t}</Button>
     },
     {
       title: '跳转页面',
@@ -71,13 +74,35 @@ export default (props) => {
       align: 'center',
       render: (_, row) => (
         <>
-          <OperButton>查看详情</OperButton>,
-          <OperButton onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton>
+          <OperButton onClick={() => router.push(`/borker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
+          <OperButton.Confirm title="确认进行操作?" color="#1890ff" onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton.Confirm>
         </>
       )
     },
   ]
 
+  const onPublish = (row) => {
+    setLoading(true)
+    updateFirstScreen({ urlData: { id: row.screenId }, data: { status: Math.abs(row.status - 1) } }).then(() => {
+      setLoading(false)
+
+      // 修改记录
+      ref.current.refreshList((list, next) => {
+        next(list.map(it => {
+          if (it.screenId === row.screenId) {
+            return {
+              ...it,
+              status: Math.abs(row.status - 1)
+            }
+          } else {
+            return it
+          }
+        }))
+      })
+    }).catch(() => {
+      setLoading(false)
+    })
+  }
 
   return (
     <Spin spinning={loading}>

src/services/apis.js

@@ -2429,5 +2429,20 @@ export default {
       method: 'GET',
       url: `${prefix}/bkFirstScreen`,
     },
+    // 新增公告
+    saveFirstScreen: {
+      method: 'POST',
+      url: `${prefix}/bkFirstScreen`,
+    },
+    // 更新公告
+    updateFirstScreen: {
+      method: 'PUT',
+      url: `${prefix}/bkFirstScreen/:id`,
+    },
+    // 消息通知列表
+    getFirstScreenDetail: {
+      method: 'GET',
+      url: `${prefix}/bkFirstScreen/:id`,
+    },
   }
 };