.

src/components/ExtendContent/List.jsx

@@ -1,113 +0,0 @@
-import { useEffect, useState, forwardRef, useImperativeHandle, useRef } from 'react';
-import { Table, Space, Button, Popconfirm } from 'antd';
-import { getList, remove } from '@/services/extendContent';
-
-export default forwardRef((props, ref) => {
-  const { targetType, targetId, onEdit } = props;
-
-  const [loading, setLoading] = useState(false);
-  const [list, setList] = useState([]);
-  const refs = useRef();
-
-  const tableList = () => {
-    setLoading(true);
-    getList({
-      pageSize: 9999,
-      targetId,
-      targetType,
-    })
-      .then((res) => {
-        setList(res.records || []);
-        setLoading(false);
-      })
-      .catch((err) => {
-        console.log(err.message)
-        setLoading(false)
-      });
-  };
-
-  refs.current = tableList;
-
-  // 父组件调用 updateList 来修改 list
-  useImperativeHandle(ref, () => ({
-    reload: refs.current,
-    setLoading,
-  }));
-
-  const handleEdit = (record) => {
-    onEdit(record);
-  };
-  //删除
-  const handleDelete = (record) => {
-    setLoading(true);
-    remove(record.extId)
-      .then(() => {
-        setList(list.filter((x) => x.extId !== record.extId));
-        setLoading(false);
-        // refs.current.reload();
-      })
-      .catch((err) => {
-        console.log(err.message)
-        setLoading(false)
-      });
-  };
-
-  const columns = [
-    {
-      title: '序号',
-      key: 'index',
-      dataIndex: 'index',
-      render: (t, record, index) => `${index + 1}`,
-    },
-    {
-      title: '权重',
-      key: 'sort',
-      dataIndex: 'sort',
-      render: (t, record) => `${record.sort}`,
-    },
-    {
-      title: '内容',
-      key: 'content',
-      dataIndex: 'content',
-      ellipsis: true,
-      render: (t, record) => {
-        if (record.contentType === 'text') return t;
-        if (record.contentType === 'image') {
-          return <img style={{ width: '110px' }} src={t} alt="" />;
-        }
-      },
-    },
-    {
-      title: '操作',
-      key: 'option',
-      render: (_, record) => {
-        return (
-          <Space>
-            <Button type="link" onClick={() => handleEdit(record)}>
-              编辑
-            </Button>
-            {/* <Button type="link" onClick={() => handleEdit(record)}>插入</Button> */}
-            <Popconfirm title="确定进行当前操作 ?" onConfirm={() => handleDelete(record)}>
-              <Button type="link">删除</Button>
-            </Popconfirm>
-          </Space>
-        );
-      },
-    },
-  ];
-
-  useEffect(() => {
-    if (targetType) {
-      refs.current();
-    }
-  }, [targetType]);
-  return (
-    <Table
-      loading={loading}
-      rowKey="extId"
-      columns={columns}
-      dataSource={list}
-      pagination={false}
-    />
-  );
-});

src/components/ExtendContent/ModalButton.jsx

