diff --git a/backend/pom.xml b/backend/pom.xml index 0dbfcb18e5..519f4acc6d 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -420,7 +420,7 @@ - + @@ -486,7 +486,7 @@ - + diff --git a/backend/src/main/java/io/dataease/config/WebSecurityConfig.java b/backend/src/main/java/io/dataease/config/WebSecurityConfig.java new file mode 100644 index 0000000000..c3c29f34a4 --- /dev/null +++ b/backend/src/main/java/io/dataease/config/WebSecurityConfig.java @@ -0,0 +1,9 @@ +package io.dataease.config; + +/** + * Author: wangjiahao + * Date: 2022/3/27 + * Description: + */ +public class WebSecurityConfig { +} diff --git a/frontend/package.json b/frontend/package.json index 9cd95b9828..e0c6fa78f8 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -54,6 +54,7 @@ "vue-axios": "3.2.4", "vue-clipboard2": "0.3.1", "vue-codemirror": "^4.0.6", + "vue-friendly-iframe": "^0.20.0", "vue-fullscreen": "^2.5.2", "vue-i18n": "7.3.2", "vue-proportion-directive": "^1.1.0", diff --git a/frontend/src/components/canvas/components/Editor/FrameLinks.vue b/frontend/src/components/canvas/components/Editor/FrameLinks.vue new file mode 100644 index 0000000000..b7f918dd96 --- /dev/null +++ b/frontend/src/components/canvas/components/Editor/FrameLinks.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index 94cdc24b5c..3f89341cc8 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -134,6 +134,11 @@ +
+ + + +
@@ -156,9 +161,10 @@ import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks' import VideoLinks from '@/components/canvas/components/Editor/VideoLinks' import DateFormat from '@/components/canvas/components/Editor/DateFormat' import { COLOR_PANEL } from '@/views/chart/chart/chart' +import FrameLinks from '@/components/canvas/components/Editor/FrameLinks' export default { - components: { Hyperlinks, DateFormat, VideoLinks }, + components: { FrameLinks, Hyperlinks, DateFormat, VideoLinks }, props: { scrollLeft: { type: Number, @@ -292,6 +298,10 @@ export default { 'de-video': [ 'opacity', 'videoLinks' + ], + 'de-frame': [ + 'opacity', + 'frameLinks' ] } }, diff --git a/frontend/src/components/canvas/custom-component/DeFrame.vue b/frontend/src/components/canvas/custom-component/DeFrame.vue new file mode 100644 index 0000000000..61e8d7cf7d --- /dev/null +++ b/frontend/src/components/canvas/custom-component/DeFrame.vue @@ -0,0 +1,106 @@ +