From 78212429e5839ce9d8c287914e6d86ce692ffdc1 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 24 Mar 2020 12:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                   | 229 ++++++++++++++++----------
 src/forge/Main/CoderRootFileDetail.js |   2 +-
 src/forge/Main/Detail.js              |   3 +-
 src/forge/Merge/merge.js              | 119 +++++++------
 src/forge/Order/Milepost.js           | 109 ++++++------
 src/forge/Order/Tags.js               |  66 ++++----
 src/modules/tpm/NewHeader.js          |   2 +-
 7 files changed, 306 insertions(+), 224 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17c1edf72..2218d282e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Index.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Milepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Milepost.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Tags.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Tags.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -15,18 +18,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -42,17 +33,35 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
-              <caret line="70" column="3" lean-forward="true" selection-start-line="70" selection-start-column="3" selection-end-line="70" selection-end-column="3" />
+            <state relative-caret-position="277">
+              <caret line="64" column="45" lean-forward="true" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="355">
-              <caret line="1285" column="75" selection-start-line="1285" selection-start-column="75" selection-end-line="1285" selection-end-column="75" />
+            <state relative-caret-position="212">
+              <caret line="1281" column="87" lean-forward="true" selection-start-line="1281" selection-start-column="87" selection-end-line="1281" selection-end-column="87" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="209">
+              <caret line="35" column="23" lean-forward="true" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="190">
+              <caret line="251" column="45" lean-forward="true" selection-start-line="251" selection-start-column="45" selection-end-line="251" selection-end-column="45" />
             </state>
           </provider>
         </entry>
@@ -60,10 +69,48 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="178">
-              <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+            <state relative-caret-position="187">
+              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="337">
+              <caret line="319" column="18" lean-forward="true" selection-start-line="319" selection-start-column="18" selection-end-line="319" selection-end-column="18" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#6599#6910#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="206">
+              <caret line="282" column="12" selection-start-line="282" selection-start-column="12" selection-end-line="286" selection-end-column="13" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#4332#4367#0" />
+                <element signature="e#4350#5226#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="319">
+              <caret line="256" column="11" selection-start-line="256" selection-start-column="11" selection-end-line="256" selection-end-column="11" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
+                <element signature="e#6583#7400#0" />
+                <element signature="e#7409#9273#0" />
               </folding>
             </state>
           </provider>
@@ -73,7 +120,7 @@
         <entry file="file://$PROJECT_DIR$/src/index.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="255">
-              <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
+              <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
               <folding>
                 <element signature="e#0#26#0" expanded="true" />
               </folding>
@@ -81,29 +128,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootIndex.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -113,6 +137,8 @@
       <find>contents/file</find>
       <find>新建翻转课堂</find>
       <find>nHeader</find>
+      <find>点赞</find>
+      <find>Educoder</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/src/forge</dir>
@@ -126,13 +152,16 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/AppConfig.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
       </list>
     </option>
   </component>
@@ -163,6 +192,13 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
+              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="forge" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -203,18 +239,18 @@
       <option name="presentableId" value="Default" />
       <updated>1584692398144</updated>
       <workItem from="1584692401543" duration="6228000" />
-      <workItem from="1585015135223" duration="3244000" />
+      <workItem from="1585015135223" duration="5631000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9472000" />
+    <option name="totallyTimeSpent" value="11859000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.2532189" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2532189" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -227,7 +263,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.47228914" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.24698795" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.28915662" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -268,25 +304,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3771">
-          <caret line="70" column="25" selection-start-line="70" selection-start-column="25" selection-end-line="70" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="87">
@@ -349,7 +366,7 @@
     <entry file="file://$PROJECT_DIR$/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
-          <caret line="33" column="4" lean-forward="true" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
+          <caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
           <folding>
             <element signature="e#0#26#0" expanded="true" />
           </folding>
