From b71b78f9f16a06c4506d3b9d58a53d8ac3377b6c Mon Sep 17 00:00:00 2001 From: pipipi-pikachu <1171051090@qq.com> Date: Sat, 2 Jan 2021 20:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=96=E8=89=B2=E5=99=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 11 + package.json | 2 + src/components/ColorPicker/Alpha.vue | 131 ++++++++++ src/components/ColorPicker/Checkboard.vue | 72 ++++++ src/components/ColorPicker/EditableInput.vue | 63 +++++ src/components/ColorPicker/Hue.vue | 127 ++++++++++ src/components/ColorPicker/Saturation.vue | 122 ++++++++++ src/components/ColorPicker/index.vue | 239 +++++++++++++++++++ src/components/Popover.vue | 33 --- src/views/Editor/Toolbar/SlideStylePanel.vue | 15 +- 10 files changed, 780 insertions(+), 35 deletions(-) create mode 100644 src/components/ColorPicker/Alpha.vue create mode 100644 src/components/ColorPicker/Checkboard.vue create mode 100644 src/components/ColorPicker/EditableInput.vue create mode 100644 src/components/ColorPicker/Hue.vue create mode 100644 src/components/ColorPicker/Saturation.vue create mode 100644 src/components/ColorPicker/index.vue delete mode 100644 src/components/Popover.vue diff --git a/package-lock.json b/package-lock.json index acd059e8..5bcf19d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1935,6 +1935,12 @@ "integrity": "sha1-qcpLcKGLJwzLK8Cqr+/R1Ia36nQ=", "dev": true }, + "@types/tinycolor2": { + "version": "1.4.2", + "resolved": "https://registry.npm.taobao.org/@types/tinycolor2/download/@types/tinycolor2-1.4.2.tgz", + "integrity": "sha1-chylxdGimItKiG41wv/Fc1tq+98=", + "dev": true + }, "@types/uglify-js": { "version": "3.11.1", "resolved": "https://registry.npm.taobao.org/@types/uglify-js/download/@types/uglify-js-3.11.1.tgz?cache=0&sync_timestamp=1605057452755&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fuglify-js%2Fdownload%2F%40types%2Fuglify-js-3.11.1.tgz", @@ -15318,6 +15324,11 @@ "resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz", "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM=" }, + "tinycolor2": { + "version": "1.4.2", + "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz", + "integrity": "sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM=" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 155e140c..44dd8356 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "prosemirror-state": "^1.3.3", "prosemirror-view": "^1.16.4", "store2": "^2.12.0", + "tinycolor2": "^1.4.2", "vue": "^3.0.0", "vuedraggable": "^4.0.1", "vuex": "^4.0.0-0" @@ -45,6 +46,7 @@ "@types/prosemirror-schema-basic": "^1.0.1", "@types/prosemirror-schema-list": "^1.0.1", "@types/resize-observer-browser": "^0.1.4", + "@types/tinycolor2": "^1.4.2", "@typescript-eslint/eslint-plugin": "^2.33.0", "@typescript-eslint/parser": "^2.33.0", "@vue/cli-plugin-babel": "~4.5.0", diff --git a/src/components/ColorPicker/Alpha.vue b/src/components/ColorPicker/Alpha.vue new file mode 100644 index 00000000..737bd3b2 --- /dev/null +++ b/src/components/ColorPicker/Alpha.vue @@ -0,0 +1,131 @@ + + + + + \ No newline at end of file diff --git a/src/components/ColorPicker/Checkboard.vue b/src/components/ColorPicker/Checkboard.vue new file mode 100644 index 00000000..86d01f74 --- /dev/null +++ b/src/components/ColorPicker/Checkboard.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file diff --git a/src/components/ColorPicker/EditableInput.vue b/src/components/ColorPicker/EditableInput.vue new file mode 100644 index 00000000..858350c1 --- /dev/null +++ b/src/components/ColorPicker/EditableInput.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/ColorPicker/Hue.vue b/src/components/ColorPicker/Hue.vue new file mode 100644 index 00000000..2b074d39 --- /dev/null +++ b/src/components/ColorPicker/Hue.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/src/components/ColorPicker/Saturation.vue b/src/components/ColorPicker/Saturation.vue new file mode 100644 index 00000000..93f5abdb --- /dev/null +++ b/src/components/ColorPicker/Saturation.vue @@ -0,0 +1,122 @@ + + + + + \ No newline at end of file diff --git a/src/components/ColorPicker/index.vue b/src/components/ColorPicker/index.vue new file mode 100644 index 00000000..096d167b --- /dev/null +++ b/src/components/ColorPicker/index.vue @@ -0,0 +1,239 @@ + + + + + \ No newline at end of file diff --git a/src/components/Popover.vue b/src/components/Popover.vue deleted file mode 100644 index a5920501..00000000 --- a/src/components/Popover.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/Editor/Toolbar/SlideStylePanel.vue b/src/views/Editor/Toolbar/SlideStylePanel.vue index c9dec99c..dccc76b6 100644 --- a/src/views/Editor/Toolbar/SlideStylePanel.vue +++ b/src/views/Editor/Toolbar/SlideStylePanel.vue @@ -1,13 +1,24 @@ \ No newline at end of file