Merge remote-tracking branch 'origin/dev' into test
This commit is contained in:
commit
621fe61d36
@ -120,7 +120,6 @@ class MouseController extends Eventful {
|
||||
|
||||
this._x = e.offsetX;
|
||||
this._y = e.offsetY;
|
||||
debugger;
|
||||
if (this._dragging) {
|
||||
if (this.eventTarget._type === deviceType.Background || !this.isAllowDragging) {
|
||||
this._preventDefaultMouseMove && eventTool.stop(e.event);
|
||||
|
@ -101,7 +101,6 @@
|
||||
watch: {
|
||||
'$store.state.ibp.rightClickCount': function (val) {
|
||||
const model = this.$store.getters['ibp/updateDeviceData'];
|
||||
console.log(model);
|
||||
if (model._type === 'IbpText' ){
|
||||
this.buttonText = '修改';
|
||||
this.showDeleteButton = true;
|
||||
|
Loading…
Reference in New Issue
Block a user