From baed9df260f9448f1b3a86483d025983d52e3d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 21 Sep 2023 14:05:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forums/ForumsDetail.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/forums/ForumsDetail.jsx b/src/forums/ForumsDetail.jsx index 41ae15638..6c955c26d 100644 --- a/src/forums/ForumsDetail.jsx +++ b/src/forums/ForumsDetail.jsx @@ -43,8 +43,13 @@ function memo_show(props) { useEffect(() => { init(); related_memos(); + return componentWillUnmount }, [memo_id]); + function componentWillUnmount() { + document.title = '论坛交流' + } + async function init() { setSpinType(true); let url = `/memos/${memo_id}.json`; @@ -69,6 +74,7 @@ function memo_show(props) { setRecentmemos(result.data.recent_memos); setIsBanned(result.data.is_banned); getMemoUser(result.data.author_info); + document.title = `${result.data.memo.subject}/${result.data.memo.forum_tag && result.data.memo.forum_tag.title}` } setSpinType(false); }) -- 2.34.1 From 0580fcb2c0ecccd6b833a0917dda5c524331c5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 21 Sep 2023 14:38:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9title=E4=B8=8Ehead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 8 ++++---- src/common/UrlTool.js | 12 ++++++++++++ src/common/educoder.js | 2 +- src/forums/ForumsDetail.jsx | 6 +++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/public/index.html b/public/index.html index 2082ca5d2..ee24f5978 100755 --- a/public/index.html +++ b/public/index.html @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 9704e713d..0689f4e81 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -219,3 +219,15 @@ export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings) allowClear={true} >) } + +// 手动添加/修改mate标签 +export function addMeta(name, content){ + if(document.querySelector(`meta[name='${name}']`)){ + document.querySelector(`meta[name='${name}']`).content=content; + }else{ + const meta = document.createElement('meta'); + meta.content = content; + meta.name = name; + document.getElementsByTagName('head')[0].appendChild(meta); + } +}; diff --git a/src/common/educoder.js b/src/common/educoder.js index 83d2a40c8..67e427004 100644 --- a/src/common/educoder.js +++ b/src/common/educoder.js @@ -6,7 +6,7 @@ export { getUploadLogoActionUrl as getUploadLogoActionUrl, getImageUrl as getImageUrl, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl , getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth - , getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl + , getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl, addMeta as addMeta } from './UrlTool'; export { setmiyah as setmiyah } from './Component'; diff --git a/src/forums/ForumsDetail.jsx b/src/forums/ForumsDetail.jsx index 6c955c26d..07c693e8a 100644 --- a/src/forums/ForumsDetail.jsx +++ b/src/forums/ForumsDetail.jsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import axios from "axios"; -import { getImageUrl } from "educoder"; +import { getImageUrl, addMeta } from "educoder"; import { Breadcrumb, Spin, Empty } from "antd"; import { Link } from "react-router-dom"; import { @@ -47,7 +47,9 @@ function memo_show(props) { }, [memo_id]); function componentWillUnmount() { + // 离开页面恢复原来title与head document.title = '论坛交流' + addMeta('Keywords', "trustie,trustieforge,forge,确实让创建更美好,协同开发平台") } async function init() { @@ -74,7 +76,9 @@ function memo_show(props) { setRecentmemos(result.data.recent_memos); setIsBanned(result.data.is_banned); getMemoUser(result.data.author_info); + // 帖子详情页动态修改title与head document.title = `${result.data.memo.subject}/${result.data.memo.forum_tag && result.data.memo.forum_tag.title}` + addMeta('Keywords', `${result.data.memo.subject}/${result.data.memo.forum_tag && result.data.memo.forum_tag.title}`) } setSpinType(false); }) -- 2.34.1 From f45d31b489f46e6f7a5d61f302e2867adfac8e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 28 Sep 2023 15:31:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=89=B9=E8=89=B2=E4=B8=93=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/tpm/NewHeader.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index e7eb9df40..892288ca0 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -689,6 +689,9 @@ class NewHeader extends Component { if (user_login && (new_link && new_link.indexOf("homes") > -1)) { new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities") } + if (item.name === '特色专区') { + is_hidden = true + } return (
  • this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}> {item.name} -- 2.34.1 From 06374112d89b2eca863f3661338c2cd761e1a8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 28 Sep 2023 16:04:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?header=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/tpm/NewHeader.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 892288ca0..66e9ed43a 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -48,6 +48,7 @@ class NewHeader extends Component { mygetHelmetapi2: null, goshowqqgtounp: false, visiblemyss: false, + navbar: [] } } componentDidMount() { @@ -536,6 +537,11 @@ class NewHeader extends Component { this.setState({ mygetHelmetapi2: chromesettingArray }); + if (mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length) { + this.setState({ navbar: mygetHelmetapi2.navbar.sort((a, b) => {return a.index - b.index}) }, () => { + console.log(''); + }); + } if (chromesettingArray.tab_logo_url) { this.gettablogourldata(chromesettingresponseArray); } else { @@ -553,6 +559,11 @@ class NewHeader extends Component { this.setState({ mygetHelmetapi2: response.data.setting }, () => { console.log(''); }); + if (response.data.setting.navbar && response.data.setting.navbar.length) { + this.setState({ navbar: response.data.setting.navbar.sort((a, b) => {return a.index - b.index}) }, () => { + console.log(''); + }); + } // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); // localStorage.setItem('chromesettingresponse', JSON.stringify(response)); try { @@ -633,6 +644,7 @@ class NewHeader extends Component { isRender, mygetHelmetapi2, goshowqqgtounp, + navbar } = this.state; const filterPersonal = mygetHelmetapi2 && mygetHelmetapi2.personal && mygetHelmetapi2.personal.filter(i=>i.key === "userinfo"); @@ -668,10 +680,10 @@ class NewHeader extends Component {
    { - mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ? + navbar && navbar.length > 0 ?
      { - mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item, key) => { + navbar && navbar.map((item, key) => { var new_link = item.link; var user_login = this.props.user && this.props.user.login; var is_hidden = item.hidden -- 2.34.1 From e414343db342f8988ae9d0b52945b8427124c706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 28 Sep 2023 16:06:12 +0800 Subject: [PATCH 5/5] cont. --- src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 66e9ed43a..b01beda6c 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -537,8 +537,8 @@ class NewHeader extends Component { this.setState({ mygetHelmetapi2: chromesettingArray }); - if (mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length) { - this.setState({ navbar: mygetHelmetapi2.navbar.sort((a, b) => {return a.index - b.index}) }, () => { + if (chromesettingArray.navbar && chromesettingArray.navbar.length) { + this.setState({ navbar: chromesettingArray.navbar.sort((a, b) => {return a.index - b.index}) }, () => { console.log(''); }); } -- 2.34.1