i18n

showSkeleton
milestone
2023-04-12 10:51:10 +08:00 · 2023-04-07 09:26:38 +08:00 · 2023-04-06 13:40:18 +08:00 · 2023-04-03 11:05:00 +08:00 · 2023-03-31 17:19:37 +08:00 · 2023-03-31 15:59:13 +08:00
26 changed files with 1805 additions and 1533 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1 @@
+VUE_APP_TITLE=flagnote.com
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=developement
+VUE_APP_FLAG=dev
 VUE_APP_BASE_NAME = developement
 VUE_APP_BASE_URL = http://localhost:8080
 VUE_APP_NOTE_MAX_COUNT = 131072
 VUE_APP_NOTE_MAX_DESC = 128K
-
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,5 @@
 NODE_ENV=production
+VUE_APP_FLAG=prod
 VUE_APP_BASE_NAME = production
 VUE_APP_BASE_URL = https://flagnote.com
 VUE_APP_NOTE_MAX_COUNT = 131072
--- a/.env.staging
+++ b/.env.staging
@@ -0,0 +1 @@
+VUE_APP_FLAG=staging
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+assets
+mock
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,31 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "plugin:vue/essential",
+        "airbnb-base"
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "rules": {
+        "semi": [2, "never"],
+        "comma-dangle": 0,
+        "no-console": 0,
+        "quotes": [2, "single"],
+        "no-undef": 0,
+        "no-debugger": 0,
+        "import/no-unresolved": 0,
+        "import/extensions": 0,
+        "no-param-reassign": 0,
+        "vue/multi-word-component-names": 0,
+        "vue/no-multiple-template-root": 0,
+        "import/no-extraneous-dependencies": 0
+    }
+}
--- a/README.md
+++ b/README.md
@@ -1,24 +1,35 @@
-# flagnote-web
+# view-ui-project-vuecli
+This project build for Vue3, Vue-router, Vuex, ViewUIPlus and Vue-cli.
+## Install
+```shell
+npm install
+```
+## Run
+```shell
+npm run serve
+```
+## Build
+### Build for Production
+```shell
+npm run build
+```
+### Build for Staging
+```shell
+npm run build:staging
+```
+## Run Eslint
+### Run without Fixing

-## Project setup
+- This operation will also run before git-commit.
+```shell
+npm run lint
 ```
-yarn install
+### Run with Fixing
+```shell
+npm run lint:fix
 ```
+## .env Description

