Roomで未保存警告ダイアログなどを追加 (#5332)
* Room保存時にダイアログを表示するように * Roomから移動するときに未保存ならば警告するように
This commit is contained in:
parent
a39c1706a1
commit
0638b6cb69
@ -2300,8 +2300,10 @@ room:
|
|||||||
exit: "戻る"
|
exit: "戻る"
|
||||||
remove: "しまう"
|
remove: "しまう"
|
||||||
save: "保存"
|
save: "保存"
|
||||||
|
saved: "保存しました"
|
||||||
clear: "片付け"
|
clear: "片付け"
|
||||||
clear-confirm: "全ての家具をしまいますか?"
|
clear-confirm: "全ての家具をしまいますか?"
|
||||||
|
leave-confirm: "未保存の変更があります、移動しますか?"
|
||||||
chooseImage: "画像を選択"
|
chooseImage: "画像を選択"
|
||||||
room-type: "部屋のタイプ"
|
room-type: "部屋のタイプ"
|
||||||
carpet-color: "床の色"
|
carpet-color: "床の色"
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
</label>
|
</label>
|
||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<ui-button primary @click="save()"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
|
<ui-button :primary="changed" @click="save()"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
|
||||||
<ui-button @click="clear()"><fa :icon="faBroom"/> {{ $t('clear') }}</ui-button>
|
<ui-button @click="clear()"><fa :icon="faBroom"/> {{ $t('clear') }}</ui-button>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
@ -87,11 +87,14 @@ export default Vue.extend({
|
|||||||
isTranslateMode: false,
|
isTranslateMode: false,
|
||||||
isRotateMode: false,
|
isRotateMode: false,
|
||||||
isMyRoom: false,
|
isMyRoom: false,
|
||||||
|
changed: false,
|
||||||
faBoxOpen, faSave, faTrashAlt, faUndo, faArrowsAlt, faBan, faBroom,
|
faBoxOpen, faSave, faTrashAlt, faUndo, faArrowsAlt, faBan, faBroom,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
async mounted() {
|
async mounted() {
|
||||||
|
window.addEventListener('beforeunload', this.beforeunload);
|
||||||
|
|
||||||
const user = await this.$root.api('users/show', {
|
const user = await this.$root.api('users/show', {
|
||||||
...parseAcct(this.acct)
|
...parseAcct(this.acct)
|
||||||
});
|
});
|
||||||
@ -125,11 +128,37 @@ export default Vue.extend({
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
beforeRouteLeave(to, from, next) {
|
||||||
|
if (this.changed) {
|
||||||
|
this.$root.dialog({
|
||||||
|
type: 'warning',
|
||||||
|
text: this.$t('leave-confirm'),
|
||||||
|
showCancelButton: true
|
||||||
|
}).then(({ canceled }) => {
|
||||||
|
if (canceled) {
|
||||||
|
next(false);
|
||||||
|
} else {
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
room.destroy();
|
room.destroy();
|
||||||
|
window.removeEventListener('beforeunload', this.beforeunload);
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
beforeunload(e: BeforeUnloadEvent) {
|
||||||
|
if (this.changed) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.returnValue = '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
async add() {
|
async add() {
|
||||||
const { canceled, result: id } = await this.$root.dialog({
|
const { canceled, result: id } = await this.$root.dialog({
|
||||||
type: null,
|
type: null,
|
||||||
@ -143,17 +172,30 @@ export default Vue.extend({
|
|||||||
});
|
});
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
room.addFurniture(id);
|
room.addFurniture(id);
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
remove() {
|
remove() {
|
||||||
this.isTranslateMode = false;
|
this.isTranslateMode = false;
|
||||||
this.isRotateMode = false;
|
this.isRotateMode = false;
|
||||||
room.removeFurniture();
|
room.removeFurniture();
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
save() {
|
save() {
|
||||||
this.$root.api('room/update', {
|
this.$root.api('room/update', {
|
||||||
room: room.getRoomInfo()
|
room: room.getRoomInfo()
|
||||||
|
}).then(() => {
|
||||||
|
this.changed = false;
|
||||||
|
this.$root.dialog({
|
||||||
|
type: 'success',
|
||||||
|
text: this.$t('saved')
|
||||||
|
});
|
||||||
|
}).catch((e: any) => {
|
||||||
|
this.$root.dialog({
|
||||||
|
type: 'error',
|
||||||
|
text: e.message
|
||||||
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -165,6 +207,7 @@ export default Vue.extend({
|
|||||||
}).then(({ canceled }) => {
|
}).then(({ canceled }) => {
|
||||||
if (canceled) return;
|
if (canceled) return;
|
||||||
room.removeAllFurnitures();
|
room.removeAllFurnitures();
|
||||||
|
this.changed = true;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -174,22 +217,26 @@ export default Vue.extend({
|
|||||||
}).then(file => {
|
}).then(file => {
|
||||||
room.updateProp(key, `/proxy/?${urlQuery({ url: file.thumbnailUrl })}`);
|
room.updateProp(key, `/proxy/?${urlQuery({ url: file.thumbnailUrl })}`);
|
||||||
this.$refs.preview.selected(room.getSelectedObject());
|
this.$refs.preview.selected(room.getSelectedObject());
|
||||||
|
this.changed = true;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
updateColor(key, ev) {
|
updateColor(key, ev) {
|
||||||
room.updateProp(key, ev.target.value);
|
room.updateProp(key, ev.target.value);
|
||||||
this.$refs.preview.selected(room.getSelectedObject());
|
this.$refs.preview.selected(room.getSelectedObject());
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
updateCarpetColor(ev) {
|
updateCarpetColor(ev) {
|
||||||
room.updateCarpetColor(ev.target.value);
|
room.updateCarpetColor(ev.target.value);
|
||||||
this.carpetColor = ev.target.value;
|
this.carpetColor = ev.target.value;
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
updateRoomType(type) {
|
updateRoomType(type) {
|
||||||
room.changeRoomType(type);
|
room.changeRoomType(type);
|
||||||
this.roomType = type;
|
this.roomType = type;
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
translate() {
|
translate() {
|
||||||
@ -200,6 +247,7 @@ export default Vue.extend({
|
|||||||
this.isTranslateMode = true;
|
this.isTranslateMode = true;
|
||||||
room.enterTransformMode('translate');
|
room.enterTransformMode('translate');
|
||||||
}
|
}
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
rotate() {
|
rotate() {
|
||||||
@ -210,12 +258,14 @@ export default Vue.extend({
|
|||||||
this.isRotateMode = true;
|
this.isRotateMode = true;
|
||||||
room.enterTransformMode('rotate');
|
room.enterTransformMode('rotate');
|
||||||
}
|
}
|
||||||
|
this.changed = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
exit() {
|
exit() {
|
||||||
this.isTranslateMode = false;
|
this.isTranslateMode = false;
|
||||||
this.isRotateMode = false;
|
this.isRotateMode = false;
|
||||||
room.exitTransformMode();
|
room.exitTransformMode();
|
||||||
|
this.changed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user