xctc-utils 1.6.62 → 1.6.64

package/app.ts

@@ -4,6 +4,7 @@
 // npm publish
 
 // ts-node app.ts
+// npm install -g cnpm --registry=https://registry.npmmirror.com
 
 import {formatTimeStamp,formatStrTime} from "./src/time"
 import {decrypt,encrypt} from "./src/crypto"

package/dist/canvas/index.d.ts

@@ -1,4 +1,6 @@
 export default class CanvasHooks {
+    fabricSource: any;
+    fabricUrlSource: string;
     canvasDataSource: any;
     zoomDataSource: string;
     dragLastPosDataSource: any;

package/dist/canvas/index.js

@@ -11,7 +11,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var fabric_1 = require("fabric");
 var config_1 = require("../config");
 var utils_1 = require("../utils");
 var is_1 = require("../is");
@@ -33,6 +32,8 @@ var index_2 = require("../event/index");
 var defaultConfig = __assign({}, config_1.configDefaultValue.canvasDefaultValue);
 var CanvasHooks = /** @class */ (function () {
     function CanvasHooks(config) {
+        this.fabricSource = null;
+        this.fabricUrlSource = "https://cdn.jsdelivr.net/npm/fabric";
         this.canvasDataSource = null;
         this.zoomDataSource = "100";
         this.canvasBackgroundImageTarget = null;
@@ -76,6 +77,7 @@ var CanvasHooks = /** @class */ (function () {
     });
     // 创建画布
     CanvasHooks.prototype.createCanvasFn = function (config) {
+        var _a;
         var _ = this;
         _.renderCanvasStatus = 1;
         var canvasId = "";
@@ -102,76 +104,87 @@ var CanvasHooks = /** @class */ (function () {
         var imgUrl = (data === null || data === void 0 ? void 0 : data.backgroundImgUrl) || "";
         console.log("canvas--options", data);
         canvasId = data.id;
-        if (imgUrl) {
-            fabric_1.fabric.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 fabric_1.fabric.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;
+        var url = _.fabricUrlSource;
+        if ((_a = _.canvasConfig) === null || _a === void 0 ? void 0 : _a.fabricUrlSource) {
+            url = _.canvasConfig.fabricUrlSource;
+        }
+        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);
+                        }
                     }
-                    else {
-                        // 图片更高或宽高比相同，基于宽度缩放
-                        scaleX = canvasWidth / imgWidth;
-                        scaleY = scaleX / imageAspectRatio;
+                    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,
+                    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);
                 });
-                _.renderCanvasStatus = 3;
-                _.registerAllEventHandleFn();
-                _.canvasDataSource.renderAll();
-                callBack(_.canvasDataSource);
-            });
-        }
-        else {
-            if (!_.canvasDataSource) {
-                _.canvasDataSource = new fabric_1.fabric.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);
+            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/crypto/index.d.ts

@@ -1,4 +1,4 @@
-import CryptoJS from "crypto-js";
-export declare const cryptojs: typeof CryptoJS;
+export declare const loadCryptoJs: (url?: string, callback?: any) => void;
+export declare const cryptojs: any;
 export declare function encrypt(word: any, key?: any, iv?: any): any;
 export declare function decrypt(word: any, key?: any, iv?: any): any;

package/dist/crypto/index.js

@@ -1,18 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decrypt = exports.encrypt = exports.cryptojs = void 0;
-var crypto_js_1 = __importDefault(require("crypto-js"));
+exports.decrypt = exports.encrypt = exports.cryptojs = exports.loadCryptoJs = void 0;
 var utils_1 = require("../utils");
+var utils_2 = require("../utils");
+var cryptoUrl = "https://unpkg.com/crypto-js@4.1.1/index.js";
+var cryptoJsSource = "";
+var loadCryptoJs = function (url, callback) {
+    var win = window;
+    if (url) {
+        cryptoUrl = url;
+    }
+    (0, utils_2.loadScript)(cryptoUrl, function () {
+        cryptoJsSource = (win === null || win === void 0 ? void 0 : win.CryptoJS) || "";
+        if (typeof callback === "function") {
+            callback();
+        }
+    });
+};
+exports.loadCryptoJs = loadCryptoJs;
 function formatVal(val) {
     var key = "5uMz4R8r0926DkC8";
     if (val)
         key = val;
-    return crypto_js_1.default.enc.Utf8.parse(key);
+    return cryptoJsSource.enc.Utf8.parse(key);
 }
-exports.cryptojs = crypto_js_1.default;
+exports.cryptojs = cryptoJsSource;
 // 加密
 function encrypt(word, key, iv) {
     if (!word) {
@@ -24,12 +36,12 @@ function encrypt(word, key, iv) {
     }
     // key  //十六位十六进制数作为密钥
     // iv 十六位十六进制数作为密钥偏移量
-    var src = crypto_js_1.default.enc.Utf8.parse(word);
+    var src = cryptoJsSource.enc.Utf8.parse(word);
     key = formatVal(key);
     iv = formatVal(iv);
     var encryptedData = "";
     try {
-        var encrypted = crypto_js_1.default.AES.encrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
+        var encrypted = cryptoJsSource.AES.encrypt(src, key, { iv: iv, mode: cryptoJsSource.mode.CBC, padding: cryptoJsSource.pad.Pkcs7 });
         encryptedData = encrypted.ciphertext.toString().toUpperCase();
     }
     catch (error) {
@@ -47,12 +59,12 @@ function decrypt(word, key, iv) {
     }
     key = formatVal(key);
     iv = formatVal(iv);
-    var encryptedHexStr = crypto_js_1.default.enc.Hex.parse(word);
-    var src = crypto_js_1.default.enc.Base64.stringify(encryptedHexStr);
+    var encryptedHexStr = cryptoJsSource.enc.Hex.parse(word);
+    var src = cryptoJsSource.enc.Base64.stringify(encryptedHexStr);
     var decryptedData = "";
     try {
-        var decrypt_1 = crypto_js_1.default.AES.decrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
-        var decryptedStr = decrypt_1.toString(crypto_js_1.default.enc.Utf8);
+        var decrypt_1 = cryptoJsSource.AES.decrypt(src, key, { iv: iv, mode: cryptoJsSource.mode.CBC, padding: cryptoJsSource.pad.Pkcs7 });
+        var decryptedStr = decrypt_1.toString(cryptoJsSource.enc.Utf8);
         decryptedData = decryptedStr.toString();
     }
     catch (error) {

package/dist/handle/create.d.ts

@@ -1,4 +1,3 @@
-export declare const xx: {};
 export declare function CreateDragElementFn(): void;
 export declare function InitElement2CanvasFn(list: any[]): void;
 export declare function CreateCanvasSvgElementFn(item: any, index?: number): void;

package/dist/handle/create.js

@@ -11,11 +11,9 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 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;
+exports.CreateElementFn = exports.CreateRightClickMenuFn = exports.CreateAllSelectionRectFn = exports.CreateSelectionRectFn = exports.CreateCanvasImageElementFn = exports.CreateCanvasSvgElementFn = exports.InitElement2CanvasFn = exports.CreateDragElementFn = void 0;
 var utils_1 = require("../utils");
 var is_1 = require("../is");
-var fabric_1 = require("fabric");
-exports.xx = {};
 function CreateDragElementFn() {
     var _a, _b, _c, _d, _e;
     var _ = this;
@@ -64,6 +62,7 @@ function InitElement2CanvasFn(list) {
             }
         });
     }
+    _.defaultCreateDataListStatus = true;
 }
 exports.InitElement2CanvasFn = InitElement2CanvasFn;
 function CreateCanvasSvgElementFn(item, index) {
@@ -75,7 +74,7 @@ function CreateCanvasSvgElementFn(item, index) {
         return;
     }
     var createDragElementBackFn = (_.callBackEventConfig || {}).createDragElementBackFn;
-    fabric_1.fabric.loadSVGFromURL(item === null || item === void 0 ? void 0 : item.address, function (objects) {
+    _.fabricSource.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;
@@ -106,7 +105,7 @@ function CreateCanvasImageElementFn(item, index) {
         return;
     }
     var createDragElementBackFn = (_.callBackEventConfig || {}).createDragElementBackFn;
-    fabric_1.fabric.Image.fromURL((_a = _.dragElementDataSource) === null || _a === void 0 ? void 0 : _a.address, function (img) {
+    _.fabricSource.Image.fromURL((_a = _.dragElementDataSource) === null || _a === void 0 ? void 0 : _a.address, function (img) {
         img.set(__assign({}, item));
         _.canvasDataSource.add(img);
         _.canvasCreateElementsDataSource.push(img);
@@ -133,7 +132,7 @@ function CreateSelectionRectFn() {
     if (!_.canvasDataSource) {
         return;
     }
-    _.createSelectionRectDataSource = new fabric_1.fabric.Rect({
+    _.createSelectionRectDataSource = new _.fabricSource.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,
@@ -162,7 +161,7 @@ function CreateAllSelectionRectFn() {
     // console.log("xxx---",_.canvasDataSource.getWidth());
     var containerWidth = container.offsetWidth;
     var containerHeight = container.offsetWidth;
-    _.createSelectionRectDataSource = new fabric_1.fabric.Rect({
+    _.createSelectionRectDataSource = new _.fabricSource.Rect({
         left: 0,
         top: 0,
         width: _.canvasDataSource.getWidth(),

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
 import { UeditorHeightOption } from "./types";
 export declare function isMobile(): boolean;
+export declare function loadScript(url: string, callback?: any): void;
 /**
  * 判断当前传入的字符串是否为 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.isMobile = void 0;
+exports.handleCopyValue = exports.weixinBrowser = exports.deviceEnvironment = exports.getIframeContentHeight = exports.checkIframeContentHeight = exports.getDomFn = exports.isJson = exports.loadScript = exports.isMobile = void 0;
 var is_1 = require("./is");
 var win = window;
 // 是否是手机端环境
@@ -10,6 +10,30 @@ function isMobile() {
     return isPhone;
 }
 exports.isMobile = isMobile;
+function loadScript(url, callback) {
+    if (!url) {
+        return;
+    }
+    var script = document.createElement('script');
+    script.type = 'text/javascript';
+    if (script === null || script === void 0 ? void 0 : script.readyState) { // IE
+        script.onreadystatechange = function () {
+            if (script.readyState === 'loaded' || script.readyState === 'complete') {
+                script.onreadystatechange = null;
+                callback();
+            }
+        };
+    }
+    else { // Others
+        script.onload = function () {
+            callback();
+        };
+    }
+    script.src = url;
+    var head = document.getElementsByTagName('head')[0];
+    head.appendChild(script);
+}
+exports.loadScript = loadScript;
 /**
  * 判断当前传入的字符串是否为 json格式 字符串
  * @param str

package/dist/weixin/index.d.ts

@@ -13,6 +13,7 @@ interface configOption {
     debuggerStatus?: boolean;
     cb?: any;
 }
+export declare function loadWeiXinSDK(url?: string, callback?: any): void;
 export declare function getUrlCode(config: configOption): void;
 export declare function envSDK(): any;
 export declare function getCode(appId?: string, scope?: string): void;

package/dist/weixin/index.js

@@ -23,19 +23,35 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onlinePay = exports.shareReady = exports.configReady = exports.getCode = exports.envSDK = exports.getUrlCode = void 0;
+exports.onlinePay = exports.shareReady = exports.configReady = exports.getCode = exports.envSDK = exports.getUrlCode = exports.loadWeiXinSDK = void 0;
 // import * as weixin from 'weixin-js-sdk' // 引入微信SDK
-var weixin = require("weixin-js-sdk");
+// const weixin = require("weixin-js-sdk")
 var utils_1 = require("../utils");
 var crypto_1 = require("../crypto");
 var params = __importStar(require("../params"));
 var is_1 = require("../is");
 var index_1 = require("../storage/index");
+var utils_2 = require("../utils");
 var w = window;
 var loc = w.location;
 var defaultKey = "5uMz4R8r0926DkC8";
 var defaultIv = "5uMz4R8r0926DkC8";
 var weixinConfig = {};
+var weixinUrl = "https://res.wx.qq.com/open/js/jweixin-1.6.0.js";
+var weixinJsSource = "";
+function loadWeiXinSDK(url, callback) {
+    var win = window;
+    if (url) {
+        weixinUrl = url;
+    }
+    (0, utils_2.loadScript)(weixinUrl, function () {
+        weixinJsSource = (win === null || win === void 0 ? void 0 : win.wx) || "";
+        if (typeof callback === "function") {
+            callback();
+        }
+    });
+}
+exports.loadWeiXinSDK = loadWeiXinSDK;
 function getUrlCode(config) {
     var _a;
     if (!(0, utils_1.weixinBrowser)()) {
@@ -258,7 +274,12 @@ function initSdk() {
         wx = w.wx;
     }
     else {
-        wx = weixin;
+        if (!weixinJsSource) {
+            console.error("请先调用函数：loadWeiXinSDK");
+        }
+        else {
+            wx = weixinJsSource;
+        }
     }
     w['weixinConfig'] = wx;
     return wx;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.62",
+  "private": false,
+  "version": "1.6.64",
   "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",
@@ -9,17 +10,14 @@
     "prepublish": "npm run build",
     "build": "tsc"
   },
-  "author": "",
+  "author": "dyb",
   "license": "ISC",
   "devDependencies": {
-    "@types/crypto-js": "^4.1.1",
     "@types/node": "^18.11.19",
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "crypto-js": "^4.1.1",
-    "fabric": "^5.3.0",
-    "weixin-js-sdk": "^1.6.0"
+
   },
   "repository": {
     "type": "git",

package/dist/mobile/index.d.ts

@@ -1 +0,0 @@
-export declare function isMobile(): boolean;

package/dist/mobile/index.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMobile = void 0;
-var w = window;
-// 是否是手机端环境
-function isMobile() {
-    var info = w.navigator.userAgent;
-    var isPhone = /mobile/i.test(info);
-    return isPhone;
-}
-exports.isMobile = isMobile;