Merge branch 'ww' into 'main'

perf: adjust page layout size unit to px

See merge request huang/thingskit-drawio!55

@@ -7,7 +7,7 @@ const OSS_Prefix = 'https://oss.yuntengcloud.com/iotdocs/thingskit-scada-develop
 /**
  * @description enable load script form oss server
  */
-const Enable_OSS = true
+const Enable_OSS = false
 
 /**
  * @description 代理配置项

@@ -698,8 +698,11 @@ Editor.prototype.getGraphXml = function(ignoreSelection)
 
 	if (this.graph.view.translate.x != 0 || this.graph.view.translate.y != 0)
 	{
-		node.setAttribute('dx', Math.round(this.graph.view.translate.x * 100) / 100);
-		node.setAttribute('dy', Math.round(this.graph.view.translate.y * 100) / 100);
+		// TODO thingsKit modify update page size
+		// node.setAttribute('dx', Math.round(this.graph.view.translate.x * 100) / 100);
+		node.setAttribute('dx', Math.round(this.graph.view.translate.x));
+		// node.setAttribute('dy', Math.round(this.graph.view.translate.y * 100) / 100);
+		node.setAttribute('dy', Math.round(this.graph.view.translate.y));
 	}
 	
 	node.setAttribute('grid', (this.graph.isGridEnabled()) ? '1' : '0');
@@ -1372,7 +1375,9 @@ PrintDialog.prototype.create = function(editorUi)
 	function preview(print)
 	{
 		var autoOrigin = onePageCheckBox.checked || pageCountCheckBox.checked;
-		var printScale = parseInt(pageScaleInput.value) / 100;
+		// TODO thingsKit modify update page size
+		// var printScale = parseInt(pageScaleInput.value) / 100;
+		var printScale = parseInt(pageScaleInput.value);
 		
 		if (isNaN(printScale))
 		{
@@ -1837,13 +1842,17 @@ PageSetupDialog.addPageFormatPanel = function(div, namePostfix, pageFormat, page
 	widthInput.setAttribute('size', '7');
 	widthInput.style.textAlign = 'right';
 	customDiv.appendChild(widthInput);
-	mxUtils.write(customDiv, ' in x ');
+	// TODO thingsKit modify update page size
+	// mxUtils.write(customDiv, ' in x ');
+	mxUtils.write(customDiv, ' px/x ');
 	
 	var heightInput = document.createElement('input');
 	heightInput.setAttribute('size', '7');
 	heightInput.style.textAlign = 'right';
 	customDiv.appendChild(heightInput);
-	mxUtils.write(customDiv, ' in');
+	// mxUtils.write(customDiv, ' in');
+	// TODO thingsKit modify update page size
+	mxUtils.write(customDiv, ' px/y');
 
 	formatDiv.style.display = 'none';
 	customDiv.style.display = 'none';
@@ -1941,8 +1950,11 @@ PageSetupDialog.addPageFormatPanel = function(div, namePostfix, pageFormat, page
 			// Selects custom format which is last in list
 			if (!detected)
 			{
-				widthInput.value = pageFormat.width / 100;
-				heightInput.value = pageFormat.height / 100;
+				// TODO thingsKit modify update page size
+				// widthInput.value = pageFormat.width / 100;
+				widthInput.value = pageFormat.width;
+				// heightInput.value = pageFormat.height / 100;
+				heightInput.value = pageFormat.height;
 				portraitCheckBox.setAttribute('checked', 'checked');
 				paperSizeSelect.value = 'custom';
 				formatDiv.style.display = 'none';
@@ -1972,8 +1984,11 @@ PageSetupDialog.addPageFormatPanel = function(div, namePostfix, pageFormat, page
 		
 		if (f.format != null)
 		{
-			widthInput.value = f.format.width / 100;
-			heightInput.value = f.format.height / 100;
+			// TODO thingsKit modify update page size
+			// widthInput.value = f.format.width / 100;
+			widthInput.value = f.format.width;
+			// heightInput.value = f.format.height / 100;
+			heightInput.value = f.format.height;
 			customDiv.style.display = 'none';
 			formatDiv.style.display = '';
 		}
@@ -1987,19 +2002,27 @@ PageSetupDialog.addPageFormatPanel = function(div, namePostfix, pageFormat, page
 		
 		if (isNaN(wi) || wi <= 0)
 		{
-			widthInput.value = pageFormat.width / 100;
+			// TODO thingsKit modify update page size
+			// widthInput.value = pageFormat.width / 100;
+			widthInput.value = pageFormat.width;
 		}
 		
 		var hi = parseFloat(heightInput.value);
 		
 		if (isNaN(hi) || hi <= 0)
 		{
-			heightInput.value = pageFormat.height / 100;
+			// TODO thingsKit modify update page size
+			// heightInput.value = pageFormat.height / 100;
+			heightInput.value = pageFormat.height;
 		}
 		
+		// TODO thingsKit modify update page size
+		// var newPageFormat = new mxRectangle(0, 0,
+		// 	Math.floor(parseFloat(widthInput.value) * 100),
+		// 	Math.floor(parseFloat(heightInput.value) * 100));
 		var newPageFormat = new mxRectangle(0, 0,
-			Math.floor(parseFloat(widthInput.value) * 100),
-			Math.floor(parseFloat(heightInput.value) * 100));
+			Math.floor(parseFloat(widthInput.value)),
+			Math.floor(parseFloat(heightInput.value)));
 		
 		if (paperSizeSelect.value != 'custom' && landscapeCheckBox.checked)
 		{