@@ -365,27 +382,73 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
-          <caret line="70" column="3" lean-forward="true" selection-start-line="70" selection-start-column="3" selection-end-line="70" selection-end-column="3" />
+        <state relative-caret-position="277">
+          <caret line="64" column="45" lean-forward="true" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="1285" column="75" selection-start-line="1285" selection-start-column="75" selection-end-line="1285" selection-end-column="75" />
+        <state relative-caret-position="212">
+          <caret line="1281" column="87" lean-forward="true" selection-start-line="1281" selection-start-column="87" selection-end-line="1281" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="35" column="23" lean-forward="true" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="190">
+          <caret line="251" column="45" lean-forward="true" selection-start-line="251" selection-start-column="45" selection-end-line="251" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="337">
+          <caret line="319" column="18" lean-forward="true" selection-start-line="319" selection-start-column="18" selection-end-line="319" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#6599#6910#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="282" column="12" selection-start-line="282" selection-start-column="12" selection-end-line="286" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#4332#4367#0" />
+            <element signature="e#4350#5226#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="256" column="11" selection-start-line="256" selection-start-column="11" selection-end-line="256" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#6583#7400#0" />
+            <element signature="e#7409#9273#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index f6745c400..a871c771c 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -63,7 +63,7 @@ class CoderRootFileDetail extends Component{
     }).then(result=>{
       if(result){
         this.props.showNotification("删除成功!");
-        this.props.history.push(`/projects/${projectsId}/coders`);
+        this.props.history.push(`/projects/${projectsId}`);
       }
     }).catch(error=>{
       console.log(error);
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 3d5e28cc1..6da6f35e5 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -250,7 +250,8 @@ class Detail extends Component{
     const url = `/projects/${project_id}/forks.json`;
     axios.post(url).then(result=>{
       if(result && result.data.status === 0){
-        this.props.history.push(`/projects/${result.data.identifier}/coders`);
+        this.props.history.push(`/projects/${result.data.id}/coders`);
+        this.props.showNotification(result.data.message);
       }else{
         this.props.showNotification(result.data.message);
       }
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 37ba70162..2416d670b 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -250,62 +250,73 @@ class merge extends Component{
       <div className="main">
         <div className="topWrapper">
           <Nav  {...this.props} {...this.state}/>
-          <Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>
-        </div>
-        <div className="topWrapper" style={{borderBottom:"none"}}>
-          <p className="topWrapper_type">
-            <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_count}个开启中</li>
-            <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_count}个已关闭</li>
-            {/* <span onClick={this.openorder} className={author_id ? "active":""}>{data && data.open_count}个开启中</span>
-            <span onClick={this.closeorder} className={author_id ? "active":""}>{data && data.close_count}个已关闭</span> */}
-          </p>
-          <div>
-            <Search
-              placeholder="搜索"
-              enterButton
-              onSearch={this.searchFunc}
-              style={{ width: 300 }}
-            />
-          </div>
-        </div>
-        <Spin spinning={isSpin}>
-          <div className="f-wrap-between mb20">
-            <ul >
-              <li>   </li>
-            </ul>
-            <ul className="topWrapper_select">
-              <li>
-                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag,'标签','issue_tag_id')} trigger={['click']} placement="bottomCenter">
-                <span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-              <li>
-                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_version,'里程碑','fixed_version_id')} trigger={['click']} placement="bottomCenter">
-                  <span>{this.state.fixed_version_ids}<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-              <li>
-                <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'指派人','assigned_to_id')} trigger={['click']} placement="bottomCenter">
-                  <span>{this.state.assigned_to_ids}<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-         
-              <li>
-              <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
-                  <span>{this.state.paix}<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-            </ul>
-          </div>
           {
-            search_count === 0 ?
-            <NoneData></NoneData>
-            :
-            <OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+            data && data.user_admin_or_member ?
+              <Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>
+              : ''
           }
