bhd-components 0.7.42 → 0.8.0

package/es2017/customerService/index.js

@@ -125,10 +125,10 @@ const CustomerService = (props)=>{
                         w: window.innerWidth,
                         h: window.innerHeight
                     },
-                    wrcReplyTime: 500,
-                    wrcWindowMode: false,
+                    wrcReplyTime: 20,
+                    wrcWindowMode: true,
                     hiddenScrollBar: {
-                        state: false
+                        state: true
                     },
                     completeCallback: ({ base64  })=>{
                         // console.log(
@@ -140,6 +140,19 @@ const CustomerService = (props)=>{
                     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();
+                        }
                     }
                 });
             // modernScreenshot
@@ -3457,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/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,
@@ -119,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/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.js

@@ -127,10 +127,10 @@ var CustomerService = function(props) {
                         w: window.innerWidth,
                         h: window.innerHeight
                     },
-                    wrcReplyTime: 500,
-                    wrcWindowMode: false,
+                    wrcReplyTime: 20,
+                    wrcWindowMode: true,
                     hiddenScrollBar: {
-                        state: false
+                        state: true
                     },
                     completeCallback: function(param) {
                         var base64 = param.base64;
@@ -143,6 +143,19 @@ var CustomerService = function(props) {
                     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
@@ -3523,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/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,

package/package.json

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