selection 样式

refresh save
use more Buffer
2023-04-03 11:05:00 +08:00 · 2023-03-31 17:19:37 +08:00 · 2023-03-31 15:59:13 +08:00 · 2023-03-31 15:58:42 +08:00 · 2023-03-31 10:21:44 +08:00 · 2023-03-30 10:19:18 +08:00
11 changed files with 292 additions and 161 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV = developement
 VUE_APP_BASE_NAME = developement
 VUE_APP_BASE_URL = http://localhost:8080
-VUE_APP_NOTE_MAX_COUNT = 409600
-VUE_APP_NOTE_MAX_DESC = 400K
+VUE_APP_NOTE_MAX_COUNT = 131072
+VUE_APP_NOTE_MAX_DESC = 128K

--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 NODE_ENV = production
 VUE_APP_BASE_NAME = production
 VUE_APP_BASE_URL = https://flagnote.com
-VUE_APP_NOTE_MAX_COUNT = 409600
-VUE_APP_NOTE_MAX_DESC = 400K
+VUE_APP_NOTE_MAX_COUNT = 131072
+VUE_APP_NOTE_MAX_DESC = 128K
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
  },
  "dependencies": {
    "axios": "^0.27.2",
+    "buffer": "^6.0.3",
    "clipboard": "^2.0.11",
    "crypto-js": "^4.1.1",
    "escape-html": "^1.0.3",
--- a/public/index.html
+++ b/public/index.html
@@ -24,29 +24,31 @@
      background-color: #dddddd
    }
  </style>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js" rel="stylesheet"
+  <script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js" rel="stylesheet"
+  <script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js" rel="stylesheet"
+  <!-- <script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js"
+    type="text/javascript"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js" rel="stylesheet"
+  <script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js" rel="stylesheet"
+  <!-- <script src="https://cdn.jsdelivr.net/npm/buffer@6.0.3/index.min.js"
+    type="text/javascript"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js" rel="stylesheet"
+  <!-- <script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js"
+    type="text/javascript"></script> -->
+  <!-- <script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js"
+    type="text/javascript"></script> -->
+  <!-- <script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js"
+    type="text/javascript"></script> -->
+  <!-- <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js"
+    type="text/javascript"></script> -->
+  <script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.min.js"
    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue-i18n@8.21.1/dist/vue-i18n.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/qrcodejs2@0.0.2/qrcode.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js" rel="stylesheet"
+  <script src="https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js"
    type="text/javascript"></script>
  <script>
    window.wasm_flate_bg_path = "https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate_bg.wasm"
--- a/src/App.vue
+++ b/src/App.vue
@@ -81,23 +81,23 @@ body {


 #noteText::selection {
-  background: #ed4014;
-  color: white;
+  background: #dddddd;
+  color: #ed4014;
 }

 #noteText::-moz-selection {
-  background: #ed4014;
-  color: white;
+  background: #dddddd;
+  color: #ed4014;
 }

 #noteText br::selection {
-  background: #ed4014;
-  color: white;
+  background: #dddddd;
+  color: #ed4014;
 }

 #noteText br::-moz-selection {
