@sswroom/sswr 1.6.19 → 1.6.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sswroom/sswr",
-  "version": "1.6.19",
+  "version": "1.6.21",
   "description": "Libraries made by sswroom",
   "main": "sswr.js",
   "scripts": {

package/parser.js

@@ -980,6 +980,25 @@ async function parseJpg(reader, sourceName)
 	return null;
 }
 
+/**
+ * @param {data.ByteReader} reader
+ * @param {string} sourceName
+ */
+async function parsePng(reader, sourceName)
+{
+	if (!(reader instanceof data.ByteReader))
+		return null;
+	if (reader.getLength() < 20)
+		return null;
+	if (reader.readUInt32(0, false) != 0x89504e47 || reader.readUInt32(4, false) != 0x0d0a1a0a)
+		return null;
+	let buff = reader.getArrayBuffer();
+	let b = new Blob([buff], {type: "image/png"});
+	let img = await media.loadImageFromBlob(b);
+	let simg = new media.StaticImage(img, sourceName, "image/png");
+	return simg;
+}
+
 /**
  * @param {data.ByteReader} reader
  * @param {string} sourceName
@@ -1300,6 +1319,7 @@ export async function parseFile(file)
 	{
 		let view = new data.ByteReader(await file.arrayBuffer());
 		let obj;
+		if (obj = await parsePng(view, file.name)) return obj;
 		if (obj = await parseJpg(view, file.name)) return obj;
 		if (obj = await parseWebp(view, file.name)) return obj;
 		if (obj = parseX509(view, file.name, t)) return obj;

package/text.d.ts

@@ -56,6 +56,9 @@ export function replaceAll(s: string, replaceFrom: string, replaceTo: string): s
 export function getEncList(): TextBinEnc[];
 export function b64Enc(s: string, cs?: Base64Charset): string;
 export function b64Dec(b64Str: string): string;
+export function isDataURL(url: string): boolean;
+export function escapeXhtml(s: string): string;
+export function svgStringToDataURI(svg: string): string;
 
 export class TextBinEnc
 {

package/text.js

@@ -617,6 +617,30 @@ export function b64Dec(b64Str)
 	return dec.decode(b64.decodeBin(b64Str));
 }
 
+/**
+ * @param {string} url
+ */
+export function isDataURL(url)
+{
+	return url.startsWith("data:");
+}
+
+/**
+ * @param {string} s
+ */
+export function escapeXhtml(s)
+{
+	return s.replace(/#/g, '%23').replace(/\n/g, '%0A');
+}
+
+/**
+ * @param {string} svg
+ */
+export function svgStringToDataURI(svg)
+{
+	return 'data:image/svg+xml;charset=utf-8,' + svg;
+}
+
 export class TextBinEnc
 {
 	constructor(name)

package/web.d.ts

@@ -12,6 +12,14 @@ declare class ImageInfo
 	height: number;
 }
 
+declare class PrintOptions
+{
+	pageBorderTopHTML?: string;
+	pageBorderBottomHTML?: string;
+	overlayHTML?: string;
+	pageTitle?: string;
+}
+
 export enum OSType
 {
 	Unknown,
@@ -88,6 +96,12 @@ export enum BrowserType
 	MiBrowser
 }
 
+export enum PaperOrientation
+{
+	Landscape,
+	Portrait
+}
+
 declare class BrowserInfo
 {
 	os: OSType;
@@ -102,6 +116,7 @@ export function getParameterByName(name: string): string | null;
 export function loadJSON(url: string, onResultFunc: Function): void;
 export function buildTable(o: object | object[]): string;
 export function openData(data: string | Blob, contentType: string, fileName?: string): void;
+export function openUrl(url: string, fileName?: string): void;
 export function parseCSSColor(c: string): Color;
 export function handleFileDrop(ele: HTMLElement, hdlr: (file: File)=>void): void;
 export function appendUrl(targetUrl: string, docUrl: string): string;
@@ -117,6 +132,10 @@ export function getDivElement(id: string): HTMLDivElement;
 export function getSpanElement(id: string): HTMLSpanElement;
 export function getCanvasElement(id: string): HTMLCanvasElement;
 export function getImgElement(id: string): HTMLImageElement;
+export function canvasToBlob(canvas: HTMLCanvasElement): Promise<Blob|null>;
+export function elementToSVGString(node: Element, width: string | number, height: string | number): string;
+export function genPrintWindowHTML(imgDataURL: string, orientation: PaperOrientation, paperSize?: string, options: PrintOptions): string;
+export function printImageData(imgDataURL: string, orientation: PaperOrientation, paperSize?: string, options: PrintOptions): void;
 export function getBrowserInfo(): Promise<BrowserInfo>;
 export function parseUserAgent(userAgent: string): BrowserInfo;
 

package/web.js

@@ -76,6 +76,11 @@ export const BrowserType = {
 	MiBrowser: "MiBrowser"
 }
 
+export const PaperOrientation = {
+	Landscape: "landscape",
+	Portrait: "portrait"
+}
+
 export function getRequestURLBase()
 {
 	let url = document.location.href;
@@ -222,6 +227,23 @@ export function openData(data, contentType, fileName)
 	}
 }
 
+/**
+ * @param {string} url
+ * @param {string|undefined} fileName
+ */
+export function openUrl(url, fileName)
+{
+	let ele = document.createElement("a");
+	ele.setAttribute('href', url);
+	if (fileName)
+		ele.setAttribute('download', fileName);
+	ele.style.display = 'none';
+
+	document.body.appendChild(ele);
+	ele.click();
+	document.body.removeChild(ele);
+}
+
 /**
  * @param {number} c
  */
@@ -1040,6 +1062,101 @@ export function getImgElement(id)
 	throw new Error("Element with id \""+id+"\" is not an img");
 }
 
