From e11fd8928633cabbd5fe267581bdb8478d40fbed Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 24 Mar 2020 14:22:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 169 +++++++++-----------------------
 src/forge/Order/CopyDetail.js   |   1 -
 src/forge/Order/Detail.js       |  31 ++++--
 src/forge/Order/New.js          |   1 -
 src/forge/Order/UpdateDetail.js |   1 -
 src/modules/tpm/NewHeader.js    |  10 +-
 6 files changed, 77 insertions(+), 136 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 14b31e37..d3fdb07a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/New.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/New.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.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" />
@@ -13,110 +17,22 @@
   <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/Detail.js">
+        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3225">
-              <caret line="317" column="9" selection-start-line="317" selection-start-column="9" selection-end-line="317" selection-end-column="9" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="277">
-              <caret line="64" column="45" selection-start-line="64" selection-start-column="45" selection-end-line="64" selection-end-column="45" />
+            <state relative-caret-position="252">
+              <caret line="1089" column="31" lean-forward="true" selection-start-line="1089" selection-start-column="31" selection-end-line="1089" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="316">
-              <caret line="1289" column="19" lean-forward="true" selection-start-line="1289" selection-start-column="19" selection-end-line="1289" selection-end-column="19" />
-            </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" 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" selection-start-line="251" selection-start-column="45" selection-end-line="251" selection-end-column="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="187">
-              <caret line="11" 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" selection-start-line="319" selection-start-column="18" selection-end-line="319" selection-end-column="18" />
+            <state relative-caret-position="264">
+              <caret line="393" column="40" lean-forward="true" selection-start-line="393" selection-start-column="40" selection-end-line="393" selection-end-column="40" />
               <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="172">
-              <caret line="280" column="38" lean-forward="true" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
-              <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="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="276" column="20" selection-start-line="276" selection-start-column="20" selection-end-line="276" selection-end-column="20" />
-              <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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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" 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" />
+                <element signature="e#15286#16091#0" />
               </folding>
             </state>
           </provider>
@@ -133,6 +49,8 @@
       <find>nHeader</find>
       <find>点赞</find>
       <find>Educoder</find>
+      <find>isedit</find>
+      <find>QuillForEditor</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/src/forge</dir>
@@ -148,7 +66,6 @@
         <option value="$PROJECT_DIR$/src/AppConfig.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/forge/Main/Detail.js" />
@@ -156,6 +73,10 @@
         <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
       </list>
     </option>
   </component>
@@ -191,7 +112,7 @@
               <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" />
+              <item name="Order" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -233,15 +154,16 @@
       <option name="presentableId" value="Default" />
       <updated>1584692398144</updated>
       <workItem from="1584692401543" duration="6228000" />
-      <workItem from="1585015135223" duration="7416000" />
+      <workItem from="1585015135223" duration="9020000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13644000" />
+    <option name="totallyTimeSpent" value="15248000" />
   </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 id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -256,7 +178,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 active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.43253013" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.06746988" />
       <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" />
@@ -336,26 +258,6 @@
         </state>
       </provider>
     </entry>
-    <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>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3225">
-          <caret line="317" column="9" selection-start-line="317" selection-start-column="9" selection-end-line="317" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
@@ -429,7 +331,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="172">
-          <caret line="280" column="38" lean-forward="true" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
+          <caret line="280" column="38" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#4332#4367#0" />
@@ -438,10 +340,31 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <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>
     <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="1289" column="19" lean-forward="true" selection-start-line="1289" selection-start-column="19" selection-end-line="1289" selection-end-column="19" />
