diff --git a/src/router/index.js b/src/router/index.js index 0731f33..b25687f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,8 +2,8 @@ import Vue from "vue"; import VueRouter from "vue-router"; import EditNote from "@/views/EditNote.vue"; import ViewNote from "@/views/ViewNote.vue"; -import ErrorView from "@/views/ErrorView.vue"; -import InvalidateNote from "@/views/InvalidateNote.vue"; +import ErrorRoute from "@/views/ErrorRoute.vue"; +import ErrorNote from "@/views/ErrorNote.vue"; import { getKeyMeta, getNoteMeta } from "@/api/note"; import { getStoreKey } from "@/api/lock"; import storage from "@/libs/storage"; @@ -27,7 +27,7 @@ function getErrorMetaParam() { } function getNoteView() { - if(errorMeta){ + if (errorMeta) { return; } @@ -42,7 +42,7 @@ function getNoteView() { let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/; if (!regKey.test(key)) { errorMeta = 100002; - return InvalidateNote; + return ErrorNote; } if (keyMeta && keyMeta.key) { @@ -56,13 +56,13 @@ function getNoteView() { //server error if (!noteMeta) { errorMeta = 100006; - return InvalidateNote; + return ErrorNote; } //invalidated key if (!noteMeta.key) { errorMeta = 100002; - return InvalidateNote; + return ErrorNote; } //validated state @@ -77,10 +77,10 @@ function getNoteView() { // user deleted if (noteMeta.ttl > 0) { errorMeta = 100003; - return InvalidateNote; + return ErrorNote; } else {// timeout errorMeta = 100004; - return InvalidateNote; + return ErrorNote; } } @@ -94,17 +94,17 @@ function getNoteView() { let df = storage.session.getText(storeKey + "_delete") if (df) {//unsubmitted,user deleted. errorMeta = 100003; - return InvalidateNote; + return ErrorNote; } else {//unsubmitted errorMeta = 100005; - return InvalidateNote; + return ErrorNote; } } } // other exception errorMeta = 100001; - return InvalidateNote; + return ErrorNote; } function getHomeRedirect() { @@ -119,7 +119,7 @@ function getHomeRedirect() { // server error if (!keyMeta) { errorMeta = 100006; - return "/invalidatenote"; + return "/error_"+errorMeta; } return "/" + keyMeta.key; @@ -131,14 +131,14 @@ const routes = [ name: "home", redirect: getHomeRedirect(), }, - { path: "/invalidatenote", component: InvalidateNote }, + { path: "/error_:code([0-9]{6})", component: ErrorNote }, { path: "/:name([a-z0-9]{1,20})", name: "note", component: getNoteView(), meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() }, }, - { path: "/:path(.*)", component: ErrorView } + { path: "/:path(.*)", component: ErrorRoute } ]; const router = new VueRouter({ diff --git a/src/views/EditNote.vue b/src/views/EditNote.vue index 0a8cffc..48c4f60 100644 --- a/src/views/EditNote.vue +++ b/src/views/EditNote.vue @@ -149,7 +149,7 @@
+ @on-keydown="recordEventKdown"/>
@@ -345,20 +345,19 @@ export default { setStoreText(this.noteForm, this.state, this.secret); }, - recordEventKup(event) { - let tn = event.currentTarget.value; - let ss = event.currentTarget.selectionStart; - let cline = tn.substring(0, ss).split('\n').length; + // recordEventKup(event) { + // let tn = event.currentTarget.value; + // let ss = event.currentTarget.selectionStart; + // let cline = tn.substring(0, ss).split('\n').length; - var noteTop = parseFloat(window.getComputedStyle(event.currentTarget).lineHeight) * cline; - console.log(noteTop) - var scrollTop = document.documentElement.scrollTop || document.body.scrollTop; - console.log(scrollTop) - if (noteTop < scrollTop+10) { - window.scrollTo(0, noteTop-10); - } - - }, + // var noteTop = parseFloat(window.getComputedStyle(event.currentTarget).lineHeight) * cline; + // console.log(noteTop) + // var scrollTop = document.documentElement.scrollTop || document.body.scrollTop; + // console.log(scrollTop) + // if (noteTop < scrollTop+10) { + // window.scrollTo(0, noteTop-10); + // } + // }, recordEventKdown(event) { if (event.key == "Tab") { diff --git a/src/views/InvalidateNote.vue b/src/views/ErrorNote.vue similarity index 89% rename from src/views/InvalidateNote.vue rename to src/views/ErrorNote.vue index 8984699..2dcb559 100644 --- a/src/views/InvalidateNote.vue +++ b/src/views/ErrorNote.vue @@ -85,8 +85,7 @@

- {{ $t("content.blankTip") }} - {{ $t("error."+this.errorInfo.code) }} + {{ $t("error." + this.errorInfo.code) }}
@@ -106,7 +105,7 @@