diff --git a/src/jmapNew/shape/graph/SignalButton/index.js b/src/jmapNew/shape/graph/SignalButton/index.js index 9d7d47b5a..71910d656 100644 --- a/src/jmapNew/shape/graph/SignalButton/index.js +++ b/src/jmapNew/shape/graph/SignalButton/index.js @@ -155,7 +155,7 @@ export default class SignalButton extends Group { const borderLine = this.style.SignalButton && this.style.SignalButton.borderLine ? this.style.SignalButton.borderLine : 2; const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; // 接车按钮 通过按钮 引导按钮 - const showBorderBtn = ['PICK', 'PASS', 'GUIDE']; + const showBorderBtn = ['PICK', 'PASS', 'GUIDE', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION', 'FLEXIBLE']; this.leftBoard = new Line({ zlevel: this.zlevel, z: this.z + 1, @@ -326,32 +326,65 @@ export default class SignalButton extends Group { // { value: 'ASSIST', label: '总辅助按钮' }, // { value: 'PICK_ASSIST', label: '接辅助按钮' }, // { value: 'DEPART_ASSIST', label: '发辅助按钮' }, + const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION']; if (list.includes(model.type)) { if (this.rectButton) { if (model.pressDown) { this.rectButton.setStyle({ fill: '#FFFF00' }); + if (isShowBorder) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); + } } else { this.rectButton.setStyle({ fill: this.getTypeColor() }); + if (isShowBorder) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#FFFFFF'); + this.topBoard && this.topBoard.setStyle('stroke', '#FFFFFF'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#A0A0A0'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#A0A0A0'); + this.leftBoard && this.leftBoard.show(); + this.rightBoard && this.rightBoard.show(); + this.topBoard && this.topBoard.show(); + this.bottomBoard && this.bottomBoard.show(); + } } } } - const isShowBorder = this.style.SignalButton && this.style.SignalButton.isShowBorder; + if (isShowBorder) { + if (model.type == 'FLEXIBLE') { + this.leftBoard && this.leftBoard.show(); + this.rightBoard && this.rightBoard.show(); + this.topBoard && this.topBoard.show(); + this.bottomBoard && this.bottomBoard.show(); + } + } // 接车按钮 通过按钮 引导按钮 const showBorderBtn = ['PICK', 'PASS', 'GUIDE']; if (isShowBorder && showBorderBtn.includes(model.type)) { if (this.rectButton) { - if (model.hasSelected) { - this.leftBoard && this.leftBoard.hide(); - this.rightBoard && this.rightBoard.hide(); - this.topBoard && this.topBoard.hide(); - this.bottomBoard && this.bottomBoard.hide(); + if (model.hasSelected || model.pressDown) { + this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); } else { + this.leftBoard && this.leftBoard.setStyle('stroke', '#FFFFFF'); + this.topBoard && this.topBoard.setStyle('stroke', '#FFFFFF'); + this.rightBoard && this.rightBoard.setStyle('stroke', '#A0A0A0'); + this.bottomBoard && this.bottomBoard.setStyle('stroke', '#A0A0A0'); this.leftBoard && this.leftBoard.show(); this.rightBoard && this.rightBoard.show(); this.topBoard && this.topBoard.show(); this.bottomBoard && this.bottomBoard.show(); } + // else if (model.hasSelected && (model.type == 'PICK' || model.type == 'PASS')) { + // this.leftBoard && this.leftBoard.setStyle('stroke', '#A0A0A0'); + // this.topBoard && this.topBoard.setStyle('stroke', '#A0A0A0'); + // this.rightBoard && this.rightBoard.setStyle('stroke', '#FFFFFF'); + // this.bottomBoard && this.bottomBoard.setStyle('stroke', '#FFFFFF'); } } diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue index d9a626059..03c8e7432 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue @@ -93,6 +93,7 @@