From dc4bf5aac0521355f4971668cdf67526ae6424c1 Mon Sep 17 00:00:00 2001 From: qinoy Date: Wed, 8 Nov 2023 09:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=95=B0=E5=AD=97=E5=8F=98=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/designer/scripts/diagraming/designer.core.debug.js | 6 ++++++ .../lib/designer/scripts/diagraming/designer.core.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js index 8744dab6..09be3b97 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js @@ -75,6 +75,12 @@ var Designer = { } }, initCanvas: function() { + if (typeof Model.define.page.width == 'string') { + Model.define.page.width = parseFloat(Model.define.page.width); + } + if (typeof Model.define.page.height == 'string') { + Model.define.page.height = parseFloat(Model.define.page.height); + } var q = Model.define.page.width.toScale(); var v = Model.define.page.height.toScale(); var B = Model.define.page.backgroundColor; diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js index cff534e6..d60f2890 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js @@ -75,6 +75,12 @@ var Designer = { } }, initCanvas: function () { + if (typeof Model.define.page.width == 'string') { + Model.define.page.width = parseFloat(Model.define.page.width); + } + if (typeof Model.define.page.height == 'string') { + Model.define.page.height = parseFloat(Model.define.page.height); + } var q = Model.define.page.width.toScale(); var v = Model.define.page.height.toScale(); var B = Model.define.page.backgroundColor;