Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client

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",

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;
   }
 };

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;
+  startOffset.x = e.offsetX;
-  start.y = e.screenY - offset.y;
+  startOffset.y = e.offsetY;
+  start.x = e.clientX - offset.x;
+  start.y = e.clientY - offset.y;
   window.addEventListener('mousemove', onMove);
   window.addEventListener('mouseup', onMouseUp);
 }

src/components/draw-app/properties/PlatformProperty.vue

@@ -10,16 +10,14 @@
       lazy-rules
       autogrow
     />
-    <q-select
+    <q-toggle
-      outlined
-      @blur="onUpdate"
       v-model="platformModel.hasdoor"
-      :options="optionsDoor"
       label="是否有屏蔽门"
-      map-options
       emit-value
+      @update:model-value="onUpdate"
     />
     <q-select
+      v-if="platformModel.hasdoor"
       outlined
       @blur="onUpdate"
       v-model="platformModel.direction"
@@ -105,10 +103,6 @@ const sectionName = computed(() => {
   }
   return '';
 });
-const optionsDoor = [
-  { label: '是', value: true },
-  { label: '否', value: false },
-];
 const optionsDirection = [
   { label: '向上', value: 'up' },
   { label: '向下', value: 'down' },

xian-ncc-da-message

@@ -1 +1 @@
-Subproject commit 509c8f3f91257e1c489c2bb2435fa66f0fc29cab
+Subproject commit c20feed4b6ae3bdd02cb21b4cc5af03c55be869b