From 5dc543db99cb2bd4cb071b674541932338006b56 Mon Sep 17 00:00:00 2001 From: gaoxingzaq <63081664+gaoxingzaq@users.noreply.github.com> Date: Wed, 11 Jan 2023 13:26:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E9=94=99=E8=AF=AF=20,=E4=BF=AE=E5=A4=8D=E8=B7=A8?= =?UTF-8?q?=E5=9F=9F=E8=84=9A=E6=9C=AC=E7=BC=BA=E5=B0=91BASE64=20(#423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复office下载方法中 错误 * 更新OFD解析效果,修复禁止trace请求无效问题,其他压缩包修复 * 修复压缩包 缓存BUG * 限制某些特殊文件上传 * 修复OFFICE文件密码检查关闭流 上传文件关闭流 检查PDF文件是否存在 * 特殊符号的支持 Co-authored-by: gaoxiongzaq --- .../cn/keking/service/FileHandlerService.java | 8 +- .../service/impl/CompressFilePreviewImpl.java | 6 + .../service/impl/OfficeFilePreviewImpl.java | 7 +- .../service/impl/PdfFilePreviewImpl.java | 2 + .../java/cn/keking/utils/DownloadUtils.java | 6 + .../java/cn/keking/utils/KkFileUtils.java | 2 +- .../java/cn/keking/utils/OfficeUtils.java | 27 +- .../main/java/cn/keking/utils/WebUtils.java | 5 + .../keking/web/controller/FileController.java | 13 +- .../web/filter/SecurityFilterProxy.java | 2 +- .../resources/static/ofd/js/cnofd.umd.min.js | 1577 +++++++++-------- server/src/main/resources/web/eml.ftl | 1 + server/src/main/resources/web/epub.ftl | 1 + server/src/main/resources/web/index.ftl | 7 + server/src/main/resources/web/online3D.ftl | 7 +- server/src/main/resources/web/xmind.ftl | 1 + 16 files changed, 919 insertions(+), 753 deletions(-) diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index a629b361..936fbe6d 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -191,6 +191,9 @@ public class FileHandlerService { } try { File pdfFile = new File(pdfFilePath); + if (!pdfFile.exists()) { + return null; + } PDDocument doc = PDDocument.load(pdfFile); int pageCount = doc.getNumberOfPages(); PDFRenderer pdfRenderer = new PDFRenderer(doc); @@ -273,11 +276,6 @@ public class FileHandlerService { if (url.contains("?fileKey=")) { attribute.setSkipDownLoad(true); } - String urlStrr = url.toLowerCase(); //转换为小写对比 - boolean wjl = WebUtils.kuayu("&fullfilename=", urlStrr); //判断是否启用文件流 - if(wjl){ - url = url.substring(0,url.lastIndexOf("&")); //删除添加的文件流内容 - } url = WebUtils.encodeUrlFileName(url); fileName = KkFileUtils.htmlEscape(fileName); //文件名处理 attribute.setType(type); diff --git a/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java index d9d78e9a..15dbc4ba 100644 --- a/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java @@ -40,6 +40,12 @@ public class CompressFilePreviewImpl implements FilePreview { } String filePath = response.getContent(); fileTree = compressFileReader.unRar(filePath, fileName); + if (fileTree != null && !"null".equals(fileTree)) { + if (ConfigConstants.isCacheEnabled()) { + // 加入缓存 + fileHandlerService.addConvertedFile(fileName, fileTree); + } + } } else { fileTree = fileHandlerService.getConvertedFile(fileName); } diff --git a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java index 158206a1..b90be1cd 100644 --- a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.ui.Model; import org.springframework.util.StringUtils; +import java.net.URLEncoder; import java.util.List; /** @@ -50,7 +51,7 @@ public class OfficeFilePreviewImpl implements FilePreview { String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf"); String cacheFileName = userToken == null ? pdfName : userToken + "_" + pdfName; String outFilePath = FILE_DIR + cacheFileName; - + if ( !fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) { // 下载远程文件到本地，如果文件在本地已存在不会重复下载 ReturnResponse response = DownloadUtils.downLoad(fileAttribute, fileName); if (response.isFailure()) { @@ -115,11 +116,11 @@ public class OfficeFilePreviewImpl implements FilePreview { } } } - + } if (!isHtml && baseUrl != null && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType))) { return getPreviewType(model, fileAttribute, officePreviewType, baseUrl, cacheFileName, outFilePath, fileHandlerService, OFFICE_PREVIEW_TYPE_IMAGE, otherFilePreview); } - + cacheFileName = URLEncoder.encode(cacheFileName).replaceAll("\\+", "%20"); model.addAttribute("pdfUrl", cacheFileName); return isHtml ? EXEL_FILE_PREVIEW_PAGE : PDF_FILE_PREVIEW_PAGE; } diff --git a/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java index e803b785..25f01dbd 100644 --- a/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java @@ -10,6 +10,7 @@ import cn.keking.web.filter.BaseUrlFilter; import org.springframework.stereotype.Service; import org.springframework.ui.Model; +import java.net.URLEncoder; import java.util.List; /** @@ -73,6 +74,7 @@ public class PdfFilePreviewImpl implements FilePreview { fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath)); } } else { + pdfName = URLEncoder.encode(pdfName).replaceAll("\\+", "%20"); model.addAttribute("pdfUrl", pdfName); } } else { diff --git a/server/src/main/java/cn/keking/utils/DownloadUtils.java b/server/src/main/java/cn/keking/utils/DownloadUtils.java index 2629b238..508e08aa 100644 --- a/server/src/main/java/cn/keking/utils/DownloadUtils.java +++ b/server/src/main/java/cn/keking/utils/DownloadUtils.java @@ -50,6 +50,11 @@ public class DownloadUtils { response.setMsg("下载失败:文件名不合法!" + urlStr); return response; } + if(realPath.equals("cunzhai")){ + response.setContent(fileDir + fileName); + response.setMsg(fileName); + return response; + } try { URL url = WebUtils.normalizedURL(urlStr); if (!fileAttribute.getSkipDownLoad()) { @@ -110,6 +115,7 @@ public class DownloadUtils { File realFile = new File(realPath); if (realFile.exists()) { fileAttribute.setSkipDownLoad(true); + return "cunzhai"; } return realPath; } diff --git a/server/src/main/java/cn/keking/utils/KkFileUtils.java b/server/src/main/java/cn/keking/utils/KkFileUtils.java index 9a4daa44..aa7a8bfe 100644 --- a/server/src/main/java/cn/keking/utils/KkFileUtils.java +++ b/server/src/main/java/cn/keking/utils/KkFileUtils.java @@ -102,7 +102,7 @@ public class KkFileUtils { public static String htmlEscape(String input) { if(StringUtils.hasText(input)){ //input = input.replaceAll("\\{", "%7B").replaceAll("}", "%7D").replaceAll("\\\\", "%5C"); - return HtmlUtils.htmlEscape(input); + return HtmlUtils.htmlEscape(input, "UTF-8"); } return input; } diff --git a/server/src/main/java/cn/keking/utils/OfficeUtils.java b/server/src/main/java/cn/keking/utils/OfficeUtils.java index fd05fe03..4bc7effd 100644 --- a/server/src/main/java/cn/keking/utils/OfficeUtils.java +++ b/server/src/main/java/cn/keking/utils/OfficeUtils.java @@ -7,6 +7,7 @@ import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.springframework.lang.Nullable; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Paths; @@ -27,8 +28,10 @@ public class OfficeUtils { * @return 是否受密码保护 */ public static boolean isPwdProtected(String path) { + InputStream propStream = null; try { - ExtractorFactory.createExtractor(Files.newInputStream(Paths.get(path))); + propStream = Files.newInputStream(Paths.get(path)); + ExtractorFactory.createExtractor(propStream); } catch (IOException | EncryptedDocumentException e) { if (e.getMessage().toLowerCase().contains(POI_INVALID_PASSWORD_MSG)) { return true; @@ -42,10 +45,17 @@ public class OfficeUtils { } } } + }finally { + if(propStream!=null) {//如果文件输入流不是null + try { + propStream.close();//关闭文件输入流 + } catch (IOException e) { + e.printStackTrace(); + } + } } return false; } - /** * 判断office文件是否可打开（兼容） * @@ -54,15 +64,24 @@ public class OfficeUtils { * @return 是否可打开（兼容） */ public static synchronized boolean isCompatible(String path, @Nullable String password) { + InputStream propStream = null; try { + propStream = Files.newInputStream(Paths.get(path)); Biff8EncryptionKey.setCurrentUserPassword(password); - ExtractorFactory.createExtractor(Files.newInputStream(Paths.get(path))); + ExtractorFactory.createExtractor(propStream); } catch (Exception e) { return false; } finally { Biff8EncryptionKey.setCurrentUserPassword(null); + if(propStream!=null) {//如果文件输入流不是null + try { + propStream.close();//关闭文件输入流 + } catch (IOException e) { + e.printStackTrace(); + } + } } return true; } -} +} \ No newline at end of file diff --git a/server/src/main/java/cn/keking/utils/WebUtils.java b/server/src/main/java/cn/keking/utils/WebUtils.java index 77947b60..bc86b11c 100644 --- a/server/src/main/java/cn/keking/utils/WebUtils.java +++ b/server/src/main/java/cn/keking/utils/WebUtils.java @@ -131,6 +131,11 @@ public class WebUtils { } catch (UnsupportedEncodingException e) { return null; } + String urlStrr = url.toLowerCase(); //转换为小写对比 + boolean wjl =kuayu("&fullfilename=", urlStrr); //判断是否启用文件流 + if(wjl){ + url = url.substring(0,url.lastIndexOf("&")); //删除添加的文件流内容 + } String noQueryUrl = url.substring(0, url.indexOf("?")); String parameterStr = url.substring(url.indexOf("?")); parameterStr = parameterStr.replaceFirst(fullFileName, encodedFileName); diff --git a/server/src/main/java/cn/keking/web/controller/FileController.java b/server/src/main/java/cn/keking/web/controller/FileController.java index 3bcdd32b..861e4008 100644 --- a/server/src/main/java/cn/keking/web/controller/FileController.java +++ b/server/src/main/java/cn/keking/web/controller/FileController.java @@ -31,7 +31,7 @@ import java.util.Objects; /** * @author yudian-it - * @date 2017/12/1 + * 2017/12/1 */ @RestController public class FileController { @@ -64,6 +64,15 @@ public class FileController { if (pos != -1) { fileName = fileName.substring(pos + 1); } + String fileType= ""; + int i = fileName.lastIndexOf('.'); + if (i > 0) { + fileType= fileName.substring(i+1); + fileType= fileType.toLowerCase(); + } + if (fileType.length() == 0 || fileType.equals("dll") || fileType.equals("exe") || fileType.equals("msi") ){ + return ReturnResponse.failure(fileName+"不允许上传的文件"); + } // 判断是否存在同名文件 if (existsFile(fileName)) { return ReturnResponse.failure("存在同名文件，请先删除原有文件再次上传"); @@ -75,6 +84,8 @@ public class FileController { logger.info("上传文件：{}", fileDir + demoPath + fileName); try (InputStream in = file.getInputStream(); OutputStream out = Files.newOutputStream(Paths.get(fileDir + demoPath + fileName))) { StreamUtils.copy(in, out); + in.close(); + out.close(); return ReturnResponse.success(null); } catch (IOException e) { logger.error("文件上传失败", e); diff --git a/server/src/main/java/cn/keking/web/filter/SecurityFilterProxy.java b/server/src/main/java/cn/keking/web/filter/SecurityFilterProxy.java index 1a837533..a132c2b2 100644 --- a/server/src/main/java/cn/keking/web/filter/SecurityFilterProxy.java +++ b/server/src/main/java/cn/keking/web/filter/SecurityFilterProxy.java @@ -19,7 +19,7 @@ public class SecurityFilterProxy extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - if((","+NOT_ALLOW_METHODS+",").indexOf(","+request.getMethod().toLowerCase()+",") > -1) { + if((","+NOT_ALLOW_METHODS+",").indexOf(","+request.getMethod().toUpperCase()+",") > -1) { response.setStatus(HttpServletResponse.SC_METHOD_NOT_ALLOWED); response.setHeader("Content-Type", "text/html; charset=iso-8859-1"); response.getWriter().println("Method Not Allowed"); diff --git a/server/src/main/resources/static/ofd/js/cnofd.umd.min.js b/server/src/main/resources/static/ofd/js/cnofd.umd.min.js index 97aecff1..973505b2 100644 --- a/server/src/main/resources/static/ofd/js/cnofd.umd.min.js +++ b/server/src/main/resources/static/ofd/js/cnofd.umd.min.js @@ -450,7 +450,7 @@ r += n + e } )), - o && !e.toJSON || !t.sort || "http://a/c%20d?a=1&c=3" !== e.href || "3" !== t.get("c") || "a=1" !== String(new URLSearchParams("?a=1")) || !t[a] || "a" !== new URL("https://a@b").username || "b" !== new URLSearchParams(new URLSearchParams("a=b")).get("a") || "xn--e1aybc" !== new URL("http://褌械褋褌").host || "#%D0%B1" !== new URL("http://a#斜").hash || "a1c3" !== r || "x" !== new URL("http://x",void 0).host + o && !e.toJSON || !t.sort || "http://a/c%20d?a=1&c=3" !== e.href || "3" !== t.get("c") || "a=1" !== String(new URLSearchParams("?a=1")) || !t[a] || "a" !== new URL("https://a@b").username || "b" !== new URLSearchParams(new URLSearchParams("a=b")).get("a") || "xn--e1aybc" !== new URL("http://тест").host || "#%D0%B1" !== new URL("http://a#б").hash || "a1c3" !== r || "x" !== new URL("http://x",void 0).host } )) }, @@ -841,11 +841,11 @@ } , b = m.prototype; e.exports = function(e, t, r) { - var n, g, y, v, S, w, C, _ = r && r.that, A = !(!r || !r.AS_ENTRIES), I = !(!r || !r.IS_ITERATOR), E = !(!r || !r.INTERRUPTED), T = i(t, _), x = function(e) { + var n, g, y, v, S, w, C, A = r && r.that, _ = !(!r || !r.AS_ENTRIES), I = !(!r || !r.IS_ITERATOR), E = !(!r || !r.INTERRUPTED), T = i(t, A), x = function(e) { return n && h(n, "normal", e), new m(!0,e) }, P = function(e) { - return A ? (a(e), + return _ ? (a(e), E ? T(e[0], e[1], x) : T(e[0], e[1])) : E ? T(e, x) : T(e) }; if (I) @@ -1133,7 +1133,7 @@ }) }, "2cf4": function(e, t, r) { - var n, i, o, a, s = r("da84"), c = r("2ba4"), u = r("0366"), d = r("1626"), l = r("1a2d"), f = r("d039"), h = r("1be4"), p = r("f36a"), m = r("cc12"), b = r("d6d6"), g = r("1cdc"), y = r("605d"), v = s.setImmediate, S = s.clearImmediate, w = s.process, C = s.Dispatch, _ = s.Function, A = s.MessageChannel, I = s.String, E = 0, T = {}, x = "onreadystatechange"; + var n, i, o, a, s = r("da84"), c = r("2ba4"), u = r("0366"), d = r("1626"), l = r("1a2d"), f = r("d039"), h = r("1be4"), p = r("f36a"), m = r("cc12"), b = r("d6d6"), g = r("1cdc"), y = r("605d"), v = s.setImmediate, S = s.clearImmediate, w = s.process, C = s.Dispatch, A = s.Function, _ = s.MessageChannel, I = s.String, E = 0, T = {}, x = "onreadystatechange"; try { n = s.location } catch (R) {} @@ -1157,7 +1157,7 @@ }; v && S || (v = function(e) { b(arguments.length, 1); - var t = d(e) ? e : _(e) + var t = d(e) ? e : A(e) , r = p(arguments, 1); return T[++E] = function() { c(t, void 0, r) @@ -1177,7 +1177,7 @@ : C && C.now ? i = function(e) { C.now(k(e)) } - : A && !g ? (o = new A, + : _ && !g ? (o = new _, a = o.port2, o.port1.onmessage = D, i = u(a.postMessage, a)) : s.addEventListener && d(s.postMessage) && !s.importScripts && n && "file:" !== n.protocol && !f(O) ? (i = O, @@ -1496,7 +1496,7 @@ t.delegate = null, f) } - function _(e) { + function A(e) { var t = { tryLoc: e[0] }; @@ -1505,7 +1505,7 @@ t.afterLoc = e[3]), this.tryEntries.push(t) } - function A(e) { + function _(e) { var t = e.completion || {}; t.type = "normal", delete t.arg, @@ -1515,7 +1515,7 @@ this.tryEntries = [{ tryLoc: "root" }], - e.forEach(_, this), + e.forEach(A, this), this.reset(!0) } function E(e) { @@ -1626,7 +1626,7 @@ this.delegate = null, this.method = "next", this.arg = void 0, - this.tryEntries.forEach(A), + this.tryEntries.forEach(_), !e) for (var t in this) "t" === t.charAt(0) && r.call(this, t) && !isNaN(+t.slice(1)) && (this[t] = void 0) @@ -1704,7 +1704,7 @@ var r = this.tryEntries[t]; if (r.finallyLoc === e) return this.complete(r.completion, r.afterLoc), - A(r), + _(r), f } }, @@ -1715,7 +1715,7 @@ var n = r.completion; if ("throw" === n.type) { var i = n.arg; - A(r) + _(r) } return i } @@ -1962,7 +1962,7 @@ 4002: function(e, t, r) { "use strict"; r("3ca3"); - var n, i = r("23e7"), o = r("83ab"), a = r("0d3b"), s = r("da84"), c = r("0366"), u = r("e330"), d = r("cb2d"), l = r("edd0"), f = r("19aa"), h = r("1a2d"), p = r("60da"), m = r("4df4"), b = r("4dae"), g = r("6547").codeAt, y = r("5fb2"), v = r("577e"), S = r("d44e"), w = r("d6d6"), C = r("5352"), _ = r("69f3"), A = _.set, I = _.getterFor("URL"), E = C.URLSearchParams, T = C.getState, x = s.URL, P = s.TypeError, k = s.parseInt, D = Math.floor, O = Math.pow, R = u("".charAt), M = u(/./.exec), N = u([].join), B = u(1..toString), F = u([].pop), j = u([].push), K = u("".replace), L = u([].shift), U = u("".split), X = u("".slice), z = u("".toLowerCase), G = u([].unshift), W = "Invalid authority", q = "Invalid scheme", H = "Invalid host", V = "Invalid port", Y = /[a-z]/i, Q = /[\d+-.a-z]/i, Z = /\d/, J = /^0x/i, $ = /^[0-7]+$/, ee = /^\d+$/, te = /^[\da-f]+$/i, re = /[\0\t\n\r #%/:<>?@[\\\]^|]/, ne = /[\0\t\n\r #/:<>?@[\\\]^|]/, ie = /^[\u0000-\u0020]+|[\u0000-\u0020]+$/g, oe = /[\t\n\r]/g, ae = function(e) { + var n, i = r("23e7"), o = r("83ab"), a = r("0d3b"), s = r("da84"), c = r("0366"), u = r("e330"), d = r("cb2d"), l = r("edd0"), f = r("19aa"), h = r("1a2d"), p = r("60da"), m = r("4df4"), b = r("4dae"), g = r("6547").codeAt, y = r("5fb2"), v = r("577e"), S = r("d44e"), w = r("d6d6"), C = r("5352"), A = r("69f3"), _ = A.set, I = A.getterFor("URL"), E = C.URLSearchParams, T = C.getState, x = s.URL, P = s.TypeError, k = s.parseInt, D = Math.floor, O = Math.pow, R = u("".charAt), M = u(/./.exec), N = u([].join), B = u(1..toString), F = u([].pop), j = u([].push), K = u("".replace), L = u([].shift), U = u("".split), X = u("".slice), z = u("".toLowerCase), G = u([].unshift), W = "Invalid authority", q = "Invalid scheme", H = "Invalid host", V = "Invalid port", Y = /[a-z]/i, Q = /[\d+-.a-z]/i, Z = /\d/, J = /^0x/i, $ = /^[0-7]+$/, ee = /^\d+$/, te = /^[\da-f]+$/i, re = /[\0\t\n\r #%/:<>?@[\\\]^|]/, ne = /[\0\t\n\r #/:<>?@[\\\]^|]/, ie = /^[\u0000-\u0020]+|[\u0000-\u0020]+$/g, oe = /[\t\n\r]/g, ae = function(e) { var t, r, n, i, o, a, s, c = U(e, "."); if (c.length && "" == c[c.length - 1] && c.length--, t = c.length, @@ -2151,7 +2151,7 @@ }, ve = function(e) { return e = z(e), ".." === e || "%2e." === e || ".%2e" === e || "%2e%2e" === e - }, Se = {}, we = {}, Ce = {}, _e = {}, Ae = {}, Ie = {}, Ee = {}, Te = {}, xe = {}, Pe = {}, ke = {}, De = {}, Oe = {}, Re = {}, Me = {}, Ne = {}, Be = {}, Fe = {}, je = {}, Ke = {}, Le = {}, Ue = function(e, t, r) { + }, Se = {}, we = {}, Ce = {}, Ae = {}, _e = {}, Ie = {}, Ee = {}, Te = {}, xe = {}, Pe = {}, ke = {}, De = {}, Oe = {}, Re = {}, Me = {}, Ne = {}, Be = {}, Fe = {}, je = {}, Ke = {}, Le = {}, Ue = function(e, t, r) { var n, i, o, a = v(e); if (t) { if (i = this.parse(a), @@ -2216,7 +2216,7 @@ t) return void (c.isSpecial() && me[c.scheme] == c.port && (c.port = null)); l = "", - "file" == c.scheme ? u = Re : c.isSpecial() && r && r.scheme == c.scheme ? u = _e : c.isSpecial() ? u = Te : "/" == i[d + 1] ? (u = Ae, + "file" == c.scheme ? u = Re : c.isSpecial() && r && r.scheme == c.scheme ? u = Ae : c.isSpecial() ? u = Te : "/" == i[d + 1] ? (u = _e, d++) : (c.cannotBeABaseURL = !0, j(c.path, ""), u = je) @@ -2236,7 +2236,7 @@ } u = "file" == r.scheme ? Re : Ie; continue; - case _e: + case Ae: if ("/" != o || "/" != i[d + 1]) { u = Ie; continue @@ -2244,7 +2244,7 @@ u = xe, d++; break; - case Ae: + case _e: if ("/" == o) { u = Pe; break @@ -2676,7 +2676,7 @@ var Xe = function(e) { var t = f(this, ze) , r = w(arguments.length, 1) > 1 ? arguments[1] : void 0 - , n = A(t, new Ue(e,!1,r)); + , n = _(t, new Ue(e,!1,r)); o || (t.href = n.serialize(), t.origin = n.getOrigin(), t.protocol = n.getProtocol(), @@ -3049,19 +3049,19 @@ , m = n > 1 ? arguments[1] : void 0 , b = void 0 !== m; b && (m = i(m, n > 2 ? arguments[2] : void 0)); - var g, y, v, S, w, C, _ = h(t), A = 0; - if (!_ || this == p && c(_)) + var g, y, v, S, w, C, A = h(t), _ = 0; + if (!A || this == p && c(A)) for (g = d(t), - y = r ? new this(g) : p(g); g > A; A++) - C = b ? m(t[A], A) : t[A], - l(y, A, C); + y = r ? new this(g) : p(g); g > _; _++) + C = b ? m(t[_], _) : t[_], + l(y, _, C); else - for (S = f(t, _), + for (S = f(t, A), w = S.next, - y = r ? new this : []; !(v = o(w, S)).done; A++) - C = b ? s(S, m, [v.value, A], !0) : v.value, - l(y, A, C); - return y.length = A, + y = r ? new this : []; !(v = o(w, S)).done; _++) + C = b ? s(S, m, [v.value, _], !0) : v.value, + l(y, _, C); + return y.length = _, y } }, @@ -3173,8 +3173,8 @@ , S = r("861d") , w = r("577e") , C = r("7c73") - , _ = r("5c6c") - , A = r("9a1f") + , A = r("5c6c") + , _ = r("9a1f") , I = r("35a1") , E = r("d6d6") , T = r("b622") @@ -3250,7 +3250,7 @@ , ue = f((function(e, t) { O(this, { type: D, - iterator: A(R(e).entries), + iterator: _(R(e).entries), kind: t }) } @@ -3277,10 +3277,10 @@ parseObject: function(e) { var t, r, n, i, a, s, c, u = I(e); if (u) { - t = A(e, u), + t = _(e, u), r = t.next; while (!(n = o(r, t)).done) { - if (i = A(v(n.value)), + if (i = _(v(n.value)), a = i.next, (s = o(a, i)).done || (c = o(a, i)).done || !o(a, i).done) throw z("Expected sequence with length 2"); @@ -3437,8 +3437,8 @@ return t = e.headers ? new K(e.headers) : new K, he(t, "content-type") || pe(t, "content-type", "application/x-www-form-urlencoded;charset=UTF-8"), C(e, { - body: _(0, w(r)), - headers: _(0, t) + body: A(0, w(r)), + headers: A(0, t) }) } return e @@ -3519,7 +3519,7 @@ )("versions", []).push({ version: "3.22.5", mode: n ? "pure" : "global", - copyright: "漏 2014-2022 Denis Pushkarev (zloirock.ru)", + copyright: "© 2014-2022 Denis Pushkarev (zloirock.ru)", license: "https://github.com/zloirock/core-js/blob/v3.22.5/LICENSE", source: "https://github.com/zloirock/core-js" }) @@ -3675,7 +3675,7 @@ }, "5e7e": function(e, t, r) { "use strict"; - var n, i, o, a, s = r("23e7"), c = r("c430"), u = r("605d"), d = r("da84"), l = r("c65b"), f = r("cb2d"), h = r("d2bb"), p = r("d44e"), m = r("2626"), b = r("59ed"), g = r("1626"), y = r("861d"), v = r("19aa"), S = r("4840"), w = r("2cf4").set, C = r("b575"), _ = r("44de"), A = r("e667"), I = r("01b4"), E = r("69f3"), T = r("d256"), x = r("4738"), P = r("f069"), k = "Promise", D = x.CONSTRUCTOR, O = x.REJECTION_EVENT, R = x.SUBCLASSING, M = E.getterFor(k), N = E.set, B = T && T.prototype, F = T, j = B, K = d.TypeError, L = d.document, U = d.process, X = P.f, z = X, G = !!(L && L.createEvent && d.dispatchEvent), W = "unhandledrejection", q = "rejectionhandled", H = 0, V = 1, Y = 2, Q = 1, Z = 2, J = function(e) { + var n, i, o, a, s = r("23e7"), c = r("c430"), u = r("605d"), d = r("da84"), l = r("c65b"), f = r("cb2d"), h = r("d2bb"), p = r("d44e"), m = r("2626"), b = r("59ed"), g = r("1626"), y = r("861d"), v = r("19aa"), S = r("4840"), w = r("2cf4").set, C = r("b575"), A = r("44de"), _ = r("e667"), I = r("01b4"), E = r("69f3"), T = r("d256"), x = r("4738"), P = r("f069"), k = "Promise", D = x.CONSTRUCTOR, O = x.REJECTION_EVENT, R = x.SUBCLASSING, M = E.getterFor(k), N = E.set, B = T && T.prototype, F = T, j = B, K = d.TypeError, L = d.document, U = d.process, X = P.f, z = X, G = !!(L && L.createEvent && d.dispatchEvent), W = "unhandledrejection", q = "rejectionhandled", H = 0, V = 1, Y = 2, Q = 1, Z = 2, J = function(e) { var t; return !(!y(e) || !g(t = e.then)) && t }, $ = function(e, t) { @@ -3712,11 +3712,11 @@ promise: t, reason: r }, - !O && (i = d["on" + e]) ? i(n) : e === W && _("Unhandled promise rejection", r) + !O && (i = d["on" + e]) ? i(n) : e === W && A("Unhandled promise rejection", r) }, re = function(e) { l(w, d, (function() { var t, r = e.facade, n = e.value, i = ne(e); - if (i && (t = A((function() { + if (i && (t = _((function() { u ? U.emit("unhandledRejection", n, r) : te(W, r, n) } )), @@ -3891,8 +3891,8 @@ , S = Math.floor , w = String.fromCharCode , C = i("".charCodeAt) - , _ = i([].join) - , A = i([].push) + , A = i([].join) + , _ = i([].push) , I = i("".replace) , E = i("".split) , T = i("".toLowerCase) @@ -3904,10 +3904,10 @@ var i = C(e, r++); if (i >= 55296 && i <= 56319 && r < n) { var o = C(e, r++); - 56320 == (64512 & o) ? A(t, ((1023 & i) << 10) + (1023 & o) + 65536) : (A(t, i), + 56320 == (64512 & o) ? _(t, ((1023 & i) << 10) + (1023 & o) + 65536) : (_(t, i), r--) } else - A(t, i) + _(t, i) } return t } @@ -3929,10 +3929,10 @@ var r, n, i = e.length, u = f, d = 0, p = l; for (r = 0; r < e.length; r++) n = e[r], - n < 128 && A(t, w(n)); + n < 128 && _(t, w(n)); var m = t.length , g = m; - m && A(t, h); + m && _(t, h); while (g < i) { var v = o; for (r = 0; r < e.length; r++) @@ -3956,11 +3956,11 @@ break; var D = I - T , O = a - T; - A(t, w(P(T + D % O))), + _(t, w(P(T + D % O))), I = S(D / O), E += a } - A(t, w(P(I))), + _(t, w(P(I))), p = k(d, C, g == m), d = 0, g++ @@ -3969,14 +3969,14 @@ d++, u++ } - return _(t, "") + return A(t, "") }; e.exports = function(e) { var t, r, n = [], i = E(I(T(e), m, "."), "."); for (t = 0; t < i.length; t++) r = i[t], - A(n, v(p, r) ? "xn--" + D(r) : r); - return _(n, ".") + _(n, v(p, r) ? "xn--" + D(r) : r); + return A(n, ".") } }, "605d": function(e, t, r) { @@ -4055,7 +4055,7 @@ var n, i = "string" == typeof t; if (void 0 === e) { var o = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" - , a = "= \f\n\r\t聽\u2028\u2029"; + , a = "= \f\n\r\t \u2028\u2029"; for (e = [], n = 0; n < 64; ++n) e[o.charCodeAt(n)] = n; @@ -4321,11 +4321,11 @@ } )), r.d(t, "b", (function() { - return _ + return A } )), r.d(t, "c", (function() { - return A + return _ } )); var n = r("3662") @@ -4634,7 +4634,7 @@ t.delegate = null, l) } - function _(e) { + function A(e) { var t = { tryLoc: e[0] }; @@ -4643,7 +4643,7 @@ t.afterLoc = e[3]), this.tryEntries.push(t) } - function A(e) { + function _(e) { var t = e.completion || {}; t.type = "normal", delete t.arg, @@ -4653,7 +4653,7 @@ this.tryEntries = [{ tryLoc: "root" }], - e.forEach(_, this), + e.forEach(A, this), this.reset(!0) } function E(e) { @@ -4764,7 +4764,7 @@ this.delegate = null, this.method = "next", this.arg = void 0, - this.tryEntries.forEach(A), + this.tryEntries.forEach(_), !e) for (var t in this) "t" === t.charAt(0) && r.call(this, t) && !isNaN(+t.slice(1)) && (this[t] = void 0) @@ -4842,7 +4842,7 @@ var r = this.tryEntries[t]; if (r.finallyLoc === e) return this.complete(r.completion, r.afterLoc), - A(r), + _(r), l } }, @@ -4853,7 +4853,7 @@ var n = r.completion; if ("throw" === n.type) { var i = n.arg; - A(r) + _(r) } return i } @@ -4911,7 +4911,7 @@ } )) } - , _ = function() { + , A = function() { var e = S(y().mark((function e(t) { var r, n, i; return y().wrap((function(e) { @@ -4938,7 +4938,7 @@ return e.apply(this, arguments) } }() - , A = function() { + , _ = function() { var e = S(y().mark((function e(t) { var r, n, i, o, a, s, c, u; return y().wrap((function(e) { @@ -5018,7 +5018,7 @@ }() , I = function() { var e = S(y().mark((function e(t, r) { - var n, i, o, s, c, u, d, f, h, p, m, b, g, v, S, w, C, _; + var n, i, o, s, c, u, d, f, h, p, m, b, g, v, w, C, A, _, I, E, T, x, P; return y().wrap((function(e) { while (1) switch (e.prev = e.next) { @@ -5037,12 +5037,12 @@ u.s(); case 11: if ((d = u.n()).done) { - e.next = 25; + e.next = 48; break } if (f = d.value, !(f.sealObj && Object.keys(f.sealObj).length > 0)) { - e.next = 23; + e.next = 46; break } if ("ofd" !== f.sealObj.type) { @@ -5065,63 +5065,127 @@ obj: b, stamp: f }) - } catch (y) { - p.e(y) + } catch (k) { + p.e(k) } finally { p.f() } - e.next = 23; + e.next = 46; break; case 22: - if ("png" === f.sealObj.type || "gif" === f.sealObj.type || "jpg" === f.sealObj.type || "jpeg" === f.sealObj.type || 0 == f.sealObj.type.indexOf("png")) { - g = "data:image/png;base64," + btoa(String.fromCharCode.apply(null, f.sealObj.ofdArray)), - v = [], - v = v.concat(f.stampAnnot), - S = l(v); - try { - for (S.s(); !(w = S.n()).done; ) - C = w.value, - C && (_ = { - img: g, - pageId: C["@_PageRef"], - boundary: Object(a["k"])(C["@_Boundary"]), - clip: Object(a["k"])(C["@_Clip"]) - }, - c[C["@_PageRef"]] || (c[C["@_PageRef"]] = []), - c[C["@_PageRef"]].push({ - type: "png", - obj: _, - stamp: f - })) - } catch (y) { - S.e(y) - } finally { - S.f() + if ("png" !== f.sealObj.type && "gif" !== f.sealObj.type && "jpg" !== f.sealObj.type && "jpeg" !== f.sealObj.type && 0 != f.sealObj.type.indexOf("png") && "bmp" !== f.sealObj.type) { + e.next = 45; + break + } + if (g = void 0, + "bmp" !== f.sealObj.type) { + e.next = 38; + break + } + return v = function() { + var e = S(y().mark((function e(t) { + var r, n; + return y().wrap((function(e) { + while (1) + switch (e.prev = e.next) { + case 0: + return r = Object.assign(new Image, { + src: t + }), + e.next = 3, + new Promise((function(e) { + return r.addEventListener("load", (function() { + return e() + } + )) + } + )); + case 3: + return n = Object.assign(document.createElement("canvas"), { + width: r.width, + height: r.height + }).getContext("2d"), + n.imageSmoothingEnabled = !1, + n.drawImage(r, 0, 0), + e.abrupt("return", n.getImageData(0, 0, r.width, r.height)); + case 7: + case "end": + return e.stop() + } + } + ), e) } - } else - console.log(f.sealObj.type); - case 23: + ))); + return function(t) { + return e.apply(this, arguments) + } + }(), + e.next = 28, + v("data:image/bmp;base64," + Object(a["o"])(f.sealObj.ofdArray)); + case 28: + for (w = e.sent, + C = document.createElement("canvas"), + C.width = w.width, + C.height = w.height, + A = C.getContext("2d"), + _ = 0; _ < w.data.length / 4; _++) + w.data[4 * _] > 250 && w.data[4 * _ + 1] > 250 && w.data[4 * _ + 2] > 250 && (w.data[4 * _ + 3] = 0); + A.putImageData(w, 0, 0), + g = C.toDataURL("image/png", 1), + e.next = 39; + break; + case 38: + g = "data:image/png;base64," + Object(a["o"])(f.sealObj.ofdArray); + case 39: + I = [], + I = I.concat(f.stampAnnot), + E = l(I); + try { + for (E.s(); !(T = E.n()).done; ) + x = T.value, + x && (P = { + img: g, + pageId: x["@_PageRef"], + boundary: Object(a["k"])(x["@_Boundary"]), + clip: Object(a["k"])(x["@_Clip"]) + }, + c[x["@_PageRef"]] || (c[x["@_PageRef"]] = []), + c[x["@_PageRef"]].push({ + type: "png", + obj: P, + stamp: f + })) + } catch (k) { + E.e(k) + } finally { + E.f() + } + e.next = 46; + break; + case 45: + console.log(f.sealObj.type); + case 46: e.next = 11; break; - case 25: - e.next = 30; + case 48: + e.next = 53; break; - case 27: - e.prev = 27, + case 50: + e.prev = 50, e.t0 = e["catch"](9), u.e(e.t0); - case 30: - return e.prev = 30, + case 53: + return e.prev = 53, u.f(), - e.finish(30); - case 33: + e.finish(53); + case 56: return e.abrupt("return", [t, i, n, c]); - case 34: + case 57: case "end": return e.stop() } } - ), e, null, [[9, 27, 30, 33]]) + ), e, null, [[9, 50, 53, 56]]) } ))); return function(t, r) { @@ -5347,7 +5411,7 @@ }() , P = function() { var e = S(y().mark((function e(t) { - var r, n, i, o, a, s, c, u, d, h, p, m, b, g, v, S, w, C, _, A, I, E, T; + var r, n, i, o, a, s, c, u, d, h, p, m, b, g, v, S, w, C, A, _, I, E, T; return y().wrap((function(e) { while (1) switch (e.prev = e.next) { @@ -5397,24 +5461,24 @@ return e.next = 12, U(n, C); case 12: - return _ = e.sent, - A = _["json"]["ofd:Res"], + return A = e.sent, + _ = A["json"]["ofd:Res"], e.next = 16, - O(A, n, i); + O(_, n, i); case 16: return I = e.sent, c = Object.assign(c, I), e.next = 20, - R(A); + R(_); case 20: return E = e.sent, u = Object.assign(u, E), e.next = 24, - M(n, A, i); + M(n, _, i); case 24: T = e.sent, d = Object.assign(d, T), - h = h.concat(N(A)); + h = h.concat(N(_)); case 27: S++, e.next = 6; @@ -5502,7 +5566,7 @@ }() , D = function() { var e = S(y().mark((function e(t) { - var r, n, i, o, a, s, c, u, d, h, p, m, b, g, v, S, w, C, _, A, I; + var r, n, i, o, a, s, c, u, d, h, p, m, b, g, v, S, w, C, A, _, I; return y().wrap((function(e) { while (1) switch (e.prev = e.next) { @@ -5539,11 +5603,11 @@ B(n, w, i); case 13: C = e.sent, - C && (_ = Object.keys(C)[0], - A = a[_], - A && (C[_].stamp = A), - I = s[_], - I && (C[_].annotation = I), + C && (A = Object.keys(C)[0], + _ = a[A], + _ && (C[A].stamp = _), + I = s[A], + I && (C[A].annotation = I), g.push(C)); case 15: e.next = 8; @@ -5726,7 +5790,7 @@ }() , M = function() { var e = S(y().mark((function e(t, r, n) { - var i, o, s, c, u, d, f, h, p, m, b, g, v, S, w, C, _, A, I; + var i, o, s, c, u, d, f, h, p, m, b, g, v, S, w, C, A, _, I; return y().wrap((function(e) { while (1) switch (e.prev = e.next) { @@ -5811,9 +5875,9 @@ return e.next = 29, z(t, v); case 29: - _ = e.sent, + A = e.sent, o[g["@_ID"]] = { - img: _, + img: A, format: "jpeg" }, e.next = 44; @@ -5826,9 +5890,9 @@ return e.next = 36, G(t, v); case 36: - A = e.sent, + _ = e.sent, o[g["@_ID"]] = { - img: A, + img: _, format: "jp2" }, e.next = 44; @@ -6170,7 +6234,7 @@ } ), t) } - ))), _, A).then((function(e) { + ))), A, _).then((function(e) { r(e) } )).catch((function(e) { @@ -6338,6 +6402,12 @@ while (1) switch (e.prev = e.next) { case 0: + if (null != t.files[r]) { + e.next = 2; + break + } + return e.abrupt("return", null); + case 2: return e.abrupt("return", new Promise((function(e, n) { t.files[r].async("base64").then((function(t) { var r = "data:image/png;base64," + t @@ -6359,7 +6429,7 @@ )) } ))); - case 1: + case 3: case "end": return e.stop() } @@ -16770,12 +16840,12 @@ var S = f.state || (f.state = new g) , w = c(S.get) , C = c(S.has) - , _ = c(S.set); + , A = c(S.set); n = function(e, t) { if (C(S, e)) throw new b(m); return t.facade = e, - _(S, e, t), + A(S, e, t), t } , @@ -16787,22 +16857,22 @@ return C(S, e) } } else { - var A = h("state"); - p[A] = !0, + var _ = h("state"); + p[_] = !0, n = function(e, t) { - if (l(e, A)) + if (l(e, _)) throw new b(m); return t.facade = e, - d(e, A, t), + d(e, _, t), t } , i = function(e) { - return l(e, A) ? e[A] : {} + return l(e, _) ? e[_] : {} } , o = function(e) { - return l(e, A) + return l(e, _) } } e.exports = { @@ -16916,7 +16986,7 @@ } )), r.d(t, "g", (function() { - return A + return _ } )), r.d(t, "k", (function() { @@ -16934,6 +17004,10 @@ r.d(t, "d", (function() { return x } + )), + r.d(t, "o", (function() { + return P + } )); var a = function(e) { var t = e.split(" ") @@ -17051,8 +17125,8 @@ , S = n.ry , w = n.rotation , C = n.arc - , _ = n.sweep - , A = n.x + , A = n.sweep + , _ = n.x , I = n.y , E = { type: "A", @@ -17060,8 +17134,8 @@ ry: m(S), rotation: w, arc: C, - sweep: _, - x: m(A), + sweep: A, + x: m(_), y: m(I) }; t.push(E) @@ -17201,30 +17275,31 @@ } )) } - , _ = { - "妤蜂綋": "妤蜂綋, KaiTi, Kai, simkai", - kaiti: "妤蜂綋, KaiTi, Kai, simkai", - Kai: "妤蜂綋, KaiTi, Kai", + , A = { + "楷体": "楷体, KaiTi, Kai, simkai", + kaiti: "楷体, KaiTi, Kai, simkai", + Kai: "楷体, KaiTi, Kai", simsun: "SimSun, simsun, Songti SC", - "瀹嬩綋": "SimSun, simsun, Songti SC", - "榛戜綋": "SimHei, STHeiti, simhei", - "浠垮畫": "FangSong, STFangsong, simfang", - "灏忔爣瀹嬩綋": "sSun", - "鏂规灏忔爣瀹媉gbk": "sSun", - "浠垮畫_gb2312": "FangSong, STFangsong, simfang", - "妤蜂綋_gb2312": "妤蜂綋, KaiTi, Kai, simkai", + "宋体": "SimSun, simsun, Songti SC", + "黑体": "SimHei, STHeiti, simhei", + "仿宋": "FangSong, STFangsong, simfang", + "小标宋体": "sSun", + "方正小标宋简体": "FZXiaoBiaoSong-B05S", + "方正小标宋_gbk": "FZXiaoBiaoSong-B05", + "仿宋_gb2312": "FangSong, STFangsong, simfang", + "楷体_gb2312": "楷体, KaiTi, Kai, simkai", couriernew: "Courier New", "courier new": "Courier New" } - , A = function(e) { + , _ = function(e) { var t = "simsun"; "undefined" != typeof e && (t = e.familyName), t || (t = e.fontName), - _[t.toLowerCase()] && (t = _[t.toLowerCase()]); - for (var r = 0, n = Object.keys(_); r < n.length; r++) { + A[t.toLowerCase()] && (t = A[t.toLowerCase()]); + for (var r = 0, n = Object.keys(A); r < n.length; r++) { var i = n[r]; if (-1 != t.toLowerCase().indexOf(i.toLowerCase())) - return _[i] + return A[i] } return t } @@ -17264,6 +17339,24 @@ h: m(e.h) } } + , P = function(e) { + for (var t = e.byteLength, r = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "+", "/"], n = "", i = 0; t - i >= 3; i += 3) { + var o = e[i] + , a = e[i + 1] + , s = e[i + 2]; + n += r[o >>> 2] + r[(3 & o) << 4 | a >>> 4] + r[(15 & a) << 2 | s >>> 6] + r[63 & s] + } + var c = t - i; + if (1 === c) { + var u = e[i]; + n += r[u >>> 2] + r[(3 & u) << 4] + "==" + } else if (2 === c) { + u = e[i]; + var d = e[i + 1]; + n += r[u >>> 2] + r[(3 & u) << 4 | d >>> 4] + r[(15 & d) << 2] + "=" + } + return n + } }, "6b84": function(e, t, r) { r("3ca3"), @@ -17307,8 +17400,8 @@ , S = i[e] , w = S && S.prototype , C = S - , _ = {} - , A = function(e) { + , A = {} + , _ = function(e) { var t = o(w[e]); s(w, e, "add" == e ? function(e) { return t(this, 0 === e ? 0 : e), @@ -17367,18 +17460,18 @@ )), C.prototype = w, w.constructor = C), - (x || k) && (A("delete"), - A("has"), - g && A("get")), - (k || T) && A(v), + (x || k) && (_("delete"), + _("has"), + g && _("get")), + (k || T) && _(v), y && w.clear && delete w.clear } - return _[e] = C, + return A[e] = C, n({ global: !0, constructor: !0, forced: C != S - }, _), + }, A), m(C, e), y || r.setStrong(C, e, g), C @@ -17426,7 +17519,7 @@ var n, i = "string" == typeof t; if (void 0 === e) { var o = "0123456789ABCDEF" - , a = " \f\n\r\t聽\u2028\u2029"; + , a = " \f\n\r\t \u2028\u2029"; for (e = [], n = 0; n < 16; ++n) e[o.charCodeAt(n)] = n; @@ -18296,7 +18389,7 @@ if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } - function _(e, t) { + function A(e, t) { if ("function" !== typeof t && null !== t) throw new TypeError("Super expression must either be null or a function"); e.prototype = Object.create(t && t.prototype, { @@ -18309,15 +18402,15 @@ Object.defineProperty(e, "prototype", { writable: !1 }), - t && A(e, t) + t && _(e, t) } - function A(e, t) { - return A = Object.setPrototypeOf || function(e, t) { + function _(e, t) { + return _ = Object.setPrototypeOf || function(e, t) { return e.__proto__ = t, e } , - A(e, t) + _(e, t) } function I(e) { var t = x(); @@ -18366,7 +18459,7 @@ P(e) } var k = function(e) { - _(r, e); + A(r, e); var t = I(r); function r(e) { return C(this, r), @@ -18643,24 +18736,24 @@ return e.y - t.y || e.x - t.x } )); - var h, m, b = f.length, g = new Int8Array(b), y = new Int8Array(b), v = [], S = 0, w = 0, C = 0, _ = 0; + var h, m, b = f.length, g = new Int8Array(b), y = new Int8Array(b), v = [], S = 0, w = 0, C = 0, A = 0; for (m = 0; m < b; m++) g[m] = f[m].x, y[m] = f[m].y, w = Math.min(w, f[m].x), C = Math.max(C, f[m].x), - _ = Math.min(_, f[m].y), + A = Math.min(A, f[m].y), m < b - 1 && f[m].y === f[m + 1].y && f[m].x === f[m + 1].x - 1 ? S |= 1 << b - 1 - m : v.push(m); - var A = v.length - , I = new Int8Array(A) - , E = new Int8Array(A) - , T = new Uint16Array(A); - for (h = 0; h < A; h++) + var _ = v.length + , I = new Int8Array(_) + , E = new Int8Array(_) + , T = new Uint16Array(_); + for (h = 0; h < _; h++) m = v[h], I[h] = f[m].x, E[h] = f[m].y, T[h] = 1 << b - 1 - m; - for (var x, P, k, D, O, R = -w, M = -_, N = t - C, B = c[n], F = new Uint8Array(t), j = [], L = u.decoder, U = u.contextCache.getContexts("GB"), X = 0, z = 0, W = 0; W < r; W++) { + for (var x, P, k, D, O, R = -w, M = -A, N = t - C, B = c[n], F = new Uint8Array(t), j = [], L = u.decoder, U = u.contextCache.getContexts("GB"), X = 0, z = 0, W = 0; W < r; W++) { if (i) { var q = L.readBit(U, B); if (X ^= q, @@ -18677,7 +18770,7 @@ else { if (x >= R && x < N && W >= M) for (z = z << 1 & S, - m = 0; m < A; m++) + m = 0; m < _; m++) P = W + E[m], k = x + I[m], D = j[P][k], @@ -18713,58 +18806,58 @@ for (l = 0; l < g; l++) y[l] = b[l].x, v[l] = b[l].y; - for (var S = n[0].length, w = n.length, C = h[r], _ = [], A = u.decoder, I = u.contextCache.getContexts("GR"), E = 0, T = 0; T < t; T++) { + for (var S = n[0].length, w = n.length, C = h[r], A = [], _ = u.decoder, I = u.contextCache.getContexts("GR"), E = 0, T = 0; T < t; T++) { if (s) { - var x = A.readBit(I, C); + var x = _.readBit(I, C); if (E ^= x, E) throw new k("prediction is not supported") } var P = new Uint8Array(e); - _.push(P); + A.push(P); for (var D = 0; D < e; D++) { var O, R, M = 0; for (l = 0; l < f; l++) O = T + m[l], R = D + p[l], - O < 0 || R < 0 || R >= e ? M <<= 1 : M = M << 1 | _[O][R]; + O < 0 || R < 0 || R >= e ? M <<= 1 : M = M << 1 | A[O][R]; for (l = 0; l < g; l++) O = T + v[l] - o, R = D + y[l] - i, O < 0 || O >= w || R < 0 || R >= S ? M <<= 1 : M = M << 1 | n[O][R]; - var N = A.readBit(I, M); + var N = _.readBit(I, M); P[D] = N } } - return _ + return A } function v(e, t, i, o, a, s, c, d, l, f, h, p) { if (e && t) throw new k("symbol refinement with Huffman is not supported"); - var g, y, v = [], w = 0, C = u(i.length + o), _ = h.decoder, A = h.contextCache; + var g, y, v = [], w = 0, C = u(i.length + o), A = h.decoder, _ = h.contextCache; e && (g = j(1), y = [], C = Math.max(C, 1)); while (v.length < o) { - var I = e ? s.tableDeltaHeight.decode(p) : r(A, "IADH", _); + var I = e ? s.tableDeltaHeight.decode(p) : r(_, "IADH", A); w += I; var E = 0 , T = 0 , x = e ? y.length : 0; while (1) { - var P, D = e ? s.tableDeltaWidth.decode(p) : r(A, "IADW", _); + var P, D = e ? s.tableDeltaWidth.decode(p) : r(_, "IADW", A); if (null === D) break; if (E += D, T += E, t) { - var O = r(A, "IAAI", _); + var O = r(_, "IAAI", A); if (O > 1) P = S(e, t, E, w, 0, O, 1, i.concat(v), C, 0, 0, 1, 0, s, l, f, h, 0, p); else { - var R = n(A, _, C) - , M = r(A, "IARDX", _) - , N = r(A, "IARDY", _) + var R = n(_, A, C) + , M = r(_, "IARDX", A) + , N = r(_, "IARDY", A) , B = R < i.length ? i[R] : v[R - i.length]; P = b(E, w, l, B, M, N, !1, f, h) } @@ -18814,7 +18907,7 @@ , $ = !1 , ee = i.length + o; while (J.length < ee) { - var te = e ? g.decode(p) : r(A, "IAEX", _); + var te = e ? g.decode(p) : r(_, "IAEX", A); while (te--) J.push($); $ = !$ @@ -18829,13 +18922,13 @@ function S(e, t, i, o, a, s, c, u, d, l, f, h, p, m, g, y, v, S, w) { if (e && t) throw new k("refinement with Huffman is not supported"); - var C, _, A = []; + var C, A, _ = []; for (C = 0; C < o; C++) { - if (_ = new Uint8Array(i), + if (A = new Uint8Array(i), a) for (var I = 0; I < i; I++) - _[I] = a; - A.push(_) + A[I] = a; + _.push(A) } var E = v.decoder , T = v.contextCache @@ -18869,18 +18962,18 @@ var W, q, H, V = N - (1 & h ? 0 : L - 1), Y = R - (2 & h ? K - 1 : 0); if (l) { for (W = 0; W < L; W++) - if (_ = A[Y + W], - _) { + if (A = _[Y + W], + A) { H = j[W]; var Q = Math.min(i - V, K); switch (p) { case 0: for (q = 0; q < Q; q++) - _[V + q] |= H[q]; + A[V + q] |= H[q]; break; case 2: for (q = 0; q < Q; q++) - _[V + q] ^= H[q]; + A[V + q] ^= H[q]; break; default: throw new k("operator ".concat(p, " is not supported")) @@ -18889,17 +18982,17 @@ R += L - 1 } else { for (q = 0; q < L; q++) - if (_ = A[V + q], - _) + if (A = _[V + q], + A) switch (H = j[q], p) { case 0: for (W = 0; W < K; W++) - _[Y + W] |= H[W]; + A[Y + W] |= H[W]; break; case 2: for (W = 0; W < K; W++) - _[Y + W] ^= H[W]; + A[Y + W] ^= H[W]; break; default: throw new k("operator ".concat(p, " is not supported")) @@ -18913,7 +19006,7 @@ R += Z + f } while (1) } - return A + return _ } function w(e, t, r, n, i, o) { var a = []; @@ -18955,9 +19048,9 @@ w.push(S) } var C = t.length - , _ = t[0] - , A = _[0].length - , I = _.length + , A = t[0] + , _ = A[0].length + , I = A.length , E = u(C) , T = []; e || (T.push({ @@ -18991,11 +19084,11 @@ if (N = t[M], B = l + D * p + O * h >> 8, F = f + D * h - O * p >> 8, - B >= 0 && B + A <= n && F >= 0 && F + I <= i) + B >= 0 && B + _ <= n && F >= 0 && F + I <= i) for (y = 0; y < I; y++) for (L = w[F + y], j = N[y], - v = 0; v < A; v++) + v = 0; v < _; v++) L[B + v] |= j[v]; else { var X = void 0 @@ -19005,14 +19098,14 @@ !(z < 0 || z >= i)) for (L = w[z], j = N[y], - v = 0; v < A; v++) + v = 0; v < _; v++) X = B + v, X >= 0 && X < n && (L[X] |= j[v]) } } return w } - function _(e, t) { + function A(e, t) { var r = {}; r.number = f(e, t); var n = e[t + 4] @@ -19058,19 +19151,19 @@ , S = e[d + E] , w = !!(1 & S) , C = 6 - , _ = new Uint8Array(C); - for (w || (_[0] = 255, - _[1] = 172), - _[2] = v.height >>> 24 & 255, - _[3] = v.height >> 16 & 255, - _[4] = v.height >> 8 & 255, - _[5] = 255 & v.height, + , A = new Uint8Array(C); + for (w || (A[0] = 255, + A[1] = 172), + A[2] = v.height >>> 24 & 255, + A[3] = v.height >> 16 & 255, + A[4] = v.height >> 8 & 255, + A[5] = 255 & v.height, m = d, b = e.length; m < b; m++) { - var A = 0; - while (A < C && _[A] === e[m + A]) - A++; - if (A === C) { + var _ = 0; + while (_ < C && A[_] === e[m + _]) + _++; + if (_ === C) { r.length = m + C; break } @@ -19081,11 +19174,11 @@ return r.headerEnd = d, r } - function A(e, t, r, n) { + function _(e, t, r, n) { var i = [] , o = r; while (o < n) { - var a = _(t, o); + var a = A(t, o); o = a.headerEnd; var s = { header: a, @@ -19243,10 +19336,10 @@ var C = {}; C.info = I(s, c), c += E; - var _ = s[c++]; - if (C.mmr = !!(1 & _), - C.template = _ >> 1 & 3, - C.prediction = !!(8 & _), + var A = s[c++]; + if (C.mmr = !!(1 & A), + C.template = A >> 1 & 3, + C.prediction = !!(8 & A), !C.mmr) { for (o = 0 === C.template ? 4 : 1, n = [], @@ -19261,22 +19354,22 @@ r = [C, s, c, u]; break; case 48: - var A = { + var _ = { width: f(s, c), height: f(s, c + 4), resolutionX: f(s, c + 8), resolutionY: f(s, c + 12) }; - 4294967295 === A.height && delete A.height; + 4294967295 === _.height && delete _.height; var T = s[c + 16]; l(s, c + 17), - A.lossless = !!(1 & T), - A.refinement = !!(2 & T), - A.defaultPixelValue = T >> 2 & 1, - A.combinationOperator = T >> 3 & 3, - A.requiresBuffer = !!(32 & T), - A.combinationOperatorOverride = !!(64 & T), - r = [A]; + _.lossless = !!(1 & T), + _.refinement = !!(2 & T), + _.defaultPixelValue = T >> 2 & 1, + _.combinationOperator = T >> 3 & 3, + _.requiresBuffer = !!(32 & T), + _.combinationOperatorOverride = !!(64 & T), + r = [_]; break; case 49: break; @@ -19302,7 +19395,7 @@ function P(e) { for (var t = new O, r = 0, n = e.length; r < n; r++) { var i = e[r] - , o = A({}, i.data, i.start, i.end); + , o = _({}, i.data, i.start, i.end); x(o, t) } return t.buffer @@ -19318,7 +19411,7 @@ n.randomAccess = !(1 & i), 2 & i || (n.numberOfPages = f(e, r), r += 4); - var o = A(n, e, r, t) + var o = _(n, e, r, t) , a = new O; x(o, a); for (var s = a.currentPageInfo, c = s.width, u = s.height, d = a.buffer, l = new Uint8ClampedArray(c * u), h = 0, p = 0, m = 0; m < u; m++) @@ -19966,8 +20059,8 @@ , S = b.BUGGY_SAFARI_ITERATORS , w = p("iterator") , C = "keys" - , _ = "values" - , A = "entries" + , A = "values" + , _ = "entries" , I = function() { return this }; @@ -19984,12 +20077,12 @@ return new r(this,e) } ; - case _: + case A: return function() { return new r(this,e) } ; - case A: + case _: return function() { return new r(this,e) } @@ -20002,16 +20095,16 @@ T !== Object.prototype && T.next && (o || u(T) === v || (d ? d(T, v) : s(T[w]) || h(T, w, I)), l(T, D, !0, !0), o && (m[D] = I))), - g && p == _ && M && M.name !== _ && (!o && y ? f(R, "name", _) : (O = !0, + g && p == A && M && M.name !== A && (!o && y ? f(R, "name", A) : (O = !0, N = function() { return i(M, this) } )), p) if (x = { - values: k(_), + values: k(A), keys: b ? N : k(C), - entries: k(A) + entries: k(_) }, E) for (P in x) @@ -20746,7 +20839,7 @@ s.xs[c] = b, s.ys[c] = g } else { - var y, v = 1, S = 2, w = 8, C = 32, _ = 64, A = 128, I = 256; + var y, v = 1, S = 2, w = 8, C = 32, A = 64, _ = 128, I = 256; s.parts = []; do { y = r.readUshort(n, a), @@ -20781,10 +20874,10 @@ E.m.ty = x) : (E.p1 = T, E.p2 = x), y & w ? (E.m.a = E.m.d = r.readF2dot14(n, a), - a += 2) : y & _ ? (E.m.a = r.readF2dot14(n, a), + a += 2) : y & A ? (E.m.a = r.readF2dot14(n, a), a += 2, E.m.d = r.readF2dot14(n, a), - a += 2) : y & A && (E.m.a = r.readF2dot14(n, a), + a += 2) : y & _ && (E.m.a = r.readF2dot14(n, a), a += 2, E.m.b = r.readF2dot14(n, a), a += 2, @@ -21439,13 +21532,13 @@ var S = 1.15 * e["head"]["unitsPerEm"] , w = Math.round(S) , C = Math.round(S) - , _ = Math.round(.15 * -C); - n.crds.push(0, C + _, w, C + _, w, _, 0, _) + , A = Math.round(.15 * -C); + n.crds.push(0, C + A, w, C + A, w, A, 0, A) } else if (o && o.entries[t]) { - var A = o.entries[t]; - null != A && ("string" == typeof A && (A = f["SVG"].toPath(A), - o.entries[t] = A), - n = A) + var _ = o.entries[t]; + null != _ && ("string" == typeof _ && (_ = f["SVG"].toPath(_), + o.entries[t] = _), + n = _) } else if (1 != r && s && s[0]["g" + t] && s[0]["g" + t][1] > 1) { var I = function(e) { var t = e.toString(16); @@ -21574,18 +21667,18 @@ v = g) : 0 == y && 0 == v || (0 == y ? C.push("v", v) : 0 == v ? C.push("h", y) : C.push("l", y, v)); else { C.push(S.toLowerCase()); - for (var _ = 0; _ < w; _ += 2) - b = n[s + _] - u, - g = n[s + _ + 1] - d, + for (var A = 0; A < w; A += 2) + b = n[s + A] - u, + g = n[s + A + 1] - d, y = i(b + l), v = i(g + f), C.push(y, v) } 0 != w && (l += b - y, f += g - v); - var A = C; - for (_ = 0; _ < A.length; _++) - a.push(A[_]); + var _ = C; + for (A = 0; A < _.length; A++) + a.push(_[A]); 0 != w && (s += w, u = n[s - 2], d = n[s - 1]), @@ -21644,7 +21737,7 @@ continue } n.save(); - for (var y = f - d, v = h - l, S = Math.sqrt(y * y + v * v), w = Math.atan2(v, y), C = b - d, _ = g - l, A = Math.sqrt(C * C + _ * _), I = Math.sign(y * _ - v * C), E = atob(c.slice(22)), T = [], x = 0; x < E.length; x++) + for (var y = f - d, v = h - l, S = Math.sqrt(y * y + v * v), w = Math.atan2(v, y), C = b - d, A = g - l, _ = Math.sqrt(C * C + A * A), I = Math.sign(y * A - v * C), E = atob(c.slice(22)), T = [], x = 0; x < E.length; x++) T[x] = E.charCodeAt(x); var P = u["decode"](new Uint8Array(T)) , k = P["width"] @@ -21657,7 +21750,7 @@ t.putImageData(new ImageData(new Uint8ClampedArray(O.buffer),k,D), 0, 0), n.translate(d, l), n.rotate(w), - n.scale(S * (k / D) / k, I * A / D), + n.scale(S * (k / D) / k, I * _ / D), n.drawImage(e, 0, 0), n.restore() } else if ("#" == c.charAt(0) || "r" == c.charAt(0)) @@ -21713,8 +21806,8 @@ , S = 0 , w = 0 , C = 0 - , _ = 0 - , A = i["T"].CFF + , A = 0 + , _ = i["T"].CFF , I = i["U"]["P"] , E = n["nominalWidthX"] , T = { @@ -21722,7 +21815,7 @@ size: 0 }; while (l < e.length) { - A.getCharString(e, l, T); + _.getCharString(e, l, T); var x = T.val; if (l += T.size, "o1" == x || "o18" == x) @@ -21780,54 +21873,54 @@ b = p + a.shift(), g = m + a.shift(), C = b + a.shift(), - _ = g, + A = g, y = C + a.shift(), v = g, S = y + a.shift(), w = h, f = S + a.shift(), - I.CurveTo(o, p, m, b, g, C, _), + I.CurveTo(o, p, m, b, g, C, A), I.CurveTo(o, y, v, S, w, f, h)), "o1235" == x && (p = f + a.shift(), m = h + a.shift(), b = p + a.shift(), g = m + a.shift(), C = b + a.shift(), - _ = g + a.shift(), + A = g + a.shift(), y = C + a.shift(), - v = _ + a.shift(), + v = A + a.shift(), S = y + a.shift(), w = v + a.shift(), f = S + a.shift(), h = w + a.shift(), a.shift(), - I.CurveTo(o, p, m, b, g, C, _), + I.CurveTo(o, p, m, b, g, C, A), I.CurveTo(o, y, v, S, w, f, h)), "o1236" == x && (p = f + a.shift(), m = h + a.shift(), b = p + a.shift(), g = m + a.shift(), C = b + a.shift(), - _ = g, + A = g, y = C + a.shift(), v = g, S = y + a.shift(), w = v + a.shift(), f = S + a.shift(), - I.CurveTo(o, p, m, b, g, C, _), + I.CurveTo(o, p, m, b, g, C, A), I.CurveTo(o, y, v, S, w, f, h)), "o1237" == x && (p = f + a.shift(), m = h + a.shift(), b = p + a.shift(), g = m + a.shift(), C = b + a.shift(), - _ = g + a.shift(), + A = g + a.shift(), y = C + a.shift(), - v = _ + a.shift(), + v = A + a.shift(), S = y + a.shift(), w = v + a.shift(), Math.abs(S - f) > Math.abs(w - h) ? f = S + a.shift() : h = w + a.shift(), - I.CurveTo(o, p, m, b, g, C, _), + I.CurveTo(o, p, m, b, g, C, A), I.CurveTo(o, y, v, S, w, f, h)); else if ("o14" == x) { if (a.length > 0 && 4 != a.length && !c && (u = a.shift() + r["nominalWidthX"], @@ -21837,8 +21930,8 @@ , N = a.shift() , B = a.shift() , F = a.shift() - , j = A.glyphBySE(r, B) - , K = A.glyphBySE(r, F); + , j = _.glyphBySE(r, B) + , K = _.glyphBySE(r, F); i["U"]["_drawCFF"](r["CharStrings"][j], t, r, n, o), t.x = M, t.y = N, @@ -22244,43 +22337,43 @@ else if ("Q" == m) { var w = v + r[n++] , C = S + r[n++] - , _ = v + r[n++] - , A = S + r[n++]; + , A = v + r[n++] + , _ = S + r[n++]; f.push("Q"), - h.push(w, C, _, A), - i = _, - o = A + h.push(w, C, A, _), + i = A, + o = _ } else if ("T" == m) { var I = Math.max(h.length - ("Q" == f[f.length - 1] ? 4 : 2), d); w = i + i - h[I], C = o + o - h[I + 1], - _ = v + r[n++], - A = S + r[n++]; + A = v + r[n++], + _ = S + r[n++]; f.push("Q"), - h.push(w, C, _, A), - i = _, - o = A + h.push(w, C, A, _), + i = A, + o = _ } else if ("C" == m) { w = v + r[n++], C = S + r[n++], - _ = v + r[n++], - A = S + r[n++]; + A = v + r[n++], + _ = S + r[n++]; var E = v + r[n++] , T = S + r[n++]; f.push("C"), - h.push(w, C, _, A, E, T), + h.push(w, C, A, _, E, T), i = E, o = T } else if ("S" == m) { I = Math.max(h.length - ("C" == f[f.length - 1] ? 4 : 2), d), w = i + i - h[I], C = o + o - h[I + 1], - _ = v + r[n++], - A = S + r[n++], + A = v + r[n++], + _ = S + r[n++], E = v + r[n++], T = S + r[n++]; f.push("C"), - h.push(w, C, _, A, E, T), + h.push(w, C, A, _, E, T), i = E, o = T } else if ("A" == m) { @@ -22291,12 +22384,12 @@ , k = r[n++] * (Math.PI / 180) , D = r[n++] , O = r[n++]; - _ = v + r[n++], - A = S + r[n++]; - if (_ == i && A == o && 0 == x && 0 == P) + A = v + r[n++], + _ = S + r[n++]; + if (A == i && _ == o && 0 == x && 0 == P) continue; - var R = (w - _) / 2 - , M = (C - A) / 2 + var R = (w - A) / 2 + , M = (C - _) / 2 , N = Math.cos(k) , B = Math.sin(k) , F = N * R + B * M @@ -22309,8 +22402,8 @@ , G = (D != O ? 1 : -1) * Math.sqrt(Math.max(z, 0)) , W = G * (x * j) / P , q = P * F * -G / x - , H = N * W - B * q + (w + _) / 2 - , V = B * W + N * q + (C + A) / 2 + , H = N * W - B * q + (w + A) / 2 + , V = B * W + N * q + (C + _) / 2 , Y = function(e, t, r, n) { var i = Math.sqrt(e * e + t * t) , o = Math.sqrt(r * r + n * n) @@ -22373,7 +22466,7 @@ } , C = [1, 0, 0, 1, 0, 0]; s(C, -l); - for (var _ = 0; _ < 3; _++) + for (var A = 0; A < 3; A++) c(C, S), u(w.crds, S); s(C, l / 2 - i), @@ -22392,8 +22485,8 @@ ctm: [x * N, x * B, -P * B, P * N, H, V] }; ee(te, 0, 0, 1, J, J + $, 0 == O), - i = _, - o = A + i = A, + o = _ } else console.log("Unknown SVG command " + p) } @@ -22461,16 +22554,16 @@ var S = f["hb_buffer_create"]() , w = e["encode"](p) , C = w.length - , _ = f["malloc"](C); - n.set(w, _), - f["hb_buffer_add_utf8"](S, _, C, 0, C), - f["free"](_), + , A = f["malloc"](C); + n.set(w, A), + f["hb_buffer_add_utf8"](S, A, C, 0, C), + f["free"](A), f["hb_buffer_set_direction"](S, m ? 4 : 5), f["hb_buffer_guess_segment_properties"](S), f["hb_shape"](l, S, 0, 0); - var A = t(S); + var _ = t(S); f["hb_buffer_destroy"](S); - var I = A.slice(0); + var I = _.slice(0); m || I.reverse(); for (var E = 0, T = 0, x = 1; x < I.length; x++) { var P = I[x] @@ -22485,7 +22578,7 @@ } P["cl"] = E } - return A + return _ } alert("Your browser is too old. Please, update it.") } @@ -23776,16 +23869,16 @@ var S = t[u]["json"]["ofd:Content"]["ofd:Layer"] , w = []; w = w.concat(S); - var C, _ = c(w); + var C, A = c(w); try { - for (_.s(); !(C = _.n()).done; ) { - var A = C.value; - A && b(e, i, o, a, s, A, !1) + for (A.s(); !(C = A.n()).done; ) { + var _ = C.value; + _ && b(e, i, o, a, s, _, !1) } } catch (B) { - _.e(B) + A.e(B) } finally { - _.f() + A.f() } } if (t[u].stamp) { @@ -23856,10 +23949,10 @@ w.setAttribute("data-signed-info", "".concat(JSON.stringify(f))); var C = g[y]["json"]["ofd:Template"]; if (C) { - var _ = r[C["@_TemplateID"]]["json"]["ofd:Content"]["ofd:Layer"] - , A = []; - A = A.concat(_); - var I, E = c(A); + var A = r[C["@_TemplateID"]]["json"]["ofd:Content"]["ofd:Layer"] + , _ = []; + _ = _.concat(A); + var I, E = c(_); try { for (E.s(); !(I = E.n()).done; ) { var T = I.value; @@ -23898,119 +23991,123 @@ , m = null , b = Object(n["e"])(.353) , y = s["@_DrawParam"]; - y && Object.keys(i).length > 0 && i[y] && (i[y]["relative"] && (y = i[y]["relative"], - i[y]["FillColor"] && (p = Object(n["i"])(i[y]["FillColor"])), - i[y]["StrokeColor"] && (m = Object(n["i"])(i[y]["StrokeColor"])), - i[y]["LineWidth"] && (b = Object(n["e"])(i[y]["LineWidth"]))), - i[y]["FillColor"] && (p = Object(n["i"])(i[y]["FillColor"])), - i[y]["StrokeColor"] && (m = Object(n["i"])(i[y]["StrokeColor"])), - i[y]["LineWidth"] && (b = Object(n["e"])(i[y]["LineWidth"]))); - var v = s["ofd:ImageObject"] - , C = []; - C = C.concat(v); - var _, A = c(C); + if (y && Object.keys(i).length > 0 && i[y]) { + if (i[y]["relative"]) { + var v = i[y]["relative"]; + i[v]["FillColor"] && (p = Object(n["i"])(i[v]["FillColor"])), + i[v]["StrokeColor"] && (m = Object(n["i"])(i[v]["StrokeColor"])), + i[v]["LineWidth"] && (b = Object(n["e"])(i[v]["LineWidth"])) + } + i[y]["FillColor"] && (p = Object(n["i"])(i[y]["FillColor"])), + i[y]["StrokeColor"] && (m = Object(n["i"])(i[y]["StrokeColor"])), + i[y]["LineWidth"] && (b = Object(n["e"])(i[y]["LineWidth"])) + } + var C = s["ofd:ImageObject"] + , A = []; + A = A.concat(C); + var _, I = c(A); try { - for (A.s(); !(_ = A.n()).done; ) { - var I = _.value; - if (I) { - var E = I["@_ResourceID"]; - if (null === o[E] || void 0 === o[E]) + for (I.s(); !(_ = I.n()).done; ) { + var E = _.value; + if (E) { + var T = E["@_ResourceID"]; + if (null === o[T] || void 0 === o[T]) continue; - var T = g(t.style.width, t.style.height, o, I, u, l, h); - t.appendChild(T) + var x = g(t.style.width, t.style.height, o, E, u, l, h); + t.appendChild(x) } } - } catch (ie) { - A.e(ie) + } catch (oe) { + I.e(oe) } finally { - A.f() + I.f() } - var x = s["ofd:PathObject"] - , P = []; - P = P.concat(x); - var k, D = c(P); + var P = s["ofd:PathObject"] + , k = []; + k = k.concat(P); + var D, O = c(k); try { - for (D.s(); !(k = D.n()).done; ) { - var O = k.value; - if (O) { - var R = w(i, O, p, m, b, u, d, l, f); - t.appendChild(R) + for (O.s(); !(D = O.n()).done; ) { + var R = D.value; + if (R) { + var M = w(i, R, p, m, b, u, d, l, f); + t.appendChild(M) } } - } catch (ie) { - D.e(ie) + } catch (oe) { + O.e(oe) } finally { - D.f() + O.f() } - var M = s["ofd:TextObject"] - , N = []; - N = N.concat(M); - var B, F = c(N); + var N = s["ofd:TextObject"] + , B = []; + B = B.concat(N); + var F, j = c(B); try { - for (F.s(); !(B = F.n()).done; ) { - var j = B.value; - if (j) { - var K = S(r, j, p, m, i); - t.appendChild(K) + for (j.s(); !(F = j.n()).done; ) { + var K = F.value; + if (K) { + var L = S(r, K, p, m, i); + t.appendChild(L) } } - } catch (ie) { - F.e(ie) + } catch (oe) { + j.e(oe) } finally { - F.f() + j.f() } - var L = s["ofd:CompositeObject"] - , U = []; - U = U.concat(L); - var X, z = c(U); + var U = s["ofd:CompositeObject"] + , X = []; + X = X.concat(U); + var z, G = c(X); try { - for (z.s(); !(X = z.n()).done; ) { - var G = X.value; - if (G) { - var W, q = c(a); + for (G.s(); !(z = G.n()).done; ) { + var W = z.value; + if (W) { + var q, H = c(a); try { - for (q.s(); !(W = q.n()).done; ) { - var H = W.value; - if (H["@_ID"] === G["@_ResourceID"]) { - var V = G["@_Alpha"] - , Y = G["@_Boundary"] - , Q = G["@_CTM"]; - if (Y) { - var Z = Object(n["d"])(Object(n["k"])(Y)) - , J = document.createElement("div"); - J.setAttribute("style", "position:absolute; left: ".concat(Z.x, "px; top: ").concat(Z.y, "px; width: ").concat(Z.w, "px; height: ").concat(Z.h, "px")), - t.appendChild(J), - e(J, r, i, o, a, H["ofd:Content"], !1, V, null, Q) + for (H.s(); !(q = H.n()).done; ) { + var V = q.value; + if (V["@_ID"] === W["@_ResourceID"]) { + var Y = W["@_Alpha"] + , Q = W["@_Boundary"] + , Z = W["@_CTM"]; + if (Q) { + var J = Object(n["d"])(Object(n["k"])(Q)) + , $ = document.createElement("div"); + $.setAttribute("style", "position:absolute; left: ".concat(J.x, "px; top: ").concat(J.y, "px; width: ").concat(J.w, "px; height: ").concat(J.h, "px")), + t.appendChild($), + e($, r, i, o, a, V["ofd:Content"], !1, Y, null, Z) } else - e(t, r, i, o, a, H["ofd:Content"], !1, V, Y, Q); + e(t, r, i, o, a, V["ofd:Content"], !1, Y, Q, Z); break } } - } catch (ie) { - q.e(ie) + } catch (oe) { + H.e(oe) } finally { - q.f() + H.f() } } } - } catch (ie) { - z.e(ie) + } catch (oe) { + G.e(oe) } finally { - z.f() + G.f() } - var $ = s["ofd:PageBlock"] - , ee = []; - ee = ee.concat($); - var te, re = c(ee); + var ee = s["ofd:PageBlock"] + , te = []; + te = te.concat(ee); + var re, ne = c(te); try { - for (re.s(); !(te = re.n()).done; ) { - var ne = te.value; - ne && e(t, r, i, o, a, ne, u) + for (ne.s(); !(re = ne.n()).done; ) { + var ie = re.value; + ie && e(t, r, i, o, a, ie, u) } - } catch (ie) { - re.e(ie) + } catch (oe) { + ne.e(oe) } finally { - re.f() + ne.f() } } , g = function(e, t, r, i, o, a, s) { @@ -24072,8 +24169,8 @@ p.appendChild(m); var w = parseFloat(e.replace("px", "")) , C = parseFloat(t.replace("px", "")) - , _ = i.w > w ? w : i.w - , A = i.h > C ? C : i.h + , A = i.w > w ? w : i.w + , _ = i.h > C ? C : i.h , I = ""; o && (o = Object(n["d"])(o), I = "clip: rect(".concat(o.y, "px, ").concat(o.w + o.x, "px, ").concat(o.h + o.y, "px, ").concat(o.x, "px)")); @@ -24082,9 +24179,9 @@ return I ? (E = i.x, T = i.y) : (E = i.x + b < 0 ? 0 : i.x + b, T = i.y + g < 0 ? 0 : i.y + g), - y > 0 && (_ = y, - A = v), - h ? p.setAttribute("style", "cursor: pointer; overflow: hidden; position: absolute; left: ".concat(E, "px; top: ").concat(T, "px; width: ").concat(_, "px; height: ").concat(A, "px; ").concat(I, ";")) : p.setAttribute("style", "cursor: pointer; overflow: hidden; position: absolute; left: ".concat(E, "px; top: ").concat(T, "px; width: ").concat(_, "px; height: ").concat(A, "px; ").concat(I, ";z-index: ").concat(d)), + y > 0 && (A = y, + _ = v), + h ? p.setAttribute("style", "cursor: pointer; overflow: hidden; position: absolute; left: ".concat(E, "px; top: ").concat(T, "px; width: ").concat(A, "px; height: ").concat(_, "px; ").concat(I, ";")) : p.setAttribute("style", "cursor: pointer; overflow: hidden; position: absolute; left: ".concat(E, "px; top: ").concat(T, "px; width: ").concat(A, "px; height: ").concat(_, "px; ").concat(I, ";z-index: ").concat(d)), p } , S = function(e, t, r, i, a) { @@ -24109,17 +24206,17 @@ , S = []; S = S.concat(t["ofd:TextCode"]); var w = Object(n["b"])(S) - , _ = document.createElementNS("http://www.w3.org/2000/svg", "svg"); - _.setAttribute("version", "1.1"); - var A = t["ofd:FillColor"] + , A = document.createElementNS("http://www.w3.org/2000/svg", "svg"); + A.setAttribute("version", "1.1"); + var _ = t["ofd:FillColor"] , I = !1 , E = t["@_DrawParam"]; if (E && Object.keys(a).length > 0 && a[E] && a[E]["FillColor"] && (r = Object(n["i"])(a[E]["FillColor"])), - A) { - A["@_Value"] && (r = Object(n["i"])(A["@_Value"])); - var T = A["@_Alpha"]; + _) { + _["@_Value"] && (r = Object(n["i"])(_["@_Value"])); + var T = _["@_Alpha"]; T && (s = T > 1 ? T / 255 : T); - var x = A["ofd:AxialShd"]; + var x = _["ofd:AxialShd"]; if (x) { I = !0; var P = document.createElement("linearGradient"); @@ -24145,7 +24242,7 @@ } finally { D.f() } - _.appendChild(P) + A.appendChild(P) } } var M = u.w @@ -24214,7 +24311,7 @@ var me = document.createElementNS("http://www.w3.org/2000/svg", "path"); me.setAttribute("d", se), ce.appendChild(me), - _.appendChild(ce), + A.appendChild(ce), ne = !0 } } @@ -24233,7 +24330,7 @@ be.setAttribute("fill", r), be.setAttribute("fill-opacity", s)), be.setAttribute("style", "".concat(b, " ").concat(p, " ").concat(y, " font-size:").concat(v, "px;font-family: ").concat(Object(n["g"])(e[f]), ";")), - _.appendChild(be) + A.appendChild(be) } } ee++ @@ -24243,8 +24340,8 @@ } finally { te.f() } - return _.setAttribute("style", "overflow:visible;position:absolute;width:".concat(M, "px;height:").concat(N, "px;left:").concat(B, "px;top:").concat(F, "px;z-index:").concat(t["@_ID"])), - _ + return A.setAttribute("style", "overflow:visible;position:absolute;width:".concat(M, "px;height:").concat(N, "px;left:").concat(B, "px;top:").concat(F, "px;z-index:").concat(t["@_ID"])), + A } , w = function(e, t, r, i, o, a, s, u, d) { var l = document.createElementNS("http://www.w3.org/2000/svg", "svg"); @@ -24278,10 +24375,10 @@ C.setAttribute("y1", "0%"), C.setAttribute("x2", "100%"), C.setAttribute("y2", "100%"); - var _, A = c(w["ofd:Segment"]); + var A, _ = c(w["ofd:Segment"]); try { - for (A.s(); !(_ = A.n()).done; ) { - var I = _.value; + for (_.s(); !(A = _.n()).done; ) { + var I = A.value; if (I) { var E = document.createElement("stop"); E.setAttribute("offset", "".concat(100 * I["@_Position"], "%")), @@ -24290,17 +24387,18 @@ i = Object(n["i"])(I["ofd:Color"]["@_Value"]) } } - } catch (J) { - A.e(J) + } catch ($) { + _.e($) } finally { - A.f() + _.f() } l.appendChild(C) } } var T = t["ofd:FillColor"]; if (T) { - T["@_Value"],T["@_Alpha"] && 0 == T["@_Alpha"] && (r = "none"); + T["@_Value"] && ((T["@_Value"])), + T["@_Alpha"] && 0 == T["@_Alpha"] && (r = "none"); var x = T["ofd:AxialShd"]; if (x) { !0; @@ -24322,17 +24420,18 @@ r = Object(n["i"])(O["ofd:Color"]["@_Value"]) } } - } catch (J) { - D.e(J) + } catch ($) { + D.e($) } finally { D.f() } l.appendChild(P) } } - if (o > 0 && !i && (i = r, - i || (i = "rgb(0, 0, 0)")), - s && g.setAttribute("fill-opacity", "".concat(s / 255)), + o > 0 && !i && (i = r, + i || (i = "rgb(0, 0, 0)")); + var M = t["@_Alpha"]; + if ("undefined" != typeof M ? g.setAttribute("fill-opacity", "".concat(M / 255)) : s && g.setAttribute("fill-opacity", "".concat(s / 255)), "false" != t["@_Stroke"] && (g.setAttribute("stroke", "".concat(i)), g.setAttribute("stroke-width", "".concat(o, "px")), g.setAttribute("fill", "none")), @@ -24341,58 +24440,58 @@ t["@_Join"] && g.setAttribute("stroke-linejoin", "".concat(t["@_Join"])), t["@_Cap"] && g.setAttribute("stroke-linecap", "".concat(t["@_Cap"])), t["@_DashPattern"]) { - var M = t["@_DashPattern"] - , N = Object(n["j"])(M) - , B = 0; - t["@_DashOffset"] && (B = t["@_DashOffset"]), - g.setAttribute("stroke-dasharray", "".concat(Object(n["e"])(N[0]), ",").concat(Object(n["e"])(N[1]))), - g.setAttribute("stroke-dashoffset", "".concat(Object(n["e"])(B), "px")) - } - var F, j = "", K = c(m); + var N = t["@_DashPattern"] + , B = Object(n["j"])(N) + , F = 0; + t["@_DashOffset"] && (F = t["@_DashOffset"]), + g.setAttribute("stroke-dasharray", "".concat(Object(n["e"])(B[0]), ",").concat(Object(n["e"])(B[1]))), + g.setAttribute("stroke-dashoffset", "".concat(Object(n["e"])(F), "px")) + } + var j, K = "", L = c(m); try { - for (K.s(); !(F = K.n()).done; ) { - var L = F.value; - "M" === L.type ? j += "M".concat(L.x, " ").concat(L.y, " ") : "L" === L.type ? j += "L".concat(L.x, " ").concat(L.y, " ") : "B" === L.type ? j += "C".concat(L.x1, " ").concat(L.y1, " ").concat(L.x2, " ").concat(L.y2, " ").concat(L.x3, " ").concat(L.y3, " ") : "Q" === L.type ? j += "Q".concat(L.x1, " ").concat(L.y1, " ").concat(L.x2, " ").concat(L.y2, " ") : "A" === L.type ? j += "A".concat(L.rx, ",").concat(L.ry, " ").concat(L.rotation, " ").concat(L.arc, ",").concat(L.sweep, " ").concat(L.x, ",").concat(L.y) : "C" === L.type && (j += "Z") + for (L.s(); !(j = L.n()).done; ) { + var U = j.value; + "M" === U.type ? K += "M".concat(U.x, " ").concat(U.y, " ") : "L" === U.type ? K += "L".concat(U.x, " ").concat(U.y, " ") : "B" === U.type ? K += "C".concat(U.x1, " ").concat(U.y1, " ").concat(U.x2, " ").concat(U.y2, " ").concat(U.x3, " ").concat(U.y3, " ") : "Q" === U.type ? K += "Q".concat(U.x1, " ").concat(U.y1, " ").concat(U.x2, " ").concat(U.y2, " ") : "A" === U.type ? K += "A".concat(U.rx, ",").concat(U.ry, " ").concat(U.rotation, " ").concat(U.arc, ",").concat(U.sweep, " ").concat(U.x, ",").concat(U.y) : "C" === U.type && (K += "Z") } - } catch (J) { - K.e(J) + } catch ($) { + L.e($) } finally { - K.f() + L.f() } - g.setAttribute("d", j), + g.setAttribute("d", K), l.appendChild(g); - var U = a ? f.w : Math.ceil(f.w) - , X = a ? f.h : Math.ceil(f.h) - , z = f.x - , G = f.y; - if (l.setAttribute("style", "overflow:visible;position:absolute;width:".concat(U, "px;height:").concat(X, "px;left:").concat(z, "px;top:").concat(G, "px;z-index:").concat(t["@_ID"])), + var X = a ? f.w : Math.ceil(f.w) + , z = a ? f.h : Math.ceil(f.h) + , G = f.x + , W = f.y; + if (l.setAttribute("style", "overflow:visible;position:absolute;width:".concat(X, "px;height:").concat(z, "px;left:").concat(G, "px;top:").concat(W, "px;z-index:").concat(t["@_ID"])), u) { - var W = document.createElementNS("http://www.w3.org/2000/svg", "svg"); - W.setAttribute("version", "1.1"); - var q = Object(n["k"])(u); - q = Object(n["d"])(q); - var H = Math.ceil(q.w) - , V = Math.ceil(q.h) - , Y = q.x - , Q = q.y; - if (W.setAttribute("style", "overflow:hidden;position:absolute;width:".concat(H, "px;height:").concat(V, "px;left:").concat(Y, "px;top:").concat(Q, "px;z-index:").concat(t["@_ID"])), + var q = document.createElementNS("http://www.w3.org/2000/svg", "svg"); + q.setAttribute("version", "1.1"); + var H = Object(n["k"])(u); + H = Object(n["d"])(H); + var V = Math.ceil(H.w) + , Y = Math.ceil(H.h) + , Q = H.x + , Z = H.y; + if (q.setAttribute("style", "overflow:hidden;position:absolute;width:".concat(V, "px;height:").concat(Y, "px;left:").concat(Q, "px;top:").concat(Z, "px;z-index:").concat(t["@_ID"])), d) { - var Z = Object(n["j"])(d); - l.setAttribute("transform", "matrix(".concat(Z[0], " ").concat(Z[1], " ").concat(Z[2], " ").concat(Z[3], " ").concat(Object(n["e"])(Z[4]), " ").concat(Object(n["e"])(Z[5]), ")")) + var J = Object(n["j"])(d); + l.setAttribute("transform", "matrix(".concat(J[0], " ").concat(J[1], " ").concat(J[2], " ").concat(J[3], " ").concat(Object(n["e"])(J[4]), " ").concat(Object(n["e"])(J[5]), ")")) } - return W.appendChild(l), - W + return q.appendChild(l), + q } return l } , C = function(e, t, r, n, i, o, s, c) { var u = new a([1, 0, 0, 0, -1, 0, 0, 0, 1]); "undefined" == typeof e && (e = 1), - u = _(u, Number(e), 1); + u = A(u, Number(e), 1); var d = new a([1 / s, 0, 0, 0, 1 / s, 0, 0, 0, 1]); if (u = u.multiply(d), - u = _(u, o / 3.7795, o / 3.7795), - u = A(u, n / 3.7795, i / 3.7795), + u = A(u, o / 3.7795, o / 3.7795), + u = _(u, n / 3.7795, i / 3.7795), null != t) { var l = new a([Number(t[0]), Number(t[1]), 0, Number(t[2]), Number(t[3]), 0, Number(t[4]), Number(t[5]), 1]); u = u.multiply(l) @@ -24401,11 +24500,11 @@ u = u.multiply(c), u } - , _ = function(e, t, r) { + , A = function(e, t, r) { var n = new a([t, 0, 0, 0, r, 0, 0, 0, 1]); return e.multiply(n) } - , A = function(e, t, r) { + , _ = function(e, t, r) { var n = new a([1, 0, 0, 0, 1, 0, t, r, 1]); return e.multiply(n) } @@ -24637,11 +24736,11 @@ } )), r.d(t, "d", (function() { - return _ + return A } )), r.d(t, "e", (function() { - return A + return _ } )), r.d(t, "g", (function() { @@ -24921,7 +25020,7 @@ t.delegate = null, l) } - function _(e) { + function A(e) { var t = { tryLoc: e[0] }; @@ -24930,7 +25029,7 @@ t.afterLoc = e[3]), this.tryEntries.push(t) } - function A(e) { + function _(e) { var t = e.completion || {}; t.type = "normal", delete t.arg, @@ -24940,7 +25039,7 @@ this.tryEntries = [{ tryLoc: "root" }], - e.forEach(_, this), + e.forEach(A, this), this.reset(!0) } function E(e) { @@ -25051,7 +25150,7 @@ this.delegate = null, this.method = "next", this.arg = void 0, - this.tryEntries.forEach(A), + this.tryEntries.forEach(_), !e) for (var t in this) "t" === t.charAt(0) && r.call(this, t) && !isNaN(+t.slice(1)) && (this[t] = void 0) @@ -25129,7 +25228,7 @@ var r = this.tryEntries[t]; if (r.finallyLoc === e) return this.complete(r.completion, r.afterLoc), - A(r), + _(r), l } }, @@ -25140,7 +25239,7 @@ var n = r.completion; if ("throw" === n.type) { var i = n.arg; - A(r) + _(r) } return i } @@ -25254,7 +25353,7 @@ } )) } - , _ = function(e, t) { + , A = function(e, t) { var r = []; if (!e) return r; @@ -25302,7 +25401,7 @@ } return r } - , A = function(e) { + , _ = function(e) { var t = []; if (!e) return t; @@ -25530,7 +25629,7 @@ } } return function() { - return _(void 0) + return A(void 0) } } function f(e, t, r) { @@ -25540,9 +25639,9 @@ } function h(e, t, r) { try { - return _(d(e, t, r)) + return A(d(e, t, r)) } catch (n) { - return A(n) + return _(n) } } function p(e) { @@ -25576,10 +25675,10 @@ function C(e) { return new y(e) } - function _(e) { + function A(e) { return S(e) } - function A(e) { + function _(e) { return w(e) } function I(e, t, r) { @@ -25769,17 +25868,17 @@ } return Object.defineProperty(e.prototype, "closed", { get: function() { - return ee(this) ? this._closedPromise : A(re("closed")) + return ee(this) ? this._closedPromise : _(re("closed")) }, enumerable: !0, configurable: !0 }), e.prototype.cancel = function(e) { - return ee(this) ? void 0 === this._ownerReadableStream ? A(F("cancel")) : N(this, e) : A(re("cancel")) + return ee(this) ? void 0 === this._ownerReadableStream ? _(F("cancel")) : N(this, e) : _(re("cancel")) } , e.prototype.read = function() { - return ee(this) ? void 0 === this._ownerReadableStream ? A(F("read from")) : te(this) : A(re("read")) + return ee(this) ? void 0 === this._ownerReadableStream ? _(F("read from")) : te(this) : _(re("read")) } , e.prototype.releaseLock = function() { @@ -25800,7 +25899,7 @@ function te(e) { var t = e._ownerReadableStream; return t._disturbed = !0, - "closed" === t._state ? _(R(void 0, !0, e._forAuthorCode)) : "errored" === t._state ? A(t._storedError) : t._readableStreamController[W]() + "closed" === t._state ? A(R(void 0, !0, e._forAuthorCode)) : "errored" === t._state ? _(t._storedError) : t._readableStreamController[W]() } function re(e) { return new TypeError("ReadableStreamDefaultReader.prototype." + e + " can only be used on a ReadableStreamDefaultReader") @@ -25817,9 +25916,9 @@ var ne = { next: function() { if (!1 === oe(this)) - return A(ae("next")); + return _(ae("next")); var e = this._asyncIteratorReader; - return void 0 === e._ownerReadableStream ? A(F("iterate")) : P(te(e), (function(t) { + return void 0 === e._ownerReadableStream ? _(F("iterate")) : P(te(e), (function(t) { var r = t.done; r && B(e); var n = t.value; @@ -25829,12 +25928,12 @@ }, return: function(e) { if (!1 === oe(this)) - return A(ae("next")); + return _(ae("next")); var t = this._asyncIteratorReader; if (void 0 === t._ownerReadableStream) - return A(F("finish iterating")); + return _(F("finish iterating")); if (t._readRequests.length > 0) - return A(new TypeError("Tried to release a reader lock when that reader has pending read() calls un-settled")); + return _(new TypeError("Tried to release a reader lock when that reader has pending read() calls un-settled")); if (!1 === this._preventCancel) { var r = N(t, e); return B(t), @@ -25844,7 +25943,7 @@ )) } return B(t), - _(R(e, !0, !0)) + A(R(e, !0, !0)) } }; function ie(e, t) { @@ -25919,11 +26018,11 @@ configurable: !0 }), e.prototype.abort = function(e) { - return !1 === ge(this) ? A(at("abort")) : !0 === ye(this) ? A(new TypeError("Cannot abort a stream that already has a writer")) : ve(this, e) + return !1 === ge(this) ? _(at("abort")) : !0 === ye(this) ? _(new TypeError("Cannot abort a stream that already has a writer")) : ve(this, e) } , e.prototype.close = function() { - return !1 === ge(this) ? A(at("close")) : !0 === ye(this) ? A(new TypeError("Cannot close a stream that already has a writer")) : !0 === Pe(this) ? A(new TypeError("Cannot close an already-closing stream")) : Se(this) + return !1 === ge(this) ? _(at("close")) : !0 === ye(this) ? _(new TypeError("Cannot close a stream that already has a writer")) : !0 === Pe(this) ? _(new TypeError("Cannot close an already-closing stream")) : Se(this) } , e.prototype.getWriter = function() { @@ -25970,7 +26069,7 @@ function ve(e, t) { var r = e._state; if ("closed" === r || "errored" === r) - return _(void 0); + return A(void 0); if (void 0 !== e._pendingAbortRequest) return e._pendingAbortRequest._promise; var n = !1; @@ -25987,13 +26086,13 @@ } )); return e._pendingAbortRequest._promise = i, - !1 === n && _e(e, t), + !1 === n && Ae(e, t), i } function Se(e) { var t = e._state; if ("closed" === t || "errored" === t) - return A(new TypeError("The stream (in " + t + " state) is not in the writable state and cannot be closed")); + return _(new TypeError("The stream (in " + t + " state) is not in the writable state and cannot be closed")); var r = C((function(t, r) { var n = { _resolve: t, @@ -26020,17 +26119,17 @@ } function Ce(e, t) { var r = e._state; - "writable" !== r ? Ae(e) : _e(e, t) + "writable" !== r ? _e(e) : Ae(e, t) } - function _e(e, t) { + function Ae(e, t) { var r = e._writableStreamController; e._state = "erroring", e._storedError = t; var n = e._writer; void 0 !== n && Ue(n, t), - !1 === ke(e) && !0 === r._started && Ae(e) + !1 === ke(e) && !0 === r._started && _e(e) } - function Ae(e) { + function _e(e) { e._state = "errored", e._writableStreamController[fe](); var t = e._storedError; @@ -26135,7 +26234,7 @@ } return Object.defineProperty(e.prototype, "closed", { get: function() { - return !1 === Be(this) ? A(st("closed")) : this._closedPromise + return !1 === Be(this) ? _(st("closed")) : this._closedPromise }, enumerable: !0, configurable: !0 @@ -26153,20 +26252,20 @@ }), Object.defineProperty(e.prototype, "ready", { get: function() { - return !1 === Be(this) ? A(st("ready")) : this._readyPromise + return !1 === Be(this) ? _(st("ready")) : this._readyPromise }, enumerable: !0, configurable: !0 }), e.prototype.abort = function(e) { - return !1 === Be(this) ? A(st("abort")) : void 0 === this._ownerWritableStream ? A(ct("abort")) : Fe(this, e) + return !1 === Be(this) ? _(st("abort")) : void 0 === this._ownerWritableStream ? _(ct("abort")) : Fe(this, e) } , e.prototype.close = function() { if (!1 === Be(this)) - return A(st("close")); + return _(st("close")); var e = this._ownerWritableStream; - return void 0 === e ? A(ct("close")) : !0 === Pe(e) ? A(new TypeError("Cannot close an already-closing stream")) : je(this) + return void 0 === e ? _(ct("close")) : !0 === Pe(e) ? _(new TypeError("Cannot close an already-closing stream")) : je(this) } , e.prototype.releaseLock = function() { @@ -26177,7 +26276,7 @@ } , e.prototype.write = function(e) { - return !1 === Be(this) ? A(st("write")) : void 0 === this._ownerWritableStream ? A(ct("write to")) : Ge(this, e) + return !1 === Be(this) ? _(st("write")) : void 0 === this._ownerWritableStream ? _(ct("write to")) : Ge(this, e) } , e @@ -26196,7 +26295,7 @@ function Ke(e) { var t = e._ownerWritableStream , r = t._state; - return !0 === Pe(t) || "closed" === r ? _(void 0) : "errored" === r ? A(t._storedError) : je(e) + return !0 === Pe(t) || "closed" === r ? A(void 0) : "errored" === r ? _(t._storedError) : je(e) } function Le(e, t) { "pending" === e._closedPromiseState ? ft(e, t) : ht(e, t) @@ -26222,14 +26321,14 @@ , n = r._writableStreamController , i = Ze(n, t); if (r !== e._ownerWritableStream) - return A(ct("write to")); + return _(ct("write to")); var o = r._state; if ("errored" === o) - return A(r._storedError); + return _(r._storedError); if (!0 === Pe(r) || "closed" === o) - return A(new TypeError("The stream is closing or closed and cannot be written to")); + return _(new TypeError("The stream is closing or closed and cannot be written to")); if ("erroring" === o) - return A(r._storedError); + return _(r._storedError); var a = we(r); return $e(n, t, i), a @@ -26275,7 +26374,7 @@ var c = it(t); Me(e, c); var u = r() - , d = _(u); + , d = A(u); E(d, (function() { t._started = !0, et(t) @@ -26343,7 +26442,7 @@ "close" === n ? rt(e) : nt(e, n.chunk) } } else - Ae(t) + _e(t) } } function tt(e, t) { @@ -26390,7 +26489,7 @@ function ot(e, t) { var r = e._controlledWritableStream; Ye(e), - _e(r, t) + Ae(r, t) } function at(e) { return new TypeError("WritableStream.prototype." + e + " can only be used on a WritableStream") @@ -26477,8 +26576,8 @@ return !1 } } - var _t = "undefined" !== typeof DOMException ? DOMException : void 0; - function At(e) { + var At = "undefined" !== typeof DOMException ? DOMException : void 0; + function _t(e) { if ("function" !== typeof e && "object" !== typeof e) return !1; try { @@ -26502,13 +26601,13 @@ }), e } - var Et = At(_t) ? _t : It(); + var Et = _t(At) ? At : It(); function Tt(e, t, n, i, o, a) { var s = q(e) , c = pe(t); e._disturbed = !0; var u = !1 - , d = _(void 0); + , d = A(void 0); return C((function(l, f) { var h; if (void 0 !== a) { @@ -26516,11 +26615,11 @@ var r = new Et("Aborted","AbortError") , n = []; !1 === i && n.push((function() { - return "writable" === t._state ? ve(t, r) : _(void 0) + return "writable" === t._state ? ve(t, r) : A(void 0) } )), !1 === o && n.push((function() { - return "readable" === e._state ? Br(e, r) : _(void 0) + return "readable" === e._state ? Br(e, r) : A(void 0) } )), S((function() { @@ -26546,7 +26645,7 @@ )) } function m() { - return !0 === u ? _(!0) : I(c._readyPromise, (function() { + return !0 === u ? A(!0) : I(c._readyPromise, (function() { return I(te(s), (function(e) { return !0 === e.done || (d = I(Ge(c, e.value), void 0, r), !1) @@ -26599,10 +26698,10 @@ function S(e, r, n) { function i() { E(e(), (function() { - return A(r, n) + return _(r, n) } ), (function(e) { - return A(!0, e) + return _(!0, e) } )) } @@ -26612,11 +26711,11 @@ function w(e, r) { !0 !== u && (u = !0, "writable" === t._state && !1 === Pe(t) ? T(g(), (function() { - return A(e, r) + return _(e, r) } - )) : A(e, r)) + )) : _(e, r)) } - function A(e, t) { + function _(e, t) { ze(c), B(s), void 0 !== a && a.removeEventListener("abort", h), @@ -26674,7 +26773,7 @@ var t = se(this); return !0 === this._closeRequested && 0 === this._queue.length ? (Ot(this), Fr(e)) : kt(this), - _(R(t, !1, e._reader._forAuthorCode)) + A(R(t, !1, e._reader._forAuthorCode)) } var r = H(e); return kt(this), @@ -26780,7 +26879,7 @@ t._cancelAlgorithm = i, e._readableStreamController = t; var s = r(); - E(_(s), (function() { + E(A(s), (function() { t._started = !0, kt(t) } @@ -26808,7 +26907,7 @@ )); function h() { if (!0 === u) - return _(void 0); + return A(void 0); u = !0; var e = P(te(c), (function(e) { u = !1; @@ -26824,7 +26923,7 @@ } )); return k(e), - _(void 0) + A(void 0) } function p(t) { if (d = !0, @@ -26975,9 +27074,9 @@ try { r = new Uint8Array(t.buffer,t.byteOffset,t.byteLength) } catch (s) { - return A(s) + return _(s) } - return _(R(r, !1, e._reader._forAuthorCode)) + return A(R(r, !1, e._reader._forAuthorCode)) } var n = this._autoAllocateChunkSize; if (void 0 !== n) { @@ -26985,7 +27084,7 @@ try { i = new ArrayBuffer(n) } catch (c) { - return A(c) + return _(c) } var o = { buffer: i, @@ -27037,7 +27136,7 @@ var r = !1; "closed" === e._state && (r = !0); var n = Zt(t); - "default" === t.readerType ? V(e, n, r) : Ar(e, n, r) + "default" === t.readerType ? V(e, n, r) : _r(e, n, r) } function Zt(e) { var t = e.bytesFilled @@ -27115,25 +27214,25 @@ }; if (e._pendingPullIntos.length > 0) return e._pendingPullIntos.push(a), - _r(r); + Ar(r); if ("closed" === r._state) { var s = new i(a.buffer,a.byteOffset,0); - return _(R(s, !0, r._reader._forAuthorCode)) + return A(R(s, !0, r._reader._forAuthorCode)) } if (e._queueTotalSize > 0) { if (!0 === $t(e, a)) { var c = Zt(a); return tr(e), - _(R(c, !1, r._reader._forAuthorCode)) + A(R(c, !1, r._reader._forAuthorCode)) } if (!0 === e._closeRequested) { var u = new TypeError("Insufficient bytes to fill elements in the given buffer"); return hr(e, u), - A(u) + _(u) } } e._pendingPullIntos.push(a); - var d = _r(r); + var d = Ar(r); return Vt(e), d } @@ -27277,7 +27376,7 @@ t._pendingPullIntos = new O, e._readableStreamController = t; var s = r(); - E(_(s), (function() { + E(A(s), (function() { t._started = !0, Vt(t) } @@ -27315,7 +27414,7 @@ return r._forAuthorCode = t, r } - function _r(e) { + function Ar(e) { var t = C((function(t, r) { var n = { _resolve: t, @@ -27326,7 +27425,7 @@ )); return t } - function Ar(e, t, r) { + function _r(e, t, r) { var n = e._reader , i = n._readIntoRequests.shift(); i._resolve(R(t, r, n._forAuthorCode)) @@ -27351,18 +27450,18 @@ } return Object.defineProperty(e.prototype, "closed", { get: function() { - return xr(this) ? this._closedPromise : A(kr("closed")) + return xr(this) ? this._closedPromise : _(kr("closed")) }, enumerable: !0, configurable: !0 }), e.prototype.cancel = function(e) { - return xr(this) ? void 0 === this._ownerReadableStream ? A(F("cancel")) : N(this, e) : A(kr("cancel")) + return xr(this) ? void 0 === this._ownerReadableStream ? _(F("cancel")) : N(this, e) : _(kr("cancel")) } , e.prototype.read = function(e) { - return xr(this) ? void 0 === this._ownerReadableStream ? A(F("read from")) : ArrayBuffer.isView(e) ? (m(e.buffer), - 0 === e.byteLength ? A(new TypeError("view must have non-zero byteLength")) : Pr(this, e)) : A(new TypeError("view must be an array buffer view")) : A(kr("read")) + return xr(this) ? void 0 === this._ownerReadableStream ? _(F("read from")) : ArrayBuffer.isView(e) ? (m(e.buffer), + 0 === e.byteLength ? _(new TypeError("view must have non-zero byteLength")) : Pr(this, e)) : _(new TypeError("view must be an array buffer view")) : _(kr("read")) } , e.prototype.releaseLock = function() { @@ -27383,7 +27482,7 @@ function Pr(e, t) { var r = e._ownerReadableStream; return r._disturbed = !0, - "errored" === r._state ? A(r._storedError) : ir(r._readableStreamController, t) + "errored" === r._state ? _(r._storedError) : ir(r._readableStreamController, t) } function kr(e) { return new TypeError("ReadableStreamBYOBReader.prototype." + e + " can only be used on a ReadableStreamBYOBReader") @@ -27422,7 +27521,7 @@ configurable: !0 }), e.prototype.cancel = function(e) { - return !1 === Mr(this) ? A(Kr("cancel")) : !0 === Nr(this) ? A(new TypeError("Cannot cancel a stream that already has a reader")) : Br(this, e) + return !1 === Mr(this) ? _(Kr("cancel")) : !0 === Nr(this) ? _(new TypeError("Cannot cancel a stream that already has a reader")) : Br(this, e) } , e.prototype.getReader = function(e) { @@ -27471,10 +27570,10 @@ , i = r.preventAbort , o = r.preventCancel , a = r.signal; - return !1 === Mr(this) ? A(Kr("pipeTo")) : !1 === ge(e) ? A(new TypeError("ReadableStream.prototype.pipeTo's first argument must be a WritableStream")) : (n = Boolean(n), + return !1 === Mr(this) ? _(Kr("pipeTo")) : !1 === ge(e) ? _(new TypeError("ReadableStream.prototype.pipeTo's first argument must be a WritableStream")) : (n = Boolean(n), i = Boolean(i), o = Boolean(o), - void 0 === a || Ct(a) ? !0 === Nr(this) ? A(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream")) : !0 === ye(e) ? A(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream")) : Tt(this, e, n, i, o, a) : A(new TypeError("ReadableStream.prototype.pipeTo's signal option must be an AbortSignal"))) + void 0 === a || Ct(a) ? !0 === Nr(this) ? _(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream")) : !0 === ye(e) ? _(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream")) : Tt(this, e, n, i, o, a) : _(new TypeError("ReadableStream.prototype.pipeTo's signal option must be an AbortSignal"))) } , e.prototype.tee = function() { @@ -27521,9 +27620,9 @@ function Br(e, t) { if (e._disturbed = !0, "closed" === e._state) - return _(void 0); + return A(void 0); if ("errored" === e._state) - return A(e._storedError); + return _(e._storedError); Fr(e); var n = e._readableStreamController[G](t); return P(n, r) @@ -27652,7 +27751,7 @@ } function l(t) { return qr(e, t), - _(void 0) + A(void 0) } e._writable = me(a, s, u, c, r, n), e._readable = Or(a, d, l, i, o), @@ -27730,9 +27829,9 @@ , n = function(e) { try { return $r(r, e), - _(void 0) + A(void 0) } catch (t) { - return A(t) + return _(t) } } , i = t.transform; @@ -27799,7 +27898,7 @@ } function on(e, t) { return Wr(e, t), - _(void 0) + A(void 0) } function an(e) { var t = e._readable @@ -28537,7 +28636,7 @@ "use strict"; var t = r("cb1f") , n = r("699f") - , i = "鈥�" + , i = "…" , o = /^(\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/ , a = /^(\d\d\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/; function s(e, t) { @@ -29341,7 +29440,7 @@ t.delegate = null, f) } - function _(e) { + function A(e) { var t = { tryLoc: e[0] }; @@ -29350,7 +29449,7 @@ t.afterLoc = e[3]), this.tryEntries.push(t) } - function A(e) { + function _(e) { var t = e.completion || {}; t.type = "normal", delete t.arg, @@ -29360,7 +29459,7 @@ this.tryEntries = [{ tryLoc: "root" }], - e.forEach(_, this), + e.forEach(A, this), this.reset(!0) } function E(e) { @@ -29471,7 +29570,7 @@ this.delegate = null, this.method = "next", this.arg = void 0, - this.tryEntries.forEach(A), + this.tryEntries.forEach(_), !e) for (var t in this) "t" === t.charAt(0) && r.call(this, t) && !isNaN(+t.slice(1)) && (this[t] = void 0) @@ -29549,7 +29648,7 @@ var r = this.tryEntries[t]; if (r.finallyLoc === e) return this.complete(r.completion, r.afterLoc), - A(r), + _(r), f } }, @@ -29560,7 +29659,7 @@ var n = r.completion; if ("throw" === n.type) { var i = n.arg; - A(r) + _(r) } return i } @@ -29651,15 +29750,19 @@ if (void 0 === r.toSign) return {}; var n = r.toSign.eseal.esealInfo.picture.type - , i = r.toSign.eseal.esealInfo.picture.data.byte; + , i = r.toSign.eseal.esealInfo.picture.data.byte + , o = r.toSign.eseal.esealInfo.picture.width + , a = r.toSign.eseal.esealInfo.picture.height; return { ofdArray: i, type: n.toLowerCase(), + width: o, + height: a, SES_Signature: r, verifyRet: !0 } - } catch (o) { - return console.log(o), + } catch (s) { + return console.log(s), {} } } @@ -29674,7 +29777,7 @@ t = t || 0; var r, n = c.a.decode(e, t); try { - var i, o, a, s, u, d, l, f, h, p, m, b, y, I, E, T, x, P, k, D, O, R, M, N, B, F, j, K, L, U, X, z, G, W, q, H, V, Y, Q, Z, J, $, ee, te, re, ne, ie, oe, ae, se, ce, ue, de, le, fe, he, pe, me, be, ge, ye, ve, Se, we, Ce, _e, Ae, Ie, Ee, Te, xe, Pe, ke, De, Oe, Re, Me, Ne, Be, Fe, je, Ke, Le, Ue, Xe, ze, Ge, We, qe, He, Ve, Ye, Qe, Ze, Je, $e, et, tt, rt, nt, it = g(null === (i = n.sub[0]) || void 0 === i || null === (o = i.sub[1]) || void 0 === o || null === (a = o.sub[0]) || void 0 === a || null === (s = a.sub[2]) || void 0 === s || null === (u = s.sub[3]) || void 0 === u ? void 0 : u.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[3].header, n.sub[0].sub[1].sub[0].sub[2].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[3].header + n.sub[0].sub[1].sub[0].sub[2].sub[3].length)), ot = g(null === (d = n.sub[0]) || void 0 === d || null === (l = d.sub[1]) || void 0 === l || null === (f = l.sub[0]) || void 0 === f || null === (h = f.sub[2]) || void 0 === h || null === (p = h.sub[4]) || void 0 === p ? void 0 : p.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[4].header, n.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[4].header + n.sub[0].sub[1].sub[0].sub[2].sub[4].length)), at = g(null === (m = n.sub[0]) || void 0 === m || null === (b = m.sub[1]) || void 0 === b || null === (y = b.sub[0]) || void 0 === y || null === (I = y.sub[2]) || void 0 === I || null === (E = I.sub[5]) || void 0 === E ? void 0 : E.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[5].header, n.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[5].header + n.sub[0].sub[1].sub[0].sub[2].sub[5].length)), st = g(null === (T = n.sub[0]) || void 0 === T || null === (x = T.sub[2]) || void 0 === x ? void 0 : x.stream.parseTime(n.sub[0].sub[2].stream.pos + n.sub[0].sub[2].header, n.sub[0].sub[2].stream.pos + n.sub[0].sub[2].header + n.sub[0].sub[2].length, !1)), ct = null === (P = n.sub[0]) || void 0 === P || null === (k = P.sub[1]) || void 0 === k || null === (D = k.sub[0]) || void 0 === D || null === (O = D.sub[2]) || void 0 === O ? void 0 : O.sub[2], ut = new Array; + var i, o, a, s, u, d, l, f, h, p, m, b, y, I, E, T, x, P, k, D, O, R, M, N, B, F, j, K, L, U, X, z, G, W, q, H, V, Y, Q, Z, J, $, ee, te, re, ne, ie, oe, ae, se, ce, ue, de, le, fe, he, pe, me, be, ge, ye, ve, Se, we, Ce, Ae, _e, Ie, Ee, Te, xe, Pe, ke, De, Oe, Re, Me, Ne, Be, Fe, je, Ke, Le, Ue, Xe, ze, Ge, We, qe, He, Ve, Ye, Qe, Ze, Je, $e, et, tt, rt, nt, it = g(null === (i = n.sub[0]) || void 0 === i || null === (o = i.sub[1]) || void 0 === o || null === (a = o.sub[0]) || void 0 === a || null === (s = a.sub[2]) || void 0 === s || null === (u = s.sub[3]) || void 0 === u ? void 0 : u.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[3].header, n.sub[0].sub[1].sub[0].sub[2].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[3].header + n.sub[0].sub[1].sub[0].sub[2].sub[3].length)), ot = g(null === (d = n.sub[0]) || void 0 === d || null === (l = d.sub[1]) || void 0 === l || null === (f = l.sub[0]) || void 0 === f || null === (h = f.sub[2]) || void 0 === h || null === (p = h.sub[4]) || void 0 === p ? void 0 : p.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[4].header, n.sub[0].sub[1].sub[0].sub[2].sub[4].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[4].header + n.sub[0].sub[1].sub[0].sub[2].sub[4].length)), at = g(null === (m = n.sub[0]) || void 0 === m || null === (b = m.sub[1]) || void 0 === b || null === (y = b.sub[0]) || void 0 === y || null === (I = y.sub[2]) || void 0 === I || null === (E = I.sub[5]) || void 0 === E ? void 0 : E.stream.parseTime(n.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[5].header, n.sub[0].sub[1].sub[0].sub[2].sub[5].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[5].header + n.sub[0].sub[1].sub[0].sub[2].sub[5].length)), st = g(null === (T = n.sub[0]) || void 0 === T || null === (x = T.sub[2]) || void 0 === x ? void 0 : x.stream.parseTime(n.sub[0].sub[2].stream.pos + n.sub[0].sub[2].header, n.sub[0].sub[2].stream.pos + n.sub[0].sub[2].header + n.sub[0].sub[2].length, !1)), ct = null === (P = n.sub[0]) || void 0 === P || null === (k = P.sub[1]) || void 0 === k || null === (D = k.sub[0]) || void 0 === D || null === (O = D.sub[2]) || void 0 === O ? void 0 : O.sub[2], ut = new Array; ct && ct.sub.forEach((function(e) { ut.push(e.stream.parseOctetString(e.stream.pos + e.header, e.stream.pos + e.header + e.length)) } @@ -29714,8 +29817,8 @@ picture: { type: null === (pe = n.sub[0]) || void 0 === pe || null === (me = pe.sub[1]) || void 0 === me || null === (be = me.sub[0]) || void 0 === be || null === (ge = be.sub[3]) || void 0 === ge || null === (ye = ge.sub[0]) || void 0 === ye ? void 0 : ye.stream.parseStringUTF(n.sub[0].sub[1].sub[0].sub[3].sub[0].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[0].header, n.sub[0].sub[1].sub[0].sub[3].sub[0].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[0].header + n.sub[0].sub[1].sub[0].sub[3].sub[0].length), data: { - hex: null === (ve = n.sub[0]) || void 0 === ve || null === (Se = ve.sub[1]) || void 0 === Se || null === (we = Se.sub[0]) || void 0 === we || null === (Ce = we.sub[3]) || void 0 === Ce || null === (_e = Ce.sub[1]) || void 0 === _e ? void 0 : _e.stream.parseOctetString(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length), - byte: null === (Ae = n.sub[0]) || void 0 === Ae || null === (Ie = Ae.sub[1]) || void 0 === Ie || null === (Ee = Ie.sub[0]) || void 0 === Ee || null === (Te = Ee.sub[3]) || void 0 === Te || null === (xe = Te.sub[1]) || void 0 === xe ? void 0 : xe.stream.enc.subarray(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length) + hex: null === (ve = n.sub[0]) || void 0 === ve || null === (Se = ve.sub[1]) || void 0 === Se || null === (we = Se.sub[0]) || void 0 === we || null === (Ce = we.sub[3]) || void 0 === Ce || null === (Ae = Ce.sub[1]) || void 0 === Ae ? void 0 : Ae.stream.parseOctetString(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length), + byte: null === (_e = n.sub[0]) || void 0 === _e || null === (Ie = _e.sub[1]) || void 0 === Ie || null === (Ee = Ie.sub[0]) || void 0 === Ee || null === (Te = Ee.sub[3]) || void 0 === Te || null === (xe = Te.sub[1]) || void 0 === xe ? void 0 : xe.stream.enc.subarray(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length) }, width: null === (Pe = n.sub[0]) || void 0 === Pe || null === (ke = Pe.sub[1]) || void 0 === ke || null === (De = ke.sub[0]) || void 0 === De || null === (Oe = De.sub[3]) || void 0 === Oe || null === (Re = Oe.sub[2]) || void 0 === Re ? void 0 : Re.stream.parseInteger(n.sub[0].sub[1].sub[0].sub[3].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[2].header, n.sub[0].sub[1].sub[0].sub[3].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[2].header + n.sub[0].sub[1].sub[0].sub[3].sub[2].length), height: null === (Me = n.sub[0]) || void 0 === Me || null === (Ne = Me.sub[1]) || void 0 === Ne || null === (Be = Ne.sub[0]) || void 0 === Be || null === (Fe = Be.sub[3]) || void 0 === Fe || null === (je = Fe.sub[3]) || void 0 === je ? void 0 : je.stream.parseInteger(n.sub[0].sub[1].sub[0].sub[3].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[3].header, n.sub[0].sub[1].sub[0].sub[3].sub[3].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[3].header + n.sub[0].sub[1].sub[0].sub[3].sub[3].length) @@ -29738,12 +29841,12 @@ } } catch (fn) { try { - var ft, ht, pt, mt, bt, gt, yt, vt, St, wt, Ct, _t, At, It, Et, Tt, xt, Pt, kt, Dt, Ot, Rt, Mt, Nt, Bt, Ft, jt, Kt, Lt, Ut, Xt, zt, Gt, Wt, qt, Ht, Vt, Yt, Qt, Zt, Jt, $t, er, tr, rr, nr, ir, or, ar, sr, cr, ur, dr, lr, fr, hr, pr, mr, br, gr, yr, vr, Sr, wr, Cr, _r, Ar, Ir, Er, Tr, xr, Pr, kr, Dr, Or, Rr, Mr, Nr, Br, Fr, jr, Kr, Lr, Ur, Xr, zr, Gr, Wr, qr, Hr, Vr, Yr, Qr, Zr, Jr, $r, en, tn, rn, nn = null === (ft = n.sub[0]) || void 0 === ft || null === (ht = ft.sub[1]) || void 0 === ht || null === (pt = ht.sub[0]) || void 0 === pt || null === (mt = pt.sub[2]) || void 0 === mt || null === (bt = mt.sub[2]) || void 0 === bt ? void 0 : bt.stream.parseInteger(n.sub[0].sub[1].sub[0].sub[2].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[2].header, n.sub[0].sub[1].sub[0].sub[2].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[2].header + n.sub[0].sub[1].sub[0].sub[2].sub[2].length), on = null === (gt = n.sub[0]) || void 0 === gt || null === (yt = gt.sub[1]) || void 0 === yt || null === (vt = yt.sub[0]) || void 0 === vt || null === (St = vt.sub[2]) || void 0 === St ? void 0 : St.sub[3], an = new Array; + var ft, ht, pt, mt, bt, gt, yt, vt, St, wt, Ct, At, _t, It, Et, Tt, xt, Pt, kt, Dt, Ot, Rt, Mt, Nt, Bt, Ft, jt, Kt, Lt, Ut, Xt, zt, Gt, Wt, qt, Ht, Vt, Yt, Qt, Zt, Jt, $t, er, tr, rr, nr, ir, or, ar, sr, cr, ur, dr, lr, fr, hr, pr, mr, br, gr, yr, vr, Sr, wr, Cr, Ar, _r, Ir, Er, Tr, xr, Pr, kr, Dr, Or, Rr, Mr, Nr, Br, Fr, jr, Kr, Lr, Ur, Xr, zr, Gr, Wr, qr, Hr, Vr, Yr, Qr, Zr, Jr, $r, en, tn, rn, nn = null === (ft = n.sub[0]) || void 0 === ft || null === (ht = ft.sub[1]) || void 0 === ht || null === (pt = ht.sub[0]) || void 0 === pt || null === (mt = pt.sub[2]) || void 0 === mt || null === (bt = mt.sub[2]) || void 0 === bt ? void 0 : bt.stream.parseInteger(n.sub[0].sub[1].sub[0].sub[2].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[2].header, n.sub[0].sub[1].sub[0].sub[2].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[2].sub[2].header + n.sub[0].sub[1].sub[0].sub[2].sub[2].length), on = null === (gt = n.sub[0]) || void 0 === gt || null === (yt = gt.sub[1]) || void 0 === yt || null === (vt = yt.sub[0]) || void 0 === vt || null === (St = vt.sub[2]) || void 0 === St ? void 0 : St.sub[3], an = new Array; on && on.sub.forEach((function(e) { an.push(e.stream.parseOctetString(e.stream.pos + e.header, e.stream.pos + e.header + e.length)) } )); - var sn = null === (wt = n.sub[0]) || void 0 === wt || null === (Ct = wt.sub[1]) || void 0 === Ct || null === (_t = Ct.sub[0]) || void 0 === _t ? void 0 : _t.sub[4] + var sn = null === (wt = n.sub[0]) || void 0 === wt || null === (Ct = wt.sub[1]) || void 0 === Ct || null === (At = Ct.sub[0]) || void 0 === At ? void 0 : At.sub[4] , cn = new Array; sn && sn.sub.forEach((function(e) { var t, r, n; @@ -29756,7 +29859,7 @@ )), r = { realVersion: 4, - toSignDer: null === (At = n.sub[0]) || void 0 === At ? void 0 : At.stream.enc.subarray(n.sub[0].stream.pos, n.sub[0].stream.pos + n.sub[0].header + n.sub[0].length), + toSignDer: null === (_t = n.sub[0]) || void 0 === _t ? void 0 : _t.stream.enc.subarray(n.sub[0].stream.pos, n.sub[0].stream.pos + n.sub[0].header + n.sub[0].length), toSign: { version: null === (It = n.sub[0]) || void 0 === It || null === (Et = It.sub[0]) || void 0 === Et ? void 0 : Et.stream.parseInteger(n.sub[0].sub[0].stream.pos + n.sub[0].sub[0].header, n.sub[0].sub[0].stream.pos + n.sub[0].sub[0].header + n.sub[0].sub[0].length), eseal: { @@ -29779,7 +29882,7 @@ picture: { type: null === (gr = n.sub[0]) || void 0 === gr || null === (yr = gr.sub[1]) || void 0 === yr || null === (vr = yr.sub[0]) || void 0 === vr || null === (Sr = vr.sub[3]) || void 0 === Sr || null === (wr = Sr.sub[0]) || void 0 === wr ? void 0 : wr.stream.parseStringUTF(n.sub[0].sub[1].sub[0].sub[3].sub[0].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[0].header, n.sub[0].sub[1].sub[0].sub[3].sub[0].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[0].header + n.sub[0].sub[1].sub[0].sub[3].sub[0].length), data: { - hex: null === (Cr = n.sub[0]) || void 0 === Cr || null === (_r = Cr.sub[1]) || void 0 === _r || null === (Ar = _r.sub[0]) || void 0 === Ar || null === (Ir = Ar.sub[3]) || void 0 === Ir || null === (Er = Ir.sub[1]) || void 0 === Er ? void 0 : Er.stream.parseOctetString(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length), + hex: null === (Cr = n.sub[0]) || void 0 === Cr || null === (Ar = Cr.sub[1]) || void 0 === Ar || null === (_r = Ar.sub[0]) || void 0 === _r || null === (Ir = _r.sub[3]) || void 0 === Ir || null === (Er = Ir.sub[1]) || void 0 === Er ? void 0 : Er.stream.parseOctetString(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length), byte: null === (Tr = n.sub[0]) || void 0 === Tr || null === (xr = Tr.sub[1]) || void 0 === xr || null === (Pr = xr.sub[0]) || void 0 === Pr || null === (kr = Pr.sub[3]) || void 0 === kr || null === (Dr = kr.sub[1]) || void 0 === Dr ? void 0 : Dr.stream.enc.subarray(n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header, n.sub[0].sub[1].sub[0].sub[3].sub[1].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[1].header + n.sub[0].sub[1].sub[0].sub[3].sub[1].length) }, width: null === (Or = n.sub[0]) || void 0 === Or || null === (Rr = Or.sub[1]) || void 0 === Rr || null === (Mr = Rr.sub[0]) || void 0 === Mr || null === (Nr = Mr.sub[3]) || void 0 === Nr || null === (Br = Nr.sub[2]) || void 0 === Br ? void 0 : Br.stream.parseInteger(n.sub[0].sub[1].sub[0].sub[3].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[2].header, n.sub[0].sub[1].sub[0].sub[3].sub[2].stream.pos + n.sub[0].sub[1].sub[0].sub[3].sub[2].header + n.sub[0].sub[1].sub[0].sub[3].sub[2].length), @@ -29812,8 +29915,8 @@ picture: { type: C(un.sub[0]), data: { - hex: _(un.sub[1]), - byte: A(un.sub[1]) + hex: A(un.sub[1]), + byte: _(un.sub[1]) }, width: w(un.sub[2]), height: w(un.sub[3]) @@ -29832,8 +29935,8 @@ picture: { type: C(dn.sub[0]), data: { - hex: _(dn.sub[1]), - byte: A(dn.sub[1]) + hex: A(dn.sub[1]), + byte: _(dn.sub[1]) }, width: w(dn.sub[2]), height: w(dn.sub[3]) @@ -29852,8 +29955,8 @@ picture: { type: C(ln.sub[0]), data: { - hex: _(ln.sub[1]), - byte: A(ln.sub[1]) + hex: A(ln.sub[1]), + byte: _(ln.sub[1]) }, width: w(ln.sub[2]), height: w(ln.sub[3]) @@ -29906,10 +30009,10 @@ , C = function(e) { return e.stream.parseStringUTF(e.stream.pos + e.header, e.stream.pos + e.header + e.length) } - , _ = function(e) { + , A = function(e) { return e.stream.parseOctetString(e.stream.pos + e.header, e.stream.pos + e.header + e.length) } - , A = function(e) { + , _ = function(e) { return e.stream.enc.subarray(e.stream.pos + e.header, e.stream.pos + e.header + e.length) } }, @@ -30479,8 +30582,8 @@ } }, b575: function(e, t, r) { - var n, i, o, a, s, c, u, d, l = r("da84"), f = r("0366"), h = r("06cf").f, p = r("2cf4").set, m = r("1cdc"), b = r("d4c3"), g = r("a4b4"), y = r("605d"), v = l.MutationObserver || l.WebKitMutationObserver, S = l.document, w = l.process, C = l.Promise, _ = h(l, "queueMicrotask"), A = _ && _.value; - A || (n = function() { + var n, i, o, a, s, c, u, d, l = r("da84"), f = r("0366"), h = r("06cf").f, p = r("2cf4").set, m = r("1cdc"), b = r("d4c3"), g = r("a4b4"), y = r("605d"), v = l.MutationObserver || l.WebKitMutationObserver, S = l.document, w = l.process, C = l.Promise, A = h(l, "queueMicrotask"), _ = A && A.value; + _ || (n = function() { var e, t; y && (e = w.domain) && e.exit(); while (i) { @@ -30519,7 +30622,7 @@ c.data = s = !s } )), - e.exports = A || function(e) { + e.exports = _ || function(e) { var t = { fn: e, next: void 0 @@ -30754,7 +30857,7 @@ e[t] = e[r], e[r] = n } - function _(e, t, r, n, i) { + function A(e, t, r, n, i) { if (0 === e.length) return -1; if ("string" === typeof r ? (n = r, @@ -30773,13 +30876,13 @@ } if ("string" === typeof t && (t = u.from(t, n)), u.isBuffer(t)) - return 0 === t.length ? -1 : A(e, t, r, n, i); + return 0 === t.length ? -1 : _(e, t, r, n, i); if ("number" === typeof t) return t &= 255, - u.TYPED_ARRAY_SUPPORT && "function" === typeof Uint8Array.prototype.indexOf ? i ? Uint8Array.prototype.indexOf.call(e, t, r) : Uint8Array.prototype.lastIndexOf.call(e, t, r) : A(e, [t], r, n, i); + u.TYPED_ARRAY_SUPPORT && "function" === typeof Uint8Array.prototype.indexOf ? i ? Uint8Array.prototype.indexOf.call(e, t, r) : Uint8Array.prototype.lastIndexOf.call(e, t, r) : _(e, [t], r, n, i); throw new TypeError("val must be string, number or Buffer") } - function A(e, t, r, n, i) { + function _(e, t, r, n, i) { var o, a = 1, s = e.length, c = t.length; if (void 0 !== n && (n = String(n).toLowerCase(), "ucs2" === n || "ucs-2" === n || "utf16le" === n || "utf-16le" === n)) { @@ -31068,11 +31171,11 @@ } , u.prototype.indexOf = function(e, t, r) { - return _(this, e, t, r, !0) + return A(this, e, t, r, !0) } , u.prototype.lastIndexOf = function(e, t, r) { - return _(this, e, t, r, !1) + return A(this, e, t, r, !1) } , u.prototype.write = function(e, t, r, n) { @@ -31725,12 +31828,12 @@ , f = 7 == e , h = 5 == e || l; return function(p, m, b, g) { - for (var y, v, S = a(p), w = o(S), C = n(m, b), _ = s(w), A = 0, I = g || c, E = t ? I(p, _) : r || f ? I(p, 0) : void 0; _ > A; A++) - if ((h || A in w) && (y = w[A], - v = C(y, A, S), + for (var y, v, S = a(p), w = o(S), C = n(m, b), A = s(w), _ = 0, I = g || c, E = t ? I(p, A) : r || f ? I(p, 0) : void 0; A > _; _++) + if ((h || _ in w) && (y = w[_], + v = C(y, _, S), e)) if (t) - E[A] = v; + E[_] = v; else if (v) switch (e) { case 3: @@ -31738,7 +31841,7 @@ case 5: return y; case 6: - return A; + return _; case 2: u(E, y) } @@ -32195,7 +32298,7 @@ return n } function i(e, t, r, i, a, d) { - var l, f, h = e.file, p = e.compression, m = d !== s.utf8encode, b = o.transformTo("string", d(h.name)), g = o.transformTo("string", s.utf8encode(h.name)), y = h.comment, v = o.transformTo("string", d(y)), S = o.transformTo("string", s.utf8encode(y)), w = g.length !== h.name.length, C = S.length !== y.length, _ = "", A = "", I = "", E = h.dir, T = h.date, x = { + var l, f, h = e.file, p = e.compression, m = d !== s.utf8encode, b = o.transformTo("string", d(h.name)), g = o.transformTo("string", s.utf8encode(h.name)), y = h.comment, v = o.transformTo("string", d(y)), S = o.transformTo("string", s.utf8encode(y)), w = g.length !== h.name.length, C = S.length !== y.length, A = "", _ = "", I = "", E = h.dir, T = h.date, x = { crc32: 0, compressedSize: 0, uncompressedSize: 0 @@ -32228,10 +32331,10 @@ f |= T.getUTCMonth() + 1, f <<= 5, f |= T.getUTCDate(), - w && (A = n(1, 1) + n(c(b), 4) + g, - _ += "up" + n(A.length, 2) + A), + w && (_ = n(1, 1) + n(c(b), 4) + g, + A += "up" + n(_.length, 2) + _), C && (I = n(1, 1) + n(c(v), 4) + S, - _ += "uc" + n(I.length, 2) + I); + A += "uc" + n(I.length, 2) + I); var O = ""; return O += "\n\0", O += n(P, 2), @@ -32242,10 +32345,10 @@ O += n(x.compressedSize, 4), O += n(x.uncompressedSize, 4), O += n(b.length, 2), - O += n(_.length, 2), + O += n(A.length, 2), { - fileRecord: u.LOCAL_FILE_HEADER + O + b + _, - dirRecord: u.CENTRAL_FILE_HEADER + n(D, 2) + O + n(v.length, 2) + "\0\0\0\0" + n(k, 4) + n(i, 4) + b + _ + v + fileRecord: u.LOCAL_FILE_HEADER + O + b + A, + dirRecord: u.CENTRAL_FILE_HEADER + n(D, 2) + O + n(v.length, 2) + "\0\0\0\0" + n(k, 4) + n(i, 4) + b + A + v } } var o = e("../utils") @@ -34859,7 +34962,7 @@ , {}], 46: [function(e, t, r) { "use strict"; - var n, i = e("../utils/common"), o = e("./trees"), a = e("./adler32"), s = e("./crc32"), c = e("./messages"), u = 0, d = 4, l = 0, f = -2, h = -1, p = 4, m = 2, b = 8, g = 9, y = 286, v = 30, S = 19, w = 2 * y + 1, C = 15, _ = 3, A = 258, I = A + _ + 1, E = 42, T = 113, x = 1, P = 2, k = 3, D = 4; + var n, i = e("../utils/common"), o = e("./trees"), a = e("./adler32"), s = e("./crc32"), c = e("./messages"), u = 0, d = 4, l = 0, f = -2, h = -1, p = 4, m = 2, b = 8, g = 9, y = 286, v = 30, S = 19, w = 2 * y + 1, C = 15, A = 3, _ = 258, I = _ + A + 1, E = 42, T = 113, x = 1, P = 2, k = 3, D = 4; function O(e, t) { return e.msg = c[t], t @@ -34896,7 +34999,7 @@ e.pending_buf[e.pending++] = 255 & t } function K(e, t) { - var r, n, i = e.max_chain_length, o = e.strstart, a = e.prev_length, s = e.nice_match, c = e.strstart > e.w_size - I ? e.strstart - (e.w_size - I) : 0, u = e.window, d = e.w_mask, l = e.prev, f = e.strstart + A, h = u[o + a - 1], p = u[o + a]; + var r, n, i = e.max_chain_length, o = e.strstart, a = e.prev_length, s = e.nice_match, c = e.strstart > e.w_size - I ? e.strstart - (e.w_size - I) : 0, u = e.window, d = e.w_mask, l = e.prev, f = e.strstart + _, h = u[o + a - 1], p = u[o + a]; e.prev_length >= e.good_match && (i >>= 2), s > e.lookahead && (s = e.lookahead); do { @@ -34904,8 +35007,8 @@ o += 2, r++; do {} while (u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && u[++o] === u[++r] && o < f); - if (n = A - (f - o), - o = f - A, + if (n = _ - (f - o), + o = f - _, a < n) { if (e.match_start = t, s <= (a = n)) @@ -34952,15 +35055,15 @@ u.total_in += h, h), e.lookahead += r, - e.lookahead + e.insert >= _) + e.lookahead + e.insert >= A) for (c = e.strstart - e.insert, e.ins_h = e.window[c], - e.ins_h = (e.ins_h << e.hash_shift ^ e.window[c + 1]) & e.hash_mask; e.insert && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[c + _ - 1]) & e.hash_mask, + e.ins_h = (e.ins_h << e.hash_shift ^ e.window[c + 1]) & e.hash_mask; e.insert && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[c + A - 1]) & e.hash_mask, e.prev[c & e.w_mask] = e.head[e.ins_h], e.head[e.ins_h] = c, c++, e.insert--, - !(e.lookahead + e.insert < _)); ) + !(e.lookahead + e.insert < A)); ) ; } while (e.lookahead < I && 0 !== e.strm.avail_in) } @@ -34974,16 +35077,16 @@ break } if (r = 0, - e.lookahead >= _ && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + _ - 1]) & e.hash_mask, + e.lookahead >= A && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + A - 1]) & e.hash_mask, r = e.prev[e.strstart & e.w_mask] = e.head[e.ins_h], e.head[e.ins_h] = e.strstart), 0 !== r && e.strstart - r <= e.w_size - I && (e.match_length = K(e, r)), - e.match_length >= _) - if (n = o._tr_tally(e, e.strstart - e.match_start, e.match_length - _), + e.match_length >= A) + if (n = o._tr_tally(e, e.strstart - e.match_start, e.match_length - A), e.lookahead -= e.match_length, - e.match_length <= e.max_lazy_match && e.lookahead >= _) { + e.match_length <= e.max_lazy_match && e.lookahead >= A) { for (e.match_length--; e.strstart++, - e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + _ - 1]) & e.hash_mask, + e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + A - 1]) & e.hash_mask, r = e.prev[e.strstart & e.w_mask] = e.head[e.ins_h], e.head[e.ins_h] = e.strstart, 0 != --e.match_length; ) @@ -35002,7 +35105,7 @@ 0 === e.strm.avail_out)) return x } - return e.insert = e.strstart < _ - 1 ? e.strstart : _ - 1, + return e.insert = e.strstart < A - 1 ? e.strstart : A - 1, t === d ? (B(e, !0), 0 === e.strm.avail_out ? k : D) : e.last_lit && (B(e, !1), 0 === e.strm.avail_out) ? x : P @@ -35017,25 +35120,25 @@ break } if (r = 0, - e.lookahead >= _ && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + _ - 1]) & e.hash_mask, + e.lookahead >= A && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + A - 1]) & e.hash_mask, r = e.prev[e.strstart & e.w_mask] = e.head[e.ins_h], e.head[e.ins_h] = e.strstart), e.prev_length = e.match_length, e.prev_match = e.match_start, - e.match_length = _ - 1, + e.match_length = A - 1, 0 !== r && e.prev_length < e.max_lazy_match && e.strstart - r <= e.w_size - I && (e.match_length = K(e, r), - e.match_length <= 5 && (1 === e.strategy || e.match_length === _ && 4096 < e.strstart - e.match_start) && (e.match_length = _ - 1)), - e.prev_length >= _ && e.match_length <= e.prev_length) { - for (i = e.strstart + e.lookahead - _, - n = o._tr_tally(e, e.strstart - 1 - e.prev_match, e.prev_length - _), + e.match_length <= 5 && (1 === e.strategy || e.match_length === A && 4096 < e.strstart - e.match_start) && (e.match_length = A - 1)), + e.prev_length >= A && e.match_length <= e.prev_length) { + for (i = e.strstart + e.lookahead - A, + n = o._tr_tally(e, e.strstart - 1 - e.prev_match, e.prev_length - A), e.lookahead -= e.prev_length - 1, - e.prev_length -= 2; ++e.strstart <= i && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + _ - 1]) & e.hash_mask, + e.prev_length -= 2; ++e.strstart <= i && (e.ins_h = (e.ins_h << e.hash_shift ^ e.window[e.strstart + A - 1]) & e.hash_mask, r = e.prev[e.strstart & e.w_mask] = e.head[e.ins_h], e.head[e.ins_h] = e.strstart), 0 != --e.prev_length; ) ; if (e.match_available = 0, - e.match_length = _ - 1, + e.match_length = A - 1, e.strstart++, n && (B(e, !1), 0 === e.strm.avail_out)) @@ -35053,7 +35156,7 @@ } return e.match_available && (n = o._tr_tally(e, 0, e.window[e.strstart - 1]), e.match_available = 0), - e.insert = e.strstart < _ - 1 ? e.strstart : _ - 1, + e.insert = e.strstart < A - 1 ? e.strstart : A - 1, t === d ? (B(e, !0), 0 === e.strm.avail_out ? k : D) : e.last_lit && (B(e, !1), 0 === e.strm.avail_out) ? x : P @@ -35156,7 +35259,7 @@ e.block_start = 0, e.lookahead = 0, e.insert = 0, - e.match_length = e.prev_length = _ - 1, + e.match_length = e.prev_length = A - 1, e.match_available = 0, e.ins_h = 0 }(e.state), @@ -35183,7 +35286,7 @@ c.hash_bits = o + 7, c.hash_size = 1 << c.hash_bits, c.hash_mask = c.hash_size - 1, - c.hash_shift = ~~((c.hash_bits + _ - 1) / _), + c.hash_shift = ~~((c.hash_bits + A - 1) / A), c.window = new i.Buf8(2 * c.w_size), c.head = new i.Buf16(c.hash_size), c.prev = new i.Buf16(c.w_size), @@ -35371,21 +35474,21 @@ 0 === e.strm.avail_out) ? x : P }(i, t) : 3 === i.strategy ? function(e, t) { for (var r, n, i, a, s = e.window; ; ) { - if (e.lookahead <= A) { + if (e.lookahead <= _) { if (L(e), - e.lookahead <= A && t === u) + e.lookahead <= _ && t === u) return x; if (0 === e.lookahead) break } if (e.match_length = 0, - e.lookahead >= _ && 0 < e.strstart && (n = s[i = e.strstart - 1]) === s[++i] && n === s[++i] && n === s[++i]) { - a = e.strstart + A; + e.lookahead >= A && 0 < e.strstart && (n = s[i = e.strstart - 1]) === s[++i] && n === s[++i] && n === s[++i]) { + a = e.strstart + _; do {} while (n === s[++i] && n === s[++i] && n === s[++i] && n === s[++i] && n === s[++i] && n === s[++i] && n === s[++i] && n === s[++i] && i < a); - e.match_length = A - (a - i), + e.match_length = _ - (a - i), e.match_length > e.lookahead && (e.match_length = e.lookahead) } - if (e.match_length >= _ ? (r = o._tr_tally(e, 1, e.match_length - _), + if (e.match_length >= A ? (r = o._tr_tally(e, 1, e.match_length - A), e.lookahead -= e.match_length, e.strstart += e.match_length, e.match_length = 0) : (r = o._tr_tally(e, 0, e.window[e.strstart]), @@ -35456,23 +35559,23 @@ e.avail_in = p, e.next_in = 0, e.input = t, - L(r); r.lookahead >= _; ) { + L(r); r.lookahead >= A; ) { for (n = r.strstart, - o = r.lookahead - (_ - 1); r.ins_h = (r.ins_h << r.hash_shift ^ r.window[n + _ - 1]) & r.hash_mask, + o = r.lookahead - (A - 1); r.ins_h = (r.ins_h << r.hash_shift ^ r.window[n + A - 1]) & r.hash_mask, r.prev[n & r.w_mask] = r.head[r.ins_h], r.head[r.ins_h] = n, n++, --o; ) ; r.strstart = n, - r.lookahead = _ - 1, + r.lookahead = A - 1, L(r) } return r.strstart += r.lookahead, r.block_start = r.strstart, r.insert = r.lookahead, r.lookahead = 0, - r.match_length = r.prev_length = _ - 1, + r.match_length = r.prev_length = A - 1, r.match_available = 0, e.next_in = u, e.input = d, @@ -35509,7 +35612,7 @@ 48: [function(e, t, r) { "use strict"; t.exports = function(e, t) { - var r, n, i, o, a, s, c, u, d, l, f, h, p, m, b, g, y, v, S, w, C, _, A, I, E; + var r, n, i, o, a, s, c, u, d, l, f, h, p, m, b, g, y, v, S, w, C, A, _, I, E; r = e.state, n = e.next_in, I = e.input, @@ -35594,54 +35697,54 @@ r.mode = 30; break e } - if (A = f, - (_ = 0) === l) { - if (_ += u - S, + if (_ = f, + (A = 0) === l) { + if (A += u - S, S < w) { - for (w -= S; E[o++] = f[_++], + for (w -= S; E[o++] = f[A++], --S; ) ; - _ = o - C, - A = E + A = o - C, + _ = E } } else if (l < S) { - if (_ += u + l - S, + if (A += u + l - S, (S -= l) < w) { - for (w -= S; E[o++] = f[_++], + for (w -= S; E[o++] = f[A++], --S; ) ; - if (_ = 0, + if (A = 0, l < w) { - for (w -= S = l; E[o++] = f[_++], + for (w -= S = l; E[o++] = f[A++], --S; ) ; - _ = o - C, - A = E + A = o - C, + _ = E } } - } else if (_ += l - S, + } else if (A += l - S, S < w) { - for (w -= S; E[o++] = f[_++], + for (w -= S; E[o++] = f[A++], --S; ) ; - _ = o - C, - A = E + A = o - C, + _ = E } for (; 2 < w; ) - E[o++] = A[_++], - E[o++] = A[_++], - E[o++] = A[_++], + E[o++] = _[A++], + E[o++] = _[A++], + E[o++] = _[A++], w -= 3; - w && (E[o++] = A[_++], - 1 < w && (E[o++] = A[_++])) + w && (E[o++] = _[A++], + 1 < w && (E[o++] = _[A++])) } else { - for (_ = o - C; E[o++] = E[_++], - E[o++] = E[_++], - E[o++] = E[_++], + for (A = o - C; E[o++] = E[A++], + E[o++] = E[A++], + E[o++] = E[A++], 2 < (w -= 3); ) ; - w && (E[o++] = E[_++], - 1 < w && (E[o++] = E[_++])) + w && (E[o++] = E[A++], + 1 < w && (E[o++] = E[A++])) } break } @@ -35758,9 +35861,9 @@ (r = v(e, t)) !== d && (e.state = null), r) : l } - var w, C, _ = !0; - function A(e) { - if (_) { + var w, C, A = !0; + function _(e) { + if (A) { var t; for (w = new n.Buf32(512), C = new n.Buf32(32), @@ -35780,7 +35883,7 @@ s(u, e.lens, 0, 32, C, 0, e.work, { bits: 5 }), - _ = !1 + A = !1 } e.lencode = w, e.lenbits = 9, @@ -35813,7 +35916,7 @@ , r.inflateInit2 = S, r.inflate = function(e, t) { - var r, h, p, b, g, y, v, S, w, C, _, E, T, x, P, k, D, O, R, M, N, B, F, j, K = 0, L = new n.Buf8(4), U = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]; + var r, h, p, b, g, y, v, S, w, C, A, E, T, x, P, k, D, O, R, M, N, B, F, j, K = 0, L = new n.Buf8(4), U = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]; if (!e || !e.state || !e.output || !e.input && 0 !== e.avail_in) return l; 12 === (r = e.state).mode && (r.mode = 13), @@ -35826,7 +35929,7 @@ S = r.hold, w = r.bits, C = y, - _ = v, + A = v, B = d; e: for (; ; ) switch (r.mode) { @@ -36063,7 +36166,7 @@ r.mode = 14; break; case 1: - if (A(r), + if (_(r), r.mode = 20, 6 !== t) break; @@ -36284,7 +36387,7 @@ e.avail_in = y, r.hold = S, r.bits = w, - a(e, _), + a(e, A), g = e.next_out, p = e.output, v = e.avail_out, @@ -36417,7 +36520,7 @@ case 25: if (0 === v) break e; - if (E = _ - v, + if (E = A - v, r.offset > E) { if ((E = r.offset - E) > r.whave && r.sane) { e.msg = "invalid distance too far back", @@ -36455,11 +36558,11 @@ S |= h[b++] << w, w += 8 } - if (_ -= v, - e.total_out += _, - r.total += _, - _ && (e.adler = r.check = r.flags ? o(r.check, p, _, g - _) : i(r.check, p, _, g - _)), - _ = v, + if (A -= v, + e.total_out += A, + r.total += A, + A && (e.adler = r.check = r.flags ? o(r.check, p, A, g - A) : i(r.check, p, A, g - A)), + A = v, (r.flags ? S : m(S)) !== r.check) { e.msg = "incorrect data check", r.mode = 30; @@ -36503,15 +36606,15 @@ e.avail_in = y, r.hold = S, r.bits = w, - (r.wsize || _ !== e.avail_out && r.mode < 30 && (r.mode < 27 || 4 !== t)) && I(e, e.output, e.next_out, _ - e.avail_out) ? (r.mode = 31, + (r.wsize || A !== e.avail_out && r.mode < 30 && (r.mode < 27 || 4 !== t)) && I(e, e.output, e.next_out, A - e.avail_out) ? (r.mode = 31, -4) : (C -= e.avail_in, - _ -= e.avail_out, + A -= e.avail_out, e.total_in += C, - e.total_out += _, - r.total += _, - r.wrap && _ && (e.adler = r.check = r.flags ? o(r.check, p, _, e.next_out - _) : i(r.check, p, _, e.next_out - _)), + e.total_out += A, + r.total += A, + r.wrap && A && (e.adler = r.check = r.flags ? o(r.check, p, A, e.next_out - A) : i(r.check, p, A, e.next_out - A)), e.data_type = r.bits + (r.last ? 64 : 0) + (12 === r.mode ? 128 : 0) + (20 === r.mode || 15 === r.mode ? 256 : 0), - (0 == C && 0 === _ || 4 === t) && B === d && (B = -5), + (0 == C && 0 === A || 4 === t) && B === d && (B = -5), B) } , @@ -36554,11 +36657,11 @@ , a = [1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0] , s = [16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 64, 64]; t.exports = function(e, t, r, c, u, d, l, f) { - var h, p, m, b, g, y, v, S, w, C = f.bits, _ = 0, A = 0, I = 0, E = 0, T = 0, x = 0, P = 0, k = 0, D = 0, O = 0, R = null, M = 0, N = new n.Buf16(16), B = new n.Buf16(16), F = null, j = 0; - for (_ = 0; _ <= 15; _++) - N[_] = 0; - for (A = 0; A < c; A++) - N[t[r + A]]++; + var h, p, m, b, g, y, v, S, w, C = f.bits, A = 0, _ = 0, I = 0, E = 0, T = 0, x = 0, P = 0, k = 0, D = 0, O = 0, R = null, M = 0, N = new n.Buf16(16), B = new n.Buf16(16), F = null, j = 0; + for (A = 0; A <= 15; A++) + N[A] = 0; + for (_ = 0; _ < c; _++) + N[t[r + _]]++; for (T = C, E = 15; 1 <= E && 0 === N[E]; E--) ; @@ -36571,17 +36674,17 @@ for (I = 1; I < E && 0 === N[I]; I++) ; for (T < I && (T = I), - _ = k = 1; _ <= 15; _++) + A = k = 1; A <= 15; A++) if (k <<= 1, - (k -= N[_]) < 0) + (k -= N[A]) < 0) return -1; if (0 < k && (0 === e || 1 !== E)) return -1; for (B[1] = 0, - _ = 1; _ < 15; _++) - B[_ + 1] = B[_] + N[_]; - for (A = 0; A < c; A++) - 0 !== t[r + A] && (l[B[t[r + A]]++] = A); + A = 1; A < 15; A++) + B[A + 1] = B[A] + N[A]; + for (_ = 0; _ < c; _++) + 0 !== t[r + _] && (l[B[t[r + _]]++] = _); if (y = 0 === e ? (R = F = l, 19) : 1 === e ? (R = i, M -= 257, @@ -36590,37 +36693,37 @@ 256) : (R = a, F = s, -1), - _ = I, + A = I, g = d, - P = A = O = 0, + P = _ = O = 0, m = -1, b = (D = 1 << (x = T)) - 1, 1 === e && 852 < D || 2 === e && 592 < D) return 1; for (; ; ) { - for (v = _ - P, - w = l[A] < y ? (S = 0, - l[A]) : l[A] > y ? (S = F[j + l[A]], - R[M + l[A]]) : (S = 96, + for (v = A - P, + w = l[_] < y ? (S = 0, + l[_]) : l[_] > y ? (S = F[j + l[_]], + R[M + l[_]]) : (S = 96, 0), - h = 1 << _ - P, + h = 1 << A - P, I = p = 1 << x; u[g + (O >> P) + (p -= h)] = v << 24 | S << 16 | w | 0, 0 !== p; ) ; - for (h = 1 << _ - 1; O & h; ) + for (h = 1 << A - 1; O & h; ) h >>= 1; if (0 !== h ? (O &= h - 1, O += h) : O = 0, - A++, - 0 == --N[_]) { - if (_ === E) + _++, + 0 == --N[A]) { + if (A === E) break; - _ = t[r + l[A]] + A = t[r + l[_]] } - if (T < _ && (O & b) !== m) { + if (T < A && (O & b) !== m) { for (0 === P && (P = T), g += I, - k = 1 << (x = _ - P); x + P < E && !((k -= N[x + P]) <= 0); ) + k = 1 << (x = A - P); x + P < E && !((k -= N[x + P]) <= 0); ) x++, k <<= 1; if (D += 1 << x, @@ -36629,7 +36732,7 @@ u[m = O & b] = T << 24 | x << 16 | g - d | 0 } } - return 0 !== O && (u[g + O] = _ - P << 24 | 64 << 16 | 0), + return 0 !== O && (u[g + O] = A - P << 24 | 64 << 16 | 0), f.bits = T, 0 } @@ -36677,8 +36780,8 @@ , S = 18 , w = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0] , C = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13] - , _ = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7] - , A = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15] + , A = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7] + , _ = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15] , I = new Array(2 * (d + 2)); a(I); var E = new Array(2 * l); @@ -36937,7 +37040,7 @@ E[2 * e] = L(e, 5); k = new M(I,w,u + 1,d,p), D = new M(E,C,0,l,p), - O = new M(new Array(0),_,0,f,b) + O = new M(new Array(0),A,0,f,b) }(), Q = !0), e.l_desc = new N(e.dyn_ltree,k), @@ -36971,7 +37074,7 @@ for (V(e, e.dyn_ltree, e.l_desc.max_code), V(e, e.dyn_dtree, e.d_desc.max_code), H(e, e.bl_desc), - t = f - 1; 3 <= t && 0 === e.bl_tree[2 * A[t] + 1]; t--) + t = f - 1; 3 <= t && 0 === e.bl_tree[2 * _[t] + 1]; t--) ; return e.opt_len += 3 * (t + 1) + 5 + 5 + 4, t @@ -36986,7 +37089,7 @@ j(e, r - 1, 5), j(e, n - 4, 4), i = 0; i < n; i++) - j(e, e.bl_tree[2 * A[i] + 1], 3); + j(e, e.bl_tree[2 * _[i] + 1], 3); Y(e, e.dyn_ltree, t - 1), Y(e, e.dyn_dtree, r - 1) }(e, e.l_desc.max_code + 1, e.d_desc.max_code + 1, c + 1), @@ -37244,7 +37347,7 @@ function C() { return ("undefined" === typeof navigator || "ReactNative" !== navigator.product && "NativeScript" !== navigator.product && "NS" !== navigator.product) && ("undefined" !== typeof window && "undefined" !== typeof document) } - function _(e, t) { + function A(e, t) { if (null !== e && "undefined" !== typeof e) if ("object" !== typeof e && (e = [e]), o(e)) @@ -37254,17 +37357,17 @@ for (var i in e) Object.prototype.hasOwnProperty.call(e, i) && t.call(null, e[i], i, e) } - function A() { + function _() { var e = {}; function t(t, r) { - p(e[r]) && p(t) ? e[r] = A(e[r], t) : p(t) ? e[r] = A({}, t) : o(t) ? e[r] = t.slice() : e[r] = t + p(e[r]) && p(t) ? e[r] = _(e[r], t) : p(t) ? e[r] = _({}, t) : o(t) ? e[r] = t.slice() : e[r] = t } for (var r = 0, n = arguments.length; r < n; r++) - _(arguments[r], t); + A(arguments[r], t); return e } function I(e, t, r) { - return _(t, (function(t, i) { + return A(t, (function(t, i) { e[i] = r && "function" === typeof t ? n(t, r) : t } )), @@ -37292,8 +37395,8 @@ isStream: v, isURLSearchParams: S, isStandardBrowserEnv: C, - forEach: _, - merge: A, + forEach: A, + merge: _, extend: I, trim: w, stripBOM: E @@ -37898,8 +38001,8 @@ , S = r("241c") , w = r("057f") , C = r("7418") - , _ = r("06cf") - , A = r("9bf2") + , A = r("06cf") + , _ = r("9bf2") , I = r("37e8") , E = r("d1e7") , T = r("cb2d") @@ -37924,8 +38027,8 @@ , q = W && W[U] , H = i.TypeError , V = i.QObject - , Y = _.f - , Q = A.f + , Y = A.f + , Q = _.f , Z = w.f , J = E.f , $ = a([].push) @@ -38044,9 +38147,9 @@ } )), E.f = ue, - A.f = ae, + _.f = ae, I.f = se, - _.f = de, + A.f = de, S.f = w.f = le, C.f = fe, R.f = function(e) { @@ -38582,8 +38685,8 @@ , S = s(1..toString) , w = /[\uD800-\uDFFF]/g , C = /^[\uD800-\uDBFF]$/ - , _ = /^[\uDC00-\uDFFF]$/ - , A = !p || c((function() { + , A = /^[\uDC00-\uDFFF]$/ + , _ = !p || c((function() { var e = i("Symbol")(); return "[null]" != m([e]) || "{}" != m({ a: e @@ -38610,17 +38713,17 @@ , T = function(e, t, r) { var n = g(r, t - 1) , i = g(r, t + 1); - return b(C, e) && !b(_, i) || b(_, e) && !b(C, n) ? "\\u" + S(y(e, 0), 16) : e + return b(C, e) && !b(A, i) || b(A, e) && !b(C, n) ? "\\u" + S(y(e, 0), 16) : e }; m && n({ target: "JSON", stat: !0, arity: 3, - forced: A || I + forced: _ || I }, { stringify: function(e, t, r) { var n = h(arguments) - , i = o(A ? E : m, null, n); + , i = o(_ ? E : m, null, n); return I && "string" == typeof i ? v(i, w, T) : i } }) @@ -38638,7 +38741,7 @@ }, ebb5: function(e, t, r) { "use strict"; - var n, i, o, a = r("a981"), s = r("83ab"), c = r("da84"), u = r("1626"), d = r("861d"), l = r("1a2d"), f = r("f5df"), h = r("0d51"), p = r("9112"), m = r("cb2d"), b = r("9bf2").f, g = r("3a9b"), y = r("e163"), v = r("d2bb"), S = r("b622"), w = r("90e3"), C = c.Int8Array, _ = C && C.prototype, A = c.Uint8ClampedArray, I = A && A.prototype, E = C && y(C), T = _ && y(_), x = Object.prototype, P = c.TypeError, k = S("toStringTag"), D = w("TYPED_ARRAY_TAG"), O = w("TYPED_ARRAY_CONSTRUCTOR"), R = a && !!v && "Opera" !== f(c.opera), M = !1, N = { + var n, i, o, a = r("a981"), s = r("83ab"), c = r("da84"), u = r("1626"), d = r("861d"), l = r("1a2d"), f = r("f5df"), h = r("0d51"), p = r("9112"), m = r("cb2d"), b = r("9bf2").f, g = r("3a9b"), y = r("e163"), v = r("d2bb"), S = r("b622"), w = r("90e3"), C = c.Int8Array, A = C && C.prototype, _ = c.Uint8ClampedArray, I = _ && _.prototype, E = C && y(C), T = A && y(A), x = Object.prototype, P = c.TypeError, k = S("toStringTag"), D = w("TYPED_ARRAY_TAG"), O = w("TYPED_ARRAY_CONSTRUCTOR"), R = a && !!v && "Opera" !== f(c.opera), M = !1, N = { Int8Array: 1, Uint8Array: 1, Uint8ClampedArray: 1, @@ -38683,7 +38786,7 @@ } catch (u) {} } } - T[e] && !r || m(T, e, r ? t : R && _[e] || t, n) + T[e] && !r || m(T, e, r ? t : R && A[e] || t, n) } }, X = function(e, t, r) { var n, i; diff --git a/server/src/main/resources/web/eml.ftl b/server/src/main/resources/web/eml.ftl index ad4eb7ca..5c6336de 100644 --- a/server/src/main/resources/web/eml.ftl +++ b/server/src/main/resources/web/eml.ftl @@ -6,6 +6,7 @@ <#include "*/commonHeader.ftl"> + <#if currentUrl?contains("http://") || currentUrl?contains("https://") || currentUrl?contains("file://")> <#assign finalUrl="${currentUrl}"> diff --git a/server/src/main/resources/web/epub.ftl b/server/src/main/resources/web/epub.ftl index b993483e..85e7d1c4 100644 --- a/server/src/main/resources/web/epub.ftl +++ b/server/src/main/resources/web/epub.ftl @@ -6,6 +6,7 @@ <#include "*/commonHeader.ftl"> + diff --git a/server/src/main/resources/web/index.ftl b/server/src/main/resources/web/index.ftl index d6f78efd..8fdee1ba 100644 --- a/server/src/main/resources/web/index.ftl +++ b/server/src/main/resources/web/index.ftl @@ -238,6 +238,13 @@ $("#btnSubmit").click(function () { var _fileName = $("#fileName").text() + var index= _fileName.lastIndexOf("."); + //获取后缀 + var ext = _fileName.substr(index+1); + if (!ext || ext == "dll"|| ext == "exe"|| ext == "msi" ){ + window.alert(ext+"不支持上传") + return ; + } if(!_fileName){ $("#postFileAlert").addClass("show"); window.setTimeout(function(){ diff --git a/server/src/main/resources/web/online3D.ftl b/server/src/main/resources/web/online3D.ftl index 61f94372..340a7066 100644 --- a/server/src/main/resources/web/online3D.ftl +++ b/server/src/main/resources/web/online3D.ftl @@ -5,7 +5,9 @@ ${file.name}3D预览 + <#include "*/commonHeader.ftl"> + <#if currentUrl?contains("http://") || currentUrl?contains("https://") || currentUrl?contains("file://")> <#assign finalUrl="${currentUrl}"> @@ -22,8 +24,11 @@ var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/'; if (!url.startsWith(baseUrl)) { url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url)); - } + document.getElementsByTagName('iframe')[0].src = "${baseUrl}website/index.html#model="+ url + "&fullfilename=/${file.name}"; + }else{ document.getElementsByTagName('iframe')[0].src = "${baseUrl}website/index.html#model="+ url; + } + document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight - 10; /** * 页面变化调整高度 diff --git a/server/src/main/resources/web/xmind.ftl b/server/src/main/resources/web/xmind.ftl index aea3c5df..3912e347 100644 --- a/server/src/main/resources/web/xmind.ftl +++ b/server/src/main/resources/web/xmind.ftl @@ -5,6 +5,7 @@ <#include "*/commonHeader.ftl"> + <#if currentUrl?contains("http://") || currentUrl?contains("https://")> <#assign finalUrl="${currentUrl}"> <#elseif currentUrl?contains("ftp://") >