From cc9e5939167cdcfccb8f4e52efed88bb48242389 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 21 Dec 2023 17:23:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AB=99=E5=8F=B0-=E6=98=AF=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../draw-app/properties/PlatformProperty.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/components/draw-app/properties/PlatformProperty.vue b/src/components/draw-app/properties/PlatformProperty.vue index c89bb31..df1b320 100644 --- a/src/components/draw-app/properties/PlatformProperty.vue +++ b/src/components/draw-app/properties/PlatformProperty.vue @@ -10,16 +10,14 @@ lazy-rules autogrow /> - { } return ''; }); -const optionsDoor = [ - { label: '是', value: true }, - { label: '否', value: false }, -]; const optionsDirection = [ { label: '向上', value: 'up' }, { label: '向下', value: 'down' }, From 5af0362c0e0a0277af9b855b632d6bf31912c828 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 22 Dec 2023 10:36:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsocket=E6=96=AD=E8=BF=9E?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf3fa58..eb1f214 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "centrifuge": "^4.0.1", "dotenv": "^16.3.1", "google-protobuf": "^3.21.2", - "jl-graphic": "git+https://git.code.tencent.com/jl-framework/graphic-pixi.git#v0.1.2", + "jl-graphic": "git+https://git.code.tencent.com/jl-framework/graphic-pixi.git#v0.1.3", "js-base64": "^3.7.5", "pinia": "^2.0.11", "quasar": "^2.6.0", From db277254f9990f439f0aea06124f2a2f3b156c0a Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 22 Dec 2023 14:44:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E5=BC=B9=E7=AA=97Y=E8=BD=B4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/DraggableDialog.vue | 15 ++++++++++++--- xian-ncc-da-message | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/common/DraggableDialog.vue b/src/components/common/DraggableDialog.vue index 12807bd..65310a8 100644 --- a/src/components/common/DraggableDialog.vue +++ b/src/components/common/DraggableDialog.vue @@ -89,6 +89,7 @@ const offset = reactive({ }); const start = { x: 0, y: 0 }; +const startOffset = { x: 0, y: 0 }; onMounted(() => { window.addEventListener('mousedown', onMouseDown); @@ -99,16 +100,24 @@ onUnmounted(() => { }); function onMove(e: MouseEvent) { - [offset.x, offset.y] = [e.screenX - start.x, e.screenY - start.y]; + let y = e.clientY > startOffset.y ? e.clientY : startOffset.y; + if (y > window.innerHeight - props.titleHeight + startOffset.y) { + y = window.innerHeight - props.titleHeight + startOffset.y; + } + [offset.x, offset.y] = [e.clientX - start.x, y - start.y]; } function onMouseUp() { window.removeEventListener('mousemove', onMove); window.removeEventListener('mouseup', onMouseUp); + startOffset.x = 0; + startOffset.y = 0; } function onMouseDown(e: MouseEvent) { if (headerRef.value?.$el !== e.target) return; - start.x = e.screenX - offset.x; - start.y = e.screenY - offset.y; + startOffset.x = e.offsetX; + startOffset.y = e.offsetY; + start.x = e.clientX - offset.x; + start.y = e.clientY - offset.y; window.addEventListener('mousemove', onMove); window.addEventListener('mouseup', onMouseUp); } diff --git a/xian-ncc-da-message b/xian-ncc-da-message index 509c8f3..c20feed 160000 --- a/xian-ncc-da-message +++ b/xian-ncc-da-message @@ -1 +1 @@ -Subproject commit 509c8f3f91257e1c489c2bb2435fa66f0fc29cab +Subproject commit c20feed4b6ae3bdd02cb21b4cc5af03c55be869b From 10271fc959747b9b738efd923983d5cf910debd2 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 22 Dec 2023 14:44:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ConnectInfoDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ConnectInfoDialog.vue b/src/components/ConnectInfoDialog.vue index 3733ff2..2b0750e 100644 --- a/src/components/ConnectInfoDialog.vue +++ b/src/components/ConnectInfoDialog.vue @@ -69,7 +69,7 @@ const onRequest: QTable['onRequest'] = async (props) => { pagination.value.rowsPerPage = rowsPerPage; const datas = lineNetStore.connectInfo?.msgs; if (datas) { - rows.value = datas; + rows.value = datas.slice((page - 1) * rowsPerPage, page * rowsPerPage - 1); pagination.value.rowsNumber = datas.length; } };