From b4f731ea0a7b6d91e529cbefeb04824374a07955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Sat, 22 Jun 2024 19:32:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9glcc=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/timerShaft/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 37a1bf372..2890f305c 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -34,7 +34,7 @@ function TimerShaft(props) { }, { title: "Step2", - date: "7.1-8.18", + date: "7.9-8.18", content: "项目开发第一阶段", }, { From 13c6b618961699d4f7d2169b60ee6c29c9b69509 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 25 Jun 2024 11:06:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E6=94=B9=E4=B8=BAcookie=E4=BF=9D=E5=AD=98=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E5=A4=A9=E6=9C=89=E6=95=88=E6=9C=9F=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Component/NoticeModal/SystemNotice.jsx | 51 +++++++++---------- src/modules/tpm/TPMIndexHOC.js | 5 +- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 78619f18b..79fafefd3 100644 --- a/src/forge/Component/NoticeModal/SystemNotice.jsx +++ b/src/forge/Component/NoticeModal/SystemNotice.jsx @@ -3,42 +3,41 @@ import { Modal , Button } from 'antd'; import './Index.scss'; import '../../css/index.scss'; import RenderHtml from '../../../components/render-html'; -// import cookie from 'react-cookies'; -import axios from 'axios'; +import cookie from 'react-cookies'; +// import axios from 'axios'; -function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice}){ +function SystemNotice({system_notification,history}){ const [ visible , setVisible ] = useState(false); useEffect(()=>{ - - if((system_notification && !system_notification.is_read) && showNotice && login){ + if(system_notification && !cookie.load('notice_stage')){ setVisible(true); } - },[system_notification,login]) + },[system_notification]) function sureContinue() { - if(login && ( system_notification && system_notification.id )){ - const url = `/users/${login}/system_notification_histories.json`; - axios.post(url,{ - system_notification_id:system_notification.id - }).then(result=>{ - setVisible(false); - hideSystemNotice(); - }).catch(error=>{ - setVisible(false); - hideSystemNotice(); - }) - }else{ - setVisible(false); - hideSystemNotice(); - } - // cookie.remove('notice_stage'); + // if(login && ( system_notification && system_notification.id )){ + // const url = `/users/${login}/system_notification_histories.json`; + // axios.post(url,{ + // system_notification_id:system_notification.id + // }).then(result=>{ + // setVisible(false); + // hideSystemNotice(); + // }).catch(error=>{ + // setVisible(false); + // hideSystemNotice(); + // }) + // }else{ + // setVisible(false); + // hideSystemNotice(); + // } + cookie.remove('notice_stage'); - // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天 - // // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟 - // cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" }); + let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天 + // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟 + cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" }); - // setVisible(false); + setVisible(false); } return ( diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index b62237e0a..62f444cfe 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -298,11 +298,10 @@ export function TPMIndexHOC(WrappedComponent) { return (
Date: Tue, 15 Oct 2024 15:48:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E6=9D=83=E9=99=90+issue=E9=99=84=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/List.jsx | 2 +- src/forge/Upload/attachment.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index ce61a7c21..86abfdc31 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -101,7 +101,7 @@ function List(props){ {organizeDetail && (
{ - organizeDetail.pms_enable &&( + organizeDetail.pms_enable && organizeDetail.is_admin &&( !enterpriseOpenInfo.isOpen ? ( diff --git a/src/forge/Upload/attachment.js b/src/forge/Upload/attachment.js index b668eb017..fe4aa60e5 100644 --- a/src/forge/Upload/attachment.js +++ b/src/forge/Upload/attachment.js @@ -136,8 +136,8 @@ class Attachment extends Component { {item.filesize} ) : ( - {item.title} {item.filesize} - + )} {canDelete ? ( From 3cf9c4e5a7c74444a762f3224f27fe9bfb0151e8 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 15 Oct 2024 16:57:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8C=E4=B8=8A=E2=80=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/List.jsx | 13 ++++++++++++- src/forge/Upload/read.js | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index 86abfdc31..f43f423e0 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -100,7 +100,18 @@ function List(props){ {organizeDetail && organizeDetail.nickname} {organizeDetail && (
+ {organizeDetail.pms_enable && organizeDetail.is_admin && !enterpriseOpenInfo.isOpen && + + + + } { + organizeDetail.pms_enable && enterpriseOpenInfo.isOpen && organizeDetail.is_member && (enterpriseOpenInfo.url ? + + : + ) + } + {/* { organizeDetail.pms_enable && organizeDetail.is_admin &&( !enterpriseOpenInfo.isOpen ? ( @@ -113,7 +124,7 @@ function List(props){ ) ) - } + } */} {organizeDetail.is_admin && }
)} diff --git a/src/forge/Upload/read.js b/src/forge/Upload/read.js index 481298261..b50d9cb32 100644 --- a/src/forge/Upload/read.js +++ b/src/forge/Upload/read.js @@ -84,7 +84,7 @@ class Read extends Component { 暂仅支持文本格式，不支持图片,excel等不可以txt读取的文件

*/}

- 文件名请使用英文且不得超过{size}MB + 文件名请使用英文且不得超过{size}MB（超过{size}MB文件请用git工具上传）

)} From 1f78d1aa9a1516d9d7f78cd686af119eb37260a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Wed, 16 Oct 2024 14:56:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?hiagent=E7=99=BB=E5=BD=95=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=9C=B0=E5=9D=80=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/iframe.jsx | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/forge/iframe.jsx b/src/forge/iframe.jsx index 26cdd8897..469aa808c 100644 --- a/src/forge/iframe.jsx +++ b/src/forge/iframe.jsx @@ -7,28 +7,24 @@ import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC"; const Iframe = (props) => { - const history = props.history - const location = history.location + const { history, showLoginDialog, current_user } = props + let settings = localStorage.chromesetting && localStorage.chromesetting !== 'undefined' &&JSON.parse(localStorage.chromesetting); - // if (!location.state.url) { - // history.push("/404"); - // } + useEffect(() => { + if (!settings?.common?.hiAgent) { + history.push("/404"); + } + if (!current_user?.login) { + history.push("/login?go_page=/hiagent"); + } + }, []) - function iframeLoad() { - let myIframe = document.getElementById("iframe"); - // if (myIframe.contentWindow.location && myIframe.contentWindow.location.href) { - // window.location.href = 'http://118.145.132.196:3000/product/llm/llm-chat' - // //myIframe.contentWindow.location.href - // } - } - - return + src={ settings?.common?.hiAgent } + > : '' } export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Iframe)))); \ No newline at end of file