xctc-utils 1.6.66 → 1.6.68

package/README.md

@@ -1,7 +1,4 @@
-#npm config set registry https://registry.npm.taobao.org/
-npm install -g pnpm@9.6.0
-pnpm install
-pnpm  run build:pro
+
 
 ### 项目中常用的方法集合
 #### email： dybself@163.com

package/dist/canvas/index.d.ts

@@ -33,6 +33,7 @@ export default class CanvasHooks {
     constructor(config: any);
     get canvasConfigData(): any;
     createCanvasFn(config?: any): void;
+    initCanvasDataFn(imgUrl: string, canvasId: any, data: any): void;
     disposeCanvasFn(): void;
     canvasConfigDataFn(config: any): void;
     registerCallBackEventFn(config?: any): void;

package/dist/canvas/index.js

@@ -32,8 +32,9 @@ var index_2 = require("../event/index");
 var defaultConfig = __assign({}, config_1.configDefaultValue.canvasDefaultValue);
 var CanvasHooks = /** @class */ (function () {
     function CanvasHooks(config) {
+        var _this = this;
         this.fabricSource = null;
-        this.fabricUrlSource = "https://cdn.jsdelivr.net/npm/fabric";
+        this.fabricUrlSource = "https://cdn.bootcss.com/fabric.js/4.0.0-beta.5/fabric.min.js";
         this.canvasDataSource = null;
         this.zoomDataSource = "100";
         this.canvasBackgroundImageTarget = null;
@@ -63,9 +64,15 @@ var CanvasHooks = /** @class */ (function () {
         this.mouseWheelStatus = false;
         this.defaultCreateDataListStatus = false;
         this.mouseCanvasInRangeStatus = false;
+        var url = this.fabricUrlSource;
         if (config === null || config === void 0 ? void 0 : config.init) {
-            // 是否默认加载画布
-            this.createCanvasFn();
+            (0, utils_1.loadScript)(url, function () {
+                // 是否默认加载画布
+                _this.createCanvasFn();
+            });
+        }
+        else {
+            (0, utils_1.loadScript)(url);
         }
     }
     Object.defineProperty(CanvasHooks.prototype, "canvasConfigData", {
@@ -102,7 +109,6 @@ var CanvasHooks = /** @class */ (function () {
             data['height'] = _.elementSizeFn("canvasContainer").height;
         }
         var imgUrl = (data === null || data === void 0 ? void 0 : data.backgroundImgUrl) || "";
-        console.log("canvas--options", data);
         canvasId = data.id;
         var url = _.fabricUrlSource;
         if ((_a = _.canvasConfig) === null || _a === void 0 ? void 0 : _a.fabricUrlSource) {
@@ -111,80 +117,89 @@ var CanvasHooks = /** @class */ (function () {
         if (config === null || config === void 0 ? void 0 : config.fabricUrlSource) {
             url = config.fabricUrlSource;
         }
-        (0, utils_1.loadScript)(url, function () {
-            var win = window;
-            _.fabricSource = (win === null || win === void 0 ? void 0 : win.fabric) || {};
-            if (imgUrl) {
-                _.fabricSource.Image.fromURL(imgUrl, function (img) {
-                    _.renderCanvasStatus = 2;
-                    _.canvasBackgroundImageTarget = img;
-                    var _a = _.canvasConfig.actions, actions = _a === void 0 ? "" : _a;
-                    var zoomValue = (actions === null || actions === void 0 ? void 0 : actions.zoom) || 1;
-                    if (!_.canvasDataSource) {
-                        _.canvasDataSource = new _.fabricSource.Canvas(canvasId, __assign({}, data));
-                        if (zoomValue != 1) {
-                            _.canvasDataSource.setZoom(zoomValue);
-                        }
-                    }
-                    var canvasWidth = _.canvasDataSource.getWidth();
-                    var canvasHeight = _.canvasDataSource.getHeight();
-                    var imgWidth = img.width;
-                    var imgHeight = img.height;
-                    var scaleX = 1;
-                    var scaleY = 1;
-                    if (canvasWidth && canvasHeight && imgWidth && imgHeight) {
-                        var imageAspectRatio = imgWidth / imgHeight;
-                        var canvasAspectRatio = canvasWidth / canvasHeight;
-                        if (imageAspectRatio > canvasAspectRatio) {
-                            // 图片更宽，基于高度缩放
-                            scaleY = canvasHeight / imgHeight;
-                            scaleX = scaleY * imageAspectRatio;
-                        }
-                        else {
-                            // 图片更高或宽高比相同，基于宽度缩放
-                            scaleX = canvasWidth / imgWidth;
-                            scaleY = scaleX / imageAspectRatio;
-                        }
-                    }
-                    console.log("原始比例：", { scaleX: scaleX, scaleY: scaleY, width: imgWidth, height: imgHeight });
-                    _.canvasDataSource.setBackgroundImage(img, _.canvasDataSource.renderAll.bind(_.canvasDataSource), {
-                        originX: 'left',
-                        originY: 'top',
-                        left: 0,
-                        top: 0,
-                        // scaleX: scaleX,
-                        // scaleY: scaleY,
-                        width: imgWidth,
-                        height: imgHeight,
-                    });
-                    _.renderCanvasStatus = 3;
-                    _.registerAllEventHandleFn();
-                    _.canvasDataSource.renderAll();
-                    callBack(_.canvasDataSource);
-                });
-            }
-            else {
+        if (!(0, utils_1.isScriptLoaded)(url)) {
+            (0, utils_1.loadScript)(url, function () {
+                _.initCanvasDataFn(imgUrl, canvasId, data);
+            });
+        }
+        else {
+            _.initCanvasDataFn(imgUrl, canvasId, data);
+        }
+    };
+    CanvasHooks.prototype.initCanvasDataFn = function (imgUrl, canvasId, data) {
+        var _ = this;
+        var win = window;
+        _.fabricSource = (win === null || win === void 0 ? void 0 : win.fabric) || {};
+        if (imgUrl) {
+            _.fabricSource.Image.fromURL(imgUrl, function (img) {
+                _.renderCanvasStatus = 2;
+                _.canvasBackgroundImageTarget = img;
+                var _a = _.canvasConfig.actions, actions = _a === void 0 ? "" : _a;
+                var zoomValue = (actions === null || actions === void 0 ? void 0 : actions.zoom) || 1;
                 if (!_.canvasDataSource) {
                     _.canvasDataSource = new _.fabricSource.Canvas(canvasId, __assign({}, data));
-                    _.renderCanvasStatus = 3;
-                    _.registerAllEventHandleFn();
-                    _.canvasDataSource.renderAll();
-                    callBack(_.canvasDataSource);
+                    if (zoomValue != 1) {
+                        _.canvasDataSource.setZoom(zoomValue);
+                    }
                 }
-            }
-            // 如果配置里面有回调函数，则将当前画布数据对象返回
-            function callBack(data) {
-                var _a;
-                var cb = ((_a = _.canvasConfig) === null || _a === void 0 ? void 0 : _a.cb) || "";
-                // 获取DOM元素
-                var targetElement = (0, utils_1.getDomFn)("canvasContainer");
-                // 添加事件监听器
-                document.addEventListener('mousemove', (0, index_2.checkMouseInElement)(targetElement));
-                if (cb instanceof Function) {
-                    cb(data);
+                var canvasWidth = _.canvasDataSource.getWidth();
+                var canvasHeight = _.canvasDataSource.getHeight();
+                var imgWidth = img.width;
+                var imgHeight = img.height;
+                var scaleX = 1;
+                var scaleY = 1;
+                if (canvasWidth && canvasHeight && imgWidth && imgHeight) {
+                    var imageAspectRatio = imgWidth / imgHeight;
+                    var canvasAspectRatio = canvasWidth / canvasHeight;
+                    if (imageAspectRatio > canvasAspectRatio) {
+                        // 图片更宽，基于高度缩放
+                        scaleY = canvasHeight / imgHeight;
+                        scaleX = scaleY * imageAspectRatio;
+                    }
+                    else {
+                        // 图片更高或宽高比相同，基于宽度缩放
+                        scaleX = canvasWidth / imgWidth;
+                        scaleY = scaleX / imageAspectRatio;
+                    }
                 }
+                console.log("原始比例：", { scaleX: scaleX, scaleY: scaleY, width: imgWidth, height: imgHeight });
+                _.canvasDataSource.setBackgroundImage(img, _.canvasDataSource.renderAll.bind(_.canvasDataSource), {
+                    originX: 'left',
+                    originY: 'top',
+                    left: 0,
+                    top: 0,
+                    // scaleX: scaleX,
+                    // scaleY: scaleY,
+                    width: imgWidth,
+                    height: imgHeight,
+                });
+                _.renderCanvasStatus = 3;
+                _.registerAllEventHandleFn();
+                _.canvasDataSource.renderAll();
+                callBack(_.canvasDataSource);
+            });
+        }
+        else {
+            if (!_.canvasDataSource) {
+                _.canvasDataSource = new _.fabricSource.Canvas(canvasId, __assign({}, data));
+                _.renderCanvasStatus = 3;
+                _.registerAllEventHandleFn();
+                _.canvasDataSource.renderAll();
+                callBack(_.canvasDataSource);
             }
-        });
+        }
+        // 如果配置里面有回调函数，则将当前画布数据对象返回
+        function callBack(data) {
+            var _a;
+            var cb = ((_a = _.canvasConfig) === null || _a === void 0 ? void 0 : _a.cb) || "";
+            // 获取DOM元素
+            var targetElement = (0, utils_1.getDomFn)("canvasContainer");
+            // 添加事件监听器
+            document.addEventListener('mousemove', (0, index_2.checkMouseInElement)(targetElement));
+            if (cb instanceof Function) {
+                cb(data);
+            }
+        }
     };
     // 销毁画布
     CanvasHooks.prototype.disposeCanvasFn = function () {

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
 import { UeditorHeightOption } from "./types";
 export declare function isMobile(): boolean;
 export declare function loadScript(url: string, callback?: any): void;
+export declare const isScriptLoaded: (src: string) => boolean;
 /**
  * 判断当前传入的字符串是否为 json格式 字符串
  * @param str

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.getDomFn = exports.isJson = exports.loadScript = exports.isMobile = void 0;
+exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.getDomFn = exports.isJson = exports.isScriptLoaded = exports.loadScript = exports.isMobile = void 0;
 var is_1 = require("./is");
 var win = window;
 // 是否是手机端环境
@@ -14,6 +14,9 @@ function loadScript(url, callback) {
     if (!url) {
         return;
     }
+    if ((0, exports.isScriptLoaded)(url)) {
+        return;
+    }
     var script = document.createElement('script');
     script.type = 'text/javascript';
     if (script === null || script === void 0 ? void 0 : script.readyState) { // IE
@@ -29,11 +32,27 @@ function loadScript(url, callback) {
             callback();
         };
     }
+    // 错误处理
+    script.onerror = function (error) {
+        console.error('Error loading script:', error);
+    };
     script.src = url;
     var head = document.getElementsByTagName('head')[0];
     head.appendChild(script);
 }
 exports.loadScript = loadScript;
+var isScriptLoaded = function (src) {
+    if (!src)
+        return false;
+    var scripts = document.scripts;
+    for (var i = 0; i < scripts.length; i++) {
+        if (scripts[i].src === src) {
+            return true;
+        }
+    }
+    return false;
+};
+exports.isScriptLoaded = isScriptLoaded;
 /**
  * 判断当前传入的字符串是否为 json格式 字符串
  * @param str

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xctc-utils",
   "private": false,
-  "version": "1.6.66",
+  "version": "1.6.68",
   "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",