Merge remote-tracking branch 'upstream/master' into hotfix/select-issue

This commit is contained in:
lhyUnited 2021-03-27 15:48:33 +08:00
commit dd3b2c1346
2 changed files with 763 additions and 691 deletions

1444
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@
"dependencies": {
"@icon-park/vue-next": "^1.2.6",
"animate.css": "^4.1.1",
"ant-design-vue": "^2.0.0",
"ant-design-vue": "^2.1.0",
"chartist": "^0.11.4",
"clipboard": "^2.0.6",
"core-js": "^3.6.5",
@ -19,7 +19,7 @@
"dexie": "^3.0.3",
"lodash": "^4.17.20",
"mitt": "^2.1.0",
"prosemirror-commands": "^1.1.4",
"prosemirror-commands": "^1.1.7",
"prosemirror-dropcursor": "^1.3.2",
"prosemirror-gapcursor": "^1.1.5",
"prosemirror-history": "^1.1.3",
@ -30,9 +30,9 @@
"prosemirror-state": "^1.3.3",
"prosemirror-view": "^1.18.1",
"tinycolor2": "^1.4.2",
"vue": "^3.0.0",
"vue": "^3.0.7",
"vuedraggable": "^4.0.1",
"vuex": "^4.0.0-0"
"vuex": "^4.0.0"
},
"devDependencies": {
"@commitlint/cli": "^11.0.0",
@ -59,7 +59,7 @@
"@vue/cli-plugin-unit-jest": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/compiler-sfc": "^3.0.0",
"@vue/compiler-sfc": "^3.0.7",
"@vue/eslint-config-typescript": "^5.0.2",
"@vue/test-utils": "^2.0.0-0",
"babel-plugin-import": "^1.13.3",