center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-10-14 18:59:14 +08:00
commit 18aa248f79
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/pom.xml
View File

@ -258,10 +258,15 @@
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<includes> <!-- <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes> -->
<filtering>true</filtering> <filtering>true</filtering>
<excludes>
<exclude>static/**/*.woff</exclude>
<exclude>static/**/*.woff2</exclude>
<exclude>static/**/*.ttf</exclude>
</excludes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>

8
frontend/src/components/canvas/custom-component/VText.vue
View File

@ -58,7 +58,7 @@ export default {
computed: { computed: {
textInfo() { textInfo() {
if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) { if (this.element && this.element.hyperlinks && this.element.hyperlinks.enable) {
return "<a target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>' return "<a title='" + this.element.hyperlinks.content + "' target='" + this.element.hyperlinks.openMode + "' href='" + this.element.hyperlinks.content + "'>" + this.element.propValue + '</a>'
} else { } else {
return this.element.propValue return this.element.propValue
} }
@ -154,6 +154,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
outline: none; outline: none;
} }
.canEdit { .canEdit {
@ -161,4 +162,9 @@ export default {
height: 100%; height: 100%;
} }
} }
::v-deep a:hover {
text-decoration: underline!important;
color: blue!important;
}
</style> </style>