error message

This commit is contained in:
Jesse-Ma
2022-12-05 13:18:12 +08:00
parent 7fb00c8cf5
commit ca5f4ad8a0
10 changed files with 106 additions and 58 deletions

View File

@@ -38,11 +38,6 @@ body {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
} }
#nprogress .bar {
background: red !important;
}
.showBlock { .showBlock {
display: block; display: block;
} }

View File

@@ -68,13 +68,23 @@ export function getNoteBlob(key) {
export function getNoteMeta(key) { export function getNoteMeta(key) {
let url = servicePath + "/note/" + key + "/noteMeta"; let url = servicePath + "/note/" + key + "/noteMeta";
let noteMeta = ajaxGet(url); let noteMeta = null;
try {
noteMeta = ajaxGet(url);
} catch (error) {
console.log(error);
}
return noteMeta; return noteMeta;
} }
export function getKeyMeta() { export function getKeyMeta() {
let url = servicePath + "/note/keyMeta"; let url = servicePath + "/note/keyMeta";
let keyMeta = ajaxGet(url); let keyMeta = null;
try {
keyMeta = ajaxGet(url);
} catch (error) {
console.log(error);
}
return keyMeta; return keyMeta;
} }

View File

@@ -22,7 +22,9 @@ const en = {
"100003": "Deleted", "100003": "Deleted",
"100004": "Expired!", "100004": "Expired!",
"100005": "Not Available!", "100005": "Not Available!",
"100006": "100006", "100006": "Server Unavailable!",
"100011": "Empty Note!",
"100012": "Too Large, Beyond 200K!",
} }
}; };
export default en; export default en;

View File

@@ -22,7 +22,9 @@ const zh = {
"100003": "内容已删除!", "100003": "内容已删除!",
"100004": "内容已过期!", "100004": "内容已过期!",
"100005": "内容不存在!", "100005": "内容不存在!",
"100006": "100006", "100006": "服务器不可用!",
"100011": "内容为空!",
"100012": "内容过大超过200K!",
} }
}; };
export default zh; export default zh;

View File

