From 9d5f554a3c807107ff96eb2e64230557d3e1645a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Wed, 7 Jan 2026 17:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B1=E5=BB=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                    | 14 +++++++++++
 src/factory/components/Resource/index.jsx     |  2 +-
 .../resource/commonTools/detail/index.jsx     | 24 ++++++++++---------
 .../resource/commonTools/detail/index.scss    | 11 +++++----
 src/factory/resource/commonTools/index.jsx    |  2 +-
 .../developmentTools/detail/index.jsx         |  2 +-
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/App.js b/src/App.js
index 10a94549e..fe07cba21 100644
--- a/src/App.js
+++ b/src/App.js
@@ -63,6 +63,11 @@ const SoftwareFactoryResourceDetail= Loadable({
   loading: Loading,
 })
 
+const SoftwareFactoryResourceDetailCommon= Loadable({
+  loader: () => import('./factory/resource/commonTools/detail/index'),
+  loading: Loading,
+})
+
 
 
 const SoftwareFactoryNews = Loadable({
@@ -497,6 +502,15 @@ class App extends Component {
                   }>
                 </Route>
 
+                <Route
+                  path={"/sf/resources/commontools/:id"}
+                  render={
+                    (props) => {
+                      return (<SoftwareFactoryResourceDetailCommon {...this.props} {...props} {...this.state} />)
+                    }
+                  }>
+                </Route>
+
                 <Route
                   path={"/sf/resources"}
                   render={
diff --git a/src/factory/components/Resource/index.jsx b/src/factory/components/Resource/index.jsx
index 1fdf3dcf8..5d1985448 100644
--- a/src/factory/components/Resource/index.jsx
+++ b/src/factory/components/Resource/index.jsx
@@ -276,7 +276,7 @@ const Resource = forwardRef(({ zoneId }, ref) => {
                       <div className="item-name" title={ item.name }>{item.name}</div>
                       <div className="item-desc" title={ item.summary }>{item.summary}</div>
                       <div className="item-btn">
-                        <Link to={`/sf/resources/devtools/${item.id}`}><button className="shiny-button">查看</button></Link>
+                        <Link to={`/sf/resources/commontools/${item.id}`}><button className="shiny-button">查看</button></Link>
                         <button onClick={() => { downloadFunc(`${httpUrl}/file/open/download/${item.fileIds}`) }}>下载</button>
                       </div>
                     </div>
diff --git a/src/factory/resource/commonTools/detail/index.jsx b/src/factory/resource/commonTools/detail/index.jsx
index 834c8db0f..7b0a8627a 100644
--- a/src/factory/resource/commonTools/detail/index.jsx
+++ b/src/factory/resource/commonTools/detail/index.jsx
@@ -45,10 +45,11 @@ function Index(props) {
           extendData = JSON.parse(response.data.data.extendData)
         }
         document.title = response.data.data.name
-        if (extendData.content) {          
-          setContent(Base64.decode(extendData.content))
-        }         
-        setDetail({...response.data.data, ...extendData});
+        if (extendData.content) {
+          const base64content = Base64.decode(extendData.content)
+          setContent(base64content !== '<p><br></p>' ? base64content : '')
+        }
+        setDetail({ ...response.data.data, ...extendData });
       }
     }).catch(error => { })
   }
@@ -65,12 +66,12 @@ function Index(props) {
       <div className="news-detail-header">
         <Breadcrumb separator=">">
           <Breadcrumb.Item href={`/sf`}>首页</Breadcrumb.Item>
-          <Breadcrumb.Item href={`/sf/resources/devtools`}>开发工具</Breadcrumb.Item>
+          <Breadcrumb.Item href={`/sf/resources/commontools`}>共建工具</Breadcrumb.Item>
           <Breadcrumb.Item> <span className="breacrumb-name">{detail.name}</span> </Breadcrumb.Item>
         </Breadcrumb>
         <div className="header-content">
           <h3>{detail.name}</h3>
-          <p title={ detail.summary }>{detail.summary}</p>
+          <p title={detail.summary}>{detail.summary}</p>
           <div className="tools-info">
             <div>
               <span>{detail.downloadCount}</span>
@@ -107,11 +108,12 @@ function Index(props) {
         </div>
       </div>
       <div className="news-detail-content">
-        <div className="news-detail-content-wrapper">
-          {
-            content && <RenderHtml className="informations_detail imageLayerParent" value={content} url={props.history.location} />
-          }
-        </div>
+        {
+          content &&
+          <div className="news-detail-content-wrapper">
+            <RenderHtml className="informations_detail imageLayerParent" value={content} url={props.history.location} />
+          </div>
+        }
       </div>
     </div>
   )
diff --git a/src/factory/resource/commonTools/detail/index.scss b/src/factory/resource/commonTools/detail/index.scss
index eb157cacf..3ad889182 100644
--- a/src/factory/resource/commonTools/detail/index.scss
+++ b/src/factory/resource/commonTools/detail/index.scss
@@ -221,7 +221,7 @@
     width: 1600px;
     height: 100%;
     margin: 52px auto;
-    margin-top: -100px;
+    margin-top: -130px;
     position: relative;
     z-index: 1;
 
@@ -241,9 +241,12 @@
     }
 
     .news-detail-content-wrapper {
-      width: 1600px;
-      float: left;
-      padding-bottom: 60px;
+      background-image: url('../../../../images/factory/resource/detail-bg.png');
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      padding: 30px;
+      border-radius: 16px;
+      margin-bottom: 60px;
     }
 
     .news-detail-content-others {
diff --git a/src/factory/resource/commonTools/index.jsx b/src/factory/resource/commonTools/index.jsx
index 9dc4e5252..74c08ae87 100644
--- a/src/factory/resource/commonTools/index.jsx
+++ b/src/factory/resource/commonTools/index.jsx
@@ -107,7 +107,7 @@ function Index(props) {
                       </div>
                     </div>
                     <div className="content-bottom-btn">
-                      <Link to={`/sf/resources/devtools/${item.id}`}><button className="shiny-button">查看详情</button></Link>
+                      <Link to={`/sf/resources/commontools/${item.id}`}><button className="shiny-button">查看详情</button></Link>
                     </div>
                   </ActionItem>
                 })
diff --git a/src/factory/resource/developmentTools/detail/index.jsx b/src/factory/resource/developmentTools/detail/index.jsx
index 2f0be727c..7285da708 100644
--- a/src/factory/resource/developmentTools/detail/index.jsx
+++ b/src/factory/resource/developmentTools/detail/index.jsx
@@ -66,7 +66,7 @@ function Index(props) {
       <div className="news-detail-header">
         <Breadcrumb separator=">">
           <Breadcrumb.Item href={`/sf`}>首页</Breadcrumb.Item>
-          <Breadcrumb.Item href={`/sf/resources/devtools`}>开发工具</Breadcrumb.Item>
+          <Breadcrumb.Item href={`/sf/resources/devtools`}>开源工具</Breadcrumb.Item>
           <Breadcrumb.Item> <span className="breacrumb-name">{detail.name}</span> </Breadcrumb.Item>
         </Breadcrumb>
         <div className="header-content">