From b9a233af17a911d597ff4b5abebeb9a1baf4d729 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Mon, 13 Apr 2020 18:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9message=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 61 +++++++++++++++++++--------------
 src/forge/Merge/MessageCount.js |  2 +-
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7da52ad3..628615820 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <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/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -41,8 +42,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="347">
-              <caret line="346" column="29" lean-forward="true" selection-start-line="346" selection-start-column="29" selection-end-line="346" selection-end-column="29" />
+            <state relative-caret-position="242">
+              <caret line="334" column="14" lean-forward="true" selection-start-line="334" selection-start-column="14" selection-end-line="334" selection-end-column="14" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
                 <element signature="e#1369#1443#0" />
@@ -97,12 +98,10 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="263">
-              <caret line="239" column="77" selection-start-line="239" selection-start-column="61" selection-end-line="239" selection-end-column="77" />
+            <state relative-caret-position="285">
+              <caret line="164" column="18" lean-forward="true" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
-                <element signature="e#1564#2480#0" />
-                <element signature="e#3799#4743#0" />
                 <element signature="e#8046#8546#0" />
                 <element signature="e#8575#9036#0" />
               </folding>
@@ -110,6 +109,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="192">
+              <caret line="152" column="65" lean-forward="true" selection-start-line="152" selection-start-column="10" selection-end-line="152" selection-end-column="65" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -311,18 +322,18 @@
       <workItem from="1586330226261" duration="658000" />
       <workItem from="1586400014081" duration="18358000" />
       <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="16104000" />
+      <workItem from="1586741565210" duration="16598000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="116849000" />
+    <option name="totallyTimeSpent" value="117343000" />
   </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.18454936" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
       <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="TypeScript" />
@@ -336,7 +347,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.20722891" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.10120482" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.26987952" />
       <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" />
@@ -686,16 +697,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="256" column="12" selection-start-line="256" selection-start-column="12" selection-end-line="256" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="804">
@@ -824,22 +825,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="239" column="77" selection-start-line="239" selection-start-column="61" selection-end-line="239" selection-end-column="77" />
+        <state relative-caret-position="285">
+          <caret line="164" column="18" lean-forward="true" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#1564#2480#0" />
-            <element signature="e#3799#4743#0" />
             <element signature="e#8046#8546#0" />
             <element signature="e#8575#9036#0" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="152" column="65" lean-forward="true" selection-start-line="152" selection-start-column="10" selection-end-line="152" selection-end-column="65" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="346" column="29" lean-forward="true" selection-start-line="346" selection-start-column="29" selection-end-line="346" selection-end-column="29" />
+        <state relative-caret-position="242">
+          <caret line="334" column="14" lean-forward="true" selection-start-line="334" selection-start-column="14" selection-end-line="334" selection-end-column="14" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#1369#1443#0" />
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index f8667b7fe..64a9c228a 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -333,7 +333,7 @@ class MessageCount extends Component{
         if(values.issue_tag_ids===''){
           values.issue_tag_ids = []
         }else{
-
+          values.issue_tag_ids = [parseInt(values.issue_tag_ids)]
         }
 
         if(values.assigned_to_id===0){