bhd-components 0.7.12 → 0.7.13

package/es2017/customerService/index.js

@@ -78,6 +78,7 @@ const CustomerService = (props)=>{
     let isPosition = useRef(true);
     let recommendeQuestionID = useRef([]); //推荐问题id
     let videoHotQuestionsList = useRef([]); //视频热门问题
+    let newHotQuestionsList = useRef([]); //视频热门问题
     const mid = props.userData.mid;
     const remarkable = new Remarkable({
         highlight: function(str, lang) {
@@ -311,19 +312,34 @@ const CustomerService = (props)=>{
         let questionsList = [];
         let obj = {};
         if (type == 1) {
-            console.log(hotQuestionsList, '33322221111');
-            questionsList = hotQuestionsList.map((item, index)=>{
-                if (index < 3) {
-                    return {
-                        key: "messageSource",
-                        value: item.id,
-                        question: item.question,
-                        answer: item.answer
-                    };
-                } else {
-                    return null;
-                }
-            });
+            console.log(hotQuestionsList, newHotQuestionsList.current, '33322221111');
+            if (newHotQuestionsList.current.length > 0) {
+                questionsList = newHotQuestionsList.current.map((item, index)=>{
+                    if (index < 3) {
+                        return {
+                            key: "messageSource",
+                            value: item.id,
+                            question: item.question,
+                            answer: item.answer
+                        };
+                    } else {
+                        return null;
+                    }
+                });
+            } else {
+                questionsList = hotQuestionsList.map((item, index)=>{
+                    if (index < 3) {
+                        return {
+                            key: "messageSource",
+                            value: item.id,
+                            question: item.question,
+                            answer: item.answer
+                        };
+                    } else {
+                        return null;
+                    }
+                });
+            }
             questionsList = questionsList.filter((i)=>i != null);
             obj = {
                 roomId: roomId,
@@ -526,8 +542,8 @@ const CustomerService = (props)=>{
         });
     };
     //发送知识库问题 item,flag == 1 是获取问候信息的答案，flag == 2 是普通消息，flag == 3 是针对视频页面点击底部推荐问题
-    const sendMessage = (item, flag)=>{
-        // console.log(item,flag,888888888);
+    const sendMessage = (item, flag, type = '')=>{
+        console.log(item, flag, 888888888);
         let questions = [];
         if (item && flag) {
             questions = [
@@ -587,7 +603,7 @@ const CustomerService = (props)=>{
                 key: "questionId",
                 value: flag == 1 ? questions.value : questions.id,
                 answer: questions.answer
-            });
+            }, type);
             setKeyWord("");
             setQuestionsList([]);
             setCitationContent({});
@@ -637,7 +653,7 @@ const CustomerService = (props)=>{
         }
     };
     //向知识库发送问题 或答案 type:1 发送问题 2 接受答案
-    const sendingExistingIssues = (type, obj, questions)=>{
+    const sendingExistingIssues = (type, obj, questions, problemType)=>{
         if (pageNumHistory <= 1) {
             setHistoryMessageList((historyMessageList)=>{
                 let newHistoryMessageList = historyMessageList.concat(_object_spread_props(_object_spread({}, obj), {
@@ -688,10 +704,10 @@ const CustomerService = (props)=>{
                         }
                     ]
                 };
-                sendingExistingIssues(2, dataObj, "");
+                sendingExistingIssues(2, dataObj, "", problemType);
                 testLabQuestion(obj.message, questions.answer, "");
             }
-            if (type == 2 && config && config.type == 'video') {
+            if (type == 2 && config && config.type == 'video' && problemType != 'AssociativeProblem') {
                 //先请求问题列表
                 videoPageQuestiionsList(2);
             }
@@ -739,6 +755,7 @@ const CustomerService = (props)=>{
             obj.regenerate = false;
         }
         let data = JSON.stringify(obj);
+        let flagKeyWord = keyWord;
         setKeyWord("");
         setQuestionsList([]);
         setTimeout(()=>{
@@ -881,7 +898,9 @@ const CustomerService = (props)=>{
                 }
                 if (msg.finished) {
                     setFinished(true); //发送结束
-                    videoPageQuestiionsList(2);
+                    if (!flagKeyWord) {
+                        videoPageQuestiionsList(2);
+                    }
                     // isPosition.current = true;
                     setTimeout(()=>{
                         isPosition.current = true;
@@ -1338,15 +1357,12 @@ const CustomerService = (props)=>{
     const videoPageQuestiionsList = (flag = 1)=>{
         console.log(flag, props, 3333333);
         if (config && config.type == 'video' && config.params) {
-            let params = config.params;
-            let videoId = params.videoId;
-            let watchTime = params.videoProgress;
-            let courseId = getQuery('yc_id');
-            let sectionId = params.VideoBriefSummaryId;
-            //  let courseId="20899",
-            //       sectionId= "462347",
-            //       videoId= "29707",
-            //       watchTime= 262
+            // let params = config.params;
+            // let videoId = params.videoId;
+            // let watchTime = params.videoProgress;
+            // let courseId = getQuery('yc_id');
+            // let sectionId = params.VideoBriefSummaryId;
+            let courseId = "20899", sectionId = "462347", videoId = "29715", watchTime = 677;
             if (videoId && courseId && sectionId) {
                 console.log(recommendeQuestionID.current, 'recommendeQuestionID.current');
                 http.post(`${urllocation}/chat-service/public/v1.0/knowledge-base/questions:recommend`, {
@@ -1374,6 +1390,7 @@ const CustomerService = (props)=>{
                             setBottomRecommendationQuestions(data);
                         } else {
                             setHotQuestionsList(data);
+                            newHotQuestionsList.current = data;
                         }
                         // let ids:any[] = [];
                         // data.map((str: { id: string; })=>{
@@ -2039,7 +2056,7 @@ const CustomerService = (props)=>{
                                                                     ]
                                                                 }),
                                                                 item.extraInfo != undefined && JSON.parse(item.extraInfo).length > 0 && JSON.parse(item.extraInfo)[0].key == "messageSource" && JSON.parse(item.extraInfo)[0].value != "knowledgebase" && /*#__PURE__*/ _jsxs("ul", {
-                                                                    className: `${styles.association_problem} ${item.message == '抱歉，我暂时无法回答这样的问题。' ? 'association_problem_flag' : ''}`,
+                                                                    className: `${styles.association_problem} ${item.message == '抱歉，我暂时无法回答这样的问题。' ? styles.association_problem_flag : ''}`,
                                                                     children: [
                                                                         item.message == '抱歉，我暂时无法回答这样的问题。' && /*#__PURE__*/ _jsx("li", {
                                                                             className: styles.related_issues_flag,
@@ -2301,6 +2318,7 @@ const CustomerService = (props)=>{
         } else if (JSON.parse(previousLineData.extraInfo).length > 0 && JSON.parse(previousLineData.extraInfo)[0].key == "imageUrl") {
             showTeacherBtn = false;
         }
+        console.log(showTeacherBtn, 'dlvkdfl');
         /// style={{position:showStopBtn && isPosition.current ? 'sticky' : 'relative'}}
         return /*#__PURE__*/ _jsxs("div", {
             className: `${styles.operate_modal_bottom}`,
@@ -2684,6 +2702,8 @@ const CustomerService = (props)=>{
                                                 }
                                             }, 1000);
                                         }
+                                        setBottomRecommendationQuestions([]);
+                                        resettingBottomHei();
                                     },
                                     onPressEnter: (e)=>{
                                         //  console.log('发送内容22222',props)
@@ -2694,6 +2714,8 @@ const CustomerService = (props)=>{
                                             clearTimeout(timer.current);
                                             setKeyWord("");
                                             setCitationContent({});
+                                            setBottomRecommendationQuestions([]);
+                                            resettingBottomHei();
                                             //查找是否是召唤老师回答并有相应的老师名称
                                             if (answerMode == 1 && teacherList.length > 0) {
                                                 let list = teacherList.filter((v)=>v.name == keyWord.trim());
@@ -2912,7 +2934,7 @@ const CustomerService = (props)=>{
                         className: styles.item,
                         children: /*#__PURE__*/ _jsx("span", {
                             onClick: ()=>{
-                                sendMessage(item, 2);
+                                sendMessage(item, 2, 'AssociativeProblem');
                                 setKeyWord("");
                                 onEvent(serverName + serverUrl(), "click_智能问答_ 发送", "提交");
                             },

package/es2017/customerService/index.module.less

@@ -630,6 +630,44 @@
         }
   
 
+      .association_problem_flag{
+       
+        li{
+          padding-left: 30px;
+          position: relative;
+          &::after{
+            content: '';
+            width: 6px;
+            height: 6px;
+            border-radius: 50%;
+            background-color: rgba(217, 217, 217, 1);
+            display: block;
+            position: absolute;
+            top: 26px;
+            left: 10px;
+          }
+        }
+
+        li:first-child{
+          padding-left:0;
+          &::after{
+            display: none;
+          }
+        }
+
+        .related_issues_flag{
+          span{
+            color: #000;
+            font-weight: 600;
+            border-bottom: 6px solid @color-background-primary-weak-hover;
+            display: inline-block;
+            height: 22px;
+          }
+          
+        }
+      }
+
+
         .img_con{
           width: 100%;
           text-align: center;
@@ -757,33 +795,6 @@
         }
       }
 
-      .association_problem_flag{
-        padding-left: 30px;
-       
-        li{
-          position: relative;
-          &::after{
-            content: '';
-            width: 6px;
-            height: 6px;
-            border-radius: 50%;
-            background-color: rgba(217, 217, 217, 1);
-            display: block;
-            position: absolute;
-            top: 12px;
-            left: 12px;
-          }
-        }
-        .related_issues_flag{
-          span{
-            color: #000;
-            font-weight: 600;
-            border-bottom: 4px solid @color-background-primary-weak-hover;
-          }
-          
-        }
-      }
-
       .time {
         display: block;
         margin: 40px 0;

package/esm/customerService/index.js

@@ -80,6 +80,7 @@ var CustomerService = function(props) {
     var isPosition = useRef(true);
     var recommendeQuestionID = useRef([]); //推荐问题id
     var videoHotQuestionsList = useRef([]); //视频热门问题
+    var newHotQuestionsList = useRef([]); //视频热门问题
     var mid = props.userData.mid;
     var remarkable = new Remarkable({
         highlight: function highlight(str, lang) {
@@ -315,19 +316,34 @@ var CustomerService = function(props) {
         var questionsList = [];
         var obj = {};
         if (type == 1) {
-            console.log(hotQuestionsList, "33322221111");
-            questionsList = hotQuestionsList.map(function(item, index) {
-                if (index < 3) {
-                    return {
-                        key: "messageSource",
-                        value: item.id,
-                        question: item.question,
-                        answer: item.answer
-                    };
-                } else {
-                    return null;
-                }
-            });
+            console.log(hotQuestionsList, newHotQuestionsList.current, "33322221111");
+            if (newHotQuestionsList.current.length > 0) {
+                questionsList = newHotQuestionsList.current.map(function(item, index) {
+                    if (index < 3) {
+                        return {
+                            key: "messageSource",
+                            value: item.id,
+                            question: item.question,
+                            answer: item.answer
+                        };
+                    } else {
+                        return null;
+                    }
+                });
+            } else {
+                questionsList = hotQuestionsList.map(function(item, index) {
+                    if (index < 3) {
+                        return {
+                            key: "messageSource",
+                            value: item.id,
+                            question: item.question,
+                            answer: item.answer
+                        };
+                    } else {
+                        return null;
+                    }
+                });
+            }
             questionsList = questionsList.filter(function(i) {
                 return i != null;
             });
@@ -539,7 +555,8 @@ var CustomerService = function(props) {
     };
     //发送知识库问题 item,flag == 1 是获取问候信息的答案，flag == 2 是普通消息，flag == 3 是针对视频页面点击底部推荐问题
     var sendMessage = function(item, flag) {
-        // console.log(item,flag,888888888);
+        var type = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "";
+        console.log(item, flag, 888888888);
         var questions = [];
         if (item && flag) {
             questions = [
@@ -601,7 +618,7 @@ var CustomerService = function(props) {
                 key: "questionId",
                 value: flag == 1 ? questions.value : questions.id,
                 answer: questions.answer
-            });
+            }, type);
             setKeyWord("");
             setQuestionsList([]);
             setCitationContent({});
@@ -653,7 +670,7 @@ var CustomerService = function(props) {
         }
     };
     //向知识库发送问题 或答案 type:1 发送问题 2 接受答案
-    var sendingExistingIssues = function(type, obj, questions) {
+    var sendingExistingIssues = function(type, obj, questions, problemType) {
         if (pageNumHistory <= 1) {
             setHistoryMessageList(function(historyMessageList) {
                 var newHistoryMessageList = historyMessageList.concat(_object_spread_props(_object_spread({}, obj), {
@@ -704,10 +721,10 @@ var CustomerService = function(props) {
                         }
                     ]
                 };
-                sendingExistingIssues(2, dataObj, "");
+                sendingExistingIssues(2, dataObj, "", problemType);
                 testLabQuestion(obj.message, questions.answer, "");
             }
-            if (type == 2 && config && config.type == "video") {
+            if (type == 2 && config && config.type == "video" && problemType != "AssociativeProblem") {
                 //先请求问题列表
                 videoPageQuestiionsList(2);
             }
@@ -757,6 +774,7 @@ var CustomerService = function(props) {
             obj.regenerate = false;
         }
         var data = JSON.stringify(obj);
+        var flagKeyWord = keyWord;
         setKeyWord("");
         setQuestionsList([]);
         setTimeout(function() {
@@ -905,7 +923,9 @@ var CustomerService = function(props) {
                 }
                 if (msg.finished) {
                     setFinished(true); //发送结束
-                    videoPageQuestiionsList(2);
+                    if (!flagKeyWord) {
+                        videoPageQuestiionsList(2);
+                    }
                     // isPosition.current = true;
                     setTimeout(function() {
                         isPosition.current = true;
@@ -1370,15 +1390,12 @@ var CustomerService = function(props) {
         var flag = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 1;
         console.log(flag, props, 3333333);
         if (config && config.type == "video" && config.params) {
-            var params = config.params;
-            var videoId = params.videoId;
-            var watchTime = params.videoProgress;
-            var courseId = getQuery("yc_id");
-            var sectionId = params.VideoBriefSummaryId;
-            //  let courseId="20899",
-            //       sectionId= "462347",
-            //       videoId= "29707",
-            //       watchTime= 262
+            // let params = config.params;
+            // let videoId = params.videoId;
+            // let watchTime = params.videoProgress;
+            // let courseId = getQuery('yc_id');
+            // let sectionId = params.VideoBriefSummaryId;
+            var courseId = "20899", sectionId = "462347", videoId = "29715", watchTime = 677;
             if (videoId && courseId && sectionId) {
                 console.log(recommendeQuestionID.current, "recommendeQuestionID.current");
                 http.post("".concat(urllocation, "/chat-service/public/v1.0/knowledge-base/questions:recommend"), {
@@ -1406,6 +1423,7 @@ var CustomerService = function(props) {
                             setBottomRecommendationQuestions(data);
                         } else {
                             setHotQuestionsList(data);
+                            newHotQuestionsList.current = data;
                         }
                         // let ids:any[] = [];
                         // data.map((str: { id: string; })=>{
@@ -2062,7 +2080,7 @@ var CustomerService = function(props) {
                                                                     ]
                                                                 }),
                                                                 item.extraInfo != undefined && JSON.parse(item.extraInfo).length > 0 && JSON.parse(item.extraInfo)[0].key == "messageSource" && JSON.parse(item.extraInfo)[0].value != "knowledgebase" && /*#__PURE__*/ _jsxs("ul", {
-                                                                    className: "".concat(styles.association_problem, " ").concat(item.message == "抱歉，我暂时无法回答这样的问题。" ? "association_problem_flag" : ""),
+                                                                    className: "".concat(styles.association_problem, " ").concat(item.message == "抱歉，我暂时无法回答这样的问题。" ? styles.association_problem_flag : ""),
                                                                     children: [
                                                                         item.message == "抱歉，我暂时无法回答这样的问题。" && /*#__PURE__*/ _jsx("li", {
                                                                             className: styles.related_issues_flag,
@@ -2336,6 +2354,7 @@ var CustomerService = function(props) {
         } else if (JSON.parse(previousLineData.extraInfo).length > 0 && JSON.parse(previousLineData.extraInfo)[0].key == "imageUrl") {
             showTeacherBtn = false;
         }
+        console.log(showTeacherBtn, "dlvkdfl");
         /// style={{position:showStopBtn && isPosition.current ? 'sticky' : 'relative'}}
         return /*#__PURE__*/ _jsxs("div", {
             className: "".concat(styles.operate_modal_bottom),
@@ -2733,6 +2752,8 @@ var CustomerService = function(props) {
                                                 }
                                             }, 1000);
                                         }
+                                        setBottomRecommendationQuestions([]);
+                                        resettingBottomHei();
                                     },
                                     onPressEnter: function(e) {
                                         //  console.log('发送内容22222',props)
@@ -2743,6 +2764,8 @@ var CustomerService = function(props) {
                                             clearTimeout(timer.current);
                                             setKeyWord("");
                                             setCitationContent({});
+                                            setBottomRecommendationQuestions([]);
+                                            resettingBottomHei();
                                             //查找是否是召唤老师回答并有相应的老师名称
                                             if (answerMode == 1 && teacherList.length > 0) {
                                                 var list = teacherList.filter(function(v) {
@@ -2973,7 +2996,7 @@ var CustomerService = function(props) {
                         className: styles.item,
                         children: /*#__PURE__*/ _jsx("span", {
                             onClick: function() {
-                                sendMessage(item, 2);
+                                sendMessage(item, 2, "AssociativeProblem");
                                 setKeyWord("");
                                 onEvent(serverName + serverUrl(), "click_智能问答_ 发送", "提交");
                             },

package/esm/customerService/index.module.less

@@ -630,6 +630,44 @@
         }
   
 
+      .association_problem_flag{
+       
+        li{
+          padding-left: 30px;
+          position: relative;
+          &::after{
+            content: '';
+            width: 6px;
+            height: 6px;
+            border-radius: 50%;
+            background-color: rgba(217, 217, 217, 1);
+            display: block;
+            position: absolute;
+            top: 26px;
+            left: 10px;
+          }
+        }
+
+        li:first-child{
+          padding-left:0;
+          &::after{
+            display: none;
+          }
+        }
+
+        .related_issues_flag{
+          span{
+            color: #000;
+            font-weight: 600;
+            border-bottom: 6px solid @color-background-primary-weak-hover;
+            display: inline-block;
+            height: 22px;
+          }
+          
+        }
+      }
+
+
         .img_con{
           width: 100%;
           text-align: center;
@@ -757,33 +795,6 @@
         }
       }
 
-      .association_problem_flag{
-        padding-left: 30px;
-       
-        li{
-          position: relative;
-          &::after{
-            content: '';
-            width: 6px;
-            height: 6px;
-            border-radius: 50%;
-            background-color: rgba(217, 217, 217, 1);
-            display: block;
-            position: absolute;
-            top: 12px;
-            left: 12px;
-          }
-        }
-        .related_issues_flag{
-          span{
-            color: #000;
-            font-weight: 600;
-            border-bottom: 4px solid @color-background-primary-weak-hover;
-          }
-          
-        }
-      }
-
       .time {
         display: block;
         margin: 40px 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bhd-components",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "description": "组件功能描述",
   "files": [
     "esm",