xctc-utils 1.6.58 → 1.6.60

package/dist/canvas/index.js

@@ -331,13 +331,13 @@ var CanvasHooks = /** @class */ (function () {
     // 创建SVG到画布
     CanvasHooks.prototype.createCanvasSvgElementFn = function (item, index) {
         var _ = this;
-        var boundFunction = create_1.CreateCanvasSvgElementFn.bind(_, fabric_1.fabric, item, index);
+        var boundFunction = create_1.CreateCanvasSvgElementFn.bind(_, item, index);
         boundFunction();
     };
     // 创建图片到画布
     CanvasHooks.prototype.createCanvasImageElementFn = function (item, index) {
         var _ = this;
-        var boundFunction = create_1.CreateCanvasImageElementFn.bind(_, fabric_1.fabric, item, index);
+        var boundFunction = create_1.CreateCanvasImageElementFn.bind(_, item, index);
         boundFunction();
     };
     // 获取到所有被框选的对象
@@ -355,13 +355,13 @@ var CanvasHooks = /** @class */ (function () {
     // 创建自定义图像
     CanvasHooks.prototype.createSelectionRectFn = function () {
         var _ = this;
-        var boundFunction = create_1.CreateSelectionRectFn.bind(_, fabric_1.fabric);
+        var boundFunction = create_1.CreateSelectionRectFn.bind(_);
         boundFunction();
     };
     // 创建全选框
     CanvasHooks.prototype.createAllSelectionRectFn = function () {
         var _ = this;
-        var boundFunction = create_1.CreateAllSelectionRectFn.bind(_, fabric_1.fabric);
+        var boundFunction = create_1.CreateAllSelectionRectFn.bind(_);
         boundFunction();
     };
     // 删除全选对象选择框

package/dist/event/index.js

@@ -15,10 +15,10 @@ function checkMouseInElement(element) {
             mouseY >= (rect === null || rect === void 0 ? void 0 : rect.top) &&
             mouseY <= (rect === null || rect === void 0 ? void 0 : rect.bottom));
         if (isInElement) {
-            console.log('鼠标在元素内部');
+            // console.log('鼠标在元素内部');
         }
         else {
-            console.log('鼠标不在元素内部');
+            // console.log('鼠标不在元素内部');
         }
         win['mouseIsInElement'] = isInElement;
         return isInElement;

package/dist/event/mouse-move.js

@@ -15,7 +15,7 @@ function RegisterMouseMoveEventFn(options) {
     _.mouseCanvasInRangeStatus = win['mouseIsInElement'];
     // 鼠标不在画布内，终止行为
     if (!_.mouseCanvasInRangeStatus) {
-        console.log("鼠标不在画布内，终止行为");
+        // console.log("鼠标不在画布内，终止行为" );
         return;
     }
     var activeTarget = options.target || options.activeTarget;

package/dist/handle/create.d.ts

@@ -1,9 +1,9 @@
 export declare const xx: {};
-export declare function CreateDragElementFn(data: any): void;
+export declare function CreateDragElementFn(): void;
 export declare function InitElement2CanvasFn(list: any[]): void;
-export declare function CreateCanvasSvgElementFn(fabric: any, item: any, index?: number): void;
-export declare function CreateCanvasImageElementFn(fabric: any, item: any, index?: number): void;
-export declare function CreateSelectionRectFn(fabric: any): void;
+export declare function CreateCanvasSvgElementFn(item: any, index?: number): void;
+export declare function CreateCanvasImageElementFn(item: any, index?: number): void;
+export declare function CreateSelectionRectFn(): void;
 export declare function CreateAllSelectionRectFn(fabric: any): void;
 export declare function CreateRightClickMenuFn(options: any): void;
 export declare function CreateElementFn(domVal: any, id: string, index?: number): void;

package/dist/handle/create.js

@@ -14,12 +14,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateElementFn = exports.CreateRightClickMenuFn = exports.CreateAllSelectionRectFn = exports.CreateSelectionRectFn = exports.CreateCanvasImageElementFn = exports.CreateCanvasSvgElementFn = exports.InitElement2CanvasFn = exports.CreateDragElementFn = exports.xx = void 0;
 var utils_1 = require("../utils");
 var is_1 = require("../is");
+var fabric_1 = require("fabric");
 exports.xx = {};
-function CreateDragElementFn(data) {
+function CreateDragElementFn() {
     var _a, _b, _c, _d, _e;
-    if (!(0, is_1.isObject)(data)) {
-        return;
-    }
     var _ = this;
     if (!_.canvasDataSource) {
         return;
@@ -36,10 +34,10 @@ function CreateDragElementFn(data) {
     var item = __assign(__assign({}, _.dragElementDataSource), { top: top, left: left });
     // 拖拽数据类型为SVG图片对象
     if (type == "svg") {
-        _.createCanvasSvgElementFn(item);
+        _.CreateCanvasSvgElementFn(item);
     }
     else {
-        _.createCanvasImageElementFn(item);
+        _.CreateCanvasImageElementFn(item);
     }
 }
 exports.CreateDragElementFn = CreateDragElementFn;
@@ -58,17 +56,17 @@ function InitElement2CanvasFn(list) {
             if (item.hasOwnProperty("left") && item.hasOwnProperty("top")) {
                 var type = (item === null || item === void 0 ? void 0 : item.renderType) || "image";
                 if (type == "svg") {
-                    _.createCanvasSvgElementFn(item, index);
+                    _.CreateCanvasSvgElementFn(item, index);
                 }
                 else {
-                    _.createCanvasImageElementFn(item, index);
+                    _.CreateCanvasImageElementFn(item, index);
                 }
             }
         });
     }
 }
 exports.InitElement2CanvasFn = InitElement2CanvasFn;
-function CreateCanvasSvgElementFn(fabric, item, index) {
+function CreateCanvasSvgElementFn(item, index) {
     if (!(0, is_1.isObject)(item)) {
         return;
     }
@@ -77,7 +75,7 @@ function CreateCanvasSvgElementFn(fabric, item, index) {
         return;
     }
     var createDragElementBackFn = (_.callBackEventConfig || {}).createDragElementBackFn;
-    fabric.loadSVGFromURL(item === null || item === void 0 ? void 0 : item.address, function (objects) {
+    fabric_1.fabric.loadSVGFromURL(item === null || item === void 0 ? void 0 : item.address, function (objects) {
         var svgObject = (objects === null || objects === void 0 ? void 0 : objects.length) ? objects[0] : "";
         if (!svgObject) {
             return;
@@ -98,7 +96,7 @@ function CreateCanvasSvgElementFn(fabric, item, index) {
     });
 }
 exports.CreateCanvasSvgElementFn = CreateCanvasSvgElementFn;
-function CreateCanvasImageElementFn(fabric, item, index) {
+function CreateCanvasImageElementFn(item, index) {
     var _a;
     if (!(0, is_1.isObject)(item)) {
         return;
@@ -108,7 +106,7 @@ function CreateCanvasImageElementFn(fabric, item, index) {
         return;
     }
     var createDragElementBackFn = (_.callBackEventConfig || {}).createDragElementBackFn;
-    fabric.Image.fromURL((_a = _.dragElementDataSource) === null || _a === void 0 ? void 0 : _a.address, function (img) {
+    fabric_1.fabric.Image.fromURL((_a = _.dragElementDataSource) === null || _a === void 0 ? void 0 : _a.address, function (img) {
         img.set(__assign({}, item));
         _.canvasDataSource.add(img);
         _.canvasCreateElementsDataSource.push(img);
@@ -129,13 +127,13 @@ function CreateCanvasImageElementFn(fabric, item, index) {
     });
 }
 exports.CreateCanvasImageElementFn = CreateCanvasImageElementFn;
-function CreateSelectionRectFn(fabric) {
+function CreateSelectionRectFn() {
     var _a, _b;
     var _ = this;
     if (!_.canvasDataSource) {
         return;
     }
-    _.createSelectionRectDataSource = new fabric.Rect({
+    _.createSelectionRectDataSource = new fabric_1.fabric.Rect({
         left: (_a = _.mousePointerDataSource) === null || _a === void 0 ? void 0 : _a.x,
         top: (_b = _.mousePointerDataSource) === null || _b === void 0 ? void 0 : _b.y,
         width: 0,
@@ -161,7 +159,7 @@ function CreateAllSelectionRectFn(fabric) {
         return;
     }
     var container = (0, utils_1.getDomFn)("canvasContainer");
-    console.log("xxx---", _.canvasDataSource.getWidth());
+    // console.log("xxx---",_.canvasDataSource.getWidth());
     var containerWidth = container.offsetWidth;
     var containerHeight = container.offsetWidth;
     _.createSelectionRectDataSource = new fabric.Rect({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.58",
+  "version": "1.6.60",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",