bhd-components 0.7.40 → 0.8.0

package/esm/customerService/index.js

@@ -6,7 +6,6 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@ice/jsx-runt
 import React, { useEffect, useState, useRef } from "react";
 import { Modal, Drawer, Input, Tooltip } from "antd";
 import ViewImage from "../viewImage";
-// import html2canvas from "html2canvas";
 import cssStyle from "./index.module.less";
 import cssStyleOnline from "./index2.module.less";
 var styles = cssStyle;
@@ -22,7 +21,7 @@ import TeacherList from "./teacherList";
 import { parseDate } from "../utils/Date";
 import { Remarkable } from "remarkable";
 import hljs from "highlight.js";
-import "highlight.js/styles/default.css";
+import "highlight.js/styles/github.css";
 import { render } from "react-dom";
 import Provider from "../provider";
 var TextArea = Input.TextArea;
@@ -108,6 +107,112 @@ var CustomerService = function(props) {
         initShowType
     ]);
     useEffect(function() {
+        var handlerHtml2canvas = function handlerHtml2canvas() {
+            console.log("kkkkkkkkkkk");
+            try {
+                newShowType.current = true;
+                setImgBese64("");
+                var plugin = new screenShotPlugin({
+                    clickCutFullScreen: true,
+                    enableWebRtc: true,
+                    loadCrossImg: true,
+                    canvasWidth: window.innerWidth,
+                    canvasHeight: window.innerHeight,
+                    level: -1,
+                    hiddenToolIco: true,
+                    screenShotDom: document.body,
+                    cropBoxInfo: {
+                        x: 0,
+                        y: 0,
+                        w: window.innerWidth,
+                        h: window.innerHeight
+                    },
+                    wrcReplyTime: 20,
+                    wrcWindowMode: true,
+                    hiddenScrollBar: {
+                        state: true
+                    },
+                    completeCallback: function(param) {
+                        var base64 = param.base64;
+                        // console.log(
+                        //   "截图组件加载完毕调用此方法来完成框选区域的截图",
+                        //   base64
+                        // );
+                        setImgBese64(base64);
+                    },
+                    triggerCallback: function() {
+                        // 截图组件加载完毕调用此方法来完成框选区域的截图
+                        plugin.completeScreenshot();
+                    },
+                    cancelCallback: function(err) {
+                        if (err.code === -1) {
+                            console.log(err);
+                            newShowType.current = false;
+                            if (saveShowType != -1) {
+                                setShowType(saveShowType);
+                            } else {
+                                setShowType(1);
+                            }
+                            setShowScreenshot(false);
+                            onCancel();
+                        }
+                    }
+                });
+            // modernScreenshot
+            // .domToPng(document.querySelector("body"))
+            // .then((dataUrl:any) => {
+            //   console.log(dataUrl);
+            //   setImgBese64(dataUrl);
+            // });
+            // domtoimage
+            // .toPng(document.body)
+            // .then(function (dataUrl:any) {
+            //   setImgBese64(dataUrl);
+            // })
+            // .catch(function (error:any) {
+            //   console.error("oops, something went wrong!", error);
+            // });
+            // //排除
+            // new screenShotPlugin({
+            //   enableWebRtc: true,
+            //   canvasWidth:window.innerWidth,
+            //   canvasHeight:window.innerHeight,
+            //   level:9999999,
+            //   completeCallback: function (info:any) {
+            //     console.log(info);
+            //     setImgBese64(info.base64);
+            //   },
+            //   closeCallback: function () {
+            //   },
+            // });
+            // html2canvas(document.body,{//__docusaurus
+            //   useCORS: true, // 支持跨域图片截图
+            //   allowTaint: true, // 污染处理
+            //   scale: 1 ,// 图片比例
+            //   logging:false,
+            //   // foreignObjectRendering:true,
+            //   ignoreElements:(element: { compareDocumentPosition: (arg0: string) => number; })=>{
+            //     if(element.compareDocumentPosition(screenshotAreaId)===2)return true
+            //         return false
+            //   },
+            //   windowWidth:window.innerWidth,
+            //   windowHeight:window.innerHeight
+            // })
+            // .then(function (canvas:any) {
+            //   // document.body.appendChild(canvas);
+            //   // console.log(canvas,99999);
+            //   // var base64URL = canvas.toDataURL('image/jpeg')
+            //   let base64URL = canvas.toDataURL("image/jpg", 1.0)
+            //   // console.log(base64URL);
+            //       setImgBese64(base64URL);
+            //       // svgNodesToRemove.forEach(item=>{
+            //       //   item.remove()
+            //       // })
+            //     }); 
+            } catch (error) {
+                console.log(error);
+            }
+        };
         var handleScroll = function handleScroll() {
             var container = document.getElementById(showType == 1 || showType == 3 ? "chat_content" : "chat_content_modal");
             var scrollTop = container.scrollTop;
@@ -156,30 +261,9 @@ var CustomerService = function(props) {
         };
         //|| showScreenshot
         if (showType == 5 || showScreenshot) {
-            try {
-                newShowType.current = true;
-                setImgBese64("");
-                // let dom = document.getElementById(screenshotAreaId);
-                html2canvas(screenshotAreaId, {
-                    useCORS: true,
-                    // allowTaint: true, // 污染处理
-                    scale: 1,
-                    // logging:true,
-                    ignoreElements: function(element) {
-                        if (element.compareDocumentPosition(screenshotAreaId) === 2) return true;
-                        return false;
-                    }
-                }).then(function(canvas) {
-                    // document.body.appendChild(canvas);
-                    console.log(canvas, 99999);
-                    // var base64URL = canvas.toDataURL('image/jpeg')
-                    var base64URL = canvas.toDataURL("image/jpg", 1.0);
-                    console.log(base64URL);
-                    setImgBese64(base64URL);
-                });
-            } catch (error) {
-                console.log(error);
-            }
+            console.log("bbbbbbbbbbbbbb");
+            handlerHtml2canvas();
+        // window.addEventListener('resize',handlerHtml2canvas)
         }
         if (showType != 1 && !firstLoad && pageCount > 0) {
             setFirstLoad(true);
@@ -194,6 +278,7 @@ var CustomerService = function(props) {
             if (content) {
                 content.removeEventListener("scroll", handleScroll);
             }
+            window.removeEventListener("resize", handlerHtml2canvas);
         };
     }, [
         historyMessageList,
@@ -1722,11 +1807,18 @@ var CustomerService = function(props) {
                     /*#__PURE__*/ _jsxs("div", {
                         className: styles.operate,
                         children: [
-                            /*#__PURE__*/ _jsx("i", {
+                            /*#__PURE__*/ _jsxs("i", {
+                                className: styles.popover_main,
                                 onClick: function() {
                                     setShowHistory(true);
                                 },
-                                children: /*#__PURE__*/ _jsx(CustomRecord, {})
+                                children: [
+                                    /*#__PURE__*/ _jsx(CustomRecord, {}),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        className: styles.popover,
+                                        children: "历史记录"
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("span", {
                                 className: styles.line
@@ -1746,20 +1838,14 @@ var CustomerService = function(props) {
                                     })
                                 ]
                             }),
-                            /*#__PURE__*/ _jsxs("i", {
+                            /*#__PURE__*/ _jsx("i", {
                                 className: styles.popover_main,
                                 onClick: function() {
                                     onEvent(serverName + serverUrl(), "click_智能问答_退出全屏", "提交");
                                     setShowType(3);
                                     setFirstLoad(false); //重启滚动条在最上方
                                 },
-                                children: [
-                                    /*#__PURE__*/ _jsx(CloseOutlined, {}),
-                                    /*#__PURE__*/ _jsx("span", {
-                                        className: styles.popover,
-                                        children: "退出全屏"
-                                    })
-                                ]
+                                children: /*#__PURE__*/ _jsx(CloseOutlined, {})
                             })
                         ]
                     })
@@ -3450,6 +3536,9 @@ var CustomerService = function(props) {
                     }),
                     (showType == 4 || showType == 5) && /*#__PURE__*/ _jsxs("div", {
                         className: "".concat(styles.ChatWindow_Drawer),
+                        style: {
+                            display: "".concat(!showScreenshot ? "none" : "flex")
+                        },
                         id: "",
                         children: [
                             /*#__PURE__*/ _jsx("div", {

package/esm/customerService/index.module.less

@@ -1177,8 +1177,8 @@
               max-height: 36px;
               word-break: break-all;
 
-              display: flex;
-              align-items: center;
+              //display: flex;
+              //align-items: center;
               img{
                 margin-right: 8px;
                 width: 60px;
@@ -1866,7 +1866,7 @@
   width: 417px;
   height: calc(100% - 48px);
   right: 0;
-  top: 48px;
+  top: 38px;
   border-radius: 0;
   background: transparent;
   overflow: visible;
@@ -1918,7 +1918,7 @@
   background-color: transparent !important;
   // background-color: burlywood;
   .ReactCrop{
-
+    cursor: default !important;
   }
   :global{
     .ReactCrop__child-wrapper{
@@ -1935,6 +1935,7 @@
       height: 100% !important;
       top: 0 !important;
       left: 0 !important;
+      cursor: default !important;
     }
 
   }

package/esm/customerService/index2.module.less

@@ -1175,8 +1175,8 @@
               max-height: 36px;
               word-break: break-all;
 
-              display: flex;
-              align-items: center;
+              //display: flex;
+              //align-items: center;
               img{
                 margin-right: 8px;
                 width: 60px;
@@ -1860,7 +1860,7 @@
   width: 417px;
   height: calc(100% - 48px);
   right: 0;
-  top: 48px;
+  top: 38px;
   border-radius: 0;
   background: transparent;
   overflow: visible;
@@ -1904,7 +1904,7 @@
   background-color: transparent !important;
   // background-color: burlywood;
   .ReactCrop{
-
+    cursor: default !important;
   }
   :global{
     .ReactCrop__child-wrapper{
@@ -1912,7 +1912,8 @@
       width: 100% !important;
       height: 100% !important;
       top: 0 !important;
-      left: 0 !important
+      left: 0 !important;
+      cursor: default !important;
     }
   }
   :global{

package/esm/customerService/screenshotTool.js

@@ -34,10 +34,10 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
         image.src = imgBese64; // 将'your_image_url'替换为你自己的图片URL
         // 等待图片加载完成后再进行操作
         image.onload = function() {
-            var x = completedCrop.x; // 起始点x坐标
-            var y = completedCrop.y; // 起始点y坐标
-            var width = completedCrop.width; // 需要裁剪的区域宽度
-            var height = completedCrop.height; // 需要裁剪的区域高度
+            var x = parseInt((completedCrop.x * devicePixelRatio).toString()); // 起始点x坐标
+            var y = parseInt((completedCrop.y * devicePixelRatio).toString()); // 起始点y坐标
+            var width = parseInt((completedCrop.width * devicePixelRatio).toString()); // 需要裁剪的区域宽度
+            var height = parseInt((completedCrop.height * devicePixelRatio).toString()); // 需要裁剪的区域高度
             // 设置canvas大小与裁剪区域相同
             canvas.width = width;
             canvas.height = height;
@@ -56,18 +56,20 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
     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 _useState2 = _sliced_to_array(useState(16 / 9), 2), aspect = _useState2[0], setAspect = _useState2[1];
-    var _useState3 = _sliced_to_array(useState({
+    var _useState3 = _sliced_to_array(useState(window.devicePixelRatio), 2), devicePixelRatio = _useState3[0], setDevicePixelRatio = _useState3[1];
+    var _useState4 = _sliced_to_array(useState(true), 2), isFirst = _useState4[0], setIsFirst = _useState4[1];
+    var _useState5 = _sliced_to_array(useState({
         top: 0,
         left: 0
-    }), 2), btnPosition = _useState3[0], setBtnPosition = _useState3[1];
-    var _useState4 = _sliced_to_array(useState(false), 2), showBtn = _useState4[0], setShowBtn = _useState4[1];
+    }), 2), btnPosition = _useState5[0], setBtnPosition = _useState5[1];
+    var _useState6 = _sliced_to_array(useState(false), 2), showBtn = _useState6[0], setShowBtn = _useState6[1];
     var savePosition = function(e) {
         // console.log(e,'位置位置');
         var x = e.x;
         var y = e.y;
         var h = e.height;
         var w = e.width;
-        var top = y + h + 8;
+        var top = y + h + (isFirst ? 21 : 8);
         var left = x + w - 88;
         if (top + 42 > window.innerHeight) {
             top = top - 50;
@@ -77,6 +79,7 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
             left: left
         });
         setShowBtn(true);
+        setIsFirst(false);
     };
     return /*#__PURE__*/ _jsxs("div", {
         className: styles.screenshot_Modal,
@@ -102,6 +105,9 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
                 minWidth: 100,
                 children: /*#__PURE__*/ _jsx("img", {
                     alt: "Crop me",
+                    style: {
+                        display: "none"
+                    },
                     src: imgBese64,
                     onLoad: onImageLoad
                 })

package/package.json

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