Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
fan 2019-09-06 17:43:09 +08:00
commit 621fe61d36
2 changed files with 0 additions and 2 deletions

View File

@ -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);

View File

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