remove wasm

Update EditNote.vue
100014 issue
2023-05-19 10:03:57 +08:00 · 2023-04-12 17:38:21 +08:00 · 2023-04-12 17:32:36 +08:00 · 2023-04-12 17:02:32 +08:00 · 2023-04-12 17:01:48 +08:00 · 2023-04-12 10:51:10 +08:00
26 changed files with 2390 additions and 2237 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
+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,5 +1,8 @@
-NODE_ENV = production
+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
 VUE_APP_NOTE_MAX_DESC = 128K
+VUE_APP_CDN_PROVIDER = jsdelivr
+# VUE_APP_CDN_PROVIDER = unpkg
--- 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,15 @@
-// module.exports = {
-//   presets: [
-//     '@vue/cli-plugin-babel/preset'
-//   ]
-// }
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset',
+  ],
+  "plugins": [
+    [
+      "import",
+      {
+        "libraryName": "view-ui-plus",
+        "libraryDirectory": "src/components"
+      },
+      "view-ui-plus"
+    ]
+  ]
+};
--- 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,62 +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,49 +18,21 @@
  <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
+      background-color: #dddddd;
+      height: 100%;
    }
  </style>
-  <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"
-    type="text/javascript"></script>
-  <!-- <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/pako@2.1.0/dist/pako.min.js"
-    type="text/javascript"></script>
-  <!-- <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/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/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"
-  </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>
-    -->
+  <% 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] %>" />
+  <% } %>
 </head>

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

--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,5 @@
 <template>
-  <div id="app">
    <router-view></router-view>
-  </div>
 </template>

 <script>