+/**
+ * @param {HTMLCanvasElement} canvas
+ * @returns {Promise<Blob|null>}
+ */
+export async function canvasToBlob(canvas)
+{
+	if (canvas.toBlob)
+	{
+		return await new Promise(function (resolve) {
+			canvas.toBlob(resolve);
+		});
+	}
+	return data.dataURI2Blob(canvas.toDataURL());
+}
+
+/**
+ * @param {Element} node
+ * @param {string | number} width
+ * @param {string | number} height
+ */
+export function elementToSVGString(node, width, height)
+{
+	node.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+	let xhtml = text.escapeXhtml(new XMLSerializer().serializeToString(node));
+	let foreignObject = '<foreignObject x="0" y="0" width="100%" height="100%">' + xhtml + '</foreignObject>';
+	return '<svg xmlns="http://www.w3.org/2000/svg" width="' + width + '" height="' + height + '">' + foreignObject + '</svg>';
+}
+
+/**
+ * @param {string} imgDataURL
+ * @param {string} orientation
+ * @param {string | null | undefined} paperSize
+ * @param {{ pageBorderTopHTML?: string; pageBorderBottomHTML?: string; overlayHTML?: string; pageTitle?: string; }} options
+ */
+export function genPrintWindowHTML(imgDataURL, orientation, paperSize, options)
+{
+	let strs =  new Array();
+	strs.push("<html><head>");
+	if (options.pageTitle)
+	{
+		strs.push("<title>"+text.toHTMLText(options.pageTitle)+"</title>");
+	}
+	strs.push(`<style>@media print {
+				img { max-width: 98%!important; max-height: 98%!important; }
+				@page { size: ` + (paperSize?paperSize:'')+' '+ orientation + `;}}
+			</style>
+			<script>function step1(){
+			setTimeout('step2()', 10);}
+			function step2(){window.print();window.close()}
+			</script></head><body onload='step1()' style="margin: 0px;">`);
+	if (options.pageBorderTopHTML || options.pageBorderBottomHTML)
+	{
+		strs.push("<table border=\"0\" width=\"100%\" height=\"100%\">");
+		if (options.pageBorderTopHTML)
+		{
+			strs.push("<tr><td>"+options.pageBorderTopHTML+"</td></tr>");
+		}
+		strs.push(`<tr><td>`);
+		if (options.overlayHTML)
+			strs.push(options.overlayHTML);
+		strs.push(`<img src="` + imgDataURL + `" style="display:block; margin:auto;"></td></tr>`);
+		if (options.pageBorderBottomHTML)
+		{
+			strs.push("<tr><td>"+options.pageBorderBottomHTML+"</td></tr>");
+		}
+		strs.push("</table>");
+	}
+	else
+	{
+		if (options.overlayHTML)
+			strs.push(options.overlayHTML);
+		strs.push(`<img src="` + imgDataURL + `" style="display:block; margin:auto;">`);
+	}
+	strs.push(`</body></html>`);
+	return strs.join("");
+}
+
+/**
+ * @param {string} imgDataURL
+ * @param {string} orientation
+ * @param {string | null | undefined} paperSize
+ * @param {{ pageBorderTopHTML?: string; pageBorderBottomHTML?: string; overlayHTML?: string }} options
+ */
+export function printImageData(imgDataURL, orientation, paperSize, options)
+{
+	let page = window.open("", "_blank", 'toolbar=no,status=no,menubar=no,scrollbars=no,resizable=no,left=10, top=10, width=600, height=800, visible=none');
+	if (page == null)
+		return false;
+	let pageContent = genPrintWindowHTML(imgDataURL, orientation, paperSize, options);
+	page.document.body.innerHTML = ''
+	page.document.write(pageContent);
+	page.document.close();  
+	return true;
+}
+
 /**
  * @returns {Promise<{os: String,osVer?:string,browser: String,browserVer?: string,devName?:string}>}
  */