+        <state relative-caret-position="252">
+          <caret line="1089" column="31" lean-forward="true" selection-start-line="1089" selection-start-column="31" selection-end-line="1089" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="393" column="40" lean-forward="true" selection-start-line="393" selection-start-column="40" selection-end-line="393" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#15286#16091#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index 4322bdd3..7a19b7f2 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/src/forge/Order/CopyDetail.js
@@ -227,7 +227,6 @@ class CopyDetail extends Component{
                   <div className="quillContent" style={{marginBottom:"20px"}}>
                     <QuillForEditor 
                       value = {textcount}
-                      imgAttrs={{ width: '60px', height: '30px' }}
                       wrapStyle={{
                         height: '220px',
                         opacity:1,
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 66f8ddbe..11456cc5 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -387,11 +387,30 @@ class Detail extends Component{
                         }
                       </div>
                       <div style={{display: (isedit && isedit === item.id) ? "block" : "none"}}>
-                        <TextArea style={{height:"200px"}} value={this.state.countvalue} onChange={this.changmodelname}/>
-                        <p className="clearfix mt15">
-                          <a className="topWrapper_btn fr" type="submit" onClick={()=>this.updatedetail(item.id)}>保存</a>
-                          <a className="a_btn cancel_btn fr" type="submit" onClick={()=>this.editdetail(item.content,undefined)}>取消</a>
-                        </p>
+                        <div className="quillContent">
+                          <QuillForEditor
+                            wrapStyle={{
+                              height: '220px',
+                              opacity:1,
+                            }}
+                            autoFocus={true}
+                            style={{ height: '150px' }}
+                            placeholder="添加评论..."
+                            options={options}
+                            value={this.state.countvalue}
+                            onContentChange={this.onContentChange}
+                            showUploadImage={this.handleShowImage}
+                            // onContentChange={handleContentChange}
+                          />
+                          <p className="quillFlag">
+                            { quillFlag && <span className="">请输入评论内容</span>}
+                          </p>
+                        </div>
+                        {/*<TextArea style={{height:"200px"}} value={this.state.countvalue} onChange={this.changmodelname}/>*/}
+                        {/*<p className="clearfix mt15">*/}
+                          {/*<a className="topWrapper_btn fr" type="submit" onClick={()=>this.updatedetail(item.id)}>保存</a>*/}
+                          {/*<a className="a_btn cancel_btn fr" type="submit" onClick={()=>this.editdetail(item.content,undefined)}>取消</a>*/}
+                        {/*</p>*/}
                       </div>
                      </div>
                     <div style={{display: this.state.display}}>
@@ -492,7 +511,7 @@ class Detail extends Component{
               <div className="new_context">
                 <div className="quillContent">
                   <QuillForEditor
-                    imgAttrs={{ width: '30px' }}
+
                     wrapStyle={{
                       height: '220px',
                       opacity:1,
diff --git a/src/forge/Order/New.js b/src/forge/Order/New.js
index 350d5aa0..b8693c27 100644
--- a/src/forge/Order/New.js
+++ b/src/forge/Order/New.js
@@ -163,7 +163,6 @@ class New extends Component{
                 <div className="quillContent" style={{marginBottom:"20px"}}>
                   <QuillForEditor 
                     value = {description}
-                    imgAttrs={{ width: '60px', height: '30px' }}
                     wrapStyle={{
                       height: '220px',
                       opacity:1,
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 46331adb..2e64167a 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -210,7 +210,6 @@ class UpdateDetail extends Component{
               <div className="quillContent" style={{marginBottom:"20px"}}>
                 <QuillForEditor 
                   value = {textcount}
-                  imgAttrs={{ width: '60px', height: '30px' }}
                   wrapStyle={{
                     height: '220px',
                     opacity:1,
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index c1e335e1..21749796 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -1082,13 +1082,15 @@ submittojoinclass=(value)=>{
 										{/*<li className={`${activeIndex === true ? 'active' : ''}`}><a href="/">首页</a></li>*/}
 
 										{/*<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.shixun_paths_url}>实训路径</a></li>*/}
-										<li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
-											<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>
-										</li>
+                    <li className={`${activePaths === true ? 'pr active' : 'pr'}`}>
+                      <Link to={'/projects'}>开源项目</Link>
+                    </li>
+										{/*<li className={`${activePaths === true ? 'pr active' : 'pr'}`}>*/}
+											{/*<Link to={this.props.Headertop===undefined?"":'/paths'}>实践课程</Link>*/}
+										{/*</li>*/}
 
 										{/*<li><a href={this.props.Headertop===undefined?"":'/courses'}>课堂</a></li>*/}
 										<li className={`${coursestype === true ? 'pr active' : 'pr'}`}>
-											{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.course_url}>课堂</a>*/}
 											<Link to={this.props.Headertop===undefined?"":'/courses'}>翻转课堂</Link>
 										</li>
 										<li className={`${activeShixuns === true ? 'pr active' : 'pr'}`}>