ztxkutils 2.10.17 → 2.10.19

package/dist/authority-e6bde99f.js

@@ -0,0 +1,423 @@
+/**
+ *  base64.ts
+ *
+ *  Licensed under the BSD 3-Clause License.
+ *    http://opensource.org/licenses/BSD-3-Clause
+ *
+ *  References:
+ *    http://en.wikipedia.org/wiki/Base64
+ *
+ * @author Dan Kogai (https://github.com/dankogai)
+ */
+const _hasatob = typeof atob === 'function';
+const _hasbtoa = typeof btoa === 'function';
+const _hasBuffer = typeof Buffer === 'function';
+const _TD = typeof TextDecoder === 'function' ? new TextDecoder() : undefined;
+const _TE = typeof TextEncoder === 'function' ? new TextEncoder() : undefined;
+const b64ch = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+const b64chs = [...b64ch];
+const b64tab = ((a) => {
+    let tab = {};
+    a.forEach((c, i) => tab[c] = i);
+    return tab;
+})(b64chs);
+const b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+const _fromCC = String.fromCharCode.bind(String);
+const _U8Afrom = typeof Uint8Array.from === 'function'
+    ? Uint8Array.from.bind(Uint8Array)
+    : (it, fn = (x) => x) => new Uint8Array(Array.prototype.slice.call(it, 0).map(fn));
+const _mkUriSafe = (src) => src
+    .replace(/[+\/]/g, (m0) => m0 == '+' ? '-' : '_')
+    .replace(/=+$/m, '');
+const _tidyB64 = (s) => s.replace(/[^A-Za-z0-9\+\/]/g, '');
+/**
+ * polyfill version of `btoa`
+ */
+const btoaPolyfill = (bin) => {
+    // console.log('polyfilled');
+    let u32, c0, c1, c2, asc = '';
+    const pad = bin.length % 3;
+    for (let i = 0; i < bin.length;) {
+        if ((c0 = bin.charCodeAt(i++)) > 255 ||
+            (c1 = bin.charCodeAt(i++)) > 255 ||
+            (c2 = bin.charCodeAt(i++)) > 255)
+            throw new TypeError('invalid character found');
+        u32 = (c0 << 16) | (c1 << 8) | c2;
+        asc += b64chs[u32 >> 18 & 63]
+            + b64chs[u32 >> 12 & 63]
+            + b64chs[u32 >> 6 & 63]
+            + b64chs[u32 & 63];
+    }
+    return pad ? asc.slice(0, pad - 3) + "===".substring(pad) : asc;
+};
+/**
+ * does what `window.btoa` of web browsers do.
+ * @param {String} bin binary string
+ * @returns {string} Base64-encoded string
+ */
+const _btoa = _hasbtoa ? (bin) => btoa(bin)
+    : _hasBuffer ? (bin) => Buffer.from(bin, 'binary').toString('base64')
+        : btoaPolyfill;
+const _fromUint8Array = _hasBuffer
+    ? (u8a) => Buffer.from(u8a).toString('base64')
+    : (u8a) => {
+        // cf. https://stackoverflow.com/questions/12710001/how-to-convert-uint8-array-to-base64-encoded-string/12713326#12713326
+        const maxargs = 0x1000;
+        let strs = [];
+        for (let i = 0, l = u8a.length; i < l; i += maxargs) {
+            strs.push(_fromCC.apply(null, u8a.subarray(i, i + maxargs)));
+        }
+        return _btoa(strs.join(''));
+    };
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const utob = (src: string) => unescape(encodeURIComponent(src));
+// reverting good old fationed regexp
+const cb_utob = (c) => {
+    if (c.length < 2) {
+        var cc = c.charCodeAt(0);
+        return cc < 0x80 ? c
+            : cc < 0x800 ? (_fromCC(0xc0 | (cc >>> 6))
+                + _fromCC(0x80 | (cc & 0x3f)))
+                : (_fromCC(0xe0 | ((cc >>> 12) & 0x0f))
+                    + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+                    + _fromCC(0x80 | (cc & 0x3f)));
+    }
+    else {
+        var cc = 0x10000
+            + (c.charCodeAt(0) - 0xD800) * 0x400
+            + (c.charCodeAt(1) - 0xDC00);
+        return (_fromCC(0xf0 | ((cc >>> 18) & 0x07))
+            + _fromCC(0x80 | ((cc >>> 12) & 0x3f))
+            + _fromCC(0x80 | ((cc >>> 6) & 0x3f))
+            + _fromCC(0x80 | (cc & 0x3f)));
+    }
+};
+const re_utob = /[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;
+/**
+ * @deprecated should have been internal use only.
+ * @param {string} src UTF-8 string
+ * @returns {string} UTF-16 string
+ */
+const utob = (u) => u.replace(re_utob, cb_utob);
+//
+const _encode = _hasBuffer
+    ? (s) => Buffer.from(s, 'utf8').toString('base64')
+    : _TE
+        ? (s) => _fromUint8Array(_TE.encode(s))
+        : (s) => _btoa(utob(s));
+/**
+ * converts a UTF-8-encoded string to a Base64 string.
+ * @param {boolean} [urlsafe] if `true` make the result URL-safe
+ * @returns {string} Base64 string
+ */
+const encode = (src, urlsafe = false) => urlsafe
+    ? _mkUriSafe(_encode(src))
+    : _encode(src);
+// This trick is found broken https://github.com/dankogai/js-base64/issues/130
+// const btou = (src: string) => decodeURIComponent(escape(src));
+// reverting good old fationed regexp
+const re_btou = /[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g;
+const cb_btou = (cccc) => {
+    switch (cccc.length) {
+        case 4:
+            var cp = ((0x07 & cccc.charCodeAt(0)) << 18)
+                | ((0x3f & cccc.charCodeAt(1)) << 12)
+                | ((0x3f & cccc.charCodeAt(2)) << 6)
+                | (0x3f & cccc.charCodeAt(3)), offset = cp - 0x10000;
+            return (_fromCC((offset >>> 10) + 0xD800)
+                + _fromCC((offset & 0x3FF) + 0xDC00));
+        case 3:
+            return _fromCC(((0x0f & cccc.charCodeAt(0)) << 12)
+                | ((0x3f & cccc.charCodeAt(1)) << 6)
+                | (0x3f & cccc.charCodeAt(2)));
+        default:
+            return _fromCC(((0x1f & cccc.charCodeAt(0)) << 6)
+                | (0x3f & cccc.charCodeAt(1)));
+    }
+};
+/**
+ * @deprecated should have been internal use only.
+ * @param {string} src UTF-16 string
+ * @returns {string} UTF-8 string
+ */
+const btou = (b) => b.replace(re_btou, cb_btou);
+/**
+ * polyfill version of `atob`
+ */
+const atobPolyfill = (asc) => {
+    // console.log('polyfilled');
+    asc = asc.replace(/\s+/g, '');
+    if (!b64re.test(asc))
+        throw new TypeError('malformed base64.');
+    asc += '=='.slice(2 - (asc.length & 3));
+    let u24, bin = '', r1, r2;
+    for (let i = 0; i < asc.length;) {
+        u24 = b64tab[asc.charAt(i++)] << 18
+            | b64tab[asc.charAt(i++)] << 12
+            | (r1 = b64tab[asc.charAt(i++)]) << 6
+            | (r2 = b64tab[asc.charAt(i++)]);
+        bin += r1 === 64 ? _fromCC(u24 >> 16 & 255)
+            : r2 === 64 ? _fromCC(u24 >> 16 & 255, u24 >> 8 & 255)
+                : _fromCC(u24 >> 16 & 255, u24 >> 8 & 255, u24 & 255);
+    }
+    return bin;
+};
+/**
+ * does what `window.atob` of web browsers do.
+ * @param {String} asc Base64-encoded string
+ * @returns {string} binary string
+ */
+const _atob = _hasatob ? (asc) => atob(_tidyB64(asc))
+    : _hasBuffer ? (asc) => Buffer.from(asc, 'base64').toString('binary')
+        : atobPolyfill;
+//
+const _toUint8Array = _hasBuffer
+    ? (a) => _U8Afrom(Buffer.from(a, 'base64'))
+    : (a) => _U8Afrom(_atob(a), c => c.charCodeAt(0));
+//
+const _decode = _hasBuffer
+    ? (a) => Buffer.from(a, 'base64').toString('utf8')
+    : _TD
+        ? (a) => _TD.decode(_toUint8Array(a))
+        : (a) => btou(_atob(a));
+const _unURI = (a) => _tidyB64(a.replace(/[-_]/g, (m0) => m0 == '-' ? '+' : '/'));
+/**
+ * converts a Base64 string to a UTF-8 string.
+ * @param {String} src Base64 string.  Both normal and URL-safe are supported
+ * @returns {string} UTF-8 string
+ */
+const decode = (src) => _decode(_unURI(src));
+
+function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCharacterError";var r="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(r){var t=String(r).replace(/=+$/,"");if(t.length%4==1)throw new e("'atob' failed: The string to be decoded is not correctly encoded.");for(var n,o,a=0,i=0,c="";o=t.charAt(i++);~o&&(n=a%4?64*n+o:o,a++%4)?c+=String.fromCharCode(255&n>>(-2*a&6)):0)o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o);return c};function t(e){var t=e.replace(/-/g,"+").replace(/_/g,"/");switch(t.length%4){case 0:break;case 2:t+="==";break;case 3:t+="=";break;default:throw "Illegal base64url string!"}try{return function(e){return decodeURIComponent(r(e).replace(/(.)/g,(function(e,r){var t=r.charCodeAt(0).toString(16).toUpperCase();return t.length<2&&(t="0"+t),"%"+t})))}(t)}catch(e){return r(t)}}function n(e){this.message=e;}function o(e,r){if("string"!=typeof e)throw new n("Invalid token specified");var o=!0===(r=r||{}).header?0:1;try{return JSON.parse(t(e.split(".")[o]))}catch(e){throw new n("Invalid token specified: "+e.message)}}n.prototype=new Error,n.prototype.name="InvalidTokenError";
+
+/**
+ * @description 权限相关操作
+ */
+// 获取token
+var getToken = function () {
+    try {
+        if (window.localStorage.getItem('system-token')) {
+            return window.localStorage.getItem('system-token');
+        }
+        else {
+            return false;
+        }
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 获取refreshToken
+var getRefreshToken = function () {
+    try {
+        if (window.localStorage.getItem('system-refresh-token')) {
+            return window.localStorage.getItem('system-refresh-token');
+        }
+        else {
+            return false;
+        }
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 获取是否第三方登录
+var getOAuth2 = function () {
+    try {
+        if (window.localStorage.getItem('system-oauth2')) {
+            return window.localStorage.getItem('system-oauth2');
+        }
+        else {
+            return false;
+        }
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 设置token
+var setToken = function (token) {
+    try {
+        window.localStorage.setItem('system-token', token);
+    }
+    catch (err) {
+        return false;
+    }
+};
+var removeToken = function () {
+    try {
+        window.localStorage.removeItem('system-token');
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 设置refreshToken
+var setRefreshToken = function (token) {
+    try {
+        window.localStorage.setItem('system-refresh-token', token);
+    }
+    catch (err) {
+        return false;
+    }
+};
+var removeRefreshToken = function () {
+    try {
+        window.localStorage.removeItem('system-refresh-token');
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 设置第三方登录
+var setOAuth2 = function () {
+    try {
+        window.localStorage.setItem('system-oauth2', '1');
+    }
+    catch (err) {
+        return false;
+    }
+};
+var removeOAuth2 = function () {
+    try {
+        window.localStorage.removeItem('system-oauth2');
+    }
+    catch (err) {
+        return false;
+    }
+};
+// 对用户名密码进行加密/解密处理
+var aesEncrypt = function (str) {
+    return encode(str);
+};
+var aesDecrypt = function (str) {
+    if (str) {
+        return decode(str);
+    }
+    else {
+        return str;
+    }
+};
+/**按钮权限级别 */
+var BTN_AUTHS = {
+    add: 'add',
+    update: 'update',
+    check: 'check',
+    detail: 'detail',
+    unfreeze: 'unfreeze',
+    frozen: 'frozen',
+    cancelLation: 'cancelLation',
+    cancelSubmit: 'cancelSubmit',
+    submitApprove: 'submitApprove', // 提交审核
+};
+/**判断是否有当前按钮的权限 */
+var isBtnAuth = function (userBtns, code) {
+    if (typeof code === 'boolean') {
+        return code;
+    }
+    if (!Array.isArray(userBtns)) {
+        return false;
+    }
+    return userBtns.some(function (userBtn) { return (userBtn === null || userBtn === void 0 ? void 0 : userBtn.code) === code; });
+};
+/**设置最后一次访问的路由 */
+var setLastUrlPath = function (pathname) {
+    try {
+        window.localStorage.setItem('last-url-path', pathname);
+    }
+    catch (err) {
+        return false;
+    }
+};
+var getLastUrlPath = function () {
+    try {
+        if (window.localStorage.getItem('last-url-path')) {
+            return window.localStorage.getItem('last-url-path');
+        }
+        else {
+            return false;
+        }
+    }
+    catch (err) {
+        return false;
+    }
+};
+/**返回是否在乾坤下启动 */
+var isQiankun = function () { return window.__POWERED_BY_QIANKUN__; };
+/** jwt解析 */
+var jwtDecode = function (str) {
+    try {
+        return o(str);
+    }
+    catch (err) {
+        //
+    }
+};
+/**
+ * 设置菜单id
+ * menuId： 菜单id
+ * menuPath：菜单对应的路由
+ */
+var setMenuId = function (menuId, menuPath) {
+    try {
+        window.sessionStorage.setItem('CURRENT_MENU_ID', menuId);
+        window.sessionStorage.setItem('CURRENT_MENU_PATH', menuPath);
+    }
+    catch (err) {
+        //
+    }
+};
+var getMenuIdInfo = function () {
+    var _a, _b, _c;
+    var obj = {};
+    try {
+        var pathname = window.location.pathname;
+        obj.CURRENT_MENU_ID = window.sessionStorage.getItem('CURRENT_MENU_ID');
+        obj.CURRENT_MENU_PATH = window.sessionStorage.getItem('CURRENT_MENU_PATH');
+        if (pathname === obj.CURRENT_MENU_PATH) {
+            obj.IS_CURRENT_MENU = true;
+        }
+        else {
+            var firstIndex = (_b = (_a = obj.CURRENT_MENU_PATH) === null || _a === void 0 ? void 0 : _a.indexOf) === null || _b === void 0 ? void 0 : _b.call(_a, ':');
+            var resultPathname = obj.CURRENT_MENU_PATH;
+            if (firstIndex !== -1) {
+                resultPathname = (_c = obj.CURRENT_MENU_PATH) === null || _c === void 0 ? void 0 : _c.substr(0, firstIndex);
+            }
+            if (pathname.indexOf(resultPathname) !== -1) {
+                obj.IS_CURRENT_MENU = true;
+            }
+            else {
+                obj.IS_CURRENT_MENU = false;
+            }
+        }
+    }
+    catch (err) {
+        //
+    }
+    return obj;
+};
+
+var authority = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  getToken: getToken,
+  getRefreshToken: getRefreshToken,
+  getOAuth2: getOAuth2,
+  setToken: setToken,
+  removeToken: removeToken,
+  setRefreshToken: setRefreshToken,
+  removeRefreshToken: removeRefreshToken,
+  setOAuth2: setOAuth2,
+  removeOAuth2: removeOAuth2,
+  aesEncrypt: aesEncrypt,
+  aesDecrypt: aesDecrypt,
+  BTN_AUTHS: BTN_AUTHS,
+  isBtnAuth: isBtnAuth,
+  setLastUrlPath: setLastUrlPath,
+  getLastUrlPath: getLastUrlPath,
+  isQiankun: isQiankun,
+  jwtDecode: jwtDecode,
+  setMenuId: setMenuId,
+  getMenuIdInfo: getMenuIdInfo
+});
+
+export { BTN_AUTHS as B, getRefreshToken as a, setRefreshToken as b, authority as c, getOAuth2 as d, removeRefreshToken as e, setOAuth2 as f, getToken as g, removeOAuth2 as h, isQiankun as i, aesEncrypt as j, aesDecrypt as k, isBtnAuth as l, setLastUrlPath as m, getLastUrlPath as n, jwtDecode as o, setMenuId as p, getMenuIdInfo as q, removeToken as r, setToken as s };

package/dist/authority.js

@@ -1 +1 @@
-export { B as BTN_AUTHS, l as aesDecrypt, k as aesEncrypt, o as getLastUrlPath, q as getMenuIdInfo, d as getOAuth2, a as getRefreshToken, g as getToken, m as isBtnAuth, i as isQiankun, j as jwtDecode, h as removeOAuth2, e as removeRefreshToken, r as removeToken, n as setLastUrlPath, p as setMenuId, f as setOAuth2, b as setRefreshToken, s as setToken } from './authority-312048ab.js';
+export { B as BTN_AUTHS, k as aesDecrypt, j as aesEncrypt, n as getLastUrlPath, q as getMenuIdInfo, d as getOAuth2, a as getRefreshToken, g as getToken, l as isBtnAuth, i as isQiankun, o as jwtDecode, h as removeOAuth2, e as removeRefreshToken, r as removeToken, m as setLastUrlPath, p as setMenuId, f as setOAuth2, b as setRefreshToken, s as setToken } from './authority-e6bde99f.js';

package/dist/fileOperation.js

@@ -1,4 +1,4 @@
-import { g as getToken } from './authority-312048ab.js';
+import { g as getToken } from './authority-e6bde99f.js';
 import { d as dangerouslySetXss } from './tools-5541a681.js';
 import './tslib.es6-f9459658.js';
 import 'dayjs';

package/dist/hooks.js

@@ -2,7 +2,7 @@ import { _ as __assign, c as __awaiter, d as __generator } from './tslib.es6-f94
 import { useState, useEffect, useRef, useCallback } from 'react';
 export { default as useFileIdToBase64 } from './useFileIdToBase64.js';
 import './fileOperation.js';
-import './authority-312048ab.js';
+import './authority-e6bde99f.js';
 import './tools-5541a681.js';
 import 'dayjs';
 import 'number-precision';

package/dist/index.js

@@ -1,8 +1,8 @@
-export { c as authority } from './authority-312048ab.js';
+export { c as authority } from './authority-e6bde99f.js';
 export { d as dataModel } from './dataModel-1fbaff40.js';
 export { t as tools } from './tools-5541a681.js';
 export { v as validate } from './validate-6e735536.js';
-export { r as request } from './request-94146afe.js';
+export { r as request } from './request-8e0e6316.js';
 export { r as reqUrl } from './reqUrl-787dd9e5.js';
 import './tslib.es6-f9459658.js';
 import 'dayjs';

package/dist/print.d.ts

@@ -30,6 +30,19 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
     pdfOptions?: any;
     imgPositionX?: number;
 }): Promise<jsPDF>;
+export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, isDownload, }: {
+    pageClassName?: string;
+    dom: HTMLElement;
+    pdfName: string;
+    isShowPage?: boolean;
+    noWater?: boolean;
+    pdfOptions?: any;
+    imgPositionX?: number;
+    isDownload?: boolean;
+}): Promise<{
+    pdfs: any;
+    pdfBase64: any;
+}>;
 export interface IPdfOption {
     /** 是否压缩 */
     compress?: boolean;

package/dist/print.js

@@ -1,7 +1,6 @@
 import { a as __spreadArray, _ as __assign, c as __awaiter, d as __generator } from './tslib.es6-f9459658.js';
 import { jsPDF } from 'jspdf';
 import html2canvas from 'html2canvas';
-import { g as getToken, j as jwtDecode } from './authority-312048ab.js';
 
 /**
  * 添加水印
@@ -65,17 +64,17 @@ function printCurrentDom(_a) {
  * @returns canvas png
  */
 function createWaterHandle(obj) {
-    var token = getToken();
-    var defaultWaterText = '内部资料，严禁外泄!';
-    if (token) {
-        try {
-            var tokenObj = jwtDecode(token);
-            defaultWaterText = "\u6D59\u5546\u4E2D\u62D3 " + ((tokenObj === null || tokenObj === void 0 ? void 0 : tokenObj.real_name) || '');
-        }
-        catch (err) {
-            console.log(err);
-        }
-    }
+    // const token = getToken();
+    // let defaultWaterText = '内部资料，严禁外泄!';
+    // if (token) {
+    //   try {
+    //     const tokenObj: any = jwtDecode(token);
+    //     defaultWaterText = `浙商中拓 ${tokenObj?.real_name || ''}`;
+    //   } catch (err) {
+    //     console.log(err);
+    //   }
+    // }
+    var defaultWaterText = '浙商中拓';
     var _a = obj || {}, waterText = _a.waterText, opacity = _a.opacity, fontSize = _a.fontSize, cavansWidth = _a.cavansWidth, cavansHeight = _a.cavansHeight;
     var canvas = document.createElement('canvas');
     canvas.width = cavansWidth || 240;
@@ -208,11 +207,79 @@ function htmlToPdf(_a) {
         });
     }
 }
+function htmlToPdfUseCanvas(_a) {
+    var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
+    var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
+    var format = (pdfOptions === null || pdfOptions === void 0 ? void 0 : pdfOptions.format) || [632.28, 841.89];
+    var _pdfOptions = __assign({ unit: 'pt', format: format }, (pdfOptions || {}));
+    if (allDom.length > 0 && isShowPage) {
+        var allDomArray = Array.prototype.slice.call(allDom);
+        var pdfBase64_1 = [];
+        var pdfs_1 = [];
+        var promiseAllDomArray_3 = allDomArray.map(function (dom) {
+            return html2canvas(dom, {
+                scale: 2,
+            });
+        });
+        return (function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _i, promiseAllDomArray_4, item, pdf, canvas;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
+                            _a.label = 1;
+                        case 1:
+                            if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
+                            item = promiseAllDomArray_4[_i];
+                            pdf = new jsPDF(_pdfOptions);
+                            return [4 /*yield*/, item];
+                        case 2:
+                            canvas = _a.sent();
+                            createPdf(canvas, pdf, noWater, imgPositionX, {
+                                width: format === null || format === void 0 ? void 0 : format[0],
+                                height: format === null || format === void 0 ? void 0 : format[1],
+                            });
+                            if (isDownload) {
+                                pdf.save(pdfName + ".pdf");
+                            }
+                            pdfBase64_1.push(pdf.output('dataurlstring'));
+                            pdfs_1.push(pdf);
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [2 /*return*/, Promise.resolve({
+                                pdfs: pdfs_1,
+                                pdfBase64: pdfBase64_1,
+                            })];
+                    }
+                });
+            });
+        })();
+    }
+    else {
+        var pdf_1 = new jsPDF(_pdfOptions);
+        return html2canvas(dom, { scale: 2 }).then(function (canvas) {
+            createPdf(canvas, pdf_1, noWater, imgPositionX, {
+                width: format === null || format === void 0 ? void 0 : format[0],
+                height: format === null || format === void 0 ? void 0 : format[1],
+            });
+            if (isDownload) {
+                pdf_1.save(pdfName + ".pdf");
+            }
+            return {
+                pdfs: [pdf_1],
+                pdfBase64: [pdf_1.output('dataurlstring')],
+            };
+        });
+    }
+}
 function htmlToPdfNoCanvas(_a) {
     var _b, _c;
     var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage, fileBinary = _a.fileBinary, pdfName = _a.pdfName, isDownload = _a.isDownload, pdfOption = _a.pdfOption, isAddWater = _a.isAddWater, waterBase64 = _a.waterBase64, imgWidth = _a.imgWidth, imgHeight = _a.imgHeight, isCompress = _a.isCompress;
     return __awaiter(this, void 0, void 0, function () {
-        var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_1, pdfs_1, pdf_1, pageWidth_1;
+        var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_2, pageWidth_1;
         return __generator(this, function (_d) {
             allDom = dom.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
             pageFormat = (pdfOption === null || pdfOption === void 0 ? void 0 : pdfOption.pageFormat) ? pdfOption.pageFormat : 'a4';
@@ -234,8 +301,8 @@ function htmlToPdfNoCanvas(_a) {
             // 如果需要分页
             if (allDom.length > 0 && isShowPage) {
                 allDomArray_1 = Array.prototype.slice.call(allDom);
-                pdfBase64_1 = [];
-                pdfs_1 = [];
+                pdfBase64_2 = [];
+                pdfs_2 = [];
                 return [2 /*return*/, (function () {
                         return __awaiter(this, void 0, void 0, function () {
                             var i, _loop_1, _i, allDomArray_2, item;
@@ -281,8 +348,8 @@ function htmlToPdfNoCanvas(_a) {
                                                                                 if (isDownload) {
                                                                                     pdf.save(pdfName + "_" + i + ".pdf");
                                                                                 }
-                                                                                pdfBase64_1.push(pdf.output('dataurlstring'));
-                                                                                pdfs_1.push(pdf);
+                                                                                pdfBase64_2.push(pdf.output('dataurlstring'));
+                                                                                pdfs_2.push(pdf);
                                                                                 resolve({});
                                                                             },
                                                                         });
@@ -308,8 +375,8 @@ function htmlToPdfNoCanvas(_a) {
                                         _i++;
                                         return [3 /*break*/, 1];
                                     case 4: return [2 /*return*/, Promise.resolve({
-                                            pdfs: pdfs_1,
-                                            pdfBase64: pdfBase64_1,
+                                            pdfs: pdfs_2,
+                                            pdfBase64: pdfBase64_2,
                                         })];
                                 }
                             });
@@ -317,10 +384,10 @@ function htmlToPdfNoCanvas(_a) {
                     })()];
             }
             else {
-                pdf_1 = new jsPDF(pdfOptions);
-                pageWidth_1 = pdf_1.internal.pageSize.width - pageMarginX * 2;
-                setPdfVersion(pdf_1);
-                supportJsPdfChinese(pdf_1, fileBinary);
+                pdf_2 = new jsPDF(pdfOptions);
+                pageWidth_1 = pdf_2.internal.pageSize.width - pageMarginX * 2;
+                setPdfVersion(pdf_2);
+                supportJsPdfChinese(pdf_2, fileBinary);
                 return [2 /*return*/, new Promise(function (resolve) {
                         new jsPDF(pdfOptions).html(dom, {
                             autoPaging: 'text',
@@ -330,28 +397,28 @@ function htmlToPdfNoCanvas(_a) {
                             callback: function (res) {
                                 // 添加呈现的HTML所需的页面（从第2页开始）
                                 for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                    pdf_1.addPage(pageFormat, pageOrient);
+                                    pdf_2.addPage(pageFormat, pageOrient);
                                 }
                                 // 正确呈现文档
-                                pdf_1.html(dom, {
+                                pdf_2.html(dom, {
                                     autoPaging: 'text',
                                     margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
                                     width: pageWidth_1,
                                     windowWidth: pageWidth_1,
                                     callback: function () {
                                         for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
-                                            pdf_1.setPage(i);
+                                            pdf_2.setPage(i);
                                             // 添加水印
                                             if (isAddWater) {
-                                                setPdfWater(pdf_1, waterBase64, imgWidth, imgHeight);
+                                                setPdfWater(pdf_2, waterBase64, imgWidth, imgHeight);
                                             }
                                         }
                                         if (isDownload) {
-                                            pdf_1.save(pdfName + ".pdf");
+                                            pdf_2.save(pdfName + ".pdf");
                                         }
                                         resolve({
-                                            pdfs: [pdf_1],
-                                            pdfBase64: [pdf_1.output('dataurlstring')],
+                                            pdfs: [pdf_2],
+                                            pdfBase64: [pdf_2.output('dataurlstring')],
                                         });
                                     },
                                 });
@@ -402,4 +469,4 @@ function setPdfWater(pdf, waterBase64, imgWidth, imgHeight) {
     }
 }
 
-export { addWaterHandle, htmlToPdf, htmlToPdfNoCanvas, printCurrentDom, removeWaterHandle };
+export { addWaterHandle, htmlToPdf, htmlToPdfNoCanvas, htmlToPdfUseCanvas, printCurrentDom, removeWaterHandle };