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

graphic-pixi

@@ -1 +1 @@
-Subproject commit 4e785acf070d8810f33b053a8a7c3d41c06f54ee
+Subproject commit defae8c01e0ec5b0cf679655bd4d761a9932593a

src/graphics/turnout/Turnout.ts

@@ -163,8 +163,8 @@ class ForkGraphic extends Graphics {
     this.clear();
     this.lostIndicationSquare.clear();
     if (
-      this.turnout.states.ipSingleSwitchStusJammed ||
-      this.turnout.states.ipSingleSwitchStusLostIndication
+      this.turnout.states.ipSingleSwitchStusJammed /* ||
+      this.turnout.states.ipSingleSwitchStusLostIndication */
     ) {
       let x: number, y: number;
       const w = 24,

src/jl-graphic/app/JlGraphicApp.ts

@@ -276,6 +276,8 @@ export class SelectedChangeEvent {
 export interface GraphicAppEvents extends GlobalMixins.GraphicAppEvents {
   graphicstored: [graphic: JlGraphic];
   graphicdeleted: [graphic: JlGraphic];
+  // 数据加载完成后，额外的逻辑处理阶段
+  postdataloaded: [];
   loadfinish: [];
   'interaction-plugin-resume': [plugin: InteractionPlugin]; // 交互插件启用
   'interaction-plugin-pause': [plugin: InteractionPlugin]; // 交互插件停止
@@ -653,6 +655,8 @@ export class GraphicApp extends EventEmitter<GraphicAppEvents> {
         .pop() ?? 0;
     // console.log('最大值', max)
     GraphicIdGenerator.initSerial(max);
+    // 数据加载完成后
+    this.emit('postdataloaded');
     // 加载完成通知
     this.emit('loadfinish');
   }

src/jl-graphic/plugins/KeyboardPlugin.ts

@@ -84,7 +84,7 @@ export class JlGraphicAppKeyboardPlugin {
       // console.log('Mousedown Event', node.nodeName, node.nodeType, node.nodeValue)
     };
     const keydownHandle = (e: KeyboardEvent) => {
-      console.debug(e.key, e.code, e.keyCode);
+      // console.debug(e.key, e.code, e.keyCode);
       if (target && target == this.app.dom.getElementsByTagName('canvas')[0]) {
         const listenerMap = this.getKeyListener(e);
         listenerMap?.forEach((listener) => {