@@ -27,6 +27,10 @@ function getErrorMetaParam() {
} }
function getNoteView() { function getNoteView() {
if(errorMeta){
return;
}
let path = location.pathname; let path = location.pathname;
let key = path.substring(1, path.length); let key = path.substring(1, path.length);
@@ -49,8 +53,14 @@ function getNoteView() {
//set noteMeta //set noteMeta
noteMeta = getNoteMeta(key); noteMeta = getNoteMeta(key);
//server error
if (!noteMeta) {
errorMeta = 100006;
return InvalidateNote;
}
//invalidated key //invalidated key
if (!noteMeta || !noteMeta.key) { if (!noteMeta.key) {
errorMeta = 100002; errorMeta = 100002;
return InvalidateNote; return InvalidateNote;
} }
@@ -105,6 +115,13 @@ function getHomeRedirect() {
//setKeyMeta //setKeyMeta
keyMeta = getKeyMeta(); keyMeta = getKeyMeta();
// server error
if (!keyMeta) {
errorMeta = 100006;
return "/invalidatenote";
}
return "/" + keyMeta.key; return "/" + keyMeta.key;
} }
@@ -114,6 +131,7 @@ const routes = [
name: "home", name: "home",
redirect: getHomeRedirect(), redirect: getHomeRedirect(),
}, },
{ path: "/invalidatenote", component: InvalidateNote },
{ {
path: "/:name([a-z0-9]{1,20})", path: "/:name([a-z0-9]{1,20})",
name: "note", name: "note",

View File

@@ -149,7 +149,7 @@
<div id="wrapper" style="border-left: 0px solid #FF3366;"> <div id="wrapper" style="border-left: 0px solid #FF3366;">
<Input element-id="noteText" type="textarea" :border="false" v-model="noteForm.text" autofocus <Input element-id="noteText" type="textarea" :border="false" v-model="noteForm.text" autofocus
:autosize="{ minRows: 30, maxRows: 20480 }" :placeholder="$t('content.noteTip')" @input="recordText" :autosize="{ minRows: 30, maxRows: 20480 }" :placeholder="$t('content.noteTip')" @input="recordText"
@on-keydown="recordEventKdown" /> @on-keydown="recordEventKdown" @on-keyup="recordEventKup"/>
</div> </div>
</Form> </Form>
</Card> </Card>
@@ -174,6 +174,16 @@
</p> </p>
</Modal> </Modal>
<Modal v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
<p style="text-align: center;font-size:medium ;margin-bottom: 20px;">
{{ errorInfo }}
</p>
<p style="text-align: center;">
<Button type="error" style="border-radius: 0px;font-size: 19px;"
@click="cloaseErrorMessage()">{{ $t("button.close") }}</Button>
</p>
</Modal>
</div> </div>
@@ -216,9 +226,11 @@ export default {
showDelete: false, showDelete: false,
deleting: false, deleting: false,
showDownloadText: false, showDownloadText: false,
showError: false,
}, },
toTopState: false, toTopState: false,
showMenuState: false, showMenuState: false,
errorInfo: '',
} }
}, },
created() { created() {
@@ -325,24 +337,28 @@ export default {
}, },
recordText() { recordText() {
let text = this.noteForm.text; let text = this.noteForm.text;
if (text.length > 102400) { if (text.length > 204800) {
alert("text length is " + text.length + ",beyond 102400!!!"); this.errorInfo = this.$t('error.100012');
this.model.showError = true;
return;
} }
setStoreText(this.noteForm, this.state, this.secret); setStoreText(this.noteForm, this.state, this.secret);
}, },
// recordEventKup(event) { recordEventKup(event) {
// let tn = event.currentTarget.value; let tn = event.currentTarget.value;
// let ss = event.currentTarget.selectionStart; let ss = event.currentTarget.selectionStart;
// let cline = tn.substring(0, ss).split('\n').length; let cline = tn.substring(0, ss).split('\n').length;
// var noteTop = parseFloat(window.getComputedStyle(event.currentTarget).lineHeight) * cline; var noteTop = parseFloat(window.getComputedStyle(event.currentTarget).lineHeight) * cline;
// var scrollTop = document.documentElement.scrollTop || document.body.scrollTop; console.log(noteTop)
// if (noteTop < scrollTop + 10) { var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
// window.scrollTo(0, noteTop - 10); console.log(scrollTop)
// } if (noteTop < scrollTop+10) {
window.scrollTo(0, noteTop-10);
}
// }, },
recordEventKdown(event) { recordEventKdown(event) {
if (event.key == "Tab") { if (event.key == "Tab") {
@@ -351,8 +367,10 @@ export default {
let end = event.currentTarget.selectionEnd; let end = event.currentTarget.selectionEnd;
let text = event.currentTarget.value; let text = event.currentTarget.value;
if (text.length > 102400) { if (text.length > 204800) {
alert("text length is " + text.length + ",beyond 102400!!!"); this.errorInfo = this.$t('error.100012');
this.model.showError = true;
return;
} }
let tab = '\t';//\t let tab = '\t';//\t
@@ -395,16 +413,22 @@ export default {
}, },
validateForm() { validateForm() {
let text = this.noteForm.text; let text = this.noteForm.text;
if (text.length > 102400) { if (text.length > 204800) {
alert("text length is " + text.length + ",beyond 102400!!!"); this.errorInfo = this.$t('error.100012');
this.model.showError = true;
return false; return false;
} }
if (text.length == 0) { if (text.length == 0) {
alert("text is empty!!!"); this.errorInfo = this.$t('error.100011');
this.model.showError = true;
return false; return false;
} }
return true; return true;
}, },
cloaseErrorMessage(){
this.errorInfo = '';
this.model.showError = false;
},
submitNote() { submitNote() {
if (this.state.locking == 1) { if (this.state.locking == 1) {
return; return;

View File

@@ -1,21 +0,0 @@
<template>
<div>
error
</div>
</template>
<script>
export default {
name: 'ErrorView',
components: {
},
data() {
return {
}
},
created() {
alert("error")
}
}
</script>

View File

@@ -11,7 +11,8 @@ export default {
data() { data() {
return {} return {}
}, },
created() { created() {
} alert("error")
}
} }
</script> </script>

View File

@@ -106,7 +106,7 @@
<script> <script>
export default { export default {
name: 'BlankNote', name: 'InvalidateNote',
components: {}, components: {},
props: {}, props: {},
data() { data() {
@@ -136,7 +136,7 @@ export default {
}, },
created() { created() {
this.errorInfo.code = this.$route.meta.errorMeta; this.errorInfo.code = this.$route.meta.errorMeta;
this.noteForm.key = this.$route.params.name; //this.noteForm.key = this.$route.params.name;
}, },
mounted() { mounted() {
//this.bindCopyTextEvent(); //this.bindCopyTextEvent();

View File

@@ -271,8 +271,8 @@
<canvas id="qrImg" class=""></canvas> <canvas id="qrImg" class=""></canvas>
</p> </p>
<p style="text-align: center;margin-top:10px;"> <p style="text-align: center;margin-top:10px;">
<Button type="error" style="border-radius: 0px;font-size:19px;" <Button type="error" style="border-radius: 0px;font-size:19px;" @click="closeShareModel()">{{ $t("button.close")
@click="closeShareModel()">{{ $t("button.close") }}</Button> }}</Button>
</p> </p>
</Modal> </Modal>
@@ -287,6 +287,17 @@
</p> </p>
</Modal> </Modal>
<Modal v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
<p style="text-align: center;font-size:medium ;margin-bottom: 20px;">
{{ errorInfo }}
</p>
<p style="text-align: center;">
<Button type="error" style="border-radius: 0px;font-size: 19px;" @click="cloaseErrorMessage()">{{
$t("button.close")
}}</Button>
</p>
</Modal>
</div> </div>
@@ -338,11 +349,11 @@ export default {
deleting: false, deleting: false,
showDownloadText: false, showDownloadText: false,
copyTip: false, copyTip: false,
showError: false,
}, },
toTopState: false, toTopState: false,
showMenuState: false, showMenuState: false,
errorInfo: '',
} }
}, },
created() { created() {
@@ -384,7 +395,9 @@ export default {
this.bindToTopEvent(); this.bindToTopEvent();
} else { } else {
alert("Unconnected."); this.errorInfo = this.$t('error.100001');
this.model.showError = true;
return false;
} }
}, },
@@ -469,6 +482,10 @@ export default {
createNote() { createNote() {
window.open("/"); window.open("/");
}, },
cloaseErrorMessage() {
this.errorInfo = '';
this.model.showError = false;
},
showShareModel() { showShareModel() {
this.model.showShare = true; this.model.showShare = true;
let qrimg = document.getElementById("qrImg"); let qrimg = document.getElementById("qrImg");