From 26baedafd163780bbe6edeb9d783ba64165d98f9 Mon Sep 17 00:00:00 2001
From: rui <rui@chatopera.com>
Date: Thu, 24 Sep 2020 17:32:12 +0800
Subject: [PATCH] #361 Knowledge base shortcut bug

---
 .../src/main/resources/static/js/cskefu.js    | 26 ++++++---
 .../templates/apps/agent/mainagentuser.html   | 57 +++++++++++++------
 .../templates/apps/cca/mainagentuser.html     | 54 ++++++++++++------
 3 files changed, 94 insertions(+), 43 deletions(-)

diff --git a/contact-center/app/src/main/resources/static/js/cskefu.js b/contact-center/app/src/main/resources/static/js/cskefu.js
index bc707c7..30d22ad 100644
--- a/contact-center/app/src/main/resources/static/js/cskefu.js
+++ b/contact-center/app/src/main/resources/static/js/cskefu.js
@@ -382,14 +382,24 @@ var Proxy = {
 							if(result.data.length>0){
 								type == "agent" ? $("#quickReplyBox").html("") : $("#ccaQuickReplyBox").html("") ;
 								$.each(sortByKey(result.data,'score'),function(i,n){
-									var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">\n' +
-										'                  <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
-										'                    <div style="color: #333">\n' +
-										'                       <p class="nowrap" title="'+result.data[i].reply_plain_text+'"  style="float: left ">答案：'+result.data[i].reply_plain_text+'</p>\n' +
-										'                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">选择</button>\n' +
-										'                   </div>\n' +
-										'      </li>'
-									type == "agent" ? $("#quickReplyBox").append(li) : $("#ccaQuickReplyBox").append(li) ;
+									var answerList =  result.data[i].replies;
+									var answer;
+									for(var i = 0; i < answerList.length; i++) {
+										if(answerList[i].rtype == 'plain' && answerList[i].enabled==true) {
+											answer=answerList[i]
+											break;
+										}
+									}
+									if(answer) {
+										var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\'' + answer.content + '\')">\n' +
+											'                  <div class="nowrap" title="' + result.data[i].post + '">问题：' + result.data[i].post + '</div>\n' +
+											'                    <div style="color: #333">\n' +
+											'                       <p class="nowrap" title="' + answer.content + '"  style="float: left ">答案：' + answer.content + '</p>\n' +
+											'                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\'' + answer.content + '\')">选择</button>\n' +
+											'                   </div>\n' +
+											'      </li>'
+										type == "agent" ? $("#quickReplyBox").append(li) : $("#ccaQuickReplyBox").append(li);
+									}
 									if(i>4){
 										return false;
 									}
diff --git a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html
index 4b1334b..594a7e0 100644
--- a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html
+++ b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.html
@@ -90,11 +90,11 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura
                         });
 			        });
                 });
-                
+
                 KindEditor.lang({
 		            evaluation  :'满意度评价'
 		        });
