diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js index 93ceec109..c96ffa6be 100644 --- a/src/jmapNew/shape/graph/Signal/index.js +++ b/src/jmapNew/shape/graph/Signal/index.js @@ -459,9 +459,7 @@ class Signal extends Group { } this.add(this.sigPost); - this.add(this.sigName); - - this.style.Signal.text.show && model.nameShow ? this.sigName.show() : this.sigName.hide(); + this.style.Signal.text.show && model.nameShow && this.add(this.sigName); this.add(this.sigRoute); this.add(this.sigDelay); this.add(this.remainTimeName); diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js index 849eb8e53..4d88bb849 100644 --- a/src/jmapNew/shape/graph/Switch/index.js +++ b/src/jmapNew/shape/graph/Switch/index.js @@ -223,10 +223,9 @@ export default class Switch extends Group { this.add(this.shapeModelB); this.add(this.shapeModelC); this.add(this.shapeBlockCover); - this.add(this.name); + style.Switch.text.show && model.nameShow && this.add(this.name); this.add(this.enabledName); - style.Switch.text.show && model.nameShow ? this.name.show() : this.name.hide(); } createLockRect() { diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue index 7e52408dc..461c38c4a 100644 --- a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue @@ -1,22 +1,63 @@