From af1a678edb8f26ef42acf3def144215fba9b4f7b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 23 Jun 2022 16:20:01 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E5=AD=97=E4=BD=93=E5=B8=83=E5=B1=80=E7=AD=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/TextAttr.vue | 4 +- .../components/canvas/components/Toolbar.vue | 412 +++++++++++------- frontend/src/icons/svg/icon-more.svg | 3 + frontend/src/icons/svg/icon-quicksetting.svg | 3 + .../src/icons/svg/icon_clear_outlined.svg | 3 + .../src/icons/svg/icon_dialpad_outlined.svg | 11 + .../src/icons/svg/icon_effects_outlined.svg | 4 + frontend/src/icons/svg/icon_left_outlined.svg | 3 + .../src/icons/svg/icon_magnify_outlined.svg | 3 + .../svg/icon_moments-categories_outlined.svg | 4 + frontend/src/icons/svg/icon_pc_outlined.svg | 3 + .../src/icons/svg/icon_phone_outlined.svg | 5 + frontend/src/icons/svg/icon_redo_outlined.svg | 3 + .../src/icons/svg/icon_right_outlined.svg | 3 + frontend/src/icons/svg/icon_undo_outlined.svg | 3 + .../src/views/panel/SubjectSetting/index.vue | 1 - frontend/src/views/panel/edit/index.vue | 3 +- 17 files changed, 311 insertions(+), 160 deletions(-) create mode 100644 frontend/src/icons/svg/icon-more.svg create mode 100644 frontend/src/icons/svg/icon-quicksetting.svg create mode 100644 frontend/src/icons/svg/icon_clear_outlined.svg create mode 100644 frontend/src/icons/svg/icon_dialpad_outlined.svg create mode 100644 frontend/src/icons/svg/icon_effects_outlined.svg create mode 100644 frontend/src/icons/svg/icon_left_outlined.svg create mode 100644 frontend/src/icons/svg/icon_magnify_outlined.svg create mode 100644 frontend/src/icons/svg/icon_moments-categories_outlined.svg create mode 100644 frontend/src/icons/svg/icon_pc_outlined.svg create mode 100644 frontend/src/icons/svg/icon_phone_outlined.svg create mode 100644 frontend/src/icons/svg/icon_redo_outlined.svg create mode 100644 frontend/src/icons/svg/icon_right_outlined.svg create mode 100644 frontend/src/icons/svg/icon_undo_outlined.svg diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 8525c85377..4ac2dfb775 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -153,7 +153,7 @@
- +
@@ -345,7 +345,7 @@ export default { mainStyle() { const style = { left: (this.getPositionX(this.curComponent.style.left) - this.scrollLeft) + 'px', - top: (this.getPositionY(this.curComponent.style.top) - this.scrollTop - 3) + 'px' + top: (this.getPositionY(this.curComponent.style.top) - this.scrollTop + 25) + 'px' } return style }, diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 4a70cf7612..0c670b939b 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -3,12 +3,10 @@
- - - + - +
@@ -28,69 +26,73 @@
- - - - + + {{ panelInfo.name }}
- + - + - + - - + - - {{ $t('panel.more') }} + + + {{ $t('panel.more') }} + - + - - {{ $t('panel.new_element_distribution') }} - + + {{ $t('panel.new_element_distribution') }} + - - {{ $t('panel.suspension') }} - + + {{ $t('panel.suspension') }} + - - {{ $t('panel.matrix') }} - + + {{ $t('panel.matrix') }} + - - {{ $t('panel.aided_grid') }} - + + {{ $t('panel.aided_grid') }} + - - {{ $t('panel.params_setting') }} + + {{ $t('panel.params_setting') }} - - {{ $t('panel.clean_canvas') }} + + {{ $t('panel.clean_canvas') }} - {{ $t('panel.panel_style') }} - {{ $t('panel.batch_opt') }} - + + {{ $t('panel.panel_style') }} + + {{ $t('panel.batch_opt') }} + {{ $t('commons.save') }} @@ -110,7 +112,9 @@ - {{ $t('panel.panel_save_warn_tips') }} + {{ + $t('panel.panel_save_warn_tips') + }}
@@ -435,8 +439,8 @@ export default { cancelLinkageSettingStatus() { this.$store.commit('clearLinkageSettingInfo') }, - auxiliaryMatrixChange() { - this.canvasStyleData.auxiliaryMatrix = !this.canvasStyleData.auxiliaryMatrix + auxiliaryMatrixChange(value) { + this.canvasStyleData.auxiliaryMatrix = value }, showGridChange() { this.$store.state.styleChangeTimes++ @@ -496,141 +500,237 @@ export default { diff --git a/frontend/src/icons/svg/icon-more.svg b/frontend/src/icons/svg/icon-more.svg new file mode 100644 index 0000000000..76178f1653 --- /dev/null +++ b/frontend/src/icons/svg/icon-more.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon-quicksetting.svg b/frontend/src/icons/svg/icon-quicksetting.svg new file mode 100644 index 0000000000..cf705e8134 --- /dev/null +++ b/frontend/src/icons/svg/icon-quicksetting.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_clear_outlined.svg b/frontend/src/icons/svg/icon_clear_outlined.svg new file mode 100644 index 0000000000..ab015c6098 --- /dev/null +++ b/frontend/src/icons/svg/icon_clear_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_dialpad_outlined.svg b/frontend/src/icons/svg/icon_dialpad_outlined.svg new file mode 100644 index 0000000000..839815857e --- /dev/null +++ b/frontend/src/icons/svg/icon_dialpad_outlined.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/frontend/src/icons/svg/icon_effects_outlined.svg b/frontend/src/icons/svg/icon_effects_outlined.svg new file mode 100644 index 0000000000..6d798aafa8 --- /dev/null +++ b/frontend/src/icons/svg/icon_effects_outlined.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/icons/svg/icon_left_outlined.svg b/frontend/src/icons/svg/icon_left_outlined.svg new file mode 100644 index 0000000000..3badd60058 --- /dev/null +++ b/frontend/src/icons/svg/icon_left_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_magnify_outlined.svg b/frontend/src/icons/svg/icon_magnify_outlined.svg new file mode 100644 index 0000000000..4bce7bca29 --- /dev/null +++ b/frontend/src/icons/svg/icon_magnify_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_moments-categories_outlined.svg b/frontend/src/icons/svg/icon_moments-categories_outlined.svg new file mode 100644 index 0000000000..bdd434c8f8 --- /dev/null +++ b/frontend/src/icons/svg/icon_moments-categories_outlined.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/icons/svg/icon_pc_outlined.svg b/frontend/src/icons/svg/icon_pc_outlined.svg new file mode 100644 index 0000000000..3f62df0691 --- /dev/null +++ b/frontend/src/icons/svg/icon_pc_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_phone_outlined.svg b/frontend/src/icons/svg/icon_phone_outlined.svg new file mode 100644 index 0000000000..4e1f3c7f20 --- /dev/null +++ b/frontend/src/icons/svg/icon_phone_outlined.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/frontend/src/icons/svg/icon_redo_outlined.svg b/frontend/src/icons/svg/icon_redo_outlined.svg new file mode 100644 index 0000000000..f3c659b2d2 --- /dev/null +++ b/frontend/src/icons/svg/icon_redo_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_right_outlined.svg b/frontend/src/icons/svg/icon_right_outlined.svg new file mode 100644 index 0000000000..f5e127d5dd --- /dev/null +++ b/frontend/src/icons/svg/icon_right_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_undo_outlined.svg b/frontend/src/icons/svg/icon_undo_outlined.svg new file mode 100644 index 0000000000..7ef459920a --- /dev/null +++ b/frontend/src/icons/svg/icon_undo_outlined.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue index a34ae52d3f..d9c4ab3dd2 100644 --- a/frontend/src/views/panel/SubjectSetting/index.vue +++ b/frontend/src/views/panel/SubjectSetting/index.vue @@ -128,7 +128,6 @@ export default {