Merge branch 'main_dev' into 'main'

fix: 修复Xml2JS类在windows环境下打包获取路径链接符号为反斜杠

See merge request yunteng/thingskit-scada!168

@@ -58,7 +58,7 @@ public class Xml2Js
 					String name = f.getCanonicalPath()
 							.substring(basePath.length() + 1);
 					result.add(
-							"f['" + name + "'] = '" + processFile(f) + "';\n");
+							"f['" + name.replace("\\", "/") + "'] = '" + processFile(f) + "';\n");
 				}
 			}
 		}

@@ -974,8 +974,8 @@ Editor.prototype.fitOldConfiguration = function (cells) {
  */
 Editor.prototype.fitOldConfigurationByCellsIds = function (cellsIds) {
 	for (const cellId of cellsIds) {
-		 const [cell] =  this.graph.getCellsById([cellId])
-		 if (!cell) continue
+		const [cell] = this.graph.getCellsById([cellId])
+		if (!cell) continue
 		var componentType = cell.getAttribute('componentType')
 		if (!componentType) continue
 		this.transformOldConfigurationKey(cell, componentType)
@@ -2306,10 +2306,19 @@ PageSetupDialog.getFormats = function () {
 				{ key: 'custom', title: mxResources.get('custom'), format: null }
 			]
 			: [
-				{ key: '1920 * 1080', title: '1920 * 1080(推荐尺寸)', format: new mxRectangle(0, 0, 1080, 1920) },
-				{ key: '1060 * 520', title: '1060 * 520', format: new mxRectangle(0, 0, 520, 1060) },
-				{ key: '1440 * 900', title: '1440 * 900', format: new mxRectangle(0, 0, 900, 1440) },
-				{ key: '1366 * 768', title: '1366* 768', format: new mxRectangle(0, 0, 768, 1366) },
+				{ 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 X/XS', title: 'iPhone X/XS', format: new mxRectangle(0, 0, 376, 813) },
+				{ key: 'iPhone XR/XS Max', title: 'iPhone XR/XS Max', format: new mxRectangle(0, 0, 415, 897) },
+				{ key: 'iPad 4', title: 'iPad 4', format: new mxRectangle(0, 0, 709, 1025) },
+				{ key: 'Galaxy S9', title: 'Galaxy S9', format: new mxRectangle(0, 0, 361, 741) },
+				{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
+				{ key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
+				{ key: 'Galaxy S10/S10+', title: 'Galaxy S10/S10+', format: new mxRectangle(0, 0, 413, 870) },
+				{ key: 'Pixel 2', title: 'Pixel 2', format: new mxRectangle(0, 0, 413, 732) },
+				{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
+				{ key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
+				{ key: 'Pixel XL', title: 'Pixel XL', format: new mxRectangle(0, 0, 413, 848) },
 				{ key: 'custom', title: mxResources.get('custom'), format: null }
 			]
 	}