简柏林 / thingskit-scada · Commits

Commit 9d688503c03fc0b9959679be352629483580f03c

Authored by ww
1 parent ab46207e

fix: 修复不同类型的组态页面尺寸设置

Inline Side-by-side
Showing 1 changed file with 15 additions and 6 deletions
@@ -974,8 +974,8 @@ Editor.prototype.fitOldConfiguration = function (cells) { @@ -974,8 +974,8 @@ Editor.prototype.fitOldConfiguration = function (cells) {
974 */ 974 */
975 Editor.prototype.fitOldConfigurationByCellsIds = function (cellsIds) { 975 Editor.prototype.fitOldConfigurationByCellsIds = function (cellsIds) {
976 for (const cellId of cellsIds) { 976 for (const cellId of cellsIds) {
977 - const [cell] = this.graph.getCellsById([cellId])  
978 - if (!cell) continue 977 + const [cell] = this.graph.getCellsById([cellId])
  978 + if (!cell) continue
979 var componentType = cell.getAttribute('componentType') 979 var componentType = cell.getAttribute('componentType')
980 if (!componentType) continue 980 if (!componentType) continue
981 this.transformOldConfigurationKey(cell, componentType) 981 this.transformOldConfigurationKey(cell, componentType)
@@ -2306,10 +2306,19 @@ PageSetupDialog.getFormats = function () { @@ -2306,10 +2306,19 @@ PageSetupDialog.getFormats = function () {
2306 { key: 'custom', title: mxResources.get('custom'), format: null } 2306 { key: 'custom', title: mxResources.get('custom'), format: null }
2307 ] 2307 ]
2308 : [ 2308 : [
2309 - { key: '1920 * 1080', title: '1920 * 1080(推荐尺寸)', format: new mxRectangle(0, 0, 1080, 1920) },  
2310 - { key: '1060 * 520', title: '1060 * 520', format: new mxRectangle(0, 0, 520, 1060) },  
2311 - { key: '1440 * 900', title: '1440 * 900', format: new mxRectangle(0, 0, 900, 1440) },  
2312 - { key: '1366 * 768', title: '1366* 768', format: new mxRectangle(0, 0, 768, 1366) }, 2309 + { key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667) },
  2310 + { key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737) },
  2311 + { key: 'iPhone X/XS', title: 'iPhone X/XS', format: new mxRectangle(0, 0, 376, 813) },
  2312 + { key: 'iPhone XR/XS Max', title: 'iPhone XR/XS Max', format: new mxRectangle(0, 0, 415, 897) },
  2313 + { key: 'iPad 4', title: 'iPad 4', format: new mxRectangle(0, 0, 709, 1025) },
  2314 + { key: 'Galaxy S9', title: 'Galaxy S9', format: new mxRectangle(0, 0, 361, 741) },
  2315 + { key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
  2316 + { key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741) },
  2317 + { key: 'Galaxy S10/S10+', title: 'Galaxy S10/S10+', format: new mxRectangle(0, 0, 413, 870) },
  2318 + { key: 'Pixel 2', title: 'Pixel 2', format: new mxRectangle(0, 0, 413, 732) },
  2319 + { key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
  2320 + { key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825) },
  2321 + { key: 'Pixel XL', title: 'Pixel XL', format: new mxRectangle(0, 0, 413, 848) },
2313 { key: 'custom', title: mxResources.get('custom'), format: null } 2322 { key: 'custom', title: mxResources.get('custom'), format: null }
2314 ] 2323 ]
2315 } 2324 }