From 9925e4e56325673f954eed95d14b1a1d6b2981bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 30 Jan 2024 14:45:29 +0800
Subject: [PATCH] =?UTF-8?q?wiki=EF=BC=9A=E9=9C=80=E8=A6=81=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9C=80=E6=96=B0=E7=89=88gitee=EF=BC=8C=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E9=9A=90=E8=97=8F=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/sub/DetailBanner.jsx         |  4 ++--
 src/forge/Wiki/EditWiki.jsx                 |  4 ++--
 src/forge/Wiki/Index.scss                   |  3 +--
 src/forge/Wiki/Welcome/index.scss           |  6 +++---
 src/forge/Wiki/api.js                       | 16 ++++++++++++++++
 src/forge/Wiki/components/sidebar/index.jsx | 14 ++++++++++++++
 6 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index a8460e4bb..9f6b5d180 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -131,8 +131,8 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur
                         <span>维基(Wiki)</span>
                       </Link>
                     </li>
-                  }
-                  {
+                  } */}
+                  {/* {
                     item.menu_name === "services" &&
                     <li className={pathname === "server" ? "active" : ""}>
                       <Link className='newTab'  to={{ pathname: `/${owner}/${projectsId}/service`, state }}>
diff --git a/src/forge/Wiki/EditWiki.jsx b/src/forge/Wiki/EditWiki.jsx
index 096d18108..d30dd0af4 100644
--- a/src/forge/Wiki/EditWiki.jsx
+++ b/src/forge/Wiki/EditWiki.jsx
@@ -94,7 +94,7 @@ export default Form.create()(({ form, history, showNotification, projectDetail,
 
   const helper = useCallback(
     (label, name, rules, widget, initialValue, rightComponent) => (
-      <Form.Item label={label} className="mb0">
+      <Form.Item label={label} className="mb0" wrapperCol={{span: 18}}>
         {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
         {rightComponent}
       </Form.Item>
@@ -330,7 +330,7 @@ export default Form.create()(({ form, history, showNotification, projectDetail,
           />
         )}
 
-        <Form.Item className="mb0 wiki-md">
+        <Form.Item className="mb0 wiki-md" wrapperCol={{span: 18}}>
           <MDEditor
             placeholder={"请输入wiki内容"}
             height={500}
diff --git a/src/forge/Wiki/Index.scss b/src/forge/Wiki/Index.scss
index e79567d69..6c3bc58d7 100644
--- a/src/forge/Wiki/Index.scss
+++ b/src/forge/Wiki/Index.scss
@@ -8,9 +8,8 @@ body {
   background: rgba(255,255,255,1);
 }
 .wiki-main {
-  width: 1200px;
   min-height: 400px;
-  margin: 20px auto 60px;
+  margin: 20px;
 
   .ant-btn-primary {
     background-color: $wikiColor;
diff --git a/src/forge/Wiki/Welcome/index.scss b/src/forge/Wiki/Welcome/index.scss
index 2250db0df..279339384 100644
--- a/src/forge/Wiki/Welcome/index.scss
+++ b/src/forge/Wiki/Welcome/index.scss
@@ -3,10 +3,10 @@
   flex-flow: column nowrap;
   justify-content: center;
   align-items: center;
-  width: 1200px;
-  min-height: 400px;
+  // width: 1200px;
+  min-height: 70vh;
   padding: 20px;
-  margin: 20px auto;
+  margin: 20px;
   background: rgba(250, 252, 255, 1);
   font-family: "PingFangSC-Medium";
   border-radius: 4px;
diff --git a/src/forge/Wiki/api.js b/src/forge/Wiki/api.js
index 50e0c693c..167511343 100644
--- a/src/forge/Wiki/api.js
+++ b/src/forge/Wiki/api.js
@@ -181,6 +181,22 @@ export function findNodeByKey(list, key){
   return undefined;
 }
 
+// 找到children中有相同key的数组
+export function findBrotherNodesByKey(list, key){
+  for (let index = 0; index < list.length; index++) {
+    const element = list[index];
+    if (element.key == key) {
+      return list;
+    }else if (element.children && element.children.length) {
+      let result = findBrotherNodesByKey(element.children, key);
+      if (result.length) {
+        return result;
+      }
+    }
+  }
+  return [];
+}
+
 // 找到children中有相同key的数组
 export function findNodeByChildrenKey(list, key){
   for (let index = 0; index < list.length; index++) {
diff --git a/src/forge/Wiki/components/sidebar/index.jsx b/src/forge/Wiki/components/sidebar/index.jsx
index da9863159..77ea4b75f 100644
--- a/src/forge/Wiki/components/sidebar/index.jsx
+++ b/src/forge/Wiki/components/sidebar/index.jsx
@@ -422,6 +422,20 @@ export default function Sidebar(props) {
     }
   }
 
+  function findBrotherNodesByKey(list, key){
+    for (let index = 0; index < list.length; index++) {
+      const element = list[index];
+      if (element.key == key) {
+        return list;
+      }else if (element.children && element.children.length) {
+        let result = findBrotherNodesByKey(element.children, key);
+        if (result.length) {
+          return result;
+        }
+      }
+    }
+    return [];
+  }
 
   function onDrop(info){
     // dragNode: 拖拽的节点  node: 放入的节点