Merge branch 'ww' into 'main'

fix: page size not change on platform happend change

See merge request huang/thingskit-drawio!53

@@ -32,7 +32,7 @@ const GLOBAL_PLATFORM_INFO = (() => {
 	 * @description user info
 	 * @description user info
 	 * @type {{JWT_TOKEN: {value: string}}}
 	 * @type {{JWT_TOKEN: {value: string}}}
 	 */
 	 */
-	const common = ls.get(GLOBAL_PLATFORM_INFO_KEY) 
+	const common = ls.get(GLOBAL_PLATFORM_INFO_KEY) || {}
 	return common
 	return common
 })()
 })()
 
 

@@ -4241,8 +4241,6 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 				const pageSizeControl = PageSetupDialog.getFormats
 				const pageSizeControl = PageSetupDialog.getFormats
 				PageSetupDialog.getFormats = function () {
 				PageSetupDialog.getFormats = function () {
 					if (platform === 'phone') {
 					if (platform === 'phone') {
-						pageFormat.width = 415
-						pageFormat.height = 737 
 						return [
 						return [
 							{ key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667) },
 							{ key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667) },
 							{ key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737) },
 							{ key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737) },
@@ -4260,8 +4258,6 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 							{ key: 'custom', title: mxResources.get('custom'), format: null }
 							{ key: 'custom', title: mxResources.get('custom'), format: null }
 						]
 						]
 					}
 					}
-					pageFormat.width = 1920
-					pageFormat.height = 1080
 					return pageSizeControl.apply(this, arguments)
 					return pageSizeControl.apply(this, arguments)
 				}
 				}
 				Editor.configurationName = response.configurationName + ".drawio";
 				Editor.configurationName = response.configurationName + ".drawio";
@@ -5051,9 +5047,8 @@ App.prototype.updateButtonContainer = function () {
 					mxUtils.write(this.importButton, '导入');
 					mxUtils.write(this.importButton, '导入');
 					mxEvent.addListener(this.importButton, 'click', mxUtils.bind(this, function () {
 					mxEvent.addListener(this.importButton, 'click', mxUtils.bind(this, function () {
 						this.currentFile.ui.actions.get('open').funct()
 						this.currentFile.ui.actions.get('open').funct()
-						console.log(this)
 					}));
 					}));
-					// this.leftContainer.appendChild(this.importButton);
+					this.leftContainer.appendChild(this.importButton);
 
 
 					// TODO thingsKit 导出案例
 					// TODO thingsKit 导出案例
 					this.exportButton = document.createElement('div');
 					this.exportButton = document.createElement('div');
@@ -5083,7 +5078,7 @@ App.prototype.updateButtonContainer = function () {
 
 
 						savefiles(this.currentFile.data, '未命名.xml')
 						savefiles(this.currentFile.data, '未命名.xml')
 					}));
 					}));
-					// this.leftContainer.appendChild(this.exportButton);
+					this.leftContainer.appendChild(this.exportButton);
 
 
 					// TODO thingsKit 锁定 / 解锁 按钮
 					// TODO thingsKit 锁定 / 解锁 按钮
 					this.lockButton = document.createElement('div');
 					this.lockButton = document.createElement('div');
@@ -5162,12 +5157,14 @@ App.prototype.updateButtonContainer = function () {
 			//Fetch notifications
 			//Fetch notifications
 			if (urlParams['extAuth'] != '1') //Disable notification with external auth (e.g, Teams app)
 			if (urlParams['extAuth'] != '1') //Disable notification with external auth (e.g, Teams app)
 			{
 			{
-				this.fetchAndShowNotification('online', this.mode);
+				// TODO thingskit close notify bell
+				// this.fetchAndShowNotification('online', this.mode);
 			}
 			}
 		}
 		}
 		else if (urlParams['notif'] != null) //Notif for embed mode
 		else if (urlParams['notif'] != null) //Notif for embed mode
 		{
 		{
-			this.fetchAndShowNotification(urlParams['notif']);
+			// TODO thingskit close notify bell
+			// this.fetchAndShowNotification(urlParams['notif']);
 		}
 		}
 	} else {
 	} else {
 		if (!hasSavePermission()) {
 		if (!hasSavePermission()) {

@@ -13297,4 +13297,4 @@ var ConnectionPointsDialog = function(editorUi, cell)
 	this.destroy = destroy;
 	this.destroy = destroy;
 
 
 	this.container = div;
 	this.container = div;
-};
+};

@@ -11719,18 +11719,29 @@
 				});
 				});
 				
 				
 				window.openFile.setData(data, name);
 				window.openFile.setData(data, name);
-				window.openWindow(this.getUrl(), null, mxUtils.bind(this, function()
+				
+				// window.openWindow(this.getUrl(), null, mxUtils.bind(this, function()
+				// {
+				// 	if (currentFile != null && currentFile.isModified())
+				// 	{
+				// 		this.confirm(mxResources.get('allChangesLost'), null, fn,
+				// 			mxResources.get('cancel'), mxResources.get('discardChanges'));
+				// 	}
+				// 	else
+				// 	{
+				// 		fn();
+				// 	}
+				// }));
+				// TODO Thingskit不打开浏览器tab标签
+				if (currentFile != null && currentFile.isModified())
 				{
 				{
-					if (currentFile != null && currentFile.isModified())
-					{
-						this.confirm(mxResources.get('allChangesLost'), null, fn,
-							mxResources.get('cancel'), mxResources.get('discardChanges'));
-					}
-					else
-					{
-						fn();
-					}
-				}));
+					this.confirm(mxResources.get('allChangesLost'), null, fn,
+						mxResources.get('cancel'), mxResources.get('discardChanges'));
+				}
+				else
+				{
+					fn();
+				}
 			}
 			}
 		}
 		}
 		else
 		else

@@ -147,8 +147,7 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 	// Updates data after changing file name
 	// Updates data after changing file name
 	if (!useCurrentData) {
 	if (!useCurrentData) {
 		this.updateFileData();
 		this.updateFileData();
-	}
-
+	} 
 	var binary = this.ui.useCanvasForExport && /(\.png)$/i.test(this.getTitle());
 	var binary = this.ui.useCanvasForExport && /(\.png)$/i.test(this.getTitle());
 	this.setShadowModified(false);
 	this.setShadowModified(false);
 	var savedData = this.getData();
 	var savedData = this.getData();
@@ -163,6 +162,12 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 	});
 	});
 
 
 	var doSave = mxUtils.bind(this, function (data) {
 	var doSave = mxUtils.bind(this, function (data) {
+		if(!this.fileHandle) {
+			this.fileHandle = {
+				kind: 'file',
+				name: '未命名.xml'
+			}
+		}
 		if (this.fileHandle != null) {
 		if (this.fileHandle != null) {
 			// Sets shadow modified state during save
 			// Sets shadow modified state during save
 			if (!this.savingFile) {
 			if (!this.savingFile) {

@@ -58,7 +58,8 @@ Draw.loadPlugin(function(ui)
 				macroData.diagramDisplayName = data.title;
 				macroData.diagramDisplayName = data.title;
 				
 				
 				//Fetch notifications
 				//Fetch notifications
-				ui.fetchAndShowNotification('conf');	
+				// TODO thingskit close notify bell
+				// ui.fetchAndShowNotification('conf');	
 			}
 			}
 		}
 		}
 		catch (e)
 		catch (e)

@@ -1917,4 +1917,4 @@ table.geProperties tr td {
 
 
 .geMaximized #max-button {
 .geMaximized #max-button {
   display: none;
   display: none;
-}
+}