Build(tinymce,tuieditor): upgrade tinymce to 5.7.1, tuieditor to 2.5.1

README-zh.md

@@ -7,7 +7,7 @@
     <img src="https://img.shields.io/badge/vue-2.6.10-brightgreen.svg" alt="vue">
   </a>
   <a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.12.0-brightgreen.svg" alt="element-ui">
+    <img src="https://img.shields.io/badge/element--ui-2.15.1-brightgreen.svg" alt="element-ui">
   </a>
   <a href="https://circleci.com/gh/Armour/vue-typescript-admin-template/tree/master">
     <img src="https://circleci.com/gh/Armour/vue-typescript-admin-template/tree/master.svg?style=shield" alt="CircleCI">

README.md

@@ -7,7 +7,7 @@
     <img src="https://img.shields.io/badge/vue-2.6.10-brightgreen.svg" alt="vue">
   </a>
   <a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.12.0-brightgreen.svg" alt="element-ui">
+    <img src="https://img.shields.io/badge/element--ui-2.15.1-brightgreen.svg" alt="element-ui">
   </a>
   <a href="https://circleci.com/gh/Armour/vue-typescript-admin-template/tree/master">
     <img src="https://circleci.com/gh/Armour/vue-typescript-admin-template/tree/master.svg?style=shield" alt="CircleCI">

mock/articles.ts

@@ -17,12 +17,12 @@ for (let i = 0; i < articleCount; i++) {
     imageURL: faker.image.imageUrl(),
     timestamp: faker.date.past().getTime(),
     platforms: [faker.random.arrayElement(['a-platform', 'b-platform', 'c-platform'])],
-    disableComment: faker.random.boolean(),
-    importance: faker.random.number({ min: 1, max: 3}),
+    disableComment: faker.datatype.boolean(),
+    importance: faker.datatype.number({ min: 1, max: 3 }),
     author: faker.name.findName(),
     reviewer: faker.name.findName(),
     type: faker.random.arrayElement(['CN', 'US', 'JP', 'EU']),
-    pageviews: faker.random.number({ min: 300, max: 500 })
+    pageviews: faker.datatype.number({ min: 300, max: 500 })
   })
 }
 
