From b15782228ad1bad0aac9042a4e51073bd0f56656 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Fri, 31 May 2019 19:56:57 +0800 Subject: [PATCH] uievent mobile --- _server/css/editor_mobile.css | 84 +++++++++++++++++++++++++++++++++++ _server/editor_unsorted_3.js | 11 +++-- editor-mobile.html | 30 +++++++++++++ 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/_server/css/editor_mobile.css b/_server/css/editor_mobile.css index 1120c9fd..ef6d2f72 100644 --- a/_server/css/editor_mobile.css +++ b/_server/css/editor_mobile.css @@ -482,4 +482,88 @@ div.row .rowtd .rowtext{ margin: 2px 0; border-radius: 3px; width: 90px; +} + +#uieventDiv { + display: none; + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + background: rgba(127,127,127,0.6); + z-index: 2000 +} + +#uieventDialog { + position: fixed; + top: 50%; + left: 0; + transform: translateY(-50%); + background: white; + width: 100vw; +} + +#uieventHead { + margin: 10px 20px; +} + +#uieventTitle { + font-weight: bold; +} + +#uieventNo { + float: right; +} + +#uieventYes { + display: none; + float: right; + margin-right: 15px; +} + +#uieventBody { + width: 100vw; + height: 100vw; + position: relative; + margin-left: 0; + margin-bottom: 5px; + overflow: hidden; +} + +#uievent { + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; +} + +#selectPoint { + display: none; + margin-left: 10px; + margin-bottom: 10px; +} + +#selectPointFloor { + margin-right: 10px; +} + +#selectPointButtons { + display: inline; +} + +#selectPointBox { + position: absolute; + z-index: 75; + width: 26px; + height: 26px; + margin: 3px 0 0 3px; + padding: 0; + /* display: none; */ + box-sizing: border-box; + background-color: rgba(255, 255, 255, 0.0); + border: 1px solid #000; + box-shadow: 0 0 0 2px #fff, + 0 0 0 3px #000; } \ No newline at end of file diff --git a/_server/editor_unsorted_3.js b/_server/editor_unsorted_3.js index e8b4905b..55e92389 100644 --- a/_server/editor_unsorted_3.js +++ b/_server/editor_unsorted_3.js @@ -448,6 +448,7 @@ uievent.previewUI = function (list) { uievent.selectPoint = function (floorId, x, y, hideFloor, callback) { uievent.values.hideFloor = hideFloor; uievent.values.callback = callback; + uievent.values.size = editor.isMobile ? window.innerWidth / core.__SIZE__ : 32; uievent.isOpen = true; uievent.elements.div.style.display = 'block'; @@ -475,8 +476,10 @@ uievent.updateSelectPoint = function (redraw) { {ctx: 'uievent', centerX: uievent.values.left + core.__HALF_SIZE__, centerY: uievent.values.top + core.__HALF_SIZE__}); } - uievent.elements.selectPointBox.style.left = 32 * (uievent.values.x - uievent.values.left) + "px"; - uievent.elements.selectPointBox.style.top = 32 * (uievent.values.y - uievent.values.top) + "px"; + uievent.elements.selectPointBox.style.width = (uievent.values.size - 6) + "px"; + uievent.elements.selectPointBox.style.height = (uievent.values.size - 6) + "px"; + uievent.elements.selectPointBox.style.left = uievent.values.size * (uievent.values.x - uievent.values.left) + "px"; + uievent.elements.selectPointBox.style.top = uievent.values.size * (uievent.values.y - uievent.values.top) + "px"; } uievent.setPoint = function (floorId, x, y) { @@ -497,8 +500,8 @@ uievent.elements.selectFloor.onchange = function () { uievent.elements.body.onclick = function (e) { if (uievent.mode != 'selectPoint') return; - uievent.values.x = uievent.values.left + Math.floor(e.offsetX / 32); - uievent.values.y = uievent.values.top + Math.floor(e.offsetY / 32); + uievent.values.x = uievent.values.left + Math.floor(e.offsetX / uievent.values.size); + uievent.values.y = uievent.values.top + Math.floor(e.offsetY / uievent.values.size); uievent.updateSelectPoint(false); } diff --git a/editor-mobile.html b/editor-mobile.html index 33c1f152..d76491b1 100644 --- a/editor-mobile.html +++ b/editor-mobile.html @@ -216,6 +216,7 @@ + @@ -522,6 +523,35 @@ + +