-          { Paginations }
-        </Spin>
-        
+        </div>
+        {
+          data && data.search_count && data.search_count > 0 ?
+            <div>
+              <div className="topWrapper" style={{borderBottom:"none"}}>
+                <p className="topWrapper_type">
+                  <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_count}个开启中</li>
+                  <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_count}个已关闭</li>
+                  {/* <span onClick={this.openorder} className={author_id ? "active":""}>{data && data.open_count}个开启中</span>
+            <span onClick={this.closeorder} className={author_id ? "active":""}>{data && data.close_count}个已关闭</span> */}
+                </p>
+                <div>
+                  <Search
+                    placeholder="搜索"
+                    enterButton
+                    onSearch={this.searchFunc}
+                    style={{ width: 300 }}
+                  />
+                </div>
+              </div>
+              <Spin spinning={isSpin}>
+                <div className="f-wrap-between mb20">
+                  <ul >
+                    <li>   </li>
+                  </ul>
+                  <ul className="topWrapper_select">
+                    <li>
+                      <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag,'标签','issue_tag_id')} trigger={['click']} placement="bottomCenter">
+                        <span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
+                      </Dropdown>
+                    </li>
+                    <li>
+                      <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_version,'里程碑','fixed_version_id')} trigger={['click']} placement="bottomCenter">
+                        <span>{this.state.fixed_version_ids}<Icon type="caret-down" className="ml5" /></span>
+                      </Dropdown>
+                    </li>
+                    <li>
+                      <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'指派人','assigned_to_id')} trigger={['click']} placement="bottomCenter">
+                        <span>{this.state.assigned_to_ids}<Icon type="caret-down" className="ml5" /></span>
+                      </Dropdown>
+                    </li>
+
+                    <li>
+                      <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
+                        <span>{this.state.paix}<Icon type="caret-down" className="ml5" /></span>
+                      </Dropdown>
+                    </li>
+                  </ul>
+                </div>
+                {
+                  search_count === 0 ?
+                    <NoneData></NoneData>
+                    :
+                    <OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+                }
+                { Paginations }
+              </Spin>
+            </div>
+            :
+            <NoneData/>
+        }
+
     </div>
     )
   }
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index c5639f257..e160462c1 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -172,12 +172,28 @@ class Milepost extends Component{
     const renderList =()=>{
        if(data && data.versions && data.versions.length>0 ){
         return(
-          <div className="tagList">
-            {
-              data.versions.map((item,key)=>{
-                return(
-                <div style={{display:'block'}}>
-                    <div className="milepostdiv">
+          <div>
+            <div className="topWrapper">
+              <div className="topWrapper_type">
+                <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
+                <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
+                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
+                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
+              </div>
+              <ul className="topWrapper_select">
+                <li>
+                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
+                    <span>排序<Icon type="caret-down" className="ml5" /></span>
+                  </Dropdown>
+                </li>
+              </ul>
+            </div>
+            <div className="tagList">
+              {
+                data.versions.map((item,key)=>{
+                  return(
+                    <div style={{display:'block'}}>
+                      <div className="milepostdiv">
                         <div className="milepostwidth">
                           <div className="grid-item width100">
                             <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
@@ -185,8 +201,8 @@ class Milepost extends Component{
                           </div>
 
                         </div>
-                    </div> 
-                    <div className="milepostdiv" style={{marginTop:5}}>
+                      </div>
+                      <div className="milepostdiv" style={{marginTop:5}}>
                         <div className="milepostrighe">
 
                           <div className="grid-item mr10">
@@ -212,43 +228,45 @@ class Milepost extends Component{
                             </span>
                           </div>
                         </div>
-                      {
-                        data && data.user_admin_or_member ?
-                          <div className="milepostleft">
-                            <div className="grid-item mr15 color-grey-9">
-                              <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                              <Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} className="color-grey-9">编辑</Link>
-                            </div>
-                            <div className="grid-item mr15 color-grey-9">
-                              <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
-                              <a onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)} className="color-grey-9">{this.state.status==="closed"?"开启":"关闭"}</a>
-                            </div>
-                            <div className="grid-item mr15 color-grey-9">
-                              <i className="iconfont icon-lajitong font-14 mr5" ></i>
-                              <Popconfirm placement="bottom" title={'是否删除里程碑？'}  okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
-                                <a className="color-grey-9">删除</a>
-                              </Popconfirm>
-                            </div>
+                        {
+                          data && data.user_admin_or_member ?
+                            <div className="milepostleft">
+                              <div className="grid-item mr15 color-grey-9">
+                                <i className="iconfont icon-bianji3 font-14 mr5"></i>
+                                <Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} className="color-grey-9">编辑</Link>
+                              </div>
+                              <div className="grid-item mr15 color-grey-9">
+                                <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
+                                <a onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)} className="color-grey-9">{this.state.status==="closed"?"开启":"关闭"}</a>
+                              </div>
+                              <div className="grid-item mr15 color-grey-9">
+                                <i className="iconfont icon-lajitong font-14 mr5" ></i>
+                                <Popconfirm placement="bottom" title={'是否删除里程碑？'}  okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
+                                  <a className="color-grey-9">删除</a>
+                                </Popconfirm>
+                              </div>
 
-                          </div>
-                          : ''
-                      }
+                            </div>
+                            : ''
+                        }
 
-                    </div> 
-                    <div className="milepostdiv"style={{marginTop:5}}>
+                      </div>
+                      <div className="milepostdiv"style={{marginTop:5}}>
                         <div className="textwidth">
-                        <Text
+                          <Text
                             type="secondary"
                             ellipsis={{rows: 30, expandable: false, onExpand: Function}}
-                        >
+                          >
                             {item.description}</Text>
                         </div>
-                    </div> 
-                </div>
-                )
-              })
-            }
+                      </div>
+                    </div>
+                  )
+                })
+              }
+            </div>
           </div>
