bhd-components 0.7.40 → 0.8.0

package/es2017/customerService/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import "highlight.js/styles/default.css";
+import "highlight.js/styles/github.css";
 interface Service {
     type: string;
     params: any;

package/es2017/customerService/index.js

@@ -4,7 +4,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";
 let styles = cssStyle;
@@ -20,7 +19,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";
 const { TextArea  } = Input;
@@ -106,33 +105,117 @@ const CustomerService = (props)=>{
         initShowType
     ]);
     useEffect(()=>{
-        //|| showScreenshot
-        if (showType == 5 || showScreenshot) {
+        function handlerHtml2canvas() {
+            console.log('kkkkkkkkkkk');
             try {
                 newShowType.current = true;
                 setImgBese64('');
-                // let dom = document.getElementById(screenshotAreaId);
-                html2canvas(screenshotAreaId, {
-                    useCORS: true,
-                    // allowTaint: true, // 污染处理
-                    scale: 1,
-                    // logging:true,
-                    ignoreElements: (element)=>{
-                        if (element.compareDocumentPosition(screenshotAreaId) === 2) return true;
-                        return false;
+                const 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: ({ base64  })=>{
+                        // console.log(
+                        //   "截图组件加载完毕调用此方法来完成框选区域的截图",
+                        //   base64
+                        // );
+                        setImgBese64(base64);
+                    },
+                    triggerCallback: ()=>{
+                        // 截图组件加载完毕调用此方法来完成框选区域的截图
+                        plugin.completeScreenshot();
+                    },
+                    cancelCallback: (err)=>{
+                        if (err.code === -1) {
+                            console.log(err);
+                            newShowType.current = false;
+                            if (saveShowType != -1) {
+                                setShowType(saveShowType);
+                            } else {
+                                setShowType(1);
+                            }
+                            setShowScreenshot(false);
+                            onCancel();
+                        }
                     }
-                }).then(function(canvas) {
-                    // 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);
                 });
+            // 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);
             }
         }
+        //|| showScreenshot
+        if (showType == 5 || showScreenshot) {
+            console.log('bbbbbbbbbbbbbb');
+            handlerHtml2canvas();
+        // window.addEventListener('resize',handlerHtml2canvas)
+        }
         if (showType != 1 && !firstLoad && pageCount > 0) {
             setFirstLoad(true);
             scrollToBottom();
@@ -192,6 +275,7 @@ const CustomerService = (props)=>{
             if (content) {
                 content.removeEventListener("scroll", handleScroll);
             }
+            window.removeEventListener('resize', handlerHtml2canvas);
         };
     }, [
         historyMessageList,
@@ -1668,11 +1752,18 @@ const CustomerService = (props)=>{
                     /*#__PURE__*/ _jsxs("div", {
                         className: styles.operate,
                         children: [
-                            /*#__PURE__*/ _jsx("i", {
+                            /*#__PURE__*/ _jsxs("i", {
+                                className: styles.popover_main,
                                 onClick: ()=>{
                                     setShowHistory(true);
                                 },
-                                children: /*#__PURE__*/ _jsx(CustomRecord, {})
+                                children: [
+                                    /*#__PURE__*/ _jsx(CustomRecord, {}),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        className: styles.popover,
+                                        children: "历史记录"
+                                    })
+                                ]
                             }),
                             /*#__PURE__*/ _jsx("span", {
                                 className: styles.line
@@ -1692,20 +1783,14 @@ const CustomerService = (props)=>{
                                     })
                                 ]
                             }),
-                            /*#__PURE__*/ _jsxs("i", {
+                            /*#__PURE__*/ _jsx("i", {
                                 className: styles.popover_main,
                                 onClick: ()=>{
                                     onEvent(serverName + serverUrl(), "click_智能问答_退出全屏", "提交");
                                     setShowType(3);
                                     setFirstLoad(false); //重启滚动条在最上方
                                 },
-                                children: [
-                                    /*#__PURE__*/ _jsx(CloseOutlined, {}),
-                                    /*#__PURE__*/ _jsx("span", {
-                                        className: styles.popover,
-                                        children: "退出全屏"
-                                    })
-                                ]
+                                children: /*#__PURE__*/ _jsx(CloseOutlined, {})
                             })
                         ]
                     })
@@ -3385,6 +3470,9 @@ const CustomerService = (props)=>{
                     }),
                     (showType == 4 || showType == 5) && /*#__PURE__*/ _jsxs("div", {
                         className: `${styles.ChatWindow_Drawer}`,
+                        style: {
+                            display: `${!showScreenshot ? "none" : "flex"}`
+                        },
                         id: "",
                         children: [
                             /*#__PURE__*/ _jsx("div", {

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

@@ -10,6 +10,8 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
     const [crop, setCrop] = useState();
     const [completedCrop, setCompletedCrop] = useState();
     const [aspect, setAspect] = useState(16 / 9);
+    const [devicePixelRatio, setDevicePixelRatio] = useState(window.devicePixelRatio);
+    const [isFirst, setIsFirst] = useState(true);
     const [btnPosition, setBtnPosition] = useState({
         top: 0,
         left: 0
@@ -35,17 +37,17 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
     }
     function saveImage() {
         // 创建一个新的canvas元素
-        var canvas = document.createElement('canvas');
-        var context = canvas.getContext('2d');
+        var canvas = document.createElement("canvas");
+        var context = canvas.getContext("2d");
         // 加载要操作的图片
         var image = new Image();
         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;
@@ -66,7 +68,7 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
         let y = e.y;
         let h = e.height;
         let w = e.width;
-        let top = y + h + 8;
+        let top = y + h + (isFirst ? 21 : 8);
         let left = x + w - 88;
         if (top + 42 > window.innerHeight) {
             top = top - 50;
@@ -76,6 +78,7 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
             left
         });
         setShowBtn(true);
+        setIsFirst(false);
     };
     return /*#__PURE__*/ _jsxs("div", {
         className: styles.screenshot_Modal,
@@ -101,6 +104,9 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
                 minWidth: 100,
                 children: /*#__PURE__*/ _jsx("img", {
                     alt: "Crop me",
+                    style: {
+                        display: 'none'
+                    },
                     src: imgBese64,
                     onLoad: onImageLoad
                 })
@@ -116,8 +122,8 @@ const ScreenshotTool = /*#__PURE__*/ forwardRef((props, ref)=>{
                         onClick: cancelScreenshot,
                         children: /*#__PURE__*/ _jsx(CloseOutlined, {
                             style: {
-                                position: 'relative',
-                                top: '1px'
+                                position: "relative",
+                                top: "1px"
                             }
                         })
                     }),

package/esm/customerService/historyFun.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import "highlight.js/styles/default.css";
+import "highlight.js/styles/github.css";
 interface data {
     type: number;
     roomId: String | number;

package/esm/customerService/historyFun.js

@@ -4,7 +4,8 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@ice/jsx-runtime/jsx-runtime";
 import React, { useEffect, useState, useRef } from "react";
 import styles from "./index.module.less";
-import "highlight.js/styles/default.css";
+import "highlight.js/styles/github.css";
+//import "highlight.js/styles/default.css";
 import { Input } from "antd";
 import { CustomClose, CustomExpand, CustomAiIcon } from "../icons/index";
 import { SearchOutlined } from "@ant-design/icons";

package/esm/customerService/html2canvas.test.js

@@ -1,4 +1,4 @@
-import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+var _instanceof = require("@swc/helpers/cjs/_instanceof.cjs")._;
 /*!
  * html2canvas 1.4.1 <https://html2canvas.hertzen.com>
  * Copyright (c) 2022 Niklas von Hertzen <https://hertzen.com>
@@ -8,66 +8,50 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 })(this, function() {
     "use strict";
     var __extends = function __extends(d, b) {
+        var __ = function __() {
+            this.constructor = d;
+        };
         if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
-        function __() {
-            this.constructor = d;
-        }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
     var __awaiter = function __awaiter(thisArg, _arguments, P, generator) {
-        function adopt(value) {
+        var adopt = function adopt(value) {
             return _instanceof(value, P) ? value : new P(function(resolve) {
                 resolve(value);
             });
-        }
+        };
         return new (P || (P = Promise))(function(resolve, reject) {
-            function fulfilled(value) {
+            var fulfilled = function fulfilled(value) {
                 try {
                     step(generator.next(value));
                 } catch (e) {
                     reject(e);
                 }
-            }
-            function rejected(value) {
+            };
+            var rejected = function rejected(value) {
                 try {
                     step(generator["throw"](value));
                 } catch (e) {
                     reject(e);
                 }
-            }
-            function step(result) {
+            };
+            var step = function step(result) {
                 result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-            }
+            };
             step((generator = generator.apply(thisArg, _arguments || [])).next());
         });
     };
     var __generator = function __generator(thisArg, body) {
-        var _ = {
-            label: 0,
-            sent: function sent() {
-                if (t[0] & 1) throw t[1];
-                return t[1];
-            },
-            trys: [],
-            ops: []
-        }, f, y, t, g;
-        return g = {
-            next: verb(0),
-            "throw": verb(1),
-            "return": verb(2)
-        }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-            return this;
-        }), g;
-        function verb(n) {
+        var verb = function verb(n) {
             return function(v) {
                 return step([
                     n,
                     v
                 ]);
             };
-        }
-        function step(op) {
+        };
+        var step = function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
             while(_)try {
                 if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
@@ -135,7 +119,23 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
                 value: op[0] ? op[1] : void 0,
                 done: true
             };
-        }
+        };
+        var _ = {
+            label: 0,
+            sent: function sent() {
+                if (t[0] & 1) throw t[1];
+                return t[1];
+            },
+            trys: [],
+            ops: []
+        }, f, y, t, g;
+        return g = {
+            next: verb(0),
+            "throw": verb(1),
+            "return": verb(2)
+        }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+            return this;
+        }), g;
     };
     var __spreadArray = function __spreadArray(to, from, pack) {
         if (pack || arguments.length === 2) for(var i = 0, l = from.length, ar; i < l; i++){
@@ -824,8 +824,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
             return BREAK_NOT_ALLOWED$1;
         }
         // LB25 Do not break between the following pairs of classes relevant to numbers:
-        if (// (PR | PO) × ( OP | HY )? NU
-        [
+        if ([
             PR,
             PO
         ].indexOf(current) !== -1 && (next === NU || [
@@ -8579,3 +8578,4 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
     };
     return html2canvas;
 }); //# sourceMappingURL=html2canvas.js.map
+ //# sourceMappingURL=html2canvas.test.js.map

package/esm/customerService/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import "highlight.js/styles/default.css";
+import "highlight.js/styles/github.css";
 interface Service {
     type: string;
     params: any;