From 357435579a390f77070d737461f591e4b80b44d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 11:13:11 +0800 Subject: [PATCH] issue --- src/forge/Component/RichEditor/index.jsx | 2 +- src/forge/Information/Pages/main.jsx | 2 +- src/forge/Information/Pages/newsCreate.jsx | 20 +++++++++++-------- src/forge/Information/Pages/newsDetail.jsx | 4 +++- src/forge/Information/Pages/sourceCreate.jsx | 20 +++++++++---------- src/forge/Information/Pages/sourceDetail.jsx | 10 +++++----- src/forge/Information/fetch.js | 1 - src/forge/Information/index.scss | 21 +++++++++++++++++++- 8 files changed, 52 insertions(+), 28 deletions(-) diff --git a/src/forge/Component/RichEditor/index.jsx b/src/forge/Component/RichEditor/index.jsx index 2a15b968b..aa9da43f8 100644 --- a/src/forge/Component/RichEditor/index.jsx +++ b/src/forge/Component/RichEditor/index.jsx @@ -23,7 +23,7 @@ function MyEditor(props) { const toolbarConfig = {}; // 隐藏 代办 toolbarConfig.excludeKeys = [ - 'todo' + 'todo', "fullScreen" ] // 编辑器配置 diff --git a/src/forge/Information/Pages/main.jsx b/src/forge/Information/Pages/main.jsx index 9fe9137f0..a1027ccc8 100644 --- a/src/forge/Information/Pages/main.jsx +++ b/src/forge/Information/Pages/main.jsx @@ -122,7 +122,7 @@ function Main(props){

{tempConfig[temp].mainTitle}

- {role && role.role !== "None" &&
+ {role && role.role !== "None" &&
{role.role === "Member" && } diff --git a/src/forge/Information/Pages/newsCreate.jsx b/src/forge/Information/Pages/newsCreate.jsx index 84483c794..b4e283848 100644 --- a/src/forge/Information/Pages/newsCreate.jsx +++ b/src/forge/Information/Pages/newsCreate.jsx @@ -90,22 +90,26 @@ function NewsCreate(props){ const {data:{code, msg}} = res; setLoading(false); if(code === 200){ - message.success("更新成功"); - history.push(`/zone/${deptId}/news/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/newdetail/${newsId}`); }else{ - message.error(msg || '更新失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } + }).catch(e=>{ + setLoading(false); }) } addNewsByDirId(fieldsValue.dirId, params).then(res=>{ - const {data:{code, msg}} = res; + const {data:{code, msg, data}} = res; setLoading(false); if(code === 200){ - message.success("新增成功"); - history.push(`/zone/${deptId}/news/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/newdetail/${data}`); }else{ - message.error(msg || '新增失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } + }).catch(e=>{ + setLoading(false); }) }) } @@ -153,7 +157,7 @@ function NewsCreate(props){ type === "richEditor" ? {setFieldsValue({"content": value})}}/> : {setFieldsValue({"content": value})}} imageExpand={false} diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx index 025f16591..3947f4cb2 100644 --- a/src/forge/Information/Pages/newsDetail.jsx +++ b/src/forge/Information/Pages/newsDetail.jsx @@ -1,5 +1,5 @@ import React,{ useState , useEffect } from 'react'; -import { Breadcrumb , Divider, Spin } from 'antd'; +import { Badge, Breadcrumb , Divider, Spin } from 'antd'; import liulan from '../img/liulan.png'; import RenderHtml from '../../../components/render-html'; import { Base64 } from 'js-base64'; @@ -108,6 +108,8 @@ function NewsDetail(props){ { cmsDir &&
  • { detail.publishUserNickname }
    • } { cmsDir &&
  • { detail.isFirstPublish ? '创建于' : '更新于' }{detail.publishTime}
    • } { detail.visits &&
  • {detail.visits}
    • } + { detail.auditStatus === '2' &&
    • } + { detail.auditStatus === '0' &&
    • }
    { !IsPC() && } diff --git a/src/forge/Information/Pages/sourceCreate.jsx b/src/forge/Information/Pages/sourceCreate.jsx index 526df0e12..14c630333 100644 --- a/src/forge/Information/Pages/sourceCreate.jsx +++ b/src/forge/Information/Pages/sourceCreate.jsx @@ -68,7 +68,7 @@ function SourceCreate(props){ }).catch(error=>{}) } - // 新建文章 + // 新建/编辑资源 function submit(e){ e.preventDefault(); validateFields((err, fieldsValue)=>{ @@ -89,21 +89,21 @@ function SourceCreate(props){ updateMyResource(params).then((res)=>{ const {data:{code, msg}} = res; if(code === 200){ - message.success("编辑成功"); - history.push(`/zone/${deptId}/source/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/source/${sourceid}`); }else{ - message.error(msg || '编辑失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } }) return; } addResource(params).then((res)=>{ - const {data:{code, msg}} = res; + const {data:{code, msg, data}} = res; if(code === 200){ - message.success("新增成功"); - history.push(`/zone/${deptId}/source/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/source/${data.id}`); }else{ - message.error(msg || '新增失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } }) }) @@ -203,8 +203,8 @@ function SourceCreate(props){ {getFieldDecorator("fileList", { rules:[{ required:true,message:"请上传资源附件！" }] })( - - diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx index cd50906ff..eae707ff8 100644 --- a/src/forge/Information/Pages/sourceDetail.jsx +++ b/src/forge/Information/Pages/sourceDetail.jsx @@ -1,11 +1,8 @@ import React , { useEffect , useState } from 'react'; -import { Breadcrumb } from 'antd'; +import { Badge, Breadcrumb } from 'antd'; import SourceFile from '../img/sourceFile.png'; -import RenderHtml from '../../../components/render-html'; import { getSourceDetail } from '../api'; import { Link } from 'react-router-dom'; -import axios from 'axios'; -import { Base64 } from 'js-base64'; import { httpUrl } from '../fetch'; import { AlignCenter, FlexAJ } from '../../Component/layout'; import SourceIcon from '../img/sourceIcon.png'; @@ -16,6 +13,7 @@ function SourceDetail(props){ const { deptId , sourceid } = props.match.params; const [ detail , setDetail ] = useState(undefined); const zonedetail = props.data; + const {temp} = props; useEffect(()=>{ if(sourceid){ @@ -69,7 +67,9 @@ function SourceDetail(props){ {detail.createUser && detail.createUser.avatar && } {detail.createUser && {detail.createUser.nickName}} - 发布于{detail.updateTime || detail.createTime} + 发布于{detail.updateTime || detail.createTime} + {detail.auditStatus === '0' && } + {detail.auditStatus === '2' && }
    {detail.summary}
    { diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index ddb0df2b7..29cc15d28 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -7,7 +7,6 @@ function beforeFetch(actionUrl){ } const service = axios.create({ - headers:{Authorization:"0cd46d63363af9205eb7ccecff574309ce069a97"}, baseURL: actionUrl, timeout: 1800000, // 请求超时时间 }); diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index ef5c0f61f..78db4134d 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -28,6 +28,12 @@ background-color: var(--primary-color); } } +.hoverThemeColorBut{ + &:hover, &:active, &:focus{ + border-color: var(--light-color); + color: var(--light-color); + } +} .information_main{ background-color:#f3f5f8; @@ -1547,7 +1553,7 @@ button{ border-color: var(--primary-color); color: var(--primary-color); - &:hover{ + &:hover, &:active, &:focus{ border-color: var(--light-color); color: var(--light-color); } @@ -1562,6 +1568,12 @@ padding: 30px 35px 50px; } } +.editNewsMd .editormd-dialog-header{ + padding: 5px 20px; +} +.editNewsMd .number-input{ + width: 60px !important; +} // 新增资源 .sourceCreateBox{ .sourceFilesBox{ @@ -1580,6 +1592,13 @@ color: var(--primary-color)!important; } +.failed .ant-badge-status-text{ + color: #eb1212; +} +.pass .ant-badge-status-text{ + color: var(--primary-color); +} + // --------------新建专区 .applyBox{ background-color: #fff;