From fe23eb8683611dfebb854e5df8e7a02c91ef050a Mon Sep 17 00:00:00 2001 From: lhyUnited Date: Mon, 22 Mar 2021 18:39:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0prosemirror-view?= =?UTF-8?q?=E8=87=B31.18.1=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 ++++++++++++++++------ package.json | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06345e3f..72afcd0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10061,7 +10061,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "normalize-path": { @@ -11572,6 +11573,13 @@ "thenify-all": "^1.0.0" } }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591646310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz", + "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -13353,9 +13361,9 @@ } }, "prosemirror-view": { - "version": "1.17.2", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.17.2.tgz", - "integrity": "sha512-8jHmdl1q/Mvjfv185I5FldBitkkVpNOIK0Z/jIuan4cZIqXRpKu7DxxeLrTouJDzgrf1kWvfG/szEb6Bg9/4dA==", + "version": "1.18.1", + "resolved": "https://registry.npm.taobao.org/prosemirror-view/download/prosemirror-view-1.18.1.tgz", + "integrity": "sha1-Uq0cZ/URROJ+Nou6EpFCzofHeR4=", "requires": { "prosemirror-model": "^1.1.0", "prosemirror-state": "^1.0.0", @@ -16996,7 +17004,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { @@ -17300,7 +17309,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { diff --git a/package.json b/package.json index 2c7df898..e1b786cd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "prosemirror-schema-basic": "^1.1.2", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.3", - "prosemirror-view": "^1.16.4", + "prosemirror-view": "^1.18.1", "tinycolor2": "^1.4.2", "vue": "^3.0.0", "vuedraggable": "^4.0.1", From 72eae7ca78e9a55da15d55fb1eccd94e8297c503 Mon Sep 17 00:00:00 2001 From: lhyUnited Date: Mon, 22 Mar 2021 18:43:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94issue=20fixes=20#3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 ++++++++++++++++------ package.json | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06345e3f..72afcd0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10061,7 +10061,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "normalize-path": { @@ -11572,6 +11573,13 @@ "thenify-all": "^1.0.0" } }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.2.tgz?cache=0&sync_timestamp=1602591646310&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnan%2Fdownload%2Fnan-2.14.2.tgz", + "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -13353,9 +13361,9 @@ } }, "prosemirror-view": { - "version": "1.17.2", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.17.2.tgz", - "integrity": "sha512-8jHmdl1q/Mvjfv185I5FldBitkkVpNOIK0Z/jIuan4cZIqXRpKu7DxxeLrTouJDzgrf1kWvfG/szEb6Bg9/4dA==", + "version": "1.18.1", + "resolved": "https://registry.npm.taobao.org/prosemirror-view/download/prosemirror-view-1.18.1.tgz", + "integrity": "sha1-Uq0cZ/URROJ+Nou6EpFCzofHeR4=", "requires": { "prosemirror-model": "^1.1.0", "prosemirror-state": "^1.0.0", @@ -16996,7 +17004,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { @@ -17300,7 +17309,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { diff --git a/package.json b/package.json index 2c7df898..e1b786cd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "prosemirror-schema-basic": "^1.1.2", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.3", - "prosemirror-view": "^1.16.4", + "prosemirror-view": "^1.18.1", "tinycolor2": "^1.4.2", "vue": "^3.0.0", "vuedraggable": "^4.0.1", From 5af4dbe74794080641547f04495bff6ad8ac5044 Mon Sep 17 00:00:00 2001 From: lhyUnited Date: Mon, 22 Mar 2021 18:48:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88taobao=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 22 ++++++++++++++++------ package.json | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06345e3f..2afc7c40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10061,7 +10061,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "normalize-path": { @@ -11572,6 +11573,13 @@ "thenify-all": "^1.0.0" } }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -13353,9 +13361,9 @@ } }, "prosemirror-view": { - "version": "1.17.2", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.17.2.tgz", - "integrity": "sha512-8jHmdl1q/Mvjfv185I5FldBitkkVpNOIK0Z/jIuan4cZIqXRpKu7DxxeLrTouJDzgrf1kWvfG/szEb6Bg9/4dA==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.18.1.tgz", + "integrity": "sha512-TZd8byDRfdopLiokBY7T27msCSfWqqRxWs/LnBbdI030F+iI2kS+tO59/XFnpZxMLFKlJgOgGGhM9SzD1Nwdxw==", "requires": { "prosemirror-model": "^1.1.0", "prosemirror-state": "^1.0.0", @@ -16996,7 +17004,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { @@ -17300,7 +17309,8 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0" + "bindings": "^1.5.0", + "nan": "^2.12.1" } }, "glob-parent": { diff --git a/package.json b/package.json index 2c7df898..e1b786cd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "prosemirror-schema-basic": "^1.1.2", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.3", - "prosemirror-view": "^1.16.4", + "prosemirror-view": "^1.18.1", "tinycolor2": "^1.4.2", "vue": "^3.0.0", "vuedraggable": "^4.0.1", From d7f79ae689739c2a102b7bc96f7fec82dd2b3e0a Mon Sep 17 00:00:00 2001 From: lhyUnited Date: Sat, 27 Mar 2021 15:43:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88user-select?= =?UTF-8?q?=E7=BB=A7=E6=89=BF,=20fix=20#7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/prosemirror.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/assets/styles/prosemirror.scss b/src/assets/styles/prosemirror.scss index 1aa7feaf..4440453e 100644 --- a/src/assets/styles/prosemirror.scss +++ b/src/assets/styles/prosemirror.scss @@ -5,6 +5,8 @@ border: 0; font-size: 20px; word-break: break-word; + // safari取消继承 issue #7 + user-select: text; ::selection { background-color: rgba(#d14424, 0.3);