From 4c7cd47fb6e7b3d7e9db02343e3de9e8ab8a0c0f Mon Sep 17 00:00:00 2001 From: tar_bin Date: Fri, 18 Aug 2023 21:41:33 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B5=B5=E6=96=87=E5=AD=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=94=BB=E9=9D=A2=E3=81=AE=E8=A1=A8=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=B7=E5=90=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af) --- .../src/components/MKCustomEmojiEditDraft.vue | 229 +++++++ .../src/components/MkCustomEmojiEditLocal.vue | 225 +++++++ .../components/MkCustomEmojiEditRemote.vue | 110 ++++ .../MkEmojiEditDialog.vue} | 0 packages/frontend/src/pages/about.emojis.vue | 2 +- .../src/pages/custom-emojis-manager.vue | 562 +----------------- 6 files changed, 582 insertions(+), 546 deletions(-) create mode 100644 packages/frontend/src/components/MKCustomEmojiEditDraft.vue create mode 100644 packages/frontend/src/components/MkCustomEmojiEditLocal.vue create mode 100644 packages/frontend/src/components/MkCustomEmojiEditRemote.vue rename packages/frontend/src/{pages/emoji-edit-dialog.vue => components/MkEmojiEditDialog.vue} (100%) diff --git a/packages/frontend/src/components/MKCustomEmojiEditDraft.vue b/packages/frontend/src/components/MKCustomEmojiEditDraft.vue new file mode 100644 index 0000000000..17576b7b06 --- /dev/null +++ b/packages/frontend/src/components/MKCustomEmojiEditDraft.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/packages/frontend/src/components/MkCustomEmojiEditLocal.vue b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue new file mode 100644 index 0000000000..7112a38430 --- /dev/null +++ b/packages/frontend/src/components/MkCustomEmojiEditLocal.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/packages/frontend/src/components/MkCustomEmojiEditRemote.vue b/packages/frontend/src/components/MkCustomEmojiEditRemote.vue new file mode 100644 index 0000000000..26c8dd66ac --- /dev/null +++ b/packages/frontend/src/components/MkCustomEmojiEditRemote.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/components/MkEmojiEditDialog.vue similarity index 100% rename from packages/frontend/src/pages/emoji-edit-dialog.vue rename to packages/frontend/src/components/MkEmojiEditDialog.vue diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue index 805662065c..a49a70c88a 100644 --- a/packages/frontend/src/pages/about.emojis.vue +++ b/packages/frontend/src/pages/about.emojis.vue @@ -120,7 +120,7 @@ function toggleTag(tag) { } const edit = () => { - os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), { + os.popup(defineAsyncComponent(() => import('@/components/MkEmojiEditDialog.vue')), { isRequest: true, }, { done: result => { diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue index 5dcd2009ed..6e55ffb945 100644 --- a/packages/frontend/src/pages/custom-emojis-manager.vue +++ b/packages/frontend/src/pages/custom-emojis-manager.vue @@ -10,106 +10,13 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - - - - - -
- Select all - Set category - Set tag - Add tag - Remove tag - Set License - Delete -
- - - - +
-
- - - - +
-
- - - - - - - - - - - - - +
@@ -118,171 +25,30 @@ SPDX-License-Identifier: AGPL-3.0-only