forked from github/dataease
Merge branch 'dev' of github.com:dataease/dataease into dev
This commit is contained in:
commit
18aa248f79
@ -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>
|
||||||
|
@ -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>
|
||||||
|
Loading…
Reference in New Issue
Block a user