bhd-components 0.7.10 → 0.7.12

package/esm/customerService/index.js

@@ -66,7 +66,8 @@ var CustomerService = function(props) {
     var _useState29 = _sliced_to_array(useState(""), 2), viewBase64 = _useState29[0], setViewBase64 = _useState29[1]; //图片预览
     var _useState30 = _sliced_to_array(useState(false), 2), visible = _useState30[0], setVisible = _useState30[1]; //是否显示图片预览
     var _useState31 = _sliced_to_array(useState([]), 2), bottomRecommendationQuestions = _useState31[0], setBottomRecommendationQuestions = _useState31[1]; //底部推荐问题
-    var _useState32 = _sliced_to_array(useState(-1), 2), saveShowType = _useState32[0], setSaveShowType = _useState32[1]; //保存截图时的状态
+    var _useState32 = _sliced_to_array(useState(false), 2), showScreenshot = _useState32[0], setShowScreenshot = _useState32[1]; //是否显示截图 主要用于newlabo页面
+    var _useState33 = _sliced_to_array(useState(-1), 2), saveShowType = _useState33[0], setSaveShowType = _useState33[1]; //保存截图时的状态
     var timer = useRef(null); //文本框输入时
     var receiveMessageTimer = useRef(null); //接收ai发回的消息
     // let voiceCountdownTimer = useRef(null); //语音录制倒计时
@@ -94,17 +95,11 @@ var CustomerService = function(props) {
         }
     });
     useEffect(function() {
-        // console.log(props,'lsdkcmsdlcksd')
-        // getQuestiionsList("", 1);
-        if (props.config && props.config.type == "video") {
+        if (config && config.type == "video") {
             //获取热门推荐
             videoPageQuestiionsList(1);
-        // getQuestiionsList("", 3)
         }
         setShowType(initShowType);
-    //获取视频页面推荐问题
-    // videoPageQuestiionsList();
-    // scrollToBottom();
     }, [
         initShowType
     ]);
@@ -155,7 +150,8 @@ var CustomerService = function(props) {
             }
             scrollTopHei.current = scrollTop;
         };
-        if (showType == 5) {
+        //|| showScreenshot
+        if (showType == 5 || showScreenshot) {
             try {
                 setImgBese64("");
                 // html2canvas(document.getElementsByTagName('html')[0],{
@@ -202,7 +198,8 @@ var CustomerService = function(props) {
     }, [
         historyMessageList,
         showType,
-        pageCount
+        pageCount,
+        showScreenshot
     ]);
     useEffect(function() {
         resettingBottomHei();
@@ -710,6 +707,10 @@ var CustomerService = function(props) {
                 sendingExistingIssues(2, dataObj, "");
                 testLabQuestion(obj.message, questions.answer, "");
             }
+            if (type == 2 && config && config.type == "video") {
+                //先请求问题列表
+                videoPageQuestiionsList(2);
+            }
         });
     };
     //向AI发送问题 type == 1 发送点赞或踩消息，type == 2 发送重新生成消息，type == 3 正常发送消息
@@ -738,8 +739,8 @@ var CustomerService = function(props) {
                 });
             });
         }, 60 * 1000);
-        if (props.config && props.config.type == "video" && props.config.params) {
-            var params = props.config.params;
+        if (config && config.type == "video" && config.params) {
+            var params = config.params;
             var videoId = params.videoId;
             var watchTime = params.videoProgress;
             var courseId = getQuery("yc_id");
@@ -794,7 +795,7 @@ var CustomerService = function(props) {
             });
             scrollToBottom();
         }