@@ -1,68 +0,0 @@
-import { useEffect, useImperativeHandle, useState, forwardRef } from 'react';
-import { Button } from 'antd';
-import ModalText from './ModalText';
-import ModalImage from './Modalimage';
-
-export default forwardRef((props, ref) => {
-  const { contentType, record, onChange, onClose, ...btnProps } = props;
-
-  const [visible, setVisible] = useState(false);
-  const [content, setContent] = useState();
-  const [sortVale, setSortVale] = useState();
-
-  const handleClose = () => {
-    setContent();
-    setSortVale();
-    setVisible(false);
-    onClose();
-  };
-
-  const handleChange = (val, e) => {
-    onChange(
-      {
-        ...(record || {}),
-        content: val,
-        sort: e - 0,
-        contentType,
-      },
-      handleClose,
-    );
-  };
-
-  useImperativeHandle(ref, () => ({
-    toggle: () => {
-      setVisible(!visible);
-    },
-  }));
-
-  useEffect(() => {
-    setContent(record?.content);
-    setSortVale(record?.sort);
-  }, [record, visible]);
-
-  return (
-    <>
-      <Button onClick={() => setVisible(true)} {...btnProps}>
-        {props.children}
-      </Button>
-      {contentType === 'text' && (
-        <ModalText
-          sortVale={sortVale}
-          visible={visible}
-          value={content}
-          onChange={handleChange}
-          onCancel={handleClose}
-        />
-      )}
-      {contentType === 'image' && (
-        <ModalImage
-          sortVale={sortVale}
-          visible={visible}
-          value={content}
-          onChange={handleChange}
-          onCancel={handleClose}
-        />
-      )}
-    </>
-  );
-});

src/components/ExtendContent/ModalText.jsx

@@ -1,42 +0,0 @@
-import { Input, Modal, Form, Button } from 'antd'
-import { useEffect, useState } from 'react'
-
-
-const FormItem = Form.Item
-export default (props) => {
-  const { value, visible, onChange, onCancel, sortVale } = props
-
-  const [text, setText] = useState()
-  const [sort, setSort] = useState()
-
-  const Submit = (e) => {
-    setSort(e.target.value)
-  }
-
-  const handleChange = (e) => {
-    setText(e.target.value || 0)
-  }
-
-  const handleOk = () => {
-    onChange(text, sort)
-  }
-
-  useEffect(() => {
-    setText(value)
-    setSort(sortVale)
-
-  }, [value, visible, sortVale])
-
-  return (
-    <Modal title="请输入文字" visible={visible} onOk={handleOk} onCancel={onCancel} destroyOnClose={true}>
-      <Form >
-        <FormItem label="内容" rules={[{ required: true, message: '请输入内容' }]} >
-          <Input.TextArea value={text} onChange={handleChange} />
-        </FormItem>
-        <FormItem label="权重" rules={[{ required: true, message: '请设置权重' }]}>
-          <Input min={0} placeholder="请输入权重" type='number' value={sort} onChange={Submit} style={{ width: '350px' }} />
-        </FormItem>
-      </Form>
-    </Modal>
-  )
-}

src/components/ExtendContent/Modalimage.jsx

@@ -1,38 +0,0 @@
-import { useEffect, useState } from 'react'
-import { UploadImage } from '@/components/Upload'
-import { Input, Modal, Form, Button } from 'antd'
-
-
-const FormItem = Form.Item
-export default (props) => {
-  const { value, visible, onChange, onCancel, sortVale } = props
-
-  const [image, setImage] = useState()
-  const [sort, setSort] = useState()
-
-  const Submit = (e) => {
-    setSort(e.target.value || 0)
-  }
-  const handleOk = () => {
-    onChange(image, sort)
-  }
-
-  useEffect(() => {
-    setImage(value)
-    setSort(sortVale)
-  }, [value, visible, sortVale])
-
-
-  return (
-    <Modal title="请上传图片" visible={visible} onOk={handleOk} onCancel={onCancel} destroyOnClose={true}>
-      <Form >
-        <FormItem label="内容" rules={[{ required: true, message: '请输入内容' }]} >
-          <UploadImage value={image} onChange={setImage} />
-        </FormItem>
-        <FormItem label="权重" rules={[{ required: true, message: '请设置权重' }]}>
-          <Input min={0} placeholder="请输入权重" type='number' value={sort} onChange={Submit} style={{ width: '350px' }} />
-        </FormItem>
-      </Form>
-    </Modal>
-  )
-}

src/components/ExtendContent/index.jsx