+
         )
       }else{
         return(
@@ -268,28 +286,13 @@ class Milepost extends Component{
                 : ''
             }
 
-
           </div>
           <div style={{display: this.state.display}}>
             <div className="tagdiv" >
             <span>里程碑{ data && data.issue_tags_count }已创建</span>
             </div>
           </div>
-          <div className="topWrapper">
-              <div className="topWrapper_type">
-              <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
-              <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
-                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
-                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
-            </div>
-            <ul className="topWrapper_select">
-              <li>
-                <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
-                  <span>排序<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-            </ul>
-          </div>
+
           { renderList()}
           { Paginations }
         </div>
diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js
index d880be566..5d8267507 100644
--- a/src/forge/Order/Tags.js
+++ b/src/forge/Order/Tags.js
@@ -280,33 +280,46 @@ class Tags extends Component{
     const renderList =()=>{
       if(data && data.issue_tags && data.issue_tags.length>0 ){
         return(
-          <div className="tagList">
-            {
-              data.issue_tags.map((item,key)=>{
-                return(
-                  <div>
+          <div>
+            <div className="topWrapper">
+              <span>共{ data && data.issue_tags_count }个标签</span>
+              <ul className="topWrapper_select">
+                <li>
+                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
+                    <span>标签<Icon type="caret-down" className="ml5" /></span>
+                  </Dropdown>
+                </li>
+              </ul>
+            </div>
+            <div className="tagList">
+              {
+                data.issue_tags.map((item,key)=>{
+                  return(
+                    <div>
                     <span className="width20 mr10">
                       <span style={{backgroundColor:`${item.color}`}} className="tagColor"></span>
                       {item.name}
                     </span>
-                    <span className="hide-1 width50 mr10">{item.description}</span>
-                    <span className="width15 mr10">{item.issues_count}个开启的工单</span>
-                    {
-                      data && data.user_admin_or_member ?
-                        <div className="width15 text-right">
-                          <a onClick={()=>this.editshow(item)} className="topWrapper_btn fr" >编辑</a>
-                          <Popconfirm placement="bottom" title={'删除标签会将其从所有引用中删除。继续？'}  okText="是" cancelText="否" onConfirm={()=>this.deletetag(item.id)}>
-                            <a className="a_btn delete_btn fr" >删除</a>
-                          </Popconfirm>
+                      <span className="hide-1 width50 mr10">{item.description}</span>
+                      <span className="width15 mr10">{item.issues_count}个开启的工单</span>
+                      {
+                        data && data.user_admin_or_member ?
+                          <div className="width15 text-right">
+                            <a onClick={()=>this.editshow(item)} className="topWrapper_btn fr" >编辑</a>
+                            <Popconfirm placement="bottom" title={'删除标签会将其从所有引用中删除。继续？'}  okText="是" cancelText="否" onConfirm={()=>this.deletetag(item.id)}>
+                              <a className="a_btn delete_btn fr" >删除</a>
+                            </Popconfirm>
 
-                        </div>
-                        : ''
-                    }
-                  </div>
-                )
-              })
-            }
+                          </div>
+                          : ''
+                      }
+                    </div>
+                  )
+                })
+              }
+            </div>
           </div>
+
         )
       }else{
         return(
@@ -378,16 +391,7 @@ class Tags extends Component{
          
 
           </div>
-          <div className="topWrapper">
-            <span>共{ data && data.issue_tags_count }个标签</span>
-            <ul className="topWrapper_select">
-              <li>
-                <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
-                  <span>标签<Icon type="caret-down" className="ml5" /></span>
-                </Dropdown>
-              </li>
-            </ul>
-          </div>
+
           { renderList() }
           { Paginations }
         </div>
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index f851629fd..6bbbd6c38 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -1283,7 +1283,7 @@ submittojoinclass=(value)=>{
                   {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":
                     pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>:""
                   }
-									{this.props.user&&this.props.user.main_site===false?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}
+									{this.props.user?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}
                 </ul>
 								{coursestypes===true&&this.props.user&&this.props.user.main_site===false?"":<ul className="fl with50 edu-txt-center">