From fe43c9cd3a3fab90e508d82a78a51749f14339a7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 19 Apr 2022 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=B6=85=E9=93=BE=E6=8E=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/EditBar.vue | 15 ++- .../canvas/components/Editor/Hyperlinks.vue | 5 +- .../components/Editor/HyperlinksDialog.vue | 113 ++++++++++++++++++ .../canvas/components/Editor/SettingMenu.vue | 23 ++++ .../components/canvas/components/Toolbar.vue | 1 + frontend/src/components/canvas/utils/utils.js | 4 +- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 71 +++++------ frontend/src/lang/zh.js | 1 + frontend/src/styles/deicon/demo_index.html | 75 +++++++++++- frontend/src/styles/deicon/iconfont.css | 18 ++- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 21 ++++ frontend/src/styles/deicon/iconfont.ttf | Bin 22872 -> 23692 bytes frontend/src/styles/deicon/iconfont.woff | Bin 14188 -> 14764 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 12040 -> 12532 bytes 16 files changed, 303 insertions(+), 47 deletions(-) create mode 100644 frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 9c7fd9d56d..39b75e3237 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -29,6 +29,11 @@ + + + + + @@ -39,9 +44,10 @@ import bus from '@/utils/bus' import SettingMenu from '@/components/canvas/components/Editor/SettingMenu' import LinkageField from '@/components/canvas/components/Editor/LinkageField' import toast from '@/components/canvas/utils/toast' +import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks' export default { - components: { SettingMenu, LinkageField }, + components: { Hyperlinks, SettingMenu, LinkageField }, props: { element: { @@ -78,6 +84,9 @@ export default { mounted() { }, computed: { + showJumpFlag() { + return this.curComponent && this.curComponent.hyperlinks && this.curComponent.hyperlinks.enable + }, // 联动区域按钮显示 linkageAreaShow() { return this.linkageSettingStatus && this.element !== this.curLinkageView && this.element.type === 'view' @@ -147,6 +156,10 @@ export default { showViewDetails() { this.$emit('showViewDetails') }, + componentJump() { + window.open(url, '_blank') + // this.$emit('showViewDetails') + }, auxiliaryMatrixChange() { if (this.curComponent.auxiliaryMatrix) { this.curComponent.auxiliaryMatrix = false diff --git a/frontend/src/components/canvas/components/Editor/Hyperlinks.vue b/frontend/src/components/canvas/components/Editor/Hyperlinks.vue index 05bc9e8d55..f354ba2add 100644 --- a/frontend/src/components/canvas/components/Editor/Hyperlinks.vue +++ b/frontend/src/components/canvas/components/Editor/Hyperlinks.vue @@ -28,7 +28,7 @@ - + @@ -119,5 +119,8 @@ export default { height: 200px; overflow: auto; } + .icon-font{ + color: white; + } diff --git a/frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue b/frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue new file mode 100644 index 0000000000..92de293ebe --- /dev/null +++ b/frontend/src/components/canvas/components/Editor/HyperlinksDialog.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index 3fe4ab34cc..6c64133a79 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -15,21 +15,40 @@ {{ $t('panel.add_tab') }} {{ $t('panel.setting_jump') }} {{ $t('panel.component_style') }} + + + {{ $t('panel.hyperlinks') }} + + + + + +