Merge branch 'fix/DEFECT-1355' into 'main_dev'

fix: DEFECT-1355修复根据平台信息设置的网页徽标使用错误

See merge request yunteng/thingskit-scada!79

@@ -614,7 +614,7 @@
 				if (platfromInfo.logo) {
 				if (platfromInfo.logo) {
 					const icoLink = document.querySelectorAll('link[rel*="ico"]')
 					const icoLink = document.querySelectorAll('link[rel*="ico"]')
 					icoLink.forEach(item => {
 					icoLink.forEach(item => {
-						item.setAttribute('href', platfromInfo.logo)
+						item.setAttribute('href', platfromInfo.icon)
 					})
 					})
 				}
 				}
 
 

@@ -2579,28 +2579,28 @@ EditorUi.prototype.initCanvas = function()
 			}), Editor.zoomInImage, mxResources.get('zoomIn') + ' (Alt+Mousewheel)');
 			}), Editor.zoomInImage, mxResources.get('zoomIn') + ' (Alt+Mousewheel)');
 			
 			
 			// TODO thingsKit 隐藏自适应按钮
 			// TODO thingsKit 隐藏自适应按钮
-			// addButton(mxUtils.bind(this, function(evt)
-			// {
-			// 	if (graph.isLightboxView())
-			// 	{
-			// 		if (graph.view.scale == 1)
-			// 		{
-			// 			this.lightboxFit();
-			// 		}
-			// 		else
-			// 		{
-			// 			graph.zoomTo(1);
-			// 		}
+			addButton(mxUtils.bind(this, function(evt)
+			{
+				if (graph.isLightboxView())
+				{
+					if (graph.view.scale == 1)
+					{
+						this.lightboxFit();
+					}
+					else
+					{
+						graph.zoomTo(1);
+					}
 					
 					
-			// 		this.chromelessResize(false);
-			// 	}
-			// 	else
-			// 	{
-			// 		this.chromelessResize(true);
-			// 	}
+					this.chromelessResize(false);
+				}
+				else
+				{
+					this.chromelessResize(true);
+				}
 				
 				
-			// 	mxEvent.consume(evt);
-			// }), Editor.zoomFitImage, mxResources.get('fit'));
+				mxEvent.consume(evt);
+			}), Editor.zoomFitImage, mxResources.get('fit'));
 	
 	
 			// Changes toolbar opacity on hover
 			// Changes toolbar opacity on hover
 			var fadeThread = null;
 			var fadeThread = null;