json

package.json

@@ -14,40 +14,42 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "axios": "^0.27.2",
+    "axios": "^0.28.1",
     "babel-plugin-import": "^1.13.6",
     "buffer": "^6.0.3",
     "clipboard": "^2.0.11",
-    "core-js": "^3.8.3",
+    "core-js": "^3.37.1",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "escape-html": "^1.0.3",
     "file-saver": "^2.0.5",
     "github-markdown-css": "^5.6.1",
     "html2canvas": "^1.4.1",
+    "json-editor-vue": "^0.15.1",
     "pako": "^2.1.0",
     "qrcodejs2-fixes": "^0.0.2",
-    "view-ui-plus": "^1.3.10",
+    "view-ui-plus": "^1.3.18",
-    "vue": "^3.2.13",
+    "vue": "^3.4.31",
     "vue-axios": "^3.5.2",
-    "vue-i18n": "^9.2.2",
+    "vue-i18n": "^9.13.1",
+    "vue-json-pretty": "^2.4.0",
     "vue-markdown-render": "^2.2.1",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.4.0",
-    "vuex": "^4.0.0"
+    "vuex": "^4.1.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.0",
+    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.0",
+    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.0",
+    "@vue/cli-service": "~5.0.8",
     "compression-webpack-plugin": "^11.1.0",
     "eslint": "^8.14.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-vue": "^8.7.1",
     "husky": "^7.0.4",
-    "javascript-obfuscator": "^4.1.0",
+    "javascript-obfuscator": "^4.1.1",
-    "less": "^4.0.0",
+    "less": "^4.2.0",
-    "less-loader": "^10.2.0",
+    "less-loader": "^12.2.0",
     "mockjs": "^1.1.0",
     "webpack-obfuscator": "^3.5.1"
   },

src/App.vue

@@ -41,6 +41,10 @@ body {
   padding: 0px;
 }
 
