Merge branch 'feat/new-component-alarm-table' into 'main_dev'

fix: 修复组态预览时会进行内容最大化

See merge request yunteng/thingskit-scada!73

@@ -349,17 +349,17 @@
 			}
 		};
 	</script>
-	<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/plgmlhohecdddhbmmkncjdmlhcmaachm">
-	<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
+	<!-- <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/plgmlhohecdddhbmmkncjdmlhcmaachm"> -->
+	<!-- <link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png"> -->
 	<!--	<link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">-->
 	<link rel="icon" type="image/png" sizes="32x32" href="images/logo-32x32.png">
-	<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
+	<!-- <link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png"> -->
 	<!--	<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">-->
 	<link rel="mask-icon" href="images/safari-pinned-tab.svg" color="#d89000">
 	<link rel="stylesheet" type="text/css" href="styles/grapheditor.css">
-	<link rel="preconnect" href="https://storage.googleapis.com">
+	<!-- <link rel="preconnect" href="https://storage.googleapis.com">
 	<link rel="canonical" href="https://app.diagrams.net">
-	<link rel="manifest" href="images/manifest.json">
+	<link rel="manifest" href="images/manifest.json"> -->
 	<!--	<link rel="shortcut icon" href="favicon.ico">-->
 	<link rel="shortcut icon" href="images/logo-16x16.ico">
 	<style type="text/css">

@@ -3386,24 +3386,26 @@ EditorUi.prototype.lightboxFit = function(maxHeight)
 		}
 		
 		// LATER: Use initial graph bounds to avoid rounding errors
-		this.editor.graph.maxFitScale = this.lightboxMaxFitScale;
-		this.editor.graph.fit(border, null, null, null, null, null, maxHeight);
+		// this.editor.graph.maxFitScale = this.lightboxMaxFitScale;
+		// this.editor.graph.fit(border, null, null, null, null, null, maxHeight);
 		// this.editor.graph.maxFitScale = null;
-		// TODO thingsKit lightbox 默认缩放为1 
+		// // TODO thingsKit lightbox 默认缩放为1 
 		// console.log(this.editor.graph.view)
 		// this.editor.graph.view.setScale(1);
 		/// TODO thingsKit 设置内容最大化
 		var margin = 2;
 		var max = 3;
 		var graph = this.editor.graph
-
+		var pageFormat = graph.pageFormat
 		var bounds = graph.getGraphBounds();
 		var cw = graph.container.clientWidth - margin;
 		var ch = graph.container.clientHeight - margin;
-		var w = bounds.width / graph.view.scale;
-		var h = bounds.height / graph.view.scale;
+		var w = pageFormat.width
+		// var w = pageFormat.width / graph.view.scale;
+		var h = pageFormat.height;
+		// var h = pageFormat.height / graph.view.scale;
 		var s = Math.min(max, Math.min(cw / w, ch / h));
-
+		console.log({w, h, scale: graph.view.scale, cw, ch, s})
 		graph.view.scaleAndTranslate(s,
 			(margin + cw - w * s) / (2 * s) - bounds.x / graph.view.scale,
 			(margin + ch - h * s) / (2 * s) - bounds.y / graph.view.scale);