@@ -1,104 +0,0 @@
-import { Button, message, Space } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { useRef, useState } from 'react';
-import ModalButton from './ModalButton';
-import List from './List';
-import { save, update } from '@/services/extendContent';
-
-export default (props) => {
-  const { onCancel, targetId, targetType } = props;
-
-  const [record, setRecord] = useState();
-  const listRef = useRef();
-  const textBtnRef = useRef();
-  const imageBtnRef = useRef();
-  const videoBtnRef = useRef();
-
-  const handleChange = (row, next) => {
-    const data = {
-      ...(row || {}),
-      targetId,
-      targetType,
-    };
-
-    if (data.extId) {
-      // 编辑提交
-
-      update(data.extId, data).then(() => {
-        listRef.current.reload();
-        next();
-
-        message.success('更新数据成功');
-      }).catch((err) => {
-        console.log(err.message)
-      });
-    } else if (data.content) {
-      // 新增提交
-      listRef.current.setLoading(true);
-      save(data).then((res) => {
-        listRef.current.reload();
-        next();
-
-        message.success('保存数据成功');
-      }).catch((err) => {
-        console.log(err.message)
-      });
-    } else {
-      next();
-    }
-  };
-
-  const handleEdit = (row) => {
-    setRecord(row);
-    switch (row.contentType) {
-      case 'text':
-        textBtnRef.current.toggle();
-        break;
-      case 'image':
-        imageBtnRef.current.toggle();
-        break;
-      case 'video':
-        videoBtnRef.current.toggle();
-        break;
-      default:
-        break;
-    }
-  };
-
-  const handleClose = () => {
-    setRecord();
-  };
-
-  return (
-    <div>
-      <Space size="large" style={{ marginBottom: '18px' }}>
-        <ModalButton
-          ref={textBtnRef}
-          type="dashed"
-          icon={<PlusOutlined />}
-          record={record}
-          contentType="text"
-          onChange={handleChange}
-          onClose={handleClose}
-        >
-          文字
-        </ModalButton>
-        <ModalButton
-          ref={imageBtnRef}
-          type="dashed"
-          icon={<PlusOutlined />}
-          record={record}
-          contentType="image"
-          onChange={handleChange}
-          onClose={handleClose}
-        >
-          图片
-        </ModalButton>
-      </Space>
-      <List ref={listRef} targetType={targetType} onEdit={handleEdit} targetId={targetId} />
-      {/* <Button onClick={onCancel} style={{ marginTop: '2em', float: 'right' }}>
-        返回
-      </Button> */}
-    </div>
-  );
-};

src/components/rich-editor/index.jsx

@@ -1,8 +1,7 @@
-import React, { useRef, useEffect, useMemo } from 'react'
+import React, { forwardRef, useRef, useEffect, useMemo, useImperativeHandle } from 'react'
 
