"); - textEscape = textEscape.replaceAll("\r", "
"); - textEscape = textEscape.replaceAll("\n", "
"); - textEscape = textEscape.replaceAll("\t", " "); - + textEscape = textEscape.replace(new RegExp(' ','gm'), " "); + textEscape = textEscape.replace(new RegExp('\\r\\n','gm'), "
"); + textEscape = textEscape.replace(new RegExp('\\r','gm'), "
"); + textEscape = textEscape.replace(new RegExp('\\n','gm'), "
"); + textEscape = textEscape.replace(new RegExp('\\t','gm'), " "); return textEscape; } diff --git a/src/libs/storage.js b/src/libs/storage.js index d07544f..1811e4e 100644 --- a/src/libs/storage.js +++ b/src/libs/storage.js @@ -1,53 +1,116 @@ class Storage { - constructor() { - this.session = new Session(); - this.local = new Local(); - } + constructor() { + this.session = new Session(); + this.local = new Local(); + } } class Session { + setObject(key, value) { + sessionStorage.setItem(key, JSON.stringify(value)); + } - setObject(key, value) { - sessionStorage.setItem(key, JSON.stringify(value)); - } + getObject(key) { + return JSON.parse(sessionStorage.getItem(key)); + } - getObject(key) { - return JSON.parse(sessionStorage.getItem(key)); - } + delete(key) { + sessionStorage.removeItem(key); + } - delete(key){ - sessionStorage.removeItem(key); - } + setText(key, value) { + sessionStorage.setItem(key, value); + } - setText(key, value) { - sessionStorage.setItem(key, value); - } - - getText(key) { - return sessionStorage.getItem(key); - } + getText(key) { + return sessionStorage.getItem(key); + } } class Local { - setObject(key, value) { - localStorage.setItem(key, JSON.stringify(value)); - } + setObject(key, value) { + localStorage.setItem(key, JSON.stringify(value)); + } - getObject(key) { - return JSON.parse(localStorage.getItem(key)); - } + getObject(key) { + return JSON.parse(localStorage.getItem(key)); + } - delete(key){ - localStorage.removeItem(key); - } + delete(key) { + localStorage.removeItem(key); + } - setText(key, value) { - localStorage.setItem(key, value); - } + setText(key, value) { + localStorage.setItem(key, value); + } - getText(key) { - return localStorage.getItem(key); + getText(key) { + return localStorage.getItem(key); + } + + getUseSize() { + var size = 0; + for (let i = 0, len = localStorage.length; i < len; i++) { + let key = localStorage.key(i); + if (null == key) { + continue; + } + let value = localStorage.getItem(key); + if (null != value) { + size += value.length; + } } + return size; + } + + getAvailableSize() { + return 5 * 1024 * 1024 - storage.local.getUseSize(); + } + + dynamicClear(ctt) { + if (storage.local.getAvailableSize() < 1 * 1024 * 1024) { + + //remove commited + for (let i = 0, len = localStorage.length; i < len; i++) { + let key = localStorage.key(i); + + if (null == key) { + continue; + } + + let value = localStorage.getItem(key); + if (key.length == 37 && key.endsWith(".text") && value.length > 50) { + let fl = value.substring(35, 36); + if (fl == "1") { + localStorage.removeItem(key); + } + } + } + + //remove expired + if (storage.local.getAvailableSize() < 1 * 1024 * 1024) { + for (let i = 0, len = localStorage.length; i < len; i++) { + let key = localStorage.key(i); + if (null == key) { + continue; + } + let value = localStorage.getItem(key); + + if (key.length == 37 && key.endsWith(".text") && value.length > 50) { + let starray = value.split("|"); + let fl = starray[2]; + let ts = starray[3]; + + if (fl == "0") { + if (ctt - ts > 3 * 24 * 3600 * 1000) { + localStorage.removeItem(key); + } + } + } + } + } + } + } } const storage = new Storage(); diff --git a/src/libs/utils.js b/src/libs/utils.js new file mode 100644 index 0000000..094578b --- /dev/null +++ b/src/libs/utils.js @@ -0,0 +1,14 @@ +export function isWeixin(){ + var useragent = navigator.userAgent; + if (useragent.match(/MicroMessenger/i) == 'MicroMessenger') { + return true; + } + return false; +} + +export function isIE() { + if (navigator.userAgent.match(/msie/) != null || navigator.userAgent.match(/trident/) != null) { + return true; + } + return false; +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 6d93198..f650cbe 100644 --- a/src/main.js +++ b/src/main.js @@ -4,36 +4,14 @@ import router from './router' import axios from 'axios' import VueAxios from 'vue-axios' import './plugins/iview.js' - -//import NProgress from 'nprogress'; -//import 'nprogress/nprogress.css'; - -//顶部页面加载条 - -// NProgress.configure({ -// easing: 'ease', -// speed: 500, -// showSpinner: false, -// trickleSpeed: 200, -// minimum: 0.3 -// }) - -// //路由监听 -// router.beforeEach((to, from, next) => { -// NProgress.start(); -// next(); -// }); - -// //路由跳转结束 -// router.afterEach(() => { -// NProgress.done() -// }) +import i18n from './i18n/' Vue.use(VueAxios, axios) Vue.config.productionTip = false new Vue({ + i18n, router, render: h => h(App) }).$mount('#app') diff --git a/src/router/index.js b/src/router/index.js index 3d74727..bdc54d4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,86 +1,100 @@ -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 BlankNote from '@/views/BlankNote.vue' +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 BlankNote from "@/views/BlankNote.vue"; import { getKeyMeta, getNoteMeta } from "@/api/note"; import { getStoreKey } from "@/api/lock"; import storage from "@/libs/storage"; -Vue.use(VueRouter) +Vue.use(VueRouter); -let keyMeta = null; +var keyMeta = null; +var noteMeta = null; + +function getKeyMetaParam() { + return keyMeta; +} + +function getNoteMetaParam() { + return noteMeta; +} function getNoteView() { - let path = location.pathname; - if (null != keyMeta) { - path = "/" + keyMeta.key; - } + let path = location.pathname; + if (null != keyMeta) { + path = "/" + keyMeta.key; + } - let reg = /^\/[abcdefhikmnopqstuvwxyz23456789]{16}$/ - if (!reg.test(path)) { - return; - } + let reg = /^\/[abcdefhikmnopqstuvwxyz23456789]{16}$/; + if (!reg.test(path)) { + return; + } - let key = path.substr(1, path.length - 1); + let key = path.substr(1, path.length - 1); - let storeKey = getStoreKey(key); - if (keyMeta && keyMeta.cipher) { - storage.session.setObject(storeKey + '.keyMeta', keyMeta); + let storeKey = getStoreKey(key); + if (keyMeta && keyMeta.cipher) { + // storage.session.setObject(storeKey + '.keyMeta', keyMeta); + return EditNote; + } + + noteMeta = getNoteMeta(key); + if (!noteMeta || !noteMeta.key) { + let storeText = storage.local.getText(storeKey + ".text"); + if (storeText) { + let starray = storeText.split("|"); + let commitFlag = starray[2]; + if (commitFlag == "1") { + storage.local.delete(storeKey + '.text'); + return BlankNote; + } else { return EditNote; + } + } else { + return BlankNote; } - - let noteMeta = null; - noteMeta = getNoteMeta(key); - if (!noteMeta || !noteMeta.key) { - let storeText = storage.local.getText(storeKey + '.text'); - if(storeText){ - return EditNote; - }else{ - return BlankNote; - } - } - - storage.session.setObject(storeKey + '.noteMeta', noteMeta); - return ViewNote; + } + // storage.session.setObject(storeKey + '.noteMeta', noteMeta); + return ViewNote; } - function getHomeRedirect() { - let path = location.pathname; - if (path != '/') { - return; - } - let km = getKeyMeta(); - km.isNew = true; - //sessionStorage.setItem(km.getKey() + '.keyMeta', km); - keyMeta = km; - return '/' + keyMeta.key; + let path = location.pathname; + if (path != "/") { + return; + } + + let km = getKeyMeta(); + km.isNew = true; + //sessionStorage.setItem(km.getKey() + '.keyMeta', km); + keyMeta = km; + return "/" + keyMeta.key; } - const routes = [ - { - path: '/', - name: 'home', - redirect: getHomeRedirect(), - }, - { - path: '/error', - name: 'error', - component: ErrorView, - }, - { - path: '/:name([abcdefhikmnopqstuvwxyz23456789]{16})', - name: 'note', - component: getNoteView(), - } -] + { + path: "/", + name: "home", + redirect: getHomeRedirect(), + }, + { + path: "/error", + name: "error", + component: ErrorView, + }, + { + path: "/:name([abcdefhikmnopqstuvwxyz23456789]{16})", + name: "note", + component: getNoteView(), + meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam() }, + }, +]; const router = new VueRouter({ - routes, - mode: 'history' -}) + routes, + mode: "history", +}); -export default router +export default router; diff --git a/src/views/BlankNote.vue b/src/views/BlankNote.vue index 648e4f4..267e350 100644 --- a/src/views/BlankNote.vue +++ b/src/views/BlankNote.vue @@ -30,61 +30,15 @@ text-align: center; } - - - - .ivu-card-bordered { border: 0px solid #dcdee2; border-color: #e8eaec; } - - -.noteKey { - color: red; - font-weight: bold; - font-size: 18px; - font-family: "Bitstream Vera Sans Mono", Consolas, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei" -}
@@ -130,7 +84,7 @@
diff --git a/src/views/EditNote.vue b/src/views/EditNote.vue
index 1221917..534bdb9 100644
--- a/src/views/EditNote.vue
+++ b/src/views/EditNote.vue
@@ -34,48 +34,39 @@
border-color: #e8eaec;
}
-.noteUrl {
- color: red;
- font-weight: bold;
- font-family: Merriweather;
-
+.fnmodal {
+ align-items: center;
+ justify-content: center;
}
-.noteKey {
- color: red;
- font-weight: bold;
- font-size: 18px;
- font-family: "Bitstream Vera Sans Mono", Consolas, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei"
+@media print {
+
+ @page {
+ size: portrait;
+ margin: 20px;
+ }
+
+ body {
+ margin: 0.8cm;
+ background-color: #ffffff;
+ }
+
+ .header {
+ display: none;
+ }
+
+ .layout-footer-center {
+ display: none;
+ }
+
}
+
@@ -91,17 +82,21 @@
-
-
+
+
@@ -120,7 +115,7 @@
+ @click="showDeleteModel()" icon="md-trash">
@@ -186,10 +181,9 @@
-
blank
+{{$t("content.blankTip")}}