bhd-components 0.7.11 → 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; })=>{
@@ -1907,7 +1924,7 @@ const CustomerService = (props)=>{
                                                                     className: styles.content_child
                                                                 }),
                                                                 item.extraInfo && JSON.parse(item.extraInfo).length > 0 && JSON.parse(item.extraInfo)[0].key == "imageUrl" && /*#__PURE__*/ _jsxs("p", {
-                                                                    className: styles.img_con,
+                                                                    className: `${styles.img_con} ${showType == 2 || showType == 4 ? styles.img_con2 : ''}`,
                                                                     children: [
                                                                         /*#__PURE__*/ _jsx("img", {
                                                                             src: JSON.parse(item.extraInfo)[0].value
@@ -2022,7 +2039,7 @@ const CustomerService = (props)=>{
                                                                     className: styles.content_child
                                                                 }),
                                                                 item.extraInfo && JSON.parse(item.extraInfo).length > 0 && JSON.parse(item.extraInfo)[0].key == "imageUrl" && /*#__PURE__*/ _jsxs("p", {
-                                                                    className: styles.img_con,
+                                                                    className: `${styles.img_con} ${showType == 2 || showType == 4 ? styles.img_con2 : ''}`,
                                                                     children: [
                                                                         /*#__PURE__*/ _jsx("img", {
                                                                             src: JSON.parse(item.extraInfo)[0].value
@@ -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,
@@ -2131,11 +2148,21 @@ const CustomerService = (props)=>{
             return "";
         }
         // console.log(historyMessageList,i,'sdcsd;sldcscsdsd')
+        //根据上一行数据，判断是否显示招唤老师按钮
+        let showTeacherBtn = true;
+        let previousLineData = historyMessageList[i - 1];
+        if (!previousLineData) {
+            showTeacherBtn = true;
+        } else if (!previousLineData.extraInfo) {
+            showTeacherBtn = true;
+        } else if (JSON.parse(previousLineData.extraInfo).length > 0 && JSON.parse(previousLineData.extraInfo)[0].key == "imageUrl") {
+            showTeacherBtn = false;
+        }
         return /*#__PURE__*/ _jsxs("p", {
             className: styles.operate,
             children: [
                 // 不在智能客服窗口，并已经点击了召唤老师，并有召唤老师权限
-                isAiChatWindow && answerMode != 1 && userData.modules.some((item)=>item.short == "TeacherAnswer") && historyMessageList[i - 1] && historyMessageList[i - 1].extraInfo && JSON.parse(historyMessageList[i - 1].extraInfo).length > 0 && JSON.parse(historyMessageList[i - 1].extraInfo)[0].key != "imageUrl" && /*#__PURE__*/ _jsx("span", {
+                isAiChatWindow && answerMode != 1 && userData.modules.some((item)=>item.short == "TeacherAnswer") && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
                     className: styles.ask_question,
                     onClick: ()=>{
                         setAnswerMode(1);
@@ -2278,9 +2305,20 @@ const CustomerService = (props)=>{
         }
         //3、是否显示召唤老师回答按钮
         let findTeacherBtn = false;
-        if (!showStopBtn && isAiChatWindow && (extraInfo != undefined && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "questionId" || extraInfo == null) && historyMessageList[i - 1] && historyMessageList[i - 1].extraInfo && JSON.parse(historyMessageList[i - 1].extraInfo).length > 0 && JSON.parse(historyMessageList[i - 1].extraInfo)[0].key != "imageUrl") {
+        if (!showStopBtn && isAiChatWindow && (extraInfo != undefined && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "questionId" || extraInfo == null)) {
             findTeacherBtn = true;
         }
+        //根据上一行数据，判断是否显示招唤老师按钮
+        let showTeacherBtn = true;
+        let previousLineData = historyMessageList[i - 1];
+        if (!previousLineData) {
+            showTeacherBtn = true;
+        } else if (!previousLineData.extraInfo) {
+            showTeacherBtn = true;
+        } 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}`,
@@ -2326,7 +2364,7 @@ const CustomerService = (props)=>{
                             ]
                         }),
                         //在ai窗口并ai已经生成完答案
-                        findTeacherBtn && userData.modules.some((item)=>item.short == "TeacherAnswer") && /*#__PURE__*/ _jsx("span", {
+                        findTeacherBtn && userData.modules.some((item)=>item.short == "TeacherAnswer") && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
                             className: styles.find_teacher,
                             onClick: ()=>{
                                 setAnswerMode(1);
@@ -2664,6 +2702,8 @@ const CustomerService = (props)=>{
                                                 }
                                             }, 1000);
                                         }
+                                        setBottomRecommendationQuestions([]);
+                                        resettingBottomHei();
                                     },
                                     onPressEnter: (e)=>{
                                         //  console.log('发送内容22222',props)
@@ -2674,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());
@@ -2892,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;
@@ -638,8 +676,11 @@
           overflow: hidden;
           display: inline-flex;
           margin-top: 12px;
+          width: 240px;
+          max-height: 134px;
           img{
-            width: 100%;
+            width: 240px;
+            height: fit-content;
           }
           .mask_zoom{
             position: absolute;
@@ -666,6 +707,14 @@
             }
           }
         }
+        .img_con2{
+          width: 300px;
+          max-height: 168px;
+          img{
+            width: 300px;
+            height: fit-content;
+          }
+        }
        
         .copyCode{
           display: flex;
@@ -746,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/es2017/customerService/index2.module.less

@@ -635,8 +635,11 @@
           overflow: hidden;
           display: inline-flex;
           margin-top: 12px;
+          width: 240px;
+          max-height: 134px;
           img{
-            width: 100%;
+            width: 240px;
+            height: fit-content;
           }
           .mask_zoom{
             position: absolute;
@@ -663,6 +666,14 @@
             }
           }
         }
+        .img_con2{
+          width: 300px;
+          max-height: 168px;
+          img{
+            width: 300px;
+            height: fit-content;
+          }
+        }
        
         .copyCode{
           display: flex;
@@ -932,8 +943,8 @@
       }
     }
     .issues_list_flag {
-      position: absolute;
-      bottom: 60px;
+      // position: absolute;
+      // bottom: 60px;
       margin: 0 16px;
       // padding-bottom: 4px;
       line-height: 1;
@@ -943,6 +954,7 @@
         background-color: #fff;
         border-radius: 38px;
         margin-bottom: 16px;
+        line-height: 1.5;
         cursor: pointer;
         &:hover{
           background-color: @color-background-primary-weak;

package/es2017/customerService/screenshotTool.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
-import React, { useState, useRef, forwardRef } from "react";
+import React, { useState, forwardRef } from "react";
 import ReactCrop, { centerCrop, makeAspectCrop } from "react-image-crop";
 import { CloseOutlined } from "@ant-design/icons";
 import { CustomDuihao } from "../icons/index";
@@ -9,7 +9,6 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props)=>{
     let { imgBese64 , saveScreenshotBese64 , cancelScreenshot  } = props;
     const [crop, setCrop] = useState();
     const [completedCrop, setCompletedCrop] = useState();
-    const imgRef = useRef(null);
     const [aspect, setAspect] = useState(16 / 9);
     const [btnPosition, setBtnPosition] = useState({
         top: 0,
@@ -85,20 +84,22 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props)=>{
                 className: styles.ReactCrop,
                 crop: crop,
                 onChange: (_, percentCrop)=>{
+                    if (percentCrop.height === 0 && percentCrop.width === 0) {
+                        return;
+                    }
                     setShowBtn(false);
                     setCrop(percentCrop);
                 },
                 onComplete: (c)=>{
+                    if (c.height === 0 && c.width === 0) {
+                        return;
+                    }
                     setCompletedCrop(c);
                     savePosition(c);
-                // console.log(c,'剪裁222');
                 },
-                //   aspect={aspect}
-                // minWidth={400}
                 minHeight: 100,
                 minWidth: 100,
                 children: /*#__PURE__*/ _jsx("img", {
-                    // ref={imgRef}
                     alt: "Crop me",
                     src: imgBese64,
                     onLoad: onImageLoad
@@ -113,7 +114,12 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props)=>{
                 children: [
                     /*#__PURE__*/ _jsx("span", {
                         onClick: cancelScreenshot,
-                        children: /*#__PURE__*/ _jsx(CloseOutlined, {})
+                        children: /*#__PURE__*/ _jsx(CloseOutlined, {
+                            style: {
+                                position: 'relative',
+                                top: '1px'
+                            }
+                        })
                     }),
                     /*#__PURE__*/ _jsx("span", {
                         onClick: saveImage,