-                
+
                 KindEditor.ready(function(K) {
                     editor = K.create('#message', {
                         height:"160px",
@@ -184,18 +184,29 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura
                                     textMessage:editor.html()
                                 }
                             }).then(function(result){
+                                console.log(result)
                                 if(result.rc === 0){
                                     if(result.data.length > 0){
                                         $("#quickReplyAgentBox").html("");
                                         $.each(sortByKey(result.data,'score'),function(i,n){
-                                            var li = ' <li class="ukefu-agentservice-list" style="font-size: 14px;line-height:22px" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">\n' +
-                                                '                  <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
-                                                '                  <div style="color: #333">\n' +
-                                                '                       <p title="'+result.data[i].reply_plain_text+'" class="nowrap" style="float: left ">答案：'+result.data[i].reply_plain_text+'</p>\n' +
-                                                '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">选择</button>\n' +
-                                                '                   </div>\n' +
-                                                '      </li>'
-                                            $("#quickReplyAgentBox").append(li);
+                                            var answerList =  result.data[i].replies;
+                                            var answer;
+                                            for(var i = 0; i < answerList.length; i++) {
+                                                if(answerList[i].rtype == 'plain' && answerList[i].enabled==true) {
+                                                    answer=answerList[i]
+                                                    break;
+                                                }
+                                            }
+                                            if(answer){
+                                                var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\''+answer.content+'\')">\n' +
+                                                    '                   <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
+                                                    '                   <div style="color: #333">\n' +
+                                                    '                       <p class="nowrap" title="'+answer.content+'"  style="float: left ">答案：'+answer.content+'</p>\n' +
+                                                    '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+answer.content+'\')">选择</button>\n' +
+                                                    '                   </div>\n' +
+                                                    '      </li>'
+                                                $("#quickReplyAgentBox").append(li);
+                                            }
                                             if(i>4){
                                                 return false;
                                             }
@@ -628,14 +639,24 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura
                         if(result.data.length>0){
                             $("#quickReplyBox").html("");
                             $.each(sortByKey(result.data,'score'),function(i,n){
-                                var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">\n' +
-                                    '                   <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
-                                    '                   <div style="color: #333">\n' +
-                                    '                       <p class="nowrap" title="'+result.data[i].reply_plain_text+'"  style="float: left ">答案：'+result.data[i].reply_plain_text+'</p>\n' +
-                                    '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">选择</button>\n' +
-                                    '                   </div>\n' +
-                                    '      </li>'
-                                $("#quickReplyBox").append(li);
+                                var answerList =  result.data[i].replies;
+                                var answer;
+                                for(var i = 0; i < answerList.length; i++) {
+                                    if(answerList[i].rtype == 'plain' && answerList[i].enabled==true) {
+                                        answer=answerList[i]
+                                        break;
+                                    }
+                                }
+                                if(answer) {
+                                    var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\'' + answer.content + '\')">\n' +
+                                        '                   <div class="nowrap" title="' + result.data[i].post + '">问题：' + result.data[i].post + '</div>\n' +
+                                        '                   <div style="color: #333">\n' +
+                                        '                       <p class="nowrap" title="' + answer.content + '"  style="float: left ">答案：' + answer.content + '</p>\n' +
+                                        '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\'' + answer.content + '\')">选择</button>\n' +
+                                        '                   </div>\n' +
+                                        '      </li>'
+                                    $("#quickReplyBox").append(li);
+                                }
                                 if (i>4){
                                     return false;
                                 }
diff --git a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html
index eb0c4d4..c54a8ba 100644
--- a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html
+++ b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.html
@@ -172,15 +172,25 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura
                             if(result.rc === 0){
                                 if(result.data.length > 0){
                                     $("#ccaQuickReplyAgentBox").html("");
-                                    $.each(sortByKey(result.data,'score'),function(i,n){
-                                        var li = ' <li class="ukefu-agentservice-list" style="font-size: 14px;line-height:22px" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">\n' +
-                                            '                  <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
-                                            '                  <div style="color: #333">\n' +
-                                            '                       <p title="'+result.data[i].reply_plain_text+'" class="nowrap" style="float: left ">答案：'+result.data[i].reply_plain_text+'</p>\n' +
-                                            '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">选择</button>\n' +
-                                            '                   </div>\n' +
-                                            '      </li>'
-                                        $("#ccaQuickReplyAgentBox").append(li);
+                                        $.each(sortByKey(result.data,'score'),function(i,n){
+                                            var answerList =  result.data[i].replies;
+                                            var answer;
+                                            for(var i = 0; i < answerList.length; i++) {
+                                                if(answerList[i].rtype == 'plain' && answerList[i].enabled==true) {
+                                                    answer=answerList[i]
+                                                    break;
+                                                }
+                                            }
+                                            if(answer) {
+                                                var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\'' + answer.content + '\')">\n' +
+                                                    '                  <div class="nowrap" title="' + result.data[i].post + '">问题：' + result.data[i].post + '</div>\n' +
+                                                    '                    <div style="color: #333">\n' +
+                                                    '                       <p class="nowrap" title="' + answer.content + '"  style="float: left ">答案：' + answer.content + '</p>\n' +
+                                                    '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\'' + answer.content + '\')">选择</button>\n' +
+                                                    '                   </div>\n' +
+                                                    '      </li>'
+                                                $("#ccaQuickReplyAgentBox").append(li);
+                                            }
                                         if(i>4){
                                             return false;
                                         }
@@ -613,14 +623,24 @@ word-break: break-all;"><#if curagentuser??>${curagentuser.username!''}<#if cura
                     if(result.data.length>0){
                         $("#ccaQuickReplyBox").html("");
                         $.each(sortByKey(result.data,'score'),function(i,n){
-                            var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">\n' +
-                                '                   <div class="nowrap" title="'+result.data[i].post+'">问题：'+result.data[i].post+'</div>\n' +
-                                '                   <div style="color: #333">\n' +
-                                '                       <p class="nowrap" title="'+result.data[i].reply_plain_text+'"  style="float: left ">答案：'+result.data[i].reply_plain_text+'</p>\n' +
-                                '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\''+result.data[i].reply_plain_text+'\')">选择</button>\n' +
-                                '                   </div>\n' +
-                                '      </li>'
-                            $("#ccaQuickReplyBox").append(li);
+                            var answerList =  result.data[i].replies;
+                            var answer;
+                            for(var i = 0; i < answerList.length; i++) {
+                                if(answerList[i].rtype == 'plain' && answerList[i].enabled==true) {
+                                    answer=answerList[i]
+                                    break;
+                                }
+                            }
+                            if(answer) {
+                                var li = ' <li class="ukefu-agentservice-list" onclick="chooseAnswer(\'' + answer.content + '\')">\n' +
+                                    '                   <div class="nowrap" title="' + result.data[i].post + '">问题：' + result.data[i].post + '</div>\n' +
+                                    '                   <div style="color: #333">\n' +
+                                    '                       <p class="nowrap" title="' + answer.content + '"  style="float: left ">答案：' + answer.content + '</p>\n' +
+                                    '                       <button style="float: right" class="layui-btn layui-btn-mini" onclick="chooseAnswer(\'' + answer.content + '\')">选择</button>\n' +
+                                    '                   </div>\n' +
+                                    '      </li>'
+                                $("#ccaQuickReplyBox").append(li);
+                            }
                             if (i>4){
                                 return false;
                             }
-- 
GitLab