@@ -54,7 +52,7 @@ body {
 }

 .noteHeaderShade {
-  background: linear-gradient(to top,rgba(255,255,255,0.7),rgba(255,255,255,1));
+  background-color: white;
  width:100%;
  height:40px;
  border-bottom: dashed #ed4014 1px;
@@ -122,10 +120,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 { setStoreText } from "@/libs/noteStorage";
 import { Buffer } from 'buffer';

 axios.interceptors.response.use(undefined, (err) => {
@@ -18,7 +19,9 @@ axios.interceptors.response.use(undefined, (err) => {
  }
 });

-export function saveNote(noteForm, secret) {
+export function saveNote(noteForm,state, secret) {
+  setStoreText(noteForm, state, secret);
+
  let storeKey = secret.storeKey;

  let storeInfo = storage.local.getText(storeKey);
@@ -73,10 +76,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,6 @@
 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;
+import { Buffer } from "buffer";

 CryptoJS.enc.Uint8Array = {
  /**
@@ -47,7 +44,7 @@ CryptoJS.enc.Uint8Array = {

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

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

 export function noteUnzip(wdary) {
@@ -112,29 +109,21 @@ export function noteZip(text) {
  return text;
 }

-export function zip(data){
-   if(wasmFlate.__wbindgen_wasm_module){
-     return wasmFlate.gzip_encode_raw(data);
-   }
-
+export function zip(data) {
  return pako.gzip(data);
 }

-export function unzip(data){
-  if(wasmFlate.__wbindgen_wasm_module){
-    return wasmFlate.gzip_decode_raw(data);
-  }
-
+export function unzip(data) {
  return pako.ungzip(data);
 }


 export function convertBase64ToHexString(base64) {
-	return CryptoJS.enc.Hex.stringify(CryptoJS.enc.Base64.parse(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));
+  return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Hex.parse(hexString));
 }

 export function convertHexStringToUint8Array(hexString) {
--- a/src/main.js
+++ b/src/main.js
@@ -1,25 +1,44 @@
-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"
+
+import {Layout,Header,Row,Col,Modal,Button,ButtonGroup,Card,Content,Input,Form,WordCount,Footer,Badge,Icon,Tag} from 'view-ui-plus';
+//import 'view-ui-plus/dist/styles/viewuiplus.css';

 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.component('Layout', Layout);
+app.component('Header', Header);
+app.component('Row', Row);
+app.component('Col', Col);
+app.component('Modal', Modal);
+app.component('Button', Button);
+app.component('ButtonGroup', ButtonGroup);
+app.component('Card', Card);
+app.component('Content', Content);
+app.component('Input', Input);
+app.component('Form', Form);
+app.component('WordCount', WordCount);
+app.component('Footer', Footer);
+app.component('Badge', Badge);
+app.component('Icon', Icon);
+app.component('Tag', Tag);


+app.use(router)
+  .use(i18n)
+  .use(VueAxios, axios)
+  .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 {
@@ -68,42 +75,30 @@

    <Layout>

-      <Header class="header">
-        <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 }">
-
-          <Affix :offset-top="0">
+      <div style="position:fixed;z-index:10;width:100%">
+        <Header class="header">
+          <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 }">
            <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;">
-
                <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>
@@ -128,13 +123,22 @@


            </div>
-          </Affix>

+            </Col>
+          </Row>
+        </Header>
+      </div>

-
-          </Col>
-        </Row>
-      </Header>
+      <Content class="content">
+        <div>
+          <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 }">
+            <div class="noteHeader" style="height:40px;border-left: 2px solid #ed4014;"></div>
+            </Col>
+          </Row>
+        </div>
+      </Content>

      <Content class="content">
        <div style="min-height: 650px;">
@@ -145,11 +149,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>
@@ -160,7 +166,7 @@
      <Footer class="layout-footer-center">2023 &copy; flagnote.com</Footer>
    </Layout>

-    <Modal v-model="model.showDelete" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
+    <Modal scrollable  v-model="model.showDelete" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
      <p style="text-align: center;font-size:medium ;margin-bottom: 20px;">
        {{ $t("message.askTodelete") }}
      </p>
@@ -171,7 +177,7 @@
      </p>
    </Modal>

-    <Modal v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
+    <Modal scrollable  v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
      <p style="text-align: center;font-size:medium ;margin-bottom: 20px;">
        {{ errorInfo }}
      </p>
@@ -197,6 +203,7 @@ import { isWeixin } from "@/libs/utils";
 import NoteConstant from "@/libs/constants";
 import html2canvas from "html2canvas";

+
 export default {
  name: 'EditNote',
  props: {},
@@ -217,6 +224,7 @@ export default {
        lock: 0,
        locking: 0,
        commited: 0,
+        deleted: 0,
        serverTime: '',
        initTime: '',
      },
@@ -299,24 +307,11 @@ export default {
    this.bindCtrlAllEvent();
    this.bindToTopEvent();

-    window.wasm_bindgen(window.wasm_flate_bg_path);
+    if(window.wasm_flate_bg_path){
+      window.wasm_bindgen(window.wasm_flate_bg_path);
+    }
  },
  mounted() {
-    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);
-
    window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
  },
  updated() {
@@ -451,7 +446,7 @@ export default {
      }
    },
    save() {
-      return saveNote(this.noteForm, this.secret);
+      return saveNote(this.noteForm,this.state,this.secret);
    },
    validateForm() {
      let text = this.noteForm.text;
@@ -518,6 +513,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();
@@ -602,7 +598,9 @@ export default {
      });
    },
    beforeunloadHandler() {
-      setStoreText(this.noteForm, this.state, this.secret);
+      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
@@ -151,40 +151,26 @@



-/* #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>

 <template>
  <div class="layout">
    <Layout>
+      <div style="position:fixed;z-index:10;width:100%">
+        <Header class="header">
+          <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 }">

-      <Header class="header">
-        <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 }">
-          <Affix :offset-top="0">
            <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"
@@ -225,9 +219,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>

@@ -241,13 +235,25 @@

            </div>

-          </Affix>



-          </Col>
-        </Row>
-      </Header>
+
+            </Col>
+          </Row>
+        </Header>
+      </div>
+
+      <Content class="content">
+        <div>
+          <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 }">
+            <div class="noteHeader" style="height:40px;border-left: 2px solid white;"></div>
+            </Col>
+          </Row>
+        </div>
+      </Content>

      <Content class="content">
        <div style="min-height: 650px;">
@@ -256,8 +262,8 @@
              :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;">
-                <Input element-id="noteText" readonly type="textarea" :border="false" v-model="noteForm.text"
-                  :autosize="{ minRows: 30, maxRows: 409600 }" :placeholder="$t('content.noteTip')" />
+                    <Input element-id="noteText" readonly type="textarea" :border="false" v-model="noteForm.text"
+                      :autosize="{ minRows: 35 }" />
              </div>
            </Card>
            </Col>
@@ -272,14 +278,9 @@

    </Layout>

-    <Modal v-model="model.showShare" width="360" footer-hide class-name="qrmodal" :styles="{ borderRadius: 0 }"
+    <Modal scrollable  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%">
@@ -297,7 +298,7 @@
      </p>
    </Modal>

-    <Modal v-model="model.showTtlDelete" width="360" footer-hide class-name="qrmodal" :styles="{ borderRadius: 0 }">
+    <Modal scrollable  v-model="model.showTtlDelete" width="360" footer-hide class-name="qrmodal" :styles="{ borderRadius: 0 }">
      <p style="text-align: center;font-size:medium ;margin-top:20px;">
        {{ $t("content.deleteTip") }}{{ state.ttlDesc }}
      </p>
@@ -309,7 +310,7 @@
      </p>
    </Modal>

-    <Modal v-model="model.showDelete" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
+    <Modal scrollable  v-model="model.showDelete" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
      <p style="text-align: center;font-size:medium;margin-bottom: 20px;">
        {{ $t("message.askTodelete") }}
      </p>
@@ -320,7 +321,7 @@
      </p>
    </Modal>

-    <Modal v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
+    <Modal scrollable  v-model="model.showError" width="360" footer-hide class-name="fnmodal" :styles="{ borderRadius: 0 }">
      <p style="text-align: center;font-size:medium ;margin-bottom: 20px;">
        {{ errorInfo }}
      </p>
@@ -341,7 +342,7 @@ 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";
@@ -388,6 +389,8 @@ export default {
      showMenuState: false,
      showHeaderShade: false,
      errorInfo: '',
+      targetTime: null,
+      showSkeleton: true,
    }
  },
  created() {
@@ -413,6 +416,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,27 +440,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 => {
-        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);
-
    let qrimg = document.getElementById("qrImg");
    let qrurl = "https://flagnote.com/" + this.noteForm.key;
    var opts = {
@@ -469,6 +452,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() {
  },
@@ -505,9 +495,7 @@ export default {
        } else if (mins < 10) {
          mins = "0" + mins;
        }
-
        let seds = parseInt(ittl % 60);
-
        if (seds < 0) {
          seds = "00";
        } else if (seds < 10) {
@@ -515,7 +503,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();
@@ -587,7 +574,7 @@ export default {

            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 + '|' + base64String);
@@ -603,6 +590,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
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,33 +1,47 @@
-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/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 = {
-      'vue': 'Vue',
-      'vue-router': 'VueRouter',
-      // 'axios': 'axios',
-      //'vue-axios':'VueAxios',
-      //'buffer': 'Buffer',
-      "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"
-    };
+    config.externals = assetsCDN.externals;

    // 为生产环境修改配置
    if (process.env.NODE_ENV === 'production') {
@@ -49,7 +63,7 @@ module.exports = defineConfig({

        new CompressionPlugin({
          algorithm: "gzip", // 使用gzip压缩
-          test: /\.js$|\.html$|\.png$|\.jpg$|\.svg$|\.wasm$|\.css$/, // 匹配文件名
+          test: /\.js$|\.html$|\.png$|\.jpg$|\.svg$|\.css$/, // 匹配文件名
          filename: "[path][base].gz[query]", // 压缩后的文件名(保持原文件名，后缀加.gz)
          minRatio: 1, // 压缩率小于1才会压缩
          threshold: 5120, // 对超过10k的数据压缩
@@ -58,26 +72,40 @@ 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:20000/", // 后台接口域名
+        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/", // 后台接口域名
+        target: "https://flagnote.com/", // 后台接口域名
+        //target: "http://localhost:20000/", // 后台接口域名
        secure: false, // 如果是https接口，需要配置这个参数
        changeOrigin: true, //是否跨域
        pathRewrite: {
@@ -85,5 +113,7 @@ module.exports = defineConfig({
        },
      },
    },
-  },
-});
+  }
+}
+
+module.exports = defineConfig(config)
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Jesse-Ma	8dfb189985	remove wasm	2023-05-19 10:03:57 +08:00
Jesse-Ma	19cef5bb67	Update EditNote.vue	2023-04-12 17:38:21 +08:00
Jesse-Ma	2d4dd7f63d	100014 issue	2023-04-12 17:32:36 +08:00
Jesse-Ma	946343e429	babel	2023-04-12 17:02:32 +08:00
Jesse-Ma	aacb2b71fd	affix	2023-04-12 17:01:48 +08:00
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