-### Compiles and hot-reloads for development
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-```
-yarn build
-```
-
-### Lints and fixes files
-```
-yarn lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+- This project exposes environment variables on `process.env` object.
+- Different modes (development/staging/production) correspond to different environment files (.env.*).
+- .env file is always included, duplicate variables are overwritten by the specific mode file (.env.*).
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,7 @@
-// module.exports = {
-//   presets: [
-//     '@vue/cli-plugin-babel/preset'
-//   ]
-// }
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset',
+  ],
+  plugins: [
+  ],
+};
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,9 +1,8 @@
 {
  "compilerOptions": {
-    "target": "esnext",
+    "target": "es5",
    "module": "esnext",
    "baseUrl": "./",
-    "jsx": "preserve",
    "moduleResolution": "node",
    "paths": {
      "@/*": [
@@ -15,10 +14,6 @@
      "dom",
      "dom.iterable",
      "scripthost"
-    ],
-    "removeComments": true,
-  },
-  "vueCompilerOptions": {
-    "target": 2.7
+    ]
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,61 +1,56 @@
 {
  "name": "flagnote-web",
-  "version": "0.1.0",
-  "private": true,
+  "version": "1.0.0",
+  "description": "flagnote web",
  "scripts": {
+    "dev": "npm run serve",
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build --mode production",
-    "build.test": "vue-cli-service build --mode test",
-    "build.production": "vue-cli-service build --mode production",
-    "lint": "vue-cli-service lint"
+    "build": "vue-cli-service build",
+    "build:staging": "vue-cli-service build --mode=staging",
+    "lint": "eslint ./src --ext .js,.vue",
+    "lint:fix": "eslint ./src --ext .js,.vue --fix",
+    "prepare": "husky install"
  },
  "dependencies": {
    "axios": "^0.27.2",
+    "babel-plugin-import": "^1.13.6",
+    "buffer": "^6.0.3",
    "clipboard": "^2.0.11",
+    "core-js": "^3.8.3",
    "crypto-js": "^4.1.1",
    "escape-html": "^1.0.3",
    "file-saver": "^2.0.5",
    "html2canvas": "^1.4.1",
    "pako": "^2.1.0",
-    "qrcodejs2": "^0.0.2",
-    "view-design": "^4.7.0",
-    "vue": "^2.7.14",
+    "qrcodejs2-fixes": "^0.0.2",
+    "view-ui-plus": "^1.3.10",
+    "vue": "^3.2.13",
    "vue-axios": "^3.5.2",
-    "vue-i18n": "^8.28.2",
-    "vue-router": "^3.6.5"
+    "vue-i18n": "^9.2.2",
+    "vue-router": "^4.1.6",
+    "vuex": "^4.0.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.12.16",
-    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "compression-webpack-plugin": "^10.0.0",
-    "core-js": "^3.26.1",
-    "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^8.0.3",
-    "javascript-obfuscator": "^4.0.0",
-    "webpack": "^5.1.0",
-    "webpack-obfuscator": "^3.5.1"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "@babel/eslint-parser"
-    },
-    "rules": {}
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-router": "~5.0.0",
+    "@vue/cli-plugin-vuex": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "eslint": "^8.14.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-vue": "^8.7.1",
+    "husky": "^7.0.4",
+    "less": "^4.0.0",
+    "less-loader": "^10.2.0",
+    "mockjs": "^1.1.0"
  },
  "browserslist": [
    "> 1%",
    "last 2 versions",
-    "not dead"
-  ]
+    "not dead",
+    "not ie 11"
+  ],
+  "engines": {
+    "node": ">= 12.0.0",
+    "npm": ">= 6.9.0"
+  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -18,47 +18,23 @@
  <meta http-equiv="Cache-control" content="no-cache" />
  <meta http-equiv="Cache" content="no-cache" />
  <link rel="icon" href="/static/favicon.png" />
-  <title>flagnote.com</title>
+  <title>
+    <%= htmlWebpackPlugin.options.title %>
+  </title>
  <style>
    body {
      background-color: #dddddd
    }
  </style>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue-router@3.6.5/dist/vue-router.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/axios@0.27.2/dist/axios.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/iview.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/pako@2.1.0/dist/pako.min.js" rel="stylesheet"
-    type="text/javascript"></script>
-  <script src="https://cdn.jsdelivr.net/npm/crypto-js@4.1.1/crypto-js.min.js" rel="stylesheet"
-    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"
-    type="text/javascript"></script>
+  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
+    <script type="text/javascript" src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
+  <% } %>
+  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
+    <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
+  <% } %>
  <script>
    window.wasm_flate_bg_path = "https://cdn.jsdelivr.net/npm/wasm-flate@1.0.2-browser/wasm_flate_bg.wasm"
  </script>
-
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/view-design@4.7.0/dist/styles/iview.css">
-  <!--Global site tag(gtag.js)-Google Analytics-->
-  <!--
-  <script async src="https://www.googletagmanager.com/gtag/js?id=G-FPS9PD2DFF"></script>
-
-  <script>window.dataLayer = window.dataLayer || []; function gtag() { dataLayer.push(arguments) } gtag("js", new Date()); gtag("config", "G-FPS9PD2DFF");</script>
-    -->
 </head>

 <body><noscript><strong>Please enable JavaScript to continue.</strong></noscript>
@@ -69,8 +45,6 @@
    if (!!window.ActiveXObject || "ActiveXObject" in window) {
      document.querySelector('#noie').style.display = 'block';
    }
-
-
  </script>
 </body>

--- 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 {
@@ -122,10 +122,10 @@ body {
  display: none;
 }

-button span {
+/* 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>
--- 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,11 +49,7 @@ export function saveNote(noteForm, secret) {
    });
  }

-  // let bufferArrary = eval("[" + note.text + "]");
-  // let array = Uint8Array.from(bufferArrary);
-
-  let encoder = new TextEncoder()
-  let array = encoder.encode(note.text)
+  let array = Buffer.from(note.text, 'base64')

  let blob = new Blob([array], { type: "application/octet-stream" });
  let form = new FormData();
@@ -76,10 +73,7 @@ export function saveNote(noteForm, secret) {
 }

 export function deleteNote(key) {
-  let storeKey = getStoreKey(key);
-  let storeInfo = storage.local.getText(storeKey);
  let note = {
-    cipher: storeInfo.substring(2, 34),
    key: key,
  };

--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/i18n/config/en.js
+++ b/src/i18n/config/en.js
@@ -4,7 +4,7 @@ const en = {
  },
  content: {
    blankTip: "I am Blank.",
-    noteTip: "Start writing something...",
+    noteTip: "Write here.",
    deleteTip: "The note will be deleted automatically. ttl:"
  },
  button: {
--- a/src/i18n/config/zh.js
+++ b/src/i18n/config/zh.js
@@ -4,7 +4,7 @@ const zh = {
  },
  content: {
    blankTip: "空白的内容。",
-    noteTip: "开始写下一些东西吧。。。",
+    noteTip: "写在这儿。",
    deleteTip: "笔记将被自动删除。剩余时间："
  },
  button: {
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -1,6 +1,4 @@
-import Vue from "vue";
-import VueI18n from "vue-i18n";
-Vue.use(VueI18n);
+import { createI18n } from "vue-i18n";

 import zh from "./config/zh";
 import en from "./config/en";
@@ -10,11 +8,16 @@ const messages = {
  en,
 }

-const i18n = new VueI18n({
-  messages: messages,
+const i18n = createI18n({
+  allowComposition: true,
+  globalInjection: true,
+  legacy: false,
  locale: getLocale(),
+  messages
 });

+
+
 function getLocale() {
  var lang = navigator.language;
  if (lang) {
--- 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  服务器随机返回的关键字
@@ -53,15 +89,15 @@ export function aesDecrypt(word, keyWord) {
  return decrypt;
 }

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

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

 export function noteUnzip(wdary) {
  let data = unzip(wdary);
@@ -92,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;
+
+export function convertBase64ToHexString(base64) {
+	return CryptoJS.enc.Hex.stringify(CryptoJS.enc.Base64.parse(base64));
 }
-	return u8_array;
+
+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) {
-	var words = [], i = 0, len = u8Array.length;
- 
-	while (i < len) {
-		words.push(
-			(u8Array[i++] << 24) |
-			(u8Array[i++] << 16) |
-			(u8Array[i++] << 8)  |
-			(u8Array[i++])
-		);
+  return CryptoJS.enc.Uint8Array.parse(u8Array);
 }

-	return {
-		sigBytes: words.length * 4,
-		words: words
-	};
-}
--- a/src/main.js
+++ b/src/main.js
@@ -1,25 +1,29 @@
-import Vue from 'vue'
+import { createApp } from 'vue'
+import ViewUIPlus from 'view-ui-plus'
 import App from './App.vue'
 import router from './router'
 import axios from 'axios'
 import VueAxios from 'vue-axios'
-import './plugins/iview.js'
 import i18n from './i18n/'
-import NoteConstant from "@/libs/constants";
+import NoteConstant from "@/libs/constants"

 axios.defaults.baseURL = NoteConstant.servicePath;
-
-Vue.use(VueAxios, axios)
-
 const debugFlag = process.env.NODE_ENV !== 'production';
-Vue.config.debug = debugFlag;
-Vue.config.devtools = debugFlag;
-Vue.config.productionTip = debugFlag;

-new Vue({
-    i18n,
-    router,
-    render: h => h(App)
-}).$mount('#app')
+const app = createApp(App)

+app.config.debug = debugFlag;
+app.config.devtools = debugFlag;
+app.config.productionTip = debugFlag;
+
+app.use(router)
+  .use(i18n)
+  .use(VueAxios, axios)
+  .use(ViewUIPlus, {
+    i18n: i18n,
+    transfer: true,
+    size: 'large',
+    capture: false,
+  })
+  .mount('#app')

--- a/src/plugins/iview.js
+++ b/src/plugins/iview.js
@@ -1,6 +0,0 @@
-import Vue from 'vue'
-import ViewUI from 'view-design'
-
-Vue.use(ViewUI)
-
-//import 'view-design/dist/styles/iview.css'
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,4 @@
-import Vue from "vue";
-import VueRouter from "vue-router";
+import { createRouter, createWebHistory } from 'vue-router'
 import EditNote from "@/views/EditNote.vue";
 import ViewNote from "@/views/ViewNote.vue";
 import ErrorRoute from "@/views/ErrorRoute.vue";
@@ -8,8 +7,6 @@ import { getNoteMeta } from "@/api/note";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";

-Vue.use(VueRouter);
-
 var keyMeta = null;
 var noteMeta = null;
 var errorMeta = null;
@@ -119,9 +116,11 @@ const routes = [
  { path: "/:path(.*)", component: ErrorRoute }
 ];

-const router = new VueRouter({
-  routes,
+const router = createRouter({
+  history: createWebHistory(process.env.VUE_APP_URL_BASE_PATH),
+  linkExactActiveClass: "active",
  mode: "history",
-});
+  routes
+})

 export default router;
--- a/src/views/EditNote.vue
+++ b/src/views/EditNote.vue
@@ -38,6 +38,13 @@
  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 {
@@ -80,30 +87,19 @@
                v-on:click="refreshPage()" />

              <div style="float:left;width:auto;">
-
                <Button-group size="large">
-
-
-
                  <Button aria-label="to top" v-show="toTopState" type="text"
                    style="margin-left:5px; border-radius: 0px; font-size: 28px;color:red;line-height: 20px;"
                    @click="toTop()" icon="ios-arrow-up" ghost></Button>
-
                </Button-group>
-
              </div>
-
-
-
              <div style="float:right;width:auto;">
-
                <Button-group size="large">
                  <Button aria-label="publish" type="error" :loading="model.submitting"
                    style="margin-left:5px; border-radius: 0px;font-size: 21px;" @click="submitNote()"
                    icon="md-cloud-upload"></Button>
                  <Button aria-label="menu" type="error" style="margin-left:3px; border-radius: 0px;font-size: 24px;"
                    @click="switchMenu()" @blur.native="hideMenu()" icon="md-menu"></Button>
-
                </Button-group>
              </div>
            </div>
@@ -145,11 +141,13 @@
              <Form :model="noteForm" :label-width="80">
                <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"
+                    :autosize="{ minRows: 35, maxRows: 100000 }" :placeholder="$t('content.noteTip')" @input="recordText"
                    @on-keydown="recordEventKdown" />
+                  
                </div>
              </Form>
            </Card>
+            <WordCount :value="noteForm.text" :total="100000" style="border-top:1px solid #ed4014;float:left" />
            </Col>

          </Row>
@@ -217,6 +215,7 @@ export default {
        lock: 0,
        locking: 0,
        commited: 0,
+        deleted: 0,
        serverTime: '',
        initTime: '',
      },
@@ -379,27 +378,27 @@ export default {
    backStoreFunction() {
      let that = this;
      return function () {
-        that.backStoreText(that);
+        that.backStoreText();
      }
    },
-    backStoreText(that) {
-      let nowEditCount = that.noteForm.text.length;
+    backStoreText() {
+      let nowEditCount = this.noteForm.text.length;
      let nowEditTime = new Date().getTime();
-      if (Math.abs(nowEditCount - that.lastStoreCount) > 10) {
-        setStoreText(that.noteForm, that.state, that.secret);
-        that.lastStoreTime = that.lastEditTime;
-        that.lastStoreCount = nowEditCount;
+      if (Math.abs(nowEditCount - this.lastStoreCount) > 10) {
+        setStoreText(this.noteForm, this.state, this.secret);
+        this.lastStoreTime = this.lastEditTime;
+        this.lastStoreCount = nowEditCount;
      } else {
-        if (nowEditTime - that.lastEditTime >= 1000 && nowEditTime - that.lastEditTime < 20000) {
-          if (that.lastEditTime != that.lastStoreTime) {
-            setStoreText(that.noteForm, that.state, that.secret);
-            that.lastStoreTime = that.lastEditTime;
-            that.lastStoreCount = nowEditCount;
+        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 - that.lastEditTime >= 20000) {
-          if (that.backStoreTextInterval != null) {
-            let ivl = that.backStoreTextInterval;
-            that.backStoreTextInterval = null;
+        } else if (nowEditTime - this.lastEditTime >= 20000) {
+          if (this.backStoreTextInterval != null) {
+            let ivl = this.backStoreTextInterval;
+            this.backStoreTextInterval = null;
            window.clearInterval(ivl);
          }
        }
@@ -518,6 +517,7 @@ export default {
    },
    dropNote() {
      this.model.deleting = true;
+      this.state.deleted = 1;
      storage.local.delete(this.secret.storeKey);
      storage.session.setText(this.secret.storeKey + "_delete", 1);
      location.reload();
@@ -549,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--) {
@@ -602,7 +602,9 @@ export default {
      });
    },
    beforeunloadHandler() {
-      this.recordText();
+      if(this.state.deleted==0){
+        setStoreText(this.noteForm, this.state, this.secret);
+      }
    },
  }
 }
--- a/src/views/ErrorNote.vue
+++ b/src/views/ErrorNote.vue
@@ -135,19 +135,6 @@ export default {

    //this.bindCopyTextEvent();

-    const myObserver = new ResizeObserver(entries => {
-      // iterate over the entries, do something.
-      entries.forEach(entry => {
-        let affix = document.querySelector('.ivu-affix');
-        if (affix) {
-          affix.setAttribute("style", "top: 0px; width: " + (entry.contentRect.width +2) + "px;");
-        }
-
-      });
-    });
-
-    const someOtherEl = document.querySelector('#wrapper');
-    myObserver.observe(someOtherEl);


  },
--- 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 {
@@ -151,11 +151,11 @@



-/* #noteMenu button span{
-  font-size: 20px;
-  line-height: 20px;
-  margin-left: 7px !important;
-  margin-right: 5px !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>

@@ -171,20 +171,6 @@
            <div :class="[showHeaderShade ? 'noteHeaderShade' : 'noteHeader']">
              <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;">

                <Button-group size="large">
@@ -203,8 +189,16 @@
                <Button-group size="large">

                  <Button aria-label="ttl" type="error"
-                    style="margin-left:5px; border-radius: 0px;font-size: 21px; font-family: Arial, sans-serif"
-                    @click="showTtlDeleteModel()" icon="md-alarm">{{ state.ttlDesc }}</Button>
+                    style="margin-left:5px; border-radius: 0px;font-size: 21px; padding-left: 3px !important;padding-right: 7px !important; font-family: Arial, sans-serif"
+                    @click="showTtlDeleteModel()">
+                    <Badge :offset="[8, 0]" style="padding-top:1px;">
+                      <Icon type="md-trash" color="#FFFFFF" size="24" />
+                      <template #count>
+                        <Icon type="md-time" color="#FFFFFF" size="14" />
+                      </template>
+                    </Badge>
+                    <span style="font-size:18px;margin-left: 7px">{{ state.ttlDesc }}</span>
+                  </Button>

                  <Button aria-label="share" type="error"
                    style="margin-left:3px; border-radius: 0px;font-size: 21px; font-family: Arial, sans-serif"
@@ -256,8 +250,32 @@
              :lg="{ span: 18, offset: 3 }" :xl="{ span: 16, offset: 4 }" :xxl="{ span: 16, offset: 4 }">
            <Card :padding="0">
              <div ref="html2canvas" id="wrapper" style="border-left: 2px solid white;">
+                <Skeleton :loading="showSkeleton">
+                  <template #template>
+                    <div style="  padding: 10px;  width: 100%;  height: 800px;text-align: left;" >
+                      <SkeletonItem />
+                      <SkeletonItem block width="80%" height="16px" />
+                      <SkeletonItem width="80%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="68%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="38%" height="16px" />
+                      <SkeletonItem width="88%" height="16px" />
+                      <SkeletonItem block width="80%" height="16px" />
+                      <SkeletonItem width="80%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="68%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="38%" height="16px" />
+                      <SkeletonItem width="88%" height="16px" />
+                      <SkeletonItem block width="80%" height="16px" />
+                      <SkeletonItem width="80%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="68%" height="16px" class="ivu-mr" />
+                      <SkeletonItem width="38%" height="16px" />
+                      <SkeletonItem width="88%" height="16px" />
+                    </div>
+                  </template>
+                  <template #default>
                    <Input element-id="noteText" readonly type="textarea" :border="false" v-model="noteForm.text"
-                  :autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" />
+                      :autosize="{ minRows: 35 }" />
+                  </template>
+                </Skeleton>
              </div>
            </Card>
            </Col>
@@ -274,12 +292,7 @@

    <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%;">
+      <p style="text-align: center; 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%">
@@ -341,11 +354,12 @@ import { getStoreKey } from "@/api/lock";
 import { deleteNote, getNoteBlob } from "@/api/note";
 import storage from "@/libs/storage";
 //import { getEscapeText } from "@/libs/noteStorage";
-import QRCode from "qrcodejs2";
+import QRCode from "qrcodejs2-fixes";
 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',
@@ -387,6 +401,8 @@ export default {
      showMenuState: false,
      showHeaderShade: false,
      errorInfo: '',
+      targetTime: null,
+      showSkeleton: true,
    }
  },
  created() {
@@ -412,6 +428,7 @@ export default {
      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; //读者有没有值可配置
@@ -436,12 +453,6 @@ export default {
  },
  mounted() {

-    let stateInfo = storage.session.getText(this.secret.storeKey + "_share");
-    if (stateInfo == '1') {
-      storage.session.setText(this.secret.storeKey + "_share", '0');
-      this.showShareModel();
-    }
-
    const myObserver = new ResizeObserver(entries => {
      // iterate over the entries, do something.
      entries.forEach(entry => {
@@ -468,6 +479,13 @@ export default {
    }
    new QRCode(qrimg, opts);

+    let stateInfo = storage.session.getText(this.secret.storeKey + "_share");
+    if (stateInfo == '1') {
+      storage.session.setText(this.secret.storeKey + "_share", '0');
+      setTimeout(() => {
+        this.showShareModel();
+      }, 100); 
+    }
  },
  updated() {
  },
@@ -504,9 +522,7 @@ export default {
        } else if (mins < 10) {
          mins = "0" + mins;
        }
-
        let seds = parseInt(ittl % 60);
-
        if (seds < 0) {
          seds = "00";
        } else if (seds < 10) {
@@ -514,7 +530,6 @@ export default {
        }
        that.state.ttlDesc = mins + ":" + seds;
        that.state.ttl = that.state.initTtl - (new Date().getTime() - that.state.initTime);
-
        if (that.state.ttl <= 0) {
          storage.local.delete(that.secret.storeKey);
          location.reload();
@@ -579,27 +594,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;
            }

-            let decoder = new TextDecoder();
-            let bytesString = decoder.decode(e.target.result);
-            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);
+            that.showSkeleton = false;
            // 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 {
@@ -610,6 +617,7 @@ export default {
        }

        this.noteForm.text = unwrap(starray[4], this.secret.secretKey);
+        this.showSkeleton = false;
        //this.noteForm.escapeText = getEscapeText(this.noteForm.text);

        // local is usable, and set commited flag
@@ -665,7 +673,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--) {
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,32 +1,70 @@
-const { defineConfig } = require("@vue/cli-service");
+const { defineConfig } = require('@vue/cli-service')
 const CompressionPlugin = require("compression-webpack-plugin");
 const WebpackObfuscator = require('webpack-obfuscator');
+const path = require('path')

-module.exports = defineConfig({
+const { NODE_ENV, VUE_APP_TITLE = '' } = process.env
+
+const assetsCDN = {
+  // 忽略打包的第三方库
+  externals: {
+    'vue': 'Vue',
+    'vue-router': 'VueRouter',
+    "crypto-js": "CryptoJS",
+    'pako': 'pako',
+    "html2canvas": "html2canvas",
+    '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-router@4.1.6/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/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/wasm-flate@1.0.2-browser/wasm_flate.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',
+  ]
+}
+
+
+const config = {

  assetsDir: 'static',
-  productionSourceMap: false,
+  productionSourceMap: NODE_ENV !== 'production',

  configureWebpack: (config) => {
    config.experiments = { asyncWebAssembly: true, syncWebAssembly: true }

+    config.externals = assetsCDN.externals;
+
+    // const assetsCDN = {
+    //   // 放置需要使用 cdn 的库
+    //   externals: {
+    //     'vue': 'Vue',
+    //     'vue-router': 'VueRouter',
+    //     "crypto-js": "CryptoJS",
+    //     'pako': 'pako',
+    //     "html2canvas": "html2canvas",
+    //     'view-ui-plus':'ViewUIPlus',
+    //   },
+    //   css: [
+    //     // 存放 引用 css文件的地址
+    //     '//unpkg.com/element-plus@1.0.2-beta.48/lib/theme-chalk/index.css',
+    //   ],
+    //   js: [
+    //     // 存放 引用 js 文件的地址
+    //     '//unpkg.com/vue@3.1.1/dist/vue.global.js',
+    //     '//unpkg.com/element-plus@1.0.2-beta.48/lib/index.full.js'
+    //   ]
+    // }

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

    // 为生产环境修改配置
    if (process.env.NODE_ENV === 'production') {
@@ -57,24 +95,49 @@ module.exports = defineConfig({
      )
    }
  },
-  transpileDependencies: true,
-  chainWebpack: (config) => {
-    config.plugin("html").tap((args) => {
-      args[0].title = "flagnote.com";
+
+  transpileDependencies: false,
+
+
+  chainWebpack: (setting) => {
+    setting.plugin("html").tap((args) => {
+      args[0].cdn = assetsCDN
+      args[0].title = VUE_APP_TITLE;
      return args;
    });
+
+
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          javascriptEnabled: true,
+        }
+      }
+    }
  },
  devServer: {
    proxy: {
      "/note": {
        target: "https://flagnote.com/", // 后台接口域名
-        //        target: "http://localhost:10000/", // 后台接口域名
+        //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/'
        },
      },
    },
-});
+  }
+}
+
+module.exports = defineConfig(config)
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Jesse-Ma	ff3e77200c	i18n	2023-04-12 10:51:10 +08:00
Jesse-Ma	4e32a23eea	showSkeleton	2023-04-07 09:26:38 +08:00
Jesse-Ma	612c9b2164	milestone	2023-04-06 13:40:18 +08:00
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