-        if (props.config && props.config.type == "video") {
+        if (config && config.type == "video") {
             //先请求问题列表
             videoPageQuestiionsList(3);
         }
@@ -904,6 +905,7 @@ var CustomerService = function(props) {
                 }
                 if (msg.finished) {
                     setFinished(true); //发送结束
+                    videoPageQuestiionsList(2);
                     // isPosition.current = true;
                     setTimeout(function() {
                         isPosition.current = true;
@@ -1304,6 +1306,7 @@ var CustomerService = function(props) {
     };
     //获取问题列表flag ==1 是问候消息 2，搜索列表 展示相关问题 ,3.视频页面,4.视频联想问题不够时，增加知识库联想问题
     var getQuestiionsList = function(value, flag) {
+        // console.log(flag,'dlfkvdmflkvmdfklv');
         var data = {};
         if (flag == 1) {
             data = {
@@ -1353,7 +1356,7 @@ var CustomerService = function(props) {
                         }
                     }).then(function(res) {
                         if (res.data.questions) {
-                            setHotQuestionsList(function(questionList) {
+                            setQuestionsList(function(questionList) {
                                 return _to_consumable_array(questionList).concat(_to_consumable_array(res.data.questions));
                             });
                         }
@@ -1366,16 +1369,20 @@ var CustomerService = function(props) {
     var videoPageQuestiionsList = function() {
         var flag = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 1;
         console.log(flag, props, 3333333);
-        var config = props.config;
         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
             if (videoId && courseId && sectionId) {
+                console.log(recommendeQuestionID.current, "recommendeQuestionID.current");
                 http.post("".concat(urllocation, "/chat-service/public/v1.0/knowledge-base/questions:recommend"), {
-                    "recommendedQuestions": [],
+                    "recommendedQuestions": recommendeQuestionID.current,
                     "contexts": [
                         {
                             "type": "VIDEO",
@@ -1400,11 +1407,11 @@ var CustomerService = function(props) {
                         } else {
                             setHotQuestionsList(data);
                         }
-                        var ids = [];
-                        data.map(function(str) {
-                            ids.push(str.id);
-                        });
-                        recommendeQuestionID.current = Array.from(new Set(recommendeQuestionID.current.concat(ids)));
+                        // let ids:any[] = [];
+                        // data.map((str: { id: string; })=>{
+                        //   ids.push(str.id);
+                        // })
+                        // recommendeQuestionID.current = Array.from(new Set(recommendeQuestionID.current.concat(ids)));
                         resettingBottomHei();
                         scrollToBottom();
                     // console.log(data,99999);
@@ -1921,7 +1928,7 @@ var CustomerService = function(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: "".concat(styles.img_con, " ").concat(showType == 2 || showType == 4 ? styles.img_con2 : ""),
                                                                     children: [
                                                                         /*#__PURE__*/ _jsx("img", {
                                                                             src: JSON.parse(item.extraInfo)[0].value
@@ -2038,7 +2045,7 @@ var CustomerService = function(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: "".concat(styles.img_con, " ").concat(showType == 2 || showType == 4 ? styles.img_con2 : ""),
                                                                     children: [
                                                                         /*#__PURE__*/ _jsx("img", {
                                                                             src: JSON.parse(item.extraInfo)[0].value
@@ -2067,10 +2074,9 @@ var CustomerService = function(props) {
                                                                             return /*#__PURE__*/ _jsx("li", {
                                                                                 onClick: function() {
                                                                                     sendMessage(list, 1);
-                                                                                    if (props.config && props.config.type == "video") {
-                                                                                        //先请求问题列表
-                                                                                        videoPageQuestiionsList(2);
-                                                                                    }
+                                                                                    recommendeQuestionID.current = recommendeQuestionID.current.concat(list.value);
+                                                                                    setBottomRecommendationQuestions([]);
+                                                                                    resettingBottomHei();
                                                                                 },
                                                                                 children: item.message == "抱歉，我暂时无法回答这样的问题。" ? list.question : /*#__PURE__*/ _jsxs(_Fragment, {
                                                                                     children: [
@@ -2152,13 +2158,23 @@ var CustomerService = function(props) {
             return "";
         }
         // console.log(historyMessageList,i,'sdcsd;sldcscsdsd')
+        //根据上一行数据，判断是否显示招唤老师按钮
+        var showTeacherBtn = true;
+        var 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(function(item) {
                     return 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", {
+                }) && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
                     className: styles.ask_question,
                     onClick: function() {
                         setAnswerMode(1);
@@ -2307,9 +2323,19 @@ var CustomerService = function(props) {
         }
         //3、是否显示召唤老师回答按钮
         var 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;
         }
+        //根据上一行数据，判断是否显示招唤老师按钮
+        var showTeacherBtn = true;
+        var 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;
+        }
         /// style={{position:showStopBtn && isPosition.current ? 'sticky' : 'relative'}}
         return /*#__PURE__*/ _jsxs("div", {
             className: "".concat(styles.operate_modal_bottom),
@@ -2361,7 +2387,7 @@ var CustomerService = function(props) {
                         //在ai窗口并ai已经生成完答案
                         findTeacherBtn && userData.modules.some(function(item) {
                             return item.short == "TeacherAnswer";
-                        }) && /*#__PURE__*/ _jsx("span", {
+                        }) && showTeacherBtn && /*#__PURE__*/ _jsx("span", {
                             className: styles.find_teacher,
                             onClick: function() {
                                 setAnswerMode(1);
@@ -2635,6 +2661,7 @@ var CustomerService = function(props) {
                                                         "讲解这张图片涉及到的知识内容"
                                                     ]
                                                 }),
+                                                /*#__PURE__*/ _jsx("br", {}),
                                                 /*#__PURE__*/ _jsxs("p", {
                                                     onClick: function() {
                                                         setHistoryMessageList(function(historyMessageList) {
@@ -2698,7 +2725,7 @@ var CustomerService = function(props) {
                                                     var roomList = contactsList;
                                                     if (roomList.length > 0 && roomList[0].roomId != roomId) return;
                                                     console.log(props, 333333);
-                                                    if (props.config && props.config.type == "video") {
+                                                    if (config && config.type == "video") {
                                                         getQuestiionsList(String(e.target.value), 3);
                                                     } else {
                                                         getQuestiionsList(String(e.target.value), 2);
@@ -2795,7 +2822,11 @@ var CustomerService = function(props) {
                                 onClick: function() {
                                     if (!finished) return;
                                     setSaveShowType(showType);
-                                    setShowType(5);
+                                    if (showType == 3) {
+                                        setShowScreenshot(true);
+                                    } else {
+                                        setShowType(5);
+                                    }
                                 },
                                 children: /*#__PURE__*/ _jsx(CustomScreenshot, {})
                             })
@@ -2955,17 +2986,20 @@ var CustomerService = function(props) {
             });
         }
     };
+    //视频页面底部推荐问题
     var renderBottomAssociationProblem = function() {
         return /*#__PURE__*/ _jsx("div", {
             className: styles.issues_list_flag,
-            style: {
-                bottom: "".concat(buttomHei - 60, "px")
-            },
             id: "BottomAssociationProblem",
             children: bottomRecommendationQuestions.map(function(item) {
                 return /*#__PURE__*/ _jsx("p", {
                     onClick: function() {
                         sendMessage(item, 1);
+                        if (config && config.type == "video") {
+                            recommendeQuestionID.current = recommendeQuestionID.current.concat(item.id);
+                            setBottomRecommendationQuestions([]);
+                            resettingBottomHei();
+                        }
                     },
                     children: item.question
                 }, item.id);
@@ -3177,7 +3211,7 @@ var CustomerService = function(props) {
                     })
                 ]
             }),
-            showType == 3 ? /*#__PURE__*/ _jsxs("div", {
+            showType == 3 && /*#__PURE__*/ _jsxs("div", {
                 className: "".concat(styles.ChatWindow_Drawer),
                 id: "",
                 onClick: function() {
@@ -3288,12 +3322,12 @@ var CustomerService = function(props) {
                         })
                     })
                 ]
-            }) : "",
-            showType == 4 && /*#__PURE__*/ _jsxs(_Fragment, {
+            }),
+            (showType == 4 || showType == 5) && /*#__PURE__*/ _jsxs(_Fragment, {
                 children: [
                     /*#__PURE__*/ _jsxs(Modal, {
                         title: "AI助手",
-                        open: true,
+                        open: showType == 4 ? true : false,
                         onCancel: function() {
                             onCancel();
                             onEvent(serverName + serverUrl(), "click_智能问答_收起侧边栏", "提交");
@@ -3379,7 +3413,7 @@ var CustomerService = function(props) {
                             })
                         ]
                     }),
-                    /*#__PURE__*/ _jsxs("div", {
+                    (showType == 4 || showType == 5) && /*#__PURE__*/ _jsxs("div", {
                         className: "".concat(styles.ChatWindow_Drawer),
                         id: "",
                         children: [
@@ -3477,7 +3511,7 @@ var CustomerService = function(props) {
                     })
                 ]
             }),
-            showType == 5 && imgBese64 && /*#__PURE__*/ _jsx(ScreenshotTool, {
+            (showType == 5 || showScreenshot) && imgBese64 && /*#__PURE__*/ _jsx(ScreenshotTool, {
                 imgBese64: imgBese64,
                 saveScreenshotBese64: function(base64) {
                     setScreenshotBese64(base64);
@@ -3486,9 +3520,15 @@ var CustomerService = function(props) {
                     } else {
                         setShowType(1);
                     }
+                    setShowScreenshot(false);
                 },
                 cancelScreenshot: function() {
-                    setShowType(1);
+                    if (saveShowType != -1) {
+                        setShowType(saveShowType);
+                    } else {
+                        setShowType(1);
+                    }
+                    setShowScreenshot(false);
                 }
             }),
             viewBase64 && visible && /*#__PURE__*/ _jsx(ViewImage, {

package/esm/customerService/index.module.less

@@ -638,8 +638,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 +669,14 @@
             }
           }
         }
+        .img_con2{
+          width: 300px;
+          max-height: 168px;
+          img{
+            width: 300px;
+            height: fit-content;
+          }
+        }
        
         .copyCode{
           display: flex;
@@ -935,8 +946,8 @@
       }
     }
     .issues_list_flag {
-      position: absolute;
-      bottom: 60px;
+      // position: absolute;
+      // bottom: 60px;
       margin: 0 16px;
       // padding-bottom: 4px;
       line-height: 1;
@@ -946,6 +957,7 @@
         background-color: #fff;
         border-radius: 38px;
         margin-bottom: 16px;
+        line-height: 1.5;
         cursor: pointer;
         &:hover{
           background-color: @color-background-primary-weak;

package/esm/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/esm/customerService/screenshotTool.js

@@ -1,6 +1,6 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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";
@@ -55,7 +55,6 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props) {
     var imgBese64 = props.imgBese64, saveScreenshotBese64 = props.saveScreenshotBese64, cancelScreenshot = props.cancelScreenshot;
     var _useState = _sliced_to_array(useState(), 2), crop = _useState[0], setCrop = _useState[1];
     var _useState1 = _sliced_to_array(useState(), 2), completedCrop = _useState1[0], setCompletedCrop = _useState1[1];
-    var imgRef = useRef(null);
     var _useState2 = _sliced_to_array(useState(16 / 9), 2), aspect = _useState2[0], setAspect = _useState2[1];
     var _useState3 = _sliced_to_array(useState({
         top: 0,
@@ -86,20 +85,22 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props) {
                 className: styles.ReactCrop,
                 crop: crop,
                 onChange: function(_, percentCrop) {
+                    if (percentCrop.height === 0 && percentCrop.width === 0) {
+                        return;
+                    }
                     setShowBtn(false);
                     setCrop(percentCrop);
                 },
                 onComplete: function(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
@@ -114,7 +115,12 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(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,

package/package.json

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