From de1b68c1c9aa5e498ef90111455b8c05682aebd4 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Tue, 20 Aug 2019 18:49:18 +0800
Subject: [PATCH] =?UTF-8?q?issue=E8=AF=84=E8=AE=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_issue_replies.html.erb      | 26 +++++++++++++--
 app/views/issues/show.html.erb                |  2 +-
 public/javascripts/create_kindeditor.js       | 26 +++++++--------
 public/javascripts/init_KindEditor.js         | 30 ++++++++---------
 .../javascripts/init_activity_KindEditor.js   | 24 +++++++-------
 public/react/public/js/create_kindeditor.js   | 33 ++++++++++---------
 6 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index d991dae1..10d60d77 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -69,17 +69,21 @@
               <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
               <div nhname='toolbar_container_<%= @issue.id %>' class="kindeditor" ></div>
               <div class="cl"></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' id="notes" name="notes"></textarea>
               <div class="cl"></div>
               <div class="mt5 fl">
                 <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
               </div>
               <span nhname='contentmsg_<%= @issue.id %>' class="fl mt5"></span>
-              <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)"
+              <a id="issue_detail_reply_id" href="javascript:void(0)"
                  class="shixun-task-btn task-btn-orange fr mt5 mb10"
+                 onclick="getNotesFun()"
                  >发送</a>
               <div class="cl"></div>
+
+
           <% end %>
+          <span id="isnullbox" class="none color-red">内容不能为空</span>
         </div>
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
@@ -88,4 +92,20 @@
 
   </div>
   <div class="cl"></div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+
+  function getNotesFun() {
+      var val = reply_editor;
+      alert(val);
+      if(val==""||val==undefined||val==null){
+          $("#isnullbox").show();}
+          // return
+      else
+          {
+              $("#issue_detail_reply_id").submit();
+          }
+
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 106d720a..f8c686bd 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -3,7 +3,7 @@
     <%= javascript_include_tag 'create_kindeditor'%>
 <% end %>
 <script>
-    sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
+    var reply_editor = sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
 </script>
 <style>
   .set_Reply_detail ul li.homepagePostReplyContainer,.set_Reply_detail div.homepagePostReplyContainer{padding-left: 10px;padding-right: 0px }
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index 822e3f7f..d7b5539a 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -207,19 +207,19 @@ function sd_check_editor_form_field(params){
             result=false;
         }
         console.log(params.content)
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-
-            params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //
+        //     params.content.sync();
+        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index 76c02b44..2442031d 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -45,21 +45,21 @@ function nh_check_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();
-            if(params.content.isEmpty()){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-                params.submit_btn.one('click', function(){
-                    params.form.submit();
-                });
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //     params.content.sync();
+        //     if(params.content.isEmpty()){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //         params.submit_btn.one('click', function(){
+        //             params.form.submit();
+        //         });
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
diff --git a/public/javascripts/init_activity_KindEditor.js b/public/javascripts/init_activity_KindEditor.js
index 4c63d169..3e44c5f0 100644
--- a/public/javascripts/init_activity_KindEditor.js
+++ b/public/javascripts/init_activity_KindEditor.js
@@ -80,18 +80,18 @@ function nh_check_field(params){
         if(params.content.isEmpty()){
             result=false;
         }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //     params.content.sync();
+        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
diff --git a/public/react/public/js/create_kindeditor.js b/public/react/public/js/create_kindeditor.js
index 434c9b46..89f1dbbd 100644
--- a/public/react/public/js/create_kindeditor.js
+++ b/public/react/public/js/create_kindeditor.js
@@ -245,21 +245,22 @@ function sd_create_shixun_editor(params){
 function sd_check_editor_form_field(params){
     var result=true;
     if(params.content!=undefined){
-        if(params.content.isEmpty()){
-            result=false;
-        }
-        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-            params.textarea.html(params.content.html());
-            params.content.sync();
-            if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
-                params.contentmsg.html('内容不能为空');
-                params.contentmsg.css({color:'#ff0000'});
-            }else{
-                params.contentmsg.html('填写正确');
-                params.contentmsg.css({color:'#008000'});
-            }
-            params.contentmsg.show();
-        }
+
+        // if(params.content.isEmpty()){
+        //     result=false;
+        // }
+        // if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+        //     params.textarea.html(params.content.html());
+        //     params.content.sync();
+        //     if(params.content.isEmpty() || /^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(params.textarea.html())){
+        //         params.contentmsg.html('内容不能为空');
+        //         params.contentmsg.css({color:'#ff0000'});
+        //     }else{
+        //         params.contentmsg.html('填写正确');
+        //         params.contentmsg.css({color:'#008000'});
+        //     }
+        //     params.contentmsg.show();
+        // }
     }
     return result;
 }
@@ -314,7 +315,7 @@ function sd_create_editor_from_data(id){
             params.contentmsg = $("span[nhname='contentmsg_" + id + "']", params.div_form);
             params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
             params.cancel_btn = $("#new_message_cancel_btn_" + id);
-            params.submit_btn = $("#new_message_submit_btn_" + id);
+            params.submit_btn = $("#fnew_message_submit_btn_" + id);
             params.height = height;
             params.width = width;
             if (params.textarea.data('init') == undefined) {