+.ivu-layout-footer {
+    padding: 5px;
+}
+
 .layout-footer-center {
   background: #dddddd;
   text-align: center;
@@ -51,6 +55,10 @@ body {
   border-color: #e8eaec;
 }
 
+.ivu-btn:focus {
+  box-shadow: none !important;
+}
+
 .layout {
   height: 100%;
   background: #dddddd;
@@ -60,10 +68,6 @@ body {
   background: #dddddd;
 }
 
-.ivu-btn:focus {
-  box-shadow: none !important;
-}
-
 
 
 .monoFt {
@@ -154,10 +158,8 @@ br::-moz-selection {
   display: none;
 }
 
-/* button span {
+.fnmodal {
-  margin-left: 0px !important;
+  align-items: center;
-  font-size: 16px !important;
+  justify-content: center;
-  font-family: apple-system,BlinkMacSystemFont,Helvetica Neue,PingFang SC,Microsoft YaHei,Source Han Sans SC,Noto Sans CJK SC,WenQuanYi Micro Hei,sans-serif;
+}
-  margin-bottom: 6px;
-} */
 </style>

src/router/index.js

@@ -1,7 +1,8 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory } from "vue-router";
 import EditNote from "@/views/EditNote.vue";
 import ViewNote from "@/views/ViewNote.vue";
-import ViewMdNote from "@/views/ViewMdNote.vue";
+// import ViewMdNote from "@/views/ViewMdNote.vue";
+// import ViewJsonNote from "@/views/ViewJsonNote.vue";
 import ErrorRoute from "@/views/ErrorRoute.vue";
 import ErrorNote from "@/views/ErrorNote.vue";
 import { getNoteMeta } from "@/api/note";
@@ -34,11 +35,15 @@ function getNoteView() {
   let key = path.substring(1, path.length);
 
   let isMd = path.endsWith(".md");
-
   if (isMd) {
     key = path.substring(1, path.length - 3);
   }
 
+  let isJson = path.endsWith(".json");
+  if (isJson) {
+    key = path.substring(1, path.length - 5);
+  }
+
   keyMeta = storage.local.getObject(key + ".keyMeta");
   if (keyMeta && keyMeta.key) {
     key = keyMeta.key;
@@ -51,13 +56,15 @@ function getNoteView() {
     return ErrorNote;
   }
 
-  if (keyMeta && keyMeta.key && !isMd) {
+  if (keyMeta && keyMeta.key && !isMd && !isJson) {
     //firstEdit
     return EditNote;
   }
 
   //set noteMeta
-  noteMeta = getNoteMeta(key);
+  if (noteMeta == null) {
+    noteMeta = getNoteMeta(key);
+  }
 
   //server error
   if (!noteMeta) {
@@ -73,9 +80,11 @@ function getNoteView() {
 
   //validated state
   if (1 == noteMeta.state) {
-    if(isMd){
+    if (isMd) {
       return ViewMdNote;
-    }else{
+    } else if (isJson) {
+      return ViewJsonNote;
+    } else {
       return ViewNote;
     }
   }
@@ -88,7 +97,8 @@ function getNoteView() {
     if (noteMeta.ttl > 0) {
       errorMeta = 100003;
       return ErrorNote;
-    } else {// timeout
+    } else {
+      // timeout
       errorMeta = 100004;
       return ErrorNote;
     }
@@ -100,12 +110,14 @@ function getNoteView() {
     if (storage.local.getText(storeKey)) {
       return EditNote;
     } else {
-      //storage is empty 
+      //storage is empty
-      let df = storage.session.getText(storeKey + "_delete")
+      let df = storage.session.getText(storeKey + "_delete");
-      if (df) {//unsubmitted,user deleted.
+      if (df) {
+        //unsubmitted,user deleted.
         errorMeta = 100003;
         return ErrorNote;
-      } else {//unsubmitted
+      } else {
+        //unsubmitted
         errorMeta = 100005;
         return ErrorNote;
       }
@@ -123,22 +135,40 @@ const routes = [
     path: "/:name([a-z0-9]{10,20})",
     name: "note",
     component: getNoteView(),
-    meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
+    meta: {
+      keyMeta: getKeyMetaParam(),
+      noteMeta: getNoteMetaParam(),
+      errorMeta: getErrorMetaParam(),
+    },
   },
-  {
+  // {
-    path: "/:name([a-z0-9]{10,20}).md",
+  //   path: "/:name([a-z0-9]{10,20}).md",
-    name: "md",
+  //   name: "md",
-    component: getNoteView(),
+  //   component: getNoteView(),
-    meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
+  //   meta: {
-  },
+  //     keyMeta: getKeyMetaParam(),
-  { path: "/:path(.*)", component: ErrorRoute }
+  //     noteMeta: getNoteMetaParam(),
+  //     errorMeta: getErrorMetaParam(),
+  //   },
+  // },
+  // {
+  //   path: "/:name([a-z0-9]{10,20}).json",
+  //   name: "json",
+  //   component: getNoteView(),
+  //   meta: {
+  //     keyMeta: getKeyMetaParam(),
+  //     noteMeta: getNoteMetaParam(),
+  //     errorMeta: getErrorMetaParam(),
+  //   },
+  // },
+  { path: "/:path(.*)", component: ErrorRoute },
 ];
 
 const router = createRouter({
   history: createWebHistory(process.env.VUE_APP_URL_BASE_PATH),
   linkExactActiveClass: "active",
   mode: "history",
-  routes
+  routes,
-})
+});
 
 export default router;

src/views/EditNote.vue

@@ -1,42 +1,6 @@
 <style scoped>
 
 
-
-.fnmodal {
-  align-items: center;
-  justify-content: center;
-}
-
-/* button span {
-  margin-left: 0px !important;
-  font-size: 18px !important;
-  font-family: apple-system,BlinkMacSystemFont,Helvetica Neue,PingFang SC,Microsoft YaHei,Source Han Sans SC,Noto Sans CJK SC,WenQuanYi Micro Hei,sans-serif;
-  margin-bottom: 6px;
-} */
-
-
-
-@media print {
-
-  @page {
-    size: portrait;
-    margin: 20px;
-  }
-
-  body {
-    margin: 0.8cm;
-    background-color: #ffffff;
-  }
-
-  .header {
-    display: none;
-  }
-
-  .layout-footer-center {
-    display: none;
-  }
-
-}
 </style>
 
 <template>
@@ -277,7 +241,7 @@ export default {
     this.$nextTick(() => {
       let clientHeight = document.documentElement.clientHeight;
       let elementNoteText = document.getElementById("noteText");
-      elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
     })
 
   },
@@ -287,7 +251,7 @@ export default {
       return (() => {
       let clientHeight = document.documentElement.clientHeight;
       let elementNoteText = document.getElementById("noteText");
-      elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
       })()
     }
   },

src/views/ErrorNote.vue

@@ -1,10 +1,8 @@
 <style scoped>
-
+.ivu-layout-footer {
-
+    padding-top: 30px;
-
+}
 </style>
-
-<style></style>
 <template>
   <div class="layout" onkeydown="keydown">
     <Layout>
@@ -14,7 +12,8 @@
             <Col :xs="{ span: 24, offset: 0 }" :sm="{ span: 22, offset: 1 }" :md="{ span: 20, offset: 2 }"
               :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
             <div style="background: white;width:100%;height:40px;">
-              <img style="height:40px;float:left;" src="/static/logo.png">
+              <img style="height:40px;float:left;cursor: pointer;" alt="refresh flagnote" src="/static/logo.png"
+                v-on:click="refreshPage()" />
 
               <div style="float:right;width:auto;">
                 <Button-group size="large">
@@ -29,15 +28,14 @@
       </Header>
 
       <Content class="content">
-        <div style="min-height: 650px;">
+        <div style="min-height: 250px;">
           <Row>
             <Col :xs="{ span: 24, offset: 0 }" :sm="{ span: 22, offset: 1 }" :md="{ span: 20, offset: 2 }"
               :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
             <Card :padding="0">
               <div id="wrapper" style="border-left: 0px solid #FF3366;">
-                <div id="noteText" style="text-align: center;min-height: 650px;" class="monoFt">
+                <div id="noteText" style="text-align: center;min-height: 250px;" class="monoFt">
-                  <h1></h1>
+                  <p>{{ $t("error." + this.errorInfo.code) }}</p>
-                  {{ $t("error." + this.errorInfo.code) }}
                 </div>
               </div>
             </Card>
@@ -93,6 +91,12 @@ export default {
     if (this.$route.params.name) {
       this.noteForm.key = this.$route.params.name;
     }
+
+    this.$nextTick(() => {
+      let clientHeight = document.documentElement.clientHeight;
+      let elementNoteText = document.getElementById("noteText");
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
+    })
   },
   mounted() {
     this.$nextTick(() => {
@@ -102,7 +106,13 @@ export default {
     //this.bindCopyTextEvent();
 
 
-
+    window.onresize = () => {
+      return (() => {
+      let clientHeight = document.documentElement.clientHeight;
+      let elementNoteText = document.getElementById("noteText");
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
+      })()
+    }
   },
   methods: {
     refreshPage() {

src/views/ViewJsonNote.vue.bak

@@ -0,0 +1,301 @@
+<style scoped>
+.markdown-body {
+    box-sizing: border-box;
+    min-width: 200px;
+    margin: 0 auto;
+    padding: 10px;
+    background: #fff;
+    color: #000;
+}
+
+.ivu-layout-footer {
+    padding-top: 30px;
+}
+
+@media (max-width: 767px) {
+    .markdown-body {
+        padding: 15px;
+    }
+}
+
+.jse-theme-red {
+  /* over all fonts, sizes, and colors */
+  --jse-theme-color: #ed4014;
+  --jse-theme-color-highlight: #ed4014;
+  --jse-background-color: #fff;
+  --jse-text-color: #d4d4d4;
+  --jse-text-color-inverse: #4d4d4d;
+
+  /* main, menu, modal */
+  --jse-main-border: 1px solid #ed4014;
+  --jse-menu-color: #fff;
+  --jse-modal-background: #2f2f2f;
+  --jse-modal-overlay-background: rgba(0, 0, 0, 0.5);
+  --jse-modal-code-background: #2f2f2f;
+
+  /* tooltip in text mode */
+  --jse-tooltip-color: var(--jse-text-color);
+  --jse-tooltip-background: #fff;
+  --jse-tooltip-border: 1px solid #fff;
+  --jse-tooltip-action-button-color: inherit;
+  --jse-tooltip-action-button-background: #fff;
+
+  /* panels: navigation bar, gutter, search box */
+  --jse-panel-background: #fff;
+  --jse-panel-background-border: 1px solid #fff;
+  --jse-panel-color: var(--jse-text-color);
+  --jse-panel-color-readonly: #737373;
+  --jse-panel-border: 1px solid #ed4014;
+  --jse-panel-button-color-highlight: #e5e5e5;
+  --jse-panel-button-background-highlight: #464646;
+
+  /* navigation-bar */
+  --jse-navigation-bar-background: #656565;
+  --jse-navigation-bar-background-highlight: #7e7e7e;
+  --jse-navigation-bar-dropdown-color: var(--jse-text-color);
+
+  /* context menu */
+  --jse-context-menu-background: #4b4b4b;
+  --jse-context-menu-background-highlight: #595959;
+  --jse-context-menu-separator-color: #595959;
+  --jse-context-menu-color: var(--jse-text-color);
+  --jse-context-menu-pointer-background: #737373;
+  --jse-context-menu-pointer-background-highlight: #818181;
+  --jse-context-menu-pointer-color: var(--jse-context-menu-color);
+
+  /* contents: json key and values */
+  --jse-key-color: #1a1a1a;
+  --jse-value-color: var(--jse-text-color);
+  --jse-value-color-number: #ee422e;
+  --jse-value-color-boolean: #ff8c00;
+  --jse-value-color-null: #004ed0;
+  --jse-value-color-string: #008000;
+  --jse-value-color-url: #ce9178;
+  --jse-delimiter-color: #949494;
+  --jse-edit-outline: 2px solid var(--jse-text-color);
+
+  /* contents: selected or hovered */
+  --jse-selection-background-color: #464646;
+  --jse-selection-background-inactive-color: #333333;
+  --jse-hover-background-color: #343434;
+  --jse-active-line-background-color: rgba(255, 255, 255, 0.06);
+  --jse-search-match-background-color: #343434;
+
+  /* contents: section of collapsed items in an array */
+  --jse-collapsed-items-background-color: #333333;
+  --jse-collapsed-items-selected-background-color: #565656;
+  --jse-collapsed-items-link-color: #b2b2b2;
+  --jse-collapsed-items-link-color-highlight: #ec8477;
+
+  /* contents: highlighting of search results */
+  --jse-search-match-color: #724c27;
+  --jse-search-match-outline: 1px solid #966535;
+  --jse-search-match-active-color: #9f6c39;
+  --jse-search-match-active-outline: 1px solid #bb7f43;
+
+  /* contents: inline tags inside the JSON document */
+  --jse-tag-background: #444444;
+  --jse-tag-color: #bdbdbd;
+
+  /* contents: table */
+  --jse-table-header-background: #333333;
+  --jse-table-header-background-highlight: #424242;
+  --jse-table-row-odd-background: rgba(255, 255, 255, 0.1);
+
+  /* controls in modals: inputs, buttons, and `a` */
+  --jse-input-background: #3d3d3d;
+  --jse-input-border: var(--jse-main-border);
+  --jse-button-background: #808080;
+  --jse-button-background-highlight: #7a7a7a;
+  --jse-button-color: #e0e0e0;
+  --jse-button-secondary-background: #494949;
+  --jse-button-secondary-background-highlight: #5d5d5d;
+  --jse-button-secondary-background-disabled: #9d9d9d;
+  --jse-button-secondary-color: var(--jse-text-color);
+  --jse-a-color: #55abff;
+  --jse-a-color-highlight: #4387c9;
+
+  /* svelte-select */
+  --jse-svelte-select-background: #3d3d3d;
+  --jse-svelte-select-border: 1px solid #4f4f4f;
+  --list-background: #3d3d3d;
+  --item-hover-bg: #505050;
+  --multi-item-bg: #5b5b5b;
+  --input-color: #d4d4d4;
+  --multi-clear-bg: #8a8a8a;
+  --multi-item-clear-icon-color: #d4d4d4;
+  --multi-item-outline: 1px solid #696969;
+  --list-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4);
+
+  /* color picker */
+  --jse-color-picker-background: #656565;
+  --jse-color-picker-border-box-shadow: #8c8c8c 0 0 0 1px;
+
+
+  --jse-menu-button-size: 32px;
+}
+
+
+</style>
+<script setup>
+import { Mode } from 'vanilla-jsoneditor'
+</script>
+<template>
+    <div class="layout">
+        <Layout>
+            <Content class="content">
+                <div style="min-height: 250px;height: 100%;margin:7px 0px">
+                    <Row>
+                        <Col :xs="{ span: 24, offset: 0 }" :sm="{ span: 22, offset: 1 }" :md="{ span: 20, offset: 2 }"
+                            :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
+                        <Card :padding="0">
+                            <div id="wrapper" style="border-left: 0px solid #FF3366;" class="markdown-body">
+                                <JsonEditorVue id="noteMdText" :mode="Mode.text" v-model="this.noteForm.text" class="jse-theme-red" />
+                            </div>
+                        </Card>
+                        </Col>
+                    </Row>
+                </div>
+            </Content>
+        </Layout>
+    </div>
+</template>
+
+<script scoped>
+import { md5, unwrap } from "@/libs/secret";
+import { getStoreKey } from "@/api/lock";
+import { getNoteBlob } from "@/api/note";
+import storage from "@/libs/storage";
+import { Buffer } from 'buffer';
+import JsonEditorVue from 'json-editor-vue'
+
+
+export default {
+    name: 'ViewJsonNote',
+    components: {JsonEditorVue },
+    data() {
+        return {
+            noteForm: {
+                url: '',
+                noteUrl: '',
+                text: '',
+                renderedMarkdown: '',
+                key: '',
+            },
+            secret: {
+                storeKey: '',
+                secretKey: '',
+                cipher: '',
+                md5: '',
+            },
+            state: {
+                lock: null,
+                initTime: null,
+                initTtl: null,
+                ttl: null,
+                ttlDesc: '-- : --',
+                serverTime: null,
+            },
+            model: {
+                showError: false,
+            },
+            errorInfo: '',
+        }
+    },
+    created() {
+        // read $route
+        this.noteForm.key = this.$route.params.name;
+        let noteMeta = this.$route.meta.noteMeta;
+        this.secret.secretKey = noteMeta.secretKey;
+
+        this.secret.storeKey = getStoreKey(this.noteForm.key);
+
+        if (noteMeta) {
+
+            this.state.lock = noteMeta.lock;
+            this.state.initTime = new Date().getTime();
+            this.state.initTtl = noteMeta.ttl;
+            this.state.ttl = noteMeta.ttl;
+            this.targetTime = noteMeta.ttl + new Date().getTime();
+            this.state.serverTime = noteMeta.serverTime;
+
+            this.secret.cipher = "00000000000000000000000000000000";//noteMeta.cipher; //读者有没有值可配置
+            this.secret.md5 = noteMeta.md5;
+
+            storage.local.dynamicClear();
+
+            this.loadText();
+
+        } else {
+            this.errorInfo = this.$t('error.100001');
+            this.model.showError = true;
+            return false;
+        }
+
+        this.$nextTick(() => {
+            let clientHeight = document.documentElement.clientHeight;
+            let elementNoteText = document.getElementById("noteMdText");
+            elementNoteText.style.minHeight = (clientHeight - 15) + "px";
+        })
+
+    }, mounted() {
+        window.onresize = () => {
+            return (() => {
+                let clientHeight = document.documentElement.clientHeight;
+                let elementNoteText = document.getElementById("noteMdText");
+                elementNoteText.style.minHeight = (clientHeight - 15) + "px";
+            })()
+        }
+    },
+    methods: {
+        loadText() {
+            let that = this;
+
+            let storeInfo = storage.local.getText(this.secret.storeKey);
+
+            let starray = [];
+            if (storeInfo) {
+                starray = storeInfo.split('|');
+            }
+
+            if (!storeInfo || !starray[4] || (md5(starray[4]) != this.secret.md5)) {
+                // local is useless
+                getNoteBlob(this.noteForm.key).then((res) => {
+                    if (!res.data || res.data.size == 0) {
+                        return;
+                    }
+
+                    res.data.arrayBuffer().then(function (ab) {
+                        if (!ab || ab.byteLength == 0) {
+                            return;
+                        }
+
+                        let base64String = Buffer.from(ab).toString('base64')
+                        that.noteForm.text = unwrap(base64String, that.secret.secretKey);
+                        // if local is enough, set local
+                        if (storage.local.getAvailableSize() > 1 * 1024 * 1024) {
+                            storage.local.setText(that.secret.storeKey, that.state.lock + '|' + that.secret.cipher + '|1|' + that.state.serverTime + '|' + base64String);
+                        }
+                    });
+                });
+
+            } else {
+                starray = storeInfo.split('|');
+                if (!starray[4]) {
+                    return;
+                }
+
+                this.noteForm.text = unwrap(starray[4], this.secret.secretKey);
+
+                // local is usable, and set commited flag
+                if ("0" == starray[2]) {
+                    storage.local.setText(this.secret.storeKey, starray[0] + "|" + starray[1] + "|1|" + starray[3] + "|" + starray[4]);
+                }
+            }
+        },
+
+    }
+}
+</script>
+
+

src/views/ViewMdNote.vue.bak

@@ -1,35 +1,55 @@
+<style scoped>
+.markdown-body {
+    box-sizing: border-box;
+    min-width: 200px;
+    margin: 0 auto;
+    padding: 10px;
+    background: #fff;
+    color: #000;
+}
+
+.ivu-layout-footer {
+    padding-top: 30px;
+}
+
+@media (max-width: 767px) {
+    .markdown-body {
+        padding: 15px;
+    }
+}
+</style>
 <template>
-    <div class="layout" onkeydown="keydown">
+    <div class="layout">
         <Layout>
             <Content class="content">
-                <div style="min-height: 250px;height: 100%;">
+                <div style="min-height: 250px;height: 100%;margin:7px 0px">
                     <Row>
                         <Col :xs="{ span: 24, offset: 0 }" :sm="{ span: 22, offset: 1 }" :md="{ span: 20, offset: 2 }"
                             :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
                         <Card :padding="0">
                             <div id="wrapper" style="border-left: 0px solid #FF3366;" class="markdown-body">
-                                <vue-markdown id="noteMdText" :source="this.noteForm.text" />
+                                <vue-markdown id="noteMdText" :source="this.noteForm.text" :options="this.options" />
                             </div>
                         </Card>
                         </Col>
                     </Row>
                 </div>
             </Content>
-            <Footer class="layout-footer-center">
-                2024 &copy; flagnote.com
-            </Footer>
         </Layout>
     </div>
 </template>
 
-<script>
+<script scroped>
 import { md5, unwrap } from "@/libs/secret";
 import { getStoreKey } from "@/api/lock";
 import { getNoteBlob } from "@/api/note";
 import storage from "@/libs/storage";
+import { Buffer } from 'buffer';
 import VueMarkdown from 'vue-markdown-render'
 import 'github-markdown-css'
-
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github.css'
+import escapeHtml from "escape-html";
 
 export default {
     name: 'ViewMdNote',
@@ -60,6 +80,39 @@ export default {
             model: {
                 showError: false,
             },
+            options: {
+                // Enable HTML tags in source
+                html: true,
+                // Use '/' to close single tags (<br />).
+                // This is only for full CommonMark compatibility.
+                xhtmlOut: true,
+                // Convert '\n' in paragraphs into <br>
+                breaks: true,
+                // CSS language prefix for fenced blocks. Can be
+                // useful for external highlighters.
+                langPrefix: 'language-',
+                // Autoconvert URL-like text to links
+                linkify: true,
+                // Enable some language-neutral replacement + quotes beautification
+                // For the full list of replacements, see https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.mjs
+                typographer: true,
+                // Highlighter function. Should return escaped HTML,
+                // or '' if the source string is not changed and should be escaped externally.
+                // If result starts with <pre... internal wrapper is skipped.
+                highlight: function (str, lang) {
+                    if (lang && hljs.getLanguage(lang)) {
+                        try {
+                            return '<pre><code class="hljs">' +
+                                hljs.highlight(str, { language: lang, ignoreIllegals: true }).value +
+                                '</code></pre>';
+                        } catch (e) {
+                            console.log(e);
+                        }
+                    }
+
+                    return '<pre><code class="hljs">' + escapeHtml(str) + '</code></pre>';
+                }
+            },
             errorInfo: '',
         }
     },
@@ -73,6 +126,13 @@ export default {
 
         if (noteMeta) {
 
+            this.state.lock = noteMeta.lock;
+            this.state.initTime = new Date().getTime();
+            this.state.initTtl = noteMeta.ttl;
+            this.state.ttl = noteMeta.ttl;
+            this.targetTime = noteMeta.ttl + new Date().getTime();
+            this.state.serverTime = noteMeta.serverTime;
+
             this.secret.cipher = "00000000000000000000000000000000";//noteMeta.cipher; //读者有没有值可配置
             this.secret.md5 = noteMeta.md5;
 
@@ -89,7 +149,7 @@ export default {
         this.$nextTick(() => {
             let clientHeight = document.documentElement.clientHeight;
             let elementNoteText = document.getElementById("noteMdText");
-            elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+            elementNoteText.style.minHeight = (clientHeight - 15) + "px";
         })
 
     }, mounted() {
@@ -97,7 +157,7 @@ export default {
             return (() => {
                 let clientHeight = document.documentElement.clientHeight;
                 let elementNoteText = document.getElementById("noteMdText");
-                elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+                elementNoteText.style.minHeight = (clientHeight - 15) + "px";
             })()
         }
     },
@@ -151,20 +211,3 @@ export default {
     }
 }
 </script>
-
-<style scoped>
-.markdown-body {
-    box-sizing: border-box;
-    min-width: 200px;
-    margin: 0 auto;
-    padding: 15px;
-    padding-top: 0px;
-    background: white;
-}
-
-@media (max-width: 767px) {
-    .markdown-body {
-        padding: 15px;
-    }
-}
-</style>

src/views/ViewNote.vue

@@ -1,34 +1,6 @@
 <style scoped>
-
+.ivu-layout-footer {
-
+    padding-top: 30px;
-
-
-.fnmodal {
-  align-items: center;
-  justify-content: center;
-}
-
-@media print {
-
-  @page {
-    size: portrait;
-    margin: 20px;
-  }
-
-  body {
-    margin: 0.8cm;
-    background-color: #ffffff;
-  }
-
-  .header {
-    display: none;
-  }
-
-  .layout-footer-center {
-    display: none;
-  }
-
-
 }
 </style>
 
@@ -108,20 +80,10 @@
   font-family: "Bitstream Vera Sans Mono", Consolas, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei";
 }
 
-
-
 .ivu-modal-content {
   border-radius: 0px !important;
 }
 
-
-
-/* button span {
-  margin-left: 0px !important;
-  font-size: 16px !important;
-  font-family: apple-system,BlinkMacSystemFont,Helvetica Neue,PingFang SC,Microsoft YaHei,Source Han Sans SC,Noto Sans CJK SC,WenQuanYi Micro Hei,sans-serif;
-  margin-bottom: 6px;
-} */
 </style>
 
 <template>
@@ -409,7 +371,7 @@ export default {
     this.$nextTick(() => {
       let clientHeight = document.documentElement.clientHeight;
       let elementNoteText = document.getElementById("noteText");
-      elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
     })
 
   },
@@ -438,7 +400,7 @@ export default {
       return (() => {
       let clientHeight = document.documentElement.clientHeight;
       let elementNoteText = document.getElementById("noteText");
-      elementNoteText.style.minHeight = (clientHeight - 140) + "px";
+      elementNoteText.style.minHeight = (clientHeight - 100) + "px";
       })()
     }
   },

vue.config.js

@@ -1,65 +1,68 @@
-const { defineConfig } = require('@vue/cli-service')
+const { defineConfig } = require("@vue/cli-service");
 const CompressionPlugin = require("compression-webpack-plugin");
-const WebpackObfuscator = require('webpack-obfuscator');
+const WebpackObfuscator = require("webpack-obfuscator");
-const path = require('path')
+const path = require("path");
 
-const { NODE_ENV, VUE_APP_TITLE = '' } = process.env
+const { NODE_ENV, VUE_APP_TITLE = "" } = process.env;
 
 const assetsCDN = {
   // 忽略打包的第三方库
   externals: {
-    'vue': 'Vue',
+    //  'vue': 'Vue',
-    'vue-router': 'VueRouter',
+    //  'vue-router': 'VueRouter',
-    "crypto-js": "CryptoJS",
+    //  "crypto-js": "CryptoJS",
-    'pako': 'pako',
+    //  'pako': 'pako',
-    "html2canvas": "html2canvas",
+    html2canvas: "html2canvas",
-  //  'view-ui-plus':'ViewUIPlus',
+    //   'view-ui-plus':'ViewUIPlus',
   },
 
   // 通过cdn方式使用
   js: [
-    'https://cdn.jsdelivr.net/npm/vue@3.2.47/dist/vue.global.min.js',
+    //  'https://cdn.jsdelivr.net/npm/vue@3.4.31/dist/vue.global.min.js',
-    'https://cdn.jsdelivr.net/npm/vue-router@4.1.6/dist/vue-router.global.min.js',
+    //  'https://cdn.jsdelivr.net/npm/vue-router@4.4.0/dist/vue-router.global.min.js',
-    'https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js',
+    //  'https://cdn.jsdelivr.net/npm/crypto-js@4.2.0/crypto-js.min.js',
-    'https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js',
+    //  'https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js',
-//    'https://cdn.jsdelivr.net/npm/view-ui-plus@1.3.10/dist/viewuiplus.min.js',
+    //   'https://cdn.jsdelivr.net/npm/view-ui-plus@1.3.18/dist/viewuiplus.min.js',
-    
+    "https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js",
-    'https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js',
   ],
 
   css: [
-    'https://cdn.jsdelivr.net/npm/view-ui-plus@1.3.10/dist/styles/viewuiplus.min.css',
+    "https://cdn.jsdelivr.net/npm/view-ui-plus@1.3.18/dist/styles/viewuiplus.min.css",
-  ]
+  ],
-}
+};
-
 
 const config = {
-
+  assetsDir: "static",
-  assetsDir: 'static',
+  productionSourceMap: NODE_ENV !== "production",
-  productionSourceMap: NODE_ENV !== 'production',
 
   configureWebpack: (config) => {
-    config.experiments = { asyncWebAssembly: true, syncWebAssembly: true }
+    config.devtool = 'source-map'
+
+    config.experiments = { asyncWebAssembly: true, syncWebAssembly: true };
 
     config.externals = assetsCDN.externals;
 
     // 为生产环境修改配置
-    if (process.env.NODE_ENV === 'production') {
+    if (process.env.NODE_ENV === "production") {
+      config.devtool = false
       config.plugins.push(
-        new WebpackObfuscator({
+        new WebpackObfuscator(
-          compact: true,//压缩代码
+          {
-          controlFlowFlattening: false,//是否启用控制流扁平化(降低1.5倍的运行速度)
+            compact: true, //压缩代码
-          deadCodeInjection: true,//随机的死代码块(增加了混淆代码的大小)
+            controlFlowFlattening: false, //是否启用控制流扁平化(降低1.5倍的运行速度)
-          debugProtection: true,//此选项几乎不可能使用开发者工具的控制台选项卡
+            deadCodeInjection: true, //随机的死代码块(增加了混淆代码的大小)
-          disableConsoleOutput: true,//通过用空函数替换它们来禁用console.log，console.info，console.error和console.warn。这使得调试器的使用更加困难。
+            debugProtection: true, //此选项几乎不可能使用开发者工具的控制台选项卡
-          identifierNamesGenerator: 'mangled',//标识符的混淆方式 hexadecimal(十六进制) mangled(短标识符)
+            disableConsoleOutput: true, //通过用空函数替换它们来禁用console.log，console.info，console.error和console.warn。这使得调试器的使用更加困难。
-          log: false,
+            identifierNamesGenerator: "mangled", //标识符的混淆方式 hexadecimal(十六进制) mangled(短标识符)
-          renameGlobals: true,//是否启用全局变量和函数名称的混淆
+            log: false,
-          rotateStringArray: true,//通过固定和随机（在代码混淆时生成）的位置移动数组。这使得将删除的字符串的顺序与其原始位置相匹配变得更加困难。如果原始源代码不小，建议使用此选项，因为辅助函数可以引起注意。
+            renameGlobals: true, //是否启用全局变量和函数名称的混淆
-          selfDefending: true,//混淆后的代码,不能使用代码美化,同时需要配置 cpmpat:true;
+            rotateStringArray: true, //通过固定和随机（在代码混淆时生成）的位置移动数组。这使得将删除的字符串的顺序与其原始位置相匹配变得更加困难。如果原始源代码不小，建议使用此选项，因为辅助函数可以引起注意。
-          // transformObjectKeys: true,
+            selfDefending: true, //混淆后的代码,不能使用代码美化,同时需要配置 cpmpat:true;
-          unicodeEscapeSequence: true//允许启用/禁用字符串转换为unicode转义序列。Unicode转义序列大大增加了代码大小，并且可以轻松地将字符串恢复为原始视图。建议仅对小型源代码启用此选项。
+            // transformObjectKeys: true,
-        }, ['static/js/chunk-vendors.*.js']),
+            unicodeEscapeSequence: true, //允许启用/禁用字符串转换为unicode转义序列。Unicode转义序列大大增加了代码大小，并且可以轻松地将字符串恢复为原始视图。建议仅对小型源代码启用此选项。
+          },
+          ["static/js/chunk-vendors.*.js"]
+        ),
 
         new CompressionPlugin({
           algorithm: "gzip", // 使用gzip压缩
@@ -68,8 +71,8 @@ const config = {
           minRatio: 1, // 压缩率小于1才会压缩
           threshold: 5120, // 对超过10k的数据压缩
           deleteOriginalAssets: false, // 是否删除未压缩的源文件，谨慎设置，如果希望提供非gzip的资源，可不设置或者设置为false（比如删除打包后的gz后还可以加载到原始资源文件）
-        }),
+        })
-      )
+      );
     }
   },
 
@@ -77,21 +80,19 @@ const config = {
 
   chainWebpack: (setting) => {
     setting.plugin("html").tap((args) => {
-      args[0].cdn = assetsCDN
+      args[0].cdn = assetsCDN;
       args[0].title = VUE_APP_TITLE;
       return args;
     });
-
-
   },
   css: {
     loaderOptions: {
       less: {
         lessOptions: {
           javascriptEnabled: true,
-        }
+        },
-      }
+      },
-    }
+    },
   },
   devServer: {
     proxy: {
@@ -101,27 +102,29 @@ const config = {
         secure: false, // 如果是https接口，需要配置这个参数
         changeOrigin: true, //是否跨域
         pathRewrite: {
-          '^/': '/html/'
+          "^/": "/html/",
         },
-      },"/note": {
+      },
-        //target: "https://flagnote.com/", // 后台接口域名
+      "/note": {
-        target: "http://localhost:21000/", // 后台接口域名
+        target: "https://flagnote.com/", // 后台接口域名
+        //target: "http://localhost:21000/", // 后台接口域名
         secure: false, // 如果是https接口，需要配置这个参数
         changeOrigin: true, //是否跨域
         pathRewrite: {
           // '^/': '/'
         },
-      }, "^/[abcdefhikmnopqstuvwxyz23456789]{16}\\.txt$": {
+      },
+      "^/[abcdefhikmnopqstuvwxyz23456789]{16}\\.txt$": {
         //target: "https://flagnote.com/", // 后台接口域名
         target: "http://localhost:21000/", // 后台接口域名
         secure: false, // 如果是https接口，需要配置这个参数
         changeOrigin: true, //是否跨域
         pathRewrite: {
-          '^/': '/note/'
+          "^/": "/note/",
         },
       },
     },
-  }
+  },
-}
+};
 
-module.exports = defineConfig(config)
+module.exports = defineConfig(config);