-export default (props) => {
+export default forwardRef((props, ref) => {
   const editorRef = useRef()
-  const initedRef = useRef(false)
   const id = useMemo(() => `mce-${Math.random().toString(36).substring(2, 10)}`, [])
 
   useEffect(() => {
@@ -10,30 +9,35 @@ export default (props) => {
       selector: `#${id}`,
       menubar: false,
       setup: (editor) => {
-        editorRef.current = editor;
-        if (props.value) {
-          initedRef.current = true
-          editor.setContent(props.value)
-        }
-
-        editor.on('input', () => {
+        editor.on('change', () => {
           props.onChange(editor.getContent());
+          console.log(editor.getContent())
         })
+      },
+      init_instance_callback: (editor) => {
+        editorRef.current = editor;
       }
     });
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [id])
 
-  useEffect(() => {
-    if (editorRef.current && !initedRef.current) {
-      if (props.inited) {
-        initedRef.current = true
-        editorRef.current.setContent(props.value)
+  useImperativeHandle(ref, () => ({
+    setContent: (val) => {
+      if (editorRef.current) {
+        editorRef.current.setContent(val)
+      } else {
+        const t = setInterval(() => {
+          if (editorRef.current) {
+            editorRef.current.setContent(val)
+            clearInterval(t)
+            console.log('-clearInterval-')
+          }
+        }, 200)
       }
     }
-  }, [props.value, props.inited])
+  }))
 
   return (
     <textarea id={id} />
   )
-}
+})

src/pages/applicationList/index.jsx

@@ -4,7 +4,7 @@ import moment from 'moment';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
-import { getList } from '@/services/work'
+import { getApplicationList } from '@/services/application'
 
 const { RangePicker } = DatePicker;
 
@@ -79,7 +79,7 @@ export default (props) => {
       <PageTable
         actionRef={actionRef}
         columns={columns}
-        request={getList}
+        request={getApplicationList}
         options={false}
         search={{
           defaultCollapsed: false
@@ -88,7 +88,7 @@ export default (props) => {
         manualRequest={true}
         revalidateOnFocus={false}
         beforeSearchSubmit={handleBeforSearch}
-        rowKey="formId"
+        rowKey="applicationId"
       />
     </PageHeaderWrapper>
   )

src/pages/dashboard/index.jsx

@@ -9,6 +9,6 @@ export default (props) => {
   const [value, setValue] = useState()
 
   return (
-    <RichEditor value={value} onChange={setValue}/>
+    <RichEditor value={value} onChange={setValue} />
   )
 }

src/pages/notice/edit.jsx

@@ -1,9 +1,10 @@
 import { Input, Card, Select, Button, Form, InputNumber, message } from 'antd';
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
-import ExtendContent from '@/components/ExtendContent';
-import { addNews, updateNews, getNewsDetail } from '@/services/news';
+import { addNotice, updateNotice, getNoticeDetail } from '@/services/notice'
+import RichEditor from "@/components/rich-editor";
+
 
 const { Option } = Select;
 const goBack = () => {
@@ -15,6 +16,9 @@ export default (props) => {
   const { id } = location.query;
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const [data, setData] = useState();
+
+  const editorRef = useRef()
 
   const formItemLayout = {
     //布局
@@ -22,10 +26,11 @@ export default (props) => {
     wrapperCol: { span: 14 },
   };
 
-  const Submit = (data) => {
+  const Submit = (value) => {
+    var myData = { ...data, ...value };
     setLoading(true);
     if (id) {
-      updateNews(id, data)
+      updateNotice(id, myData)
         .then(() => {
           setLoading(false);
           message.success('数据更新成功');
@@ -36,11 +41,11 @@ export default (props) => {
           message.error(err.message || err);
         });
     } else {
-      addNews(data)
+      addNotice(myData)
         .then((res) => {
           setLoading(false);
           message.success('数据保存成功');
-          history.replace(`./edit.jsx?id=${res.newsId}`);
+          history.replace(`./edit.jsx?id=${res.noticeId}`);
         })
         .catch((err) => {
           setLoading(false);
@@ -49,14 +54,17 @@ export default (props) => {
     }
   };
   useEffect(() => {
-    if (id) {
-      getNewsDetail(id).then((res) => {
+    if (id && form) {
+      getNoticeDetail(id).then((res) => {
         form.setFieldsValue(res);
+        setData(res);
+        editorRef.current.setContent(res.content);
       }).catch((err) => {
         console.log(err.message)
       });
     }
-  }, [id]);
+  }, [id, form]);
+
   return (
     <Card>
       <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
@@ -64,7 +72,10 @@ export default (props) => {
           <Form {...formItemLayout} onFinish={Submit} form={form}>
             <FormItem label="标题" name="title" rules={[{ required: true, message: '请输入' }]}>
               <Input placeholder="请输入" style={{ width: '350px' }} />
-            </FormItem>           
+            </FormItem>
+            <FormItem label="正文" name='content' rules={[{ required: true, message: '请输入' }]}>
+              <RichEditor ref={editorRef} />
+            </FormItem>
             <FormItem label="权重" name="weight" rules={[{ required: true, message: '请输入' }]}>
               <InputNumber min={0} placeholder="请输入权重" style={{ width: '350px' }} />
             </FormItem>
@@ -74,13 +85,11 @@ export default (props) => {
                 <Option value={0}>未发布</Option>
               </Select>
             </FormItem>
-            {id && (
-              <FormItem label="详情" colon={false}>
-                <ExtendContent targetType="news" targetId={id} onCancel={() => history.goBack()} />
-              </FormItem>
-            )}
             <FormItem label=" " colon={false}>
-              <Button type="default" onClick={() => goBack()}>
+              <Button
+                type="default"
+                onClick={() => goBack()}
+              >
                 返回
               </Button>
               <Button

src/pages/notice/index.jsx

@@ -91,13 +91,13 @@ export default (props) => {
         <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
           {record.status === 0 ? '发布' : '取消发布'}
         </Button>,
-        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => gotoEdit(record.newsId)}>
+        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => gotoEdit(record.noticeId)}>
           编辑
         </Button>,
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.newsId)}
+          onConfirm={() => handleDelete(record.noticeId)}
           okText="确定"
           cancelText="取消"
         >
@@ -116,7 +116,7 @@ export default (props) => {
         toolBarRender={actions}
         actionRef={actionRef}
         columns={columns}
-        rowKey="newsId"
+        rowKey="noticeId"
         options={false}
         scroll={{ x: 1000 }}
       />

src/services/application.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/**
+ * 审批
+ * @param {*} data
+ * @returns
+ */
+export const updateAudit = (id, data) => request(`/application/${id}/audit`, { method: 'put', data });
+
+/**
+ * 发证
+ * @param {*} data
+ * @returns
+ */
+export const updateMake = (id, data) => request(`/application/${id}/make`, { method: 'put', data });
+
+/**
+ * 查询申请列表
+ * @param {*} params
+ * @returns
+ */
+export const getApplicationList = (params) => request('/application', { params });
+
+/**
+ * 查询申请详情
+ * @param {*} params
+ * @returns
+ */
+export const getApplicationDetail = (id) => request(`/application/${id}`);

src/services/extendContent.js

@@ -1,36 +0,0 @@
-import request from '@/utils/request';
-
-/**
- * 保存扩展内容
- * @param {*} data
- * @returns
- */
-export const save = (data) => request('/extend-content', { method: 'post', data });
-
-/**
- * 修改扩展内容
- * @param {*} data
- * @returns
- */
-export const update = (id, data) => request(`/extend-content/${id}`, { method: 'put', data });
-
-/**
- * 查询扩展内容列表
- * @param {*} params
- * @returns
- */
-export const getList = (params) => request('/extend-content', { params });
-
-/**
- * 删除扩展内容
- * @param {*} data
- * @returns
- */
-export const remove = (id) => request(`/extend-content/${id}`, { method: 'delete' });
-
-/**
- * 查询扩展内容详情
- * @param {*} params
- * @returns
- */
-export const getDetail = (id) => request(`/extend-content/${id}`);

src/services/news.js

@@ -1,36 +0,0 @@
-import request from '@/utils/request';
-
-/**
- * 保存资讯
- * @param {*} data
- * @returns
- */
-export const addNews = (data) => request('/news', { method: 'post', data });
-
-/**
- * 修改资讯
- * @param {*} data
- * @returns
- */
-export const updateNews = (id, data) => request(`/news/${id}`, { method: 'put', data });
-
-/**
- * 查询资讯列表
- * @param {*} params
- * @returns
- */
-export const getNewsList = (params) => request('/news', { params });
-
-/**
- * 删除资讯
- * @param {*} data
- * @returns
- */
-export const deleteNews = (id) => request(`/news/${id}`, { method: 'delete' });
-
-/**
- * 查询资讯详情
- * @param {*} params
- * @returns
- */
-export const getNewsDetail = (id) => request(`/news/${id}`);