diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index e89f8bef2..bc441dcc0 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -151,10 +151,10 @@ export default {
},
windowSizeListener() {
- this.$store.state.windowWidth = window.innerWidth
- this.$store.state.windowHeight = window.innerHeight
- this.$store.state.windowLarge = window.innerWidth > 768
- this.$store.state.windowSmall = window.innerWidth <= 768
+ this.$store.state.windowWidth = window.outerWidth
+ this.$store.state.windowHeight = window.outerHeight
+ this.$store.state.windowLarge = window.outerWidth > 768
+ this.$store.state.windowSmall = window.outerWidth <= 768
},
windowScrollListener() {
diff --git a/resources/assets/js/components/DragBallComponent.vue b/resources/assets/js/components/DragBallComponent.vue
index fe4aab72f..796fc5c61 100644
--- a/resources/assets/js/components/DragBallComponent.vue
+++ b/resources/assets/js/components/DragBallComponent.vue
@@ -182,13 +182,13 @@ export default {
let top = e.clientY - this.record.y;
if (left < 0) {
left = 0
- } else if (left > (window.innerWidth - this.floatDrag.offsetWidth)) {
- left = window.innerWidth - this.floatDrag.offsetWidth
+ } else if (left > (window.outerWidth - this.floatDrag.offsetWidth)) {
+ left = window.outerWidth - this.floatDrag.offsetWidth
}
if (top < 0) {
top = 0
- } else if (top > (window.innerHeight - this.floatDrag.offsetHeight)) {
- top = window.innerHeight - this.floatDrag.offsetHeight
+ } else if (top > (window.outerHeight - this.floatDrag.offsetHeight)) {
+ top = window.outerHeight - this.floatDrag.offsetHeight
}
this.left = left;
this.top = top;
@@ -219,13 +219,13 @@ export default {
let top = touch.clientY - this.floatDrag.offsetHeight / 2;
if (left < 0) {
left = 0
- } else if (left > (window.innerWidth - this.floatDrag.offsetWidth)) {
- left = window.innerWidth - this.floatDrag.offsetWidth
+ } else if (left > (window.outerWidth - this.floatDrag.offsetWidth)) {
+ left = window.outerWidth - this.floatDrag.offsetWidth
}
if (top < 0) {
top = 0
- } else if (top > (window.innerHeight - this.floatDrag.offsetHeight)) {
- top = window.innerHeight - this.floatDrag.offsetHeight
+ } else if (top > (window.outerHeight - this.floatDrag.offsetHeight)) {
+ top = window.outerHeight - this.floatDrag.offsetHeight
}
this.left = left;
this.top = top;
diff --git a/resources/assets/js/components/MDEditor/assets/js/codemirror/index.js b/resources/assets/js/components/MDEditor/assets/js/codemirror/index.js
index 0d5ec3ce4..65a5d08a3 100644
--- a/resources/assets/js/components/MDEditor/assets/js/codemirror/index.js
+++ b/resources/assets/js/components/MDEditor/assets/js/codemirror/index.js
@@ -4317,7 +4317,7 @@ function maybeScrollWindow(cm, rect) {
var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
if (rect.top + box.top < 0) {
doScroll = true;
- } else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) {
+ } else if (rect.bottom + box.top > (window.outerHeight || document.documentElement.clientHeight)) {
doScroll = false;
}
if (doScroll != null && !phantom) {
@@ -11172,7 +11172,7 @@ function findPosH(doc, pos, dir, unit, visually) {
function findPosV(cm, pos, dir, unit) {
var doc = cm.doc, x = pos.left, y;
if (unit == "page") {
- var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+ var pageSize = Math.min(cm.display.wrapper.clientHeight, window.outerHeight || document.documentElement.clientHeight);
var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
diff --git a/resources/assets/js/components/PageLoading.vue b/resources/assets/js/components/PageLoading.vue
new file mode 100644
index 000000000..bf7ea7c69
--- /dev/null
+++ b/resources/assets/js/components/PageLoading.vue
@@ -0,0 +1,20 @@
+
+
{{$L('没有任何文件')}}