bhd-components 0.9.0 → 0.9.1

package/esm/customerService/screenshotTool.d.ts

@@ -2,6 +2,7 @@
 import "react-image-crop/dist/ReactCrop.css";
 interface data {
     imgBese64: string;
+    screenShotType: number;
     saveScreenshotBese64: (bese64: string) => void;
     cancelScreenshot: () => void;
 }

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, forwardRef } from "react";
+import React, { useState, forwardRef, useEffect } from "react";
 import ReactCrop, { centerCrop, makeAspectCrop } from "react-image-crop";
 import { CloseOutlined } from "@ant-design/icons";
 import { CustomDuihao } from "../icons/index";
@@ -15,7 +15,7 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
     };
     var onImageLoad = function onImageLoad(e) {
         if (aspect) {
-            // console.log(aspect,e,'dlvkdfmvlkdfmvdfkl');
+            console.log(aspect, e, "dlvkdfmvlkdfmvdfkl");
             //   const { width, height } = e.currentTarget
             var width = 100;
             var height = 100 * (9 / 16);
@@ -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;
@@ -52,21 +52,30 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
             saveScreenshotBese64(croppedDataUrl);
         };
     };
-    var imgBese64 = props.imgBese64, saveScreenshotBese64 = props.saveScreenshotBese64, cancelScreenshot = props.cancelScreenshot;
+    var imgBese64 = props.imgBese64, screenShotType = props.screenShotType, 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 _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(1), 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];
+    useEffect(function() {
+        setDevicePixelRatio(screenShotType === 1 ? window.devicePixelRatio || 1 : 1);
+    }, [
+        screenShotType
+    ]);
     var savePosition = function(e) {
         // console.log(e,'位置位置');
         var x = e.x;
         var y = e.y;
         var h = e.height;
         var w = e.width;
+        // 新方案使用
+        //旧方案改成 let top = y + h + (isFirst ? 21 : 8);
         var top = y + h + 8;
         var left = x + w - 88;
         if (top + 42 > window.innerHeight) {
@@ -77,6 +86,7 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
             left: left
         });
         setShowBtn(true);
+        setIsFirst(false);
     };
     return /*#__PURE__*/ _jsxs("div", {
         className: styles.screenshot_Modal,
@@ -102,9 +112,7 @@ var ScreenshotTool = /*#__PURE__*/ forwardRef(function(props, ref) {
                 minWidth: 100,
                 children: /*#__PURE__*/ _jsx("img", {
                     alt: "Crop me",
-                    style: {
-                        display: "none"
-                    },
+                    // style={{display:'none'}}
                     src: imgBese64,
                     onLoad: onImageLoad
                 })

package/esm/theme/variable.less

@@ -76,6 +76,8 @@
 @Gray-09: #262626;
 @Gray-10: #000000;
 
+
+
 /* 变量色值 */
 
 /* "color-background-layout": {
@@ -143,6 +145,16 @@
 
 @color-background-quinary: @Gray-01;
 
+
+/* 
+"color-background-Mask-Tr": {
+    "value": "{Gray-Tr-06}",
+    "type": "color",
+    "description": "蒙层颜色"
+  },
+*/
+
+@color-background-Mask-Tr:@Gray-Tr-06;
 /* 
   "color-background-primary-base": {
     "value": "{Red-06}",
@@ -246,6 +258,13 @@
     "description": "二级边框色"
   }, */
 @color-border-secondary-Tr: @Gray-Tr-04;
+
+/*  "color-border-tertiary": {
+    "value": "{Gray-01}",
+    "type": "color",
+    "description": "三级边框色"
+  }, */
+@color-border-tertiary:@Gray-01;
 /*   "color-border-primary": {
     "value": "{Red-06}",
     "type": "color",
@@ -525,6 +544,14 @@
     }
 */
 @color-icon-error: @Orange-06;
+/* 
+ "color-icon-base": {
+      "value": "$Blue-06",
+      "type": "color",
+      "description": "图标，一级填充色"
+    }
+*/
+@color-icon-base: @Blue-06;
 /* 
  "color-icon-fill": {
       "value": "$Gray-08",

package/package.json

@@ -1,7 +1,16 @@
 {
   "name": "bhd-components",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "组件功能描述",
+  "config": {
+    "commitizen": {
+      "path": "cz-customizable"
+    }
+  },
+  "gitHooks": {
+    "pre-commit": "lint-staged",
+    "commit-msg": "commitlint -eV"
+  },
   "files": [
     "esm",
     "es2017",
@@ -39,7 +48,9 @@
     "eslint": "eslint --cache --ext .js,.jsx,.ts,.tsx ./",
     "eslint:fix": "npm run eslint -- --fix",
     "stylelint": "stylelint \"**/*.{css,scss,less}\"",
-    "lint": "npm run eslint && npm run stylelint"
+    "lint": "npm run eslint && npm run stylelint",
+    "prepare": "husky install",
+    "commit": "git add . && npx cz"
   },
   "keywords": [
     "ice",
@@ -65,12 +76,19 @@
     "remarkable": "^2.0.1"
   },
   "devDependencies": {
+    "@commitlint/cli": "^19.4.0",
+    "@commitlint/config-conventional": "^19.2.2",
     "@ice/pkg": "^1.0.0",
     "@ice/pkg-plugin-docusaurus": "^1.0.0",
     "@iceworks/spec": "^1.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
+    "commitizen": "^4.3.0",
+    "commitlint": "^19.4.0",
+    "cz-customizable": "^7.0.0",
     "eslint": "^7.0.0",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.7",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "rollup-plugin-terser": "^7.0.2",