@@ -100,7 +100,7 @@ export const updateArticle = (req: Request, res: Response) => {
 
 export const deleteArticle = (req: Request, res: Response) => {
   return res.json({
-    code: 20000,
+    code: 20000
   })
 }
 

mock/role/index.ts

@@ -49,7 +49,7 @@ export const createRole = (req: Request, res: Response) => {
   return res.json({
     code: 20000,
     data: {
-      key: faker.random.number({ min: 3, max: 10000 })
+      key: faker.datatype.number({ min: 3, max: 10000 })
     }
   })
 }
@@ -66,7 +66,7 @@ export const updateRole = (req: Request, res: Response) => {
 
 export const deleteRole = (req: Request, res: Response) => {
   return res.json({
-    code: 20000,
+    code: 20000
   })
 }
 

mock/transactions.ts

@@ -7,7 +7,7 @@ const transactionCount = 20
 
 for (let i = 0; i < transactionCount; i++) {
   transactionList.push({
-    orderId: faker.random.uuid(),
+    orderId: faker.datatype.uuid(),
     status: faker.random.arrayElement(['success', 'pending']),
     timestamp: faker.date.past().getTime(),
     username: faker.name.findName(),

package.json

@@ -14,102 +14,100 @@
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^3.2.6",
-    "axios": "^0.21.0",
-    "clipboard": "^2.0.6",
-    "codemirror": "^5.58.2",
-    "core-js": "^3.7.0",
+    "@toast-ui/editor": "^2.5.1",
+    "axios": "^0.21.1",
+    "clipboard": "^2.0.8",
+    "codemirror": "^5.60.0",
+    "core-js": "^3.10.0",
     "cors": "^2.8.5",
     "driver.js": "^0.9.8",
-    "echarts": "^4.9.0",
-    "element-ui": "^2.14.0",
-    "faker": "^5.1.0",
-    "file-saver": "^2.0.2",
-    "fuse.js": "^6.4.3",
+    "echarts": "^5.0.2",
+    "element-ui": "^2.15.1",
+    "faker": "^5.5.2",
+    "file-saver": "^2.0.5",
+    "fuse.js": "^6.4.6",
     "js-cookie": "^2.2.1",
     "jsonlint": "^1.6.3",
-    "jszip": "^3.5.0",
-    "lodash": "^4.17.20",
+    "jszip": "^3.6.0",
+    "lodash": "^4.17.21",
     "morgan": "^1.10.0",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.0",
-    "register-service-worker": "^1.7.1",
-    "screenfull": "^5.0.2",
+    "register-service-worker": "^1.7.2",
+    "screenfull": "^5.1.0",
     "script-loader": "^0.7.2",
-    "sortablejs": "^1.12.0",
-    "tinymce": "^5.5.1",
-    "tui-editor": "^1.4.10",
+    "sortablejs": "^1.13.0",
+    "tinymce": "^5.7.1",
     "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
     "vue-count-to": "^1.0.13",
-    "vue-i18n": "^8.22.1",
+    "vue-i18n": "^8.24.2",
     "vue-image-crop-upload": "^2.5.0",
-    "vue-property-decorator": "^9.0.2",
-    "vue-router": "^3.4.9",
+    "vue-property-decorator": "^9.1.2",
+    "vue-router": "^3.5.1",
     "vue-splitpane": "^1.0.6",
     "vue-svgicon": "^3.2.9",
     "vue2-dropzone": "^3.6.0",
     "vuedraggable": "^2.24.3",
-    "vuex": "^3.5.1",
+    "vuex": "^3.6.2",
     "vuex-module-decorators": "^1.0.1",
-    "xlsx": "^0.16.8",
+    "xlsx": "^0.16.9",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {
     "@types/clipboard": "^2.0.1",
-    "@types/codemirror": "^0.0.98",
+    "@types/codemirror": "^0.0.108",
     "@types/compression": "^1.7.0",
-    "@types/cors": "^2.8.8",
-    "@types/echarts": "^4.9.0",
-    "@types/express": "^4.17.8",
-    "@types/faker": "^5.1.4",
+    "@types/cors": "^2.8.10",
+    "@types/express": "^4.17.11",
+    "@types/faker": "^5.5.0",
     "@types/file-saver": "^2.0.1",
-    "@types/jest": "^26.0.15",
+    "@types/jest": "^26.0.22",
     "@types/js-cookie": "^2.2.6",
-    "@types/lodash": "^4.14.165",
+    "@types/lodash": "^4.14.168",
     "@types/morgan": "^1.9.2",
-    "@types/node": "^14.14.6",
+    "@types/node": "^14.14.37",
     "@types/nprogress": "^0.2.0",
     "@types/sortablejs": "^1.10.6",
     "@types/tinymce": "^4.6.0",
     "@types/vue-splitpane": "^1.0.1",
-    "@types/webpack-env": "^1.15.3",
     "@types/vuedraggable": "^2.23.2",
+    "@types/webpack-env": "^1.16.0",
     "@types/yamljs": "^0.2.31",
-    "@typescript-eslint/eslint-plugin": "^4.6.1",
-    "@typescript-eslint/parser": "^4.6.1",
-    "@vue/cli-plugin-babel": "^4.5.8",
-    "@vue/cli-plugin-eslint": "^4.5.8",
-    "@vue/cli-plugin-pwa": "^4.5.8",
-    "@vue/cli-plugin-router": "^4.5.8",
-    "@vue/cli-plugin-typescript": "^4.5.8",
-    "@vue/cli-plugin-unit-jest": "^4.5.8",
-    "@vue/cli-plugin-vuex": "^4.5.8",
-    "@vue/cli-service": "^4.5.8",
-    "@vue/eslint-config-standard": "^5.1.2",
+    "@typescript-eslint/eslint-plugin": "^4.20.0",
+    "@typescript-eslint/parser": "^4.20.0",
+    "@vue/cli-plugin-babel": "^4.5.12",
+    "@vue/cli-plugin-eslint": "^4.5.12",
+    "@vue/cli-plugin-pwa": "^4.5.12",
+    "@vue/cli-plugin-router": "^4.5.12",
+    "@vue/cli-plugin-typescript": "^4.5.12",
+    "@vue/cli-plugin-unit-jest": "^4.5.12",
+    "@vue/cli-plugin-vuex": "^4.5.12",
+    "@vue/cli-service": "^4.5.12",
+    "@vue/eslint-config-standard": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "@vue/test-utils": "^1.1.1",
-    "babel-loader": "^8.1.0",
-    "concurrently": "^5.3.0",
-    "eslint": "^7.13.0",
+    "@vue/test-utils": "^1.1.3",
+    "babel-loader": "^8.2.2",
+    "concurrently": "^6.0.0",
+    "eslint": "^7.23.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.2",
-    "eslint-plugin-vue": "^7.1.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-vue": "^7.8.0",
     "fibers": "^5.0.0",
-    "lint-staged": "^10.5.1",
-    "sass": "^1.29.0",
-    "sass-loader": "^10.0.5",
-    "style-resources-loader": "^1.3.3",
-    "swagger-routes-express": "^3.2.1",
-    "ts-jest": "^26.4.3",
-    "ts-node-dev": "^1.0.0",
-    "typescript": "3.8.3",
+    "lint-staged": "^10.5.4",
+    "sass": "^1.32.8",
+    "sass-loader": "^10.1.1",
+    "style-resources-loader": "^1.4.1",
+    "swagger-routes-express": "^3.3.0",
+    "ts-jest": "^26.5.4",
+    "ts-node-dev": "^1.1.6",
+    "typescript": "4.2.3",
     "vue-cli-plugin-element": "^1.0.1",
-    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-template-compiler": "^2.6.12",
-    "webpack": "^4.4.2"
+    "webpack": "^5.30.0"
   },
   "bugs": {
     "url": "https://github.com/armour/vue-typescript-admin-template/issues"

public/tinymce/skins/skin.shadowdom.min.css

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) Tiny Technologies, Inc. All rights reserved.
+ * Licensed under the LGPL or a commercial license.
+ * For LGPL see License.txt in the project root for license information.
+ * For commercial licenses see https://www.tiny.cloud/
+ */
+body.tox-dialog__disable-scroll{overflow:hidden}.tox-fullscreen{border:0;height:100%;left:0;margin:0;overflow:hidden;-ms-scroll-chaining:none;overscroll-behavior:none;padding:0;position:fixed;top:0;touch-action:pinch-zoom;width:100%}.tox.tox-tinymce.tox-fullscreen .tox-statusbar__resize-handle{display:none}.tox.tox-tinymce.tox-fullscreen{background-color:transparent;z-index:1200}.tox-shadowhost.tox-fullscreen{z-index:1200}.tox-fullscreen .tox.tox-tinymce-aux,.tox-fullscreen~.tox.tox-tinymce-aux{z-index:1201}

src/components/Charts/BarChart.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import echarts, { EChartOption } from 'echarts'
+import * as echarts from 'echarts'
 import { Component, Prop } from 'vue-property-decorator'
 import { mixins } from 'vue-class-component'
 import ResizeMixin from './mixins/resize'
@@ -130,7 +130,7 @@ export default class extends mixins(ResizeMixin) {
       animationDelayUpdate(idx: number) {
         return idx * 20
       }
-    } as EChartOption<EChartOption.SeriesBar>)
+    })
   }
 }
 </script>