-  background: #ed4014;
-  color: white;
+  background: #dddddd;
+  color: #ed4014;
 }

 .noteUrl {
--- a/src/api/note.js
+++ b/src/api/note.js
@@ -3,6 +3,7 @@ import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
 import { md5, wrap} from "@/libs/secret";
 import NoteConstant from "@/libs/constants";
+import { Buffer } from 'buffer';

 axios.interceptors.response.use(undefined, (err) => {
  const { config: originalRequest } = err;
@@ -48,8 +49,8 @@ export function saveNote(noteForm, secret) {
    });
  }

-  let bufferArrary = eval("[" + note.text + "]");
-  let array = Uint8Array.from(bufferArrary);
+  let array = Buffer.from(note.text, 'base64')
+
  let blob = new Blob([array], { type: "application/octet-stream" });
  let form = new FormData();
  form.append("file", blob, noteForm.key);
--- a/src/libs/secret.js
+++ b/src/libs/secret.js
@@ -1,9 +1,45 @@
 import CryptoJS from "crypto-js";
 import pako from "pako";
+import {Buffer} from "buffer";
 //import {gzip_encode_raw,gzip_decode_raw} from 'wasm-flate';

 const wasmFlate = window.wasm_bindgen;

+CryptoJS.enc.Uint8Array = {
+  /**
+  * WordArray转Uint8Array
+  * @param wordArray
+  * @returns {Uint8Array}
+  */
+  stringify: function (wordArray) {
+    var len = wordArray.words.length,
+      u8_array = new Uint8Array(len << 2),
+      offset = 0, word, i;
+    for (i = 0; i < len; i++) {
+      word = wordArray.words[i];
+      u8_array[offset++] = word >> 24;
+      u8_array[offset++] = (word >> 16) & 0xff;
+      u8_array[offset++] = (word >> 8) & 0xff;
+      u8_array[offset++] = word & 0xff;
+    }
+    return u8_array;
+  },
+  /**
+  * Uint8Array转WordArray
+  * @param u8arr
+  * @returns {WordArray}
+  */
+  parse: function (u8arr) {
+    var len = u8arr.length;
+    var words = [];
+    for (var i = 0; i < len; i++) {
+      words[i >>> 2] |= (u8arr[i] & 0xff) << (24 - (i % 4) * 8);
+    }
+    return CryptoJS.lib.WordArray.create(words, len);
+  }
+};
+
+
 /**
 * @word 要加密的内容
 * @keyWord String  服务器随机返回的关键字
@@ -11,14 +47,14 @@ const wasmFlate = window.wasm_bindgen;

 export function wrap(text, secretKey) {
  text = "FLAGNOTE#" + text;
-  let result = aesEncrypt(text, secretKey);
-  result = noteZip(result);
+  let  ui8ary = noteZip(text);
+  let result = aesEncrypt(convertUint8ArrayToWordArray(ui8ary), secretKey);
  return result;
 }

-export function unwrap(storeText, secretKey) {
-  let result = noteUnzip(storeText);
-  result = aesDecrypt(result, secretKey);
+export function unwrap(text, secretKey) {
+  let wdary = aesDecrypt(text, secretKey);
+  let result = noteUnzip(convertWordArrayToUint8Array(wdary));
  if (result.startsWith("FLAGNOTE#")) {
    return result.substring(9);
  }
@@ -37,7 +73,7 @@ export function aesEncrypt(word, keyWord) {
  let key = CryptoJS.enc.Utf8.parse(keyWord);
  let encrypted = CryptoJS.AES.encrypt(word, key, {
    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.ZeroPadding,
  });
  return encrypted.toString();
 }
@@ -48,28 +84,24 @@ export function aesDecrypt(word, keyWord) {
  let key = CryptoJS.enc.Utf8.parse(keyWord);
  let decrypt = CryptoJS.AES.decrypt(word, key, {
    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.ZeroPadding,
  });
-  return CryptoJS.enc.Utf8.stringify(decrypt).toString();
+  return decrypt;
 }

-//base64 encode
-export function encode(text) {
+//base64 encode btoa
+export function base64Encode(text) {
  return Buffer.from(text, 'utf-8').toString('base64');
 }

-//base64 decode
-export function decode(text) {
+//base64 decode atob
+export function base64Decode(text) {
  return Buffer.from(text,'base64').toString('utf-8');
 }

-export function noteUnzip(text) {
-  let charData = text.split(",").map(function (x) {
-    return parseInt(x);
-  });
-  let binData = new Uint8Array(charData);
-  let data = unzip(binData);
-  text   = String.fromCharCode.apply(null, new Uint8Array(data));
+export function noteUnzip(wdary) {
+  let data = unzip(wdary);
+  let text = new TextDecoder().decode(data);
  return text;
 }

@@ -96,35 +128,27 @@ export function unzip(data){
  return pako.ungzip(data);
 }

-// function convertWordArrayToUint8Array(wordArray) {
-// 	var len = wordArray.words.length,
-// 		u8_array = new Uint8Array(len << 2),
-// 		offset = 0, word, i
-// 	;
-// 	for (i=0; i<len; i++) {
-// 		word = wordArray.words[i];
-// 		u8_array[offset++] = word >> 24;
-// 		u8_array[offset++] = (word >> 16) & 0xff;
-// 		u8_array[offset++] = (word >> 8) & 0xff;
-// 		u8_array[offset++] = word & 0xff;
-// 	}
-// 	return u8_array;
-// }

-// function convertUint8ArrayToWordArray(u8Array) {
-// 	var words = [], i = 0, len = u8Array.length;
- 
-// 	while (i < len) {
-// 		words.push(
-// 			(u8Array[i++] << 24) |
-// 			(u8Array[i++] << 16) |
-// 			(u8Array[i++] << 8)  |
-// 			(u8Array[i++])
-// 		);
-// 	}
- 
-// 	return {
-// 		sigBytes: words.length * 4,
-// 		words: words
-// 	};
-// }
+export function convertBase64ToHexString(base64) {
+	return CryptoJS.enc.Hex.stringify(CryptoJS.enc.Base64.parse(base64));
+}
+
+export function convertHexStringToBase64(hexString) {
+	return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Hex.parse(hexString));
+}
+
+export function convertHexStringToUint8Array(hexString) {
+  return Uint8Array.from(Buffer.from(hexString, 'hex'));
+}
+export function convertUint8ArrayToHexString(byteArray) {
+  return Buffer.from(byteArray).toString('hex');
+}
+
+function convertWordArrayToUint8Array(wordArray) {
+  return CryptoJS.enc.Uint8Array.stringify(wordArray);
+}
+
+function convertUint8ArrayToWordArray(u8Array) {
+  return CryptoJS.enc.Uint8Array.parse(u8Array);
+}
+
--- a/src/views/EditNote.vue
+++ b/src/views/EditNote.vue
@@ -113,10 +113,9 @@
              <Button-group vertical size="large">
                <Button aria-label="create note" type="error" style="border-radius: 0px;font-size: 24px;"
                  @click="createNote(); switchMenu(); " icon="md-add"></Button>
-                
-                <Button aria-label="crop" v-show="model.showDownloadText" type="error" 
-                 style="border-radius: 0px;font-size: 24px;" @click="saveImage();switchMenu();"
-                 icon="md-crop"></Button>
+
+                <Button aria-label="crop" v-show="model.showDownloadText" type="error"
+                  style="border-radius: 0px;font-size: 24px;" @click="saveImage(); switchMenu();" icon="md-crop"></Button>

                <Button aria-label="download text" v-show="model.showDownloadText" type="error"
                  style="border-radius: 0px;font-size: 24px;" @click="downLoadText(); switchMenu();"
@@ -144,7 +143,7 @@
              :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
            <Card :padding="0">
              <Form :model="noteForm" :label-width="80">
-                <div  ref="html2canvas" id="wrapper" style="border-left: 2px solid #ed4014;">
+                <div ref="html2canvas" id="wrapper" style="border-left: 2px solid #ed4014;">
                  <Input element-id="noteText" type="textarea" :border="false" v-model="noteForm.text" autofocus
                    :autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" @input="recordText"
                    @on-keydown="recordEventKdown" />
@@ -192,7 +191,7 @@ import { unwrap } from '../libs/secret'
 import { saveNote } from "@/api/note";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
-import { setStoreText,setNewStoreText } from "@/libs/noteStorage";
+import { setStoreText, setNewStoreText } from "@/libs/noteStorage";
 import { saveAs } from 'file-saver';
 import { isWeixin } from "@/libs/utils";
 import NoteConstant from "@/libs/constants";
@@ -231,12 +230,15 @@ export default {
      toTopState: false,
      showMenuState: false,
      showHeaderShade: false,
-      pageSession: '',
      errorInfo: '',
+      lastEditTime: 0,
+      backStoreTextInterval: null,
+      lastStoreCount: 0,
+      lastStoreTime: 0,
    }
  },
  created() {
-    this.pageSession = new Date().getTime();
+    this.editTime = new Date().getTime();

    // read $route
    this.noteForm.key = this.$route.params.name;
@@ -272,7 +274,7 @@ export default {
      // }

      storage.local.setText(storeKey, "0|" + this.secret.cipher + "|0|" + this.state.initTime + "|");
-      storage.session.delete(keyMeta.key+".keyMeta");
+      storage.session.delete(keyMeta.key + ".keyMeta");
    } else {
      // second edit
      let noteMeta = this.$route.meta.noteMeta;
@@ -290,6 +292,10 @@ export default {
      }
    }

+    this.lastStoreCount = this.noteForm.text.length;
+    this.lastEditTime = new Date().getTime();
+    this.lastStoreTime = this.lastEditTime;
+
    this.bindCtrlAllEvent();
    this.bindToTopEvent();

@@ -310,12 +316,15 @@ export default {
    const someOtherEl = document.querySelector('#wrapper');

    myObserver.observe(someOtherEl);
+
+    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
  },
  updated() {
  },
  beforeDestroy() {
  },
  destroyed() {
+    window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
  },
  computed: {},
  watch: {},
@@ -352,7 +361,49 @@ export default {
        return;
      }

-      setStoreText(this.noteForm, this.state, this.secret);
+      let nowEditCount = this.noteForm.text.length;
+      let nowEditTime = new Date().getTime();
+
+      if (nowEditCount < 1024) {
+        setStoreText(this.noteForm, this.state, this.secret);
+        this.lastStoreTime = nowEditTime;
+        this.lastStoreCount = nowEditCount;
+      } else {
+        if (null == this.backStoreTextInterval) {
+          this.backStoreTextInterval = window.setInterval(this.backStoreFunction(), 500);
+        }
+      }
+
+      this.lastEditTime = nowEditTime;
+    },
+    backStoreFunction() {
+      let that = this;
+      return function () {
+        that.backStoreText();
+      }
+    },
+    backStoreText() {
+      let nowEditCount = this.noteForm.text.length;
+      let nowEditTime = new Date().getTime();
+      if (Math.abs(nowEditCount - this.lastStoreCount) > 10) {
+        setStoreText(this.noteForm, this.state, this.secret);
+        this.lastStoreTime = this.lastEditTime;
+        this.lastStoreCount = nowEditCount;
+      } else {
+        if (nowEditTime - this.lastEditTime >= 1000 && nowEditTime - this.lastEditTime < 20000) {
+          if (this.lastEditTime != this.lastStoreTime) {
+            setStoreText(this.noteForm, this.state, this.secret);
+            this.lastStoreTime = this.lastEditTime;
+            this.lastStoreCount = nowEditCount;
+          }
+        } else if (nowEditTime - this.lastEditTime >= 20000) {
+          if (this.backStoreTextInterval != null) {
+            let ivl = this.backStoreTextInterval;
+            this.backStoreTextInterval = null;
+            window.clearInterval(ivl);
+          }
+        }
+      }
    },
    // recordEventKup(event) {
    // let tn = event.currentTarget.value;
@@ -392,7 +443,7 @@ export default {
        }

        this.noteForm.text = event.currentTarget.value;
-        setStoreText(this.noteForm, this.state, this.secret);
+        this.recordText();

      } else if (event.ctrlKey && (event.which == 13)) {
        //save
@@ -439,16 +490,16 @@ export default {

          that.state.commited = 1;
          setStoreText(this.noteForm, this.state, this.secret);
-          
+
          location.reload();
          this.state.locking = 0;
        } else {
          alert(res.data.code);
          this.model.submitting = false;
          this.state.locking = 0;
-          if(res.data.code=="100013"||res.data.code=="800001"){
+          if (res.data.code == "100013" || res.data.code == "800001") {
            let key = setNewStoreText(this.noteForm);
-            location.href="/"+key;
+            location.href = "/" + key;
          }

        }
@@ -498,7 +549,7 @@ export default {
    dataURLToBlob(dataurl) {
      let arr = dataurl.split(',');
      let mime = arr[0].match(/:(.*?);/)[1];
-      let bstr = atob(arr[1]);
+      let bstr = window.atob(arr[1]);
      let n = bstr.length;
      let u8arr = new Uint8Array(n);
      while (n--) {
@@ -511,24 +562,24 @@ export default {

      let that = this;
      let a = document.createElement('a');
-      html2canvas(canvasID,{
-        scale: 1, 
-        windowWidth: parseInt(document.getElementById("noteText").offsetWidth)+2,
+      html2canvas(canvasID, {
+        scale: 1,
+        windowWidth: parseInt(document.getElementById("noteText").offsetWidth) + 2,
        onclone: (clonedDocument) => {
          let nt = clonedDocument.getElementById("noteText");
          const div = clonedDocument.createElement('div')
          div.innerText = nt.value

-          div.style.color="black";
+          div.style.color = "black";
          div.style.padding = "10px";
          div.style.textAlign = "left";
          div.style.wordBreak = "break-word";
          div.style.whiteSpace = "pre-wrap";
          div.style.verticalAlign = "top";
-          div.style.fontSize ="15px";
-          div.style.width= "100%";
-          div.style.border="0px";
-          div.style.fontFamily="'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";
+          div.style.fontSize = "15px";
+          div.style.width = "100%";
+          div.style.border = "0px";
+          div.style.fontFamily = "'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";

          nt.style.display = 'none'

@@ -550,6 +601,9 @@ export default {
        document.body.removeChild(a);
      });
    },
+    beforeunloadHandler() {
+      setStoreText(this.noteForm, this.state, this.secret);
+    },
  }
 }
 </script>
--- a/src/views/ViewNote.vue
+++ b/src/views/ViewNote.vue
@@ -80,8 +80,8 @@
 }

 #qrUrl::selection {
-  background-color: #ed4014;
-  color: #ffffff;
+  background: #dddddd;
+  color: #ed4014;
 }

 #copyBtn {
@@ -172,17 +172,17 @@
              <img style="height:40px;float:left;cursor: pointer;" alt="refresh flagnote" src="/static/logo.png"
                v-on:click="refreshPage()">
              <!--
-                  <div style="float:left;width:auto;vertical-align: center;">
-                        <div style="font-size: 18px;
-                        color: red;
-                        line-height: 40px;
-                        display: inline-block;
-                        font-weight: bold;
-                        height: 40px;">{{
-                            state.ttlDesc
-                        }}</div>
-                  </div>
-                  -->
+                      <div style="float:left;width:auto;vertical-align: center;">
+                            <div style="font-size: 18px;
+                            color: red;
+                            line-height: 40px;
+                            display: inline-block;
+                            font-weight: bold;
+                            height: 40px;">{{
+                                state.ttlDesc
+                            }}</div>
+                      </div>
+                      -->


              <div style="float:left;width:auto;">
@@ -225,9 +225,9 @@

                <!--

-                      <Button type="error" icon="md-refresh" style="border-radius: 0px;font-size: 24px;"
-                      @click="refreshPage()"></Button>
-                    -->
+                          <Button type="error" icon="md-refresh" style="border-radius: 0px;font-size: 24px;"
+                          @click="refreshPage()"></Button>
+                        -->
                <Button aria-label="crop" v-show="model.showDownloadText" type="error" icon="md-crop"
                  style="border-radius: 0px;font-size: 24px;" @click="saveImage(); switchMenu();"></Button>

@@ -275,11 +275,11 @@
    <Modal v-model="model.showShare" width="360" footer-hide class-name="qrmodal" :styles="{ borderRadius: 0 }"
      @on-cancel="closeShareModel">
      <p style="text-align: center;
-              z-index: 1000;
-              position: absolute;
-              top: -2px;
-              left: 0px;
-              width: 100%;">
+                  z-index: 1000;
+                  position: absolute;
+                  top: -2px;
+                  left: 0px;
+                  width: 100%;">
        <Tag style="border-radius: 0px;" v-show="model.copyTip" color="#ed4014" text="">Url Copied.</Tag>
      </p>
      <p style="text-align: center;margin-top:20px;line-height:100%">
@@ -346,6 +346,7 @@ import Clipboard from "clipboard";
 import { saveAs } from 'file-saver';
 import { isWeixin, getNoteUrl } from "@/libs/utils";
 import html2canvas from "html2canvas";
+import { Buffer } from 'buffer';

 export default {
  name: 'ViewNote',
@@ -579,27 +580,19 @@ export default {
            return;
          }

-          let blob = new Blob([res.data], {
-            type: res.data.type
-          });
-
-          let reader = new FileReader();
-          reader.onload = function (e) {
-            if (!e.target.result || e.target.result.byteLength == 0) {
+          res.data.arrayBuffer().then(function (ab) {
+            if (!ab || ab.byteLength == 0) {
              return;
            }

-            var bytes = new Uint8Array(e.target.result);
-            let bytesString = bytes.join(",");
-            that.noteForm.text = unwrap(bytesString, that.secret.secretKey);
-            //that.noteForm.escapeText = getEscapeText(that.noteForm.text);
+            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 + '|' + bytesString);
+              storage.local.setText(that.secret.storeKey, that.state.lock + '|' + that.secret.cipher + '|1|' + that.state.serverTime + '|' + base64String);
            }
-          };
-          reader.readAsArrayBuffer(blob);
+          });
        });

      } else {
@@ -665,7 +658,7 @@ export default {
    dataURLToBlob(dataurl) {
      let arr = dataurl.split(',');
      let mime = arr[0].match(/:(.*?);/)[1];
-      let bstr = atob(arr[1]);
+      let bstr = window.atob(arr[1]);
      let n = bstr.length;
      let u8arr = new Uint8Array(n);
      while (n--) {
@@ -677,24 +670,24 @@ export default {
      let canvasID = this.$refs["html2canvas"];
      let that = this;
      let a = document.createElement('a');
-      html2canvas(canvasID,{
-        scale: 1, 
+      html2canvas(canvasID, {
+        scale: 1,
        windowWidth: document.getElementById("noteText").offsetWidth,
        onclone: (clonedDocument) => {
          let nt = clonedDocument.getElementById("noteText");
          const div = clonedDocument.createElement('div')
          div.innerText = nt.value

-          div.style.color="black";
+          div.style.color = "black";
          div.style.padding = "0px";
          div.style.textAlign = "left";
          div.style.wordBreak = "break-word";
          div.style.whiteSpace = "pre-wrap";
          div.style.verticalAlign = "top";
-          div.style.fontSize ="15px";
-          div.style.width= "100%";
-          div.style.border="0px";
-          div.style.fontFamily="'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";
+          div.style.fontSize = "15px";
+          div.style.width = "100%";
+          div.style.border = "0px";
+          div.style.fontFamily = "'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif";

          nt.style.display = 'none'

--- a/vue.config.js
+++ b/vue.config.js
@@ -6,26 +6,27 @@ module.exports = defineConfig({

  assetsDir: 'static',
  productionSourceMap: false,
-  
+
  configureWebpack: (config) => {
-    config.experiments = { asyncWebAssembly: true,syncWebAssembly:true }
-    
+    config.experiments = { asyncWebAssembly: true, syncWebAssembly: true }
+

    config.externals = {
      'vue': 'Vue',
      'vue-router': 'VueRouter',
-      'axios': 'axios',
+      // 'axios': 'axios',
      //'vue-axios':'VueAxios',
+      //'buffer': 'Buffer',
      "crypto-js": "CryptoJS",
-      'qrcodejs2': 'QRCode',
+      // 'qrcodejs2': 'QRCode',
      'pako': 'pako',
      "view-design": 'iview',
      "iview": 'ViewUI',
-      "file-saver": 'saveAs',
-      "clipboard": "ClipboardJS",
-      "vue-i18n": "VueI18n",
-      "html2canvas":"html2canvas",
-      "wasm_flate":"wasm_flate"
+      //"file-saver": 'saveAs',
+      // "clipboard": "ClipboardJS",
+      // "vue-i18n": "VueI18n",
+      "html2canvas": "html2canvas",
+      "wasm_flate": "wasm_flate"
    };

    // 为生产环境修改配置
@@ -67,13 +68,21 @@ module.exports = defineConfig({
  devServer: {
    proxy: {
      "/note": {
-        target: "https://flagnote.com/", // 后台接口域名
-//        target: "http://localhost:10000/", // 后台接口域名
+        //target: "https://flagnote.com/", // 后台接口域名
+        target: "http://localhost:20000/", // 后台接口域名
        secure: false, // 如果是https接口，需要配置这个参数
        changeOrigin: true, //是否跨域
        pathRewrite: {
          // '^/': '/'
        },
+      }, "^/[abcdefhikmnopqstuvwxyz23456789]{16}\\.txt$": {
+        //target: "https://flagnote.com/", // 后台接口域名
+        target: "http://localhost:20000/", // 后台接口域名
+        secure: false, // 如果是https接口，需要配置这个参数
+        changeOrigin: true, //是否跨域
+        pathRewrite: {
+          '^/': '/note/'
+        },
      },
    },
  },
--- a/yarn.lock
+++ b/yarn.lock
@@ -2013,6 +2013,11 @@ balanced-match@^1.0.0:
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==

+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
+
 base64-js@^1.3.1:
  version "1.5.1"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2123,6 +2128,14 @@ buffer@^5.5.0:
    base64-js "^1.3.1"
    ieee754 "^1.1.13"

+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 bytes@3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2558,6 +2571,13 @@ css-declaration-sorter@^6.3.1:
  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
  integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==

+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
+
 css-loader@^6.5.0:
  version "6.7.2"
  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
@@ -3650,6 +3670,14 @@ html-webpack-plugin@^5.1.0:
    pretty-error "^4.0.0"
    tapable "^2.0.0"

+html2canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
+
 htmlparser2@^6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -3728,7 +3756,7 @@ icss-utils@^5.0.0, icss-utils@^5.1.0:
  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==

-ieee754@^1.1.13:
+ieee754@^1.1.13, ieee754@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -5927,6 +5955,13 @@ terser@^5.10.0, terser@^5.14.1:
    commander "^2.20.0"
    source-map-support "~0.5.20"

+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
+
 text-table@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -6120,6 +6155,13 @@ utils-merge@1.0.1:
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==

+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
+
 uuid@^8.3.2:
  version "8.3.2"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -6204,7 +6246,7 @@ vue-loader@^17.0.0:
    hash-sum "^2.0.0"
    loader-utils "^2.0.0"

-vue-router@^3.5.4:
+vue-router@^3.6.5:
  version "3.6.5"
  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"
  integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==
@@ -6230,6 +6272,11 @@ vue@^2.7.14:
    "@vue/compiler-sfc" "2.7.14"
    csstype "^3.1.0"

+wasm-flate@^1.0.2-browser:
+  version "1.0.2-browser"
+  resolved "https://registry.yarnpkg.com/wasm-flate/-/wasm-flate-1.0.2-browser.tgz#e10e758b37c3d38829b54809fa2fef853b48131c"
+  integrity sha512-qpqOzvbKtgG/2Mb0DYXVPQ2nOrkKYoAQtpr4QZzgO8SMfKieeODUy2vomMnimQjH/K2RGWnw+kZmO8yf+Yh9qA==
+
 watchpack@^2.4.0:
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
Author	SHA1	Message	Date
Jesse-Ma	a9e7f88412	selection 样式	2023-04-03 11:05:00 +08:00
Jesse-Ma	d3a29444bf	refresh save	2023-03-31 17:19:37 +08:00
Jesse-Ma	83c3901b86	use more Buffer	2023-03-31 15:59:13 +08:00
Jesse-Ma	64db2300b3	js compact	2023-03-31 15:58:42 +08:00
Jesse-Ma	8e6ce23b98	hex plus plus	2023-03-31 10:21:44 +08:00
Jesse-Ma	f369e59f6f	hex plus	2023-03-30 10:19:18 +08:00
Jesse-Ma	0de98e660b	storetext policies	2023-03-29 16:11:59 +08:00
Jesse-Ma	b017e7bda1	zip first	2023-03-23 11:34:41 +08:00