src/components/Charts/LineChart.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import echarts, { EChartOption } from 'echarts'
+import * as echarts from 'echarts'
 import { Component, Prop } from 'vue-property-decorator'
 import { mixins } from 'vue-class-component'
 import ResizeMixin from './mixins/resize'
@@ -185,7 +185,7 @@ export default class extends mixins(ResizeMixin) {
         },
         data: [220, 182, 125, 145, 122, 191, 134, 150, 120, 110, 165, 122]
       }]
-    } as EChartOption<EChartOption.SeriesLine>)
+    })
   }
 }
 

src/components/Charts/MixedChart.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-import echarts, { EChartOption } from 'echarts'
+import * as echarts from 'echarts'
 import { Component, Prop } from 'vue-property-decorator'
 import { mixins } from 'vue-class-component'
 import ResizeMixin from './mixins/resize'
@@ -242,7 +242,7 @@ export default class extends mixins(ResizeMixin) {
         ]
       }
       ]
-    } as EChartOption<EChartOption.SeriesLine | EChartOption.SeriesBar>)
+    })
   }
 }
 </script>

src/components/MarkdownEditor/default-options.ts

@@ -1,4 +1,4 @@
-// Doc: https://nhn.github.io/tui.editor/api/latest/ToastUIEditor.html#ToastUIEditor
+// Doc: https://nhn.github.io/tui.editor/latest/ToastUIEditor
 export default {
   previewStyle: 'vertical',
   usageStatistics: false,