centaline-data-driven 1.4.2 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/centaline/dynamicForm/src/dynamicForm.vue +10 -2
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +15 -6
- package/src/centaline/progress/src/progress.vue +5 -1
- package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
|
@@ -487,13 +487,21 @@
|
|
|
487
487
|
}
|
|
488
488
|
else{
|
|
489
489
|
if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
|
|
490
|
-
window.open(
|
|
490
|
+
var tempwindow=window.open('about:blank');
|
|
491
|
+
tempwindow.location=field.action;
|
|
492
|
+
// document.body.addEventListener('click', function() {
|
|
493
|
+
// window.open(field.action, "_blank");
|
|
494
|
+
// });
|
|
491
495
|
}
|
|
492
496
|
else {
|
|
493
497
|
field.doAction(submitData, (data) => {
|
|
494
498
|
if(data.content){
|
|
495
499
|
if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
|
|
496
|
-
window.open(
|
|
500
|
+
var tempwindow=window.open('about:blank');
|
|
501
|
+
tempwindow.location=data.content;
|
|
502
|
+
// document.body.addEventListener('click', function() {
|
|
503
|
+
// window.open(data.content, "_blank");
|
|
504
|
+
// });
|
|
497
505
|
}
|
|
498
506
|
else {
|
|
499
507
|
}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
:optionApi="model.optionApi" :searchModel="model.searchModel">
|
|
12
12
|
</ct-tabletoolbar>
|
|
13
13
|
|
|
14
|
-
<ct-tabletip ref="listHeader" class="ct-search-table-list-header" :tip="model.listHeader"
|
|
14
|
+
<ct-tabletip ref="listHeader" class="ct-search-table-list-header ct-search-table-tag" :tip="model.listHeader"
|
|
15
15
|
v-if="!isLoading && model"></ct-tabletip>
|
|
16
16
|
|
|
17
17
|
<div v-loading="tableLoading" v-if="!isLoading && model"
|
|
@@ -616,7 +616,7 @@ export default {
|
|
|
616
616
|
var h2 = this.$refs.searchTable.offsetTop | 0;
|
|
617
617
|
var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
|
|
618
618
|
var h4 = this.$refs.footer.$el.offsetHeight | 0;
|
|
619
|
-
var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
|
|
619
|
+
var h5 = this.$refs.listHeader ? (this.$refs.listHeader.$el.offsetHeight + 12) | 0 : 0;
|
|
620
620
|
var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
|
|
621
621
|
var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
|
|
622
622
|
var h8 = this.$refs.popupButton ? this.$refs.popupButton.offsetHeight + 21 : 0;
|
|
@@ -973,13 +973,21 @@ export default {
|
|
|
973
973
|
}
|
|
974
974
|
else {
|
|
975
975
|
if (field.action.indexOf("http://") === 0 || field.action.indexOf("https://") === 0) {
|
|
976
|
-
window.open(
|
|
976
|
+
var tempwindow=window.open('about:blank');
|
|
977
|
+
tempwindow.location=field.action;
|
|
978
|
+
// document.body.addEventListener('click', function() {
|
|
979
|
+
// window.open(field.action, "_blank");
|
|
980
|
+
// });
|
|
977
981
|
}
|
|
978
982
|
else {
|
|
979
983
|
field.doAction(submitData, (data) => {
|
|
980
984
|
if (data.content) {
|
|
981
|
-
if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
|
|
982
|
-
window.open(
|
|
985
|
+
if (data.content.indexOf("http://") === 0 || data.content.indexOf("https://") === 0) {
|
|
986
|
+
var tempwindow=window.open('about:blank');
|
|
987
|
+
tempwindow.location=data.content;
|
|
988
|
+
// document.body.addEventListener('click', function() {
|
|
989
|
+
// window.open(data.content, "_blank");
|
|
990
|
+
// });
|
|
983
991
|
}
|
|
984
992
|
else {
|
|
985
993
|
}
|
|
@@ -1834,10 +1842,11 @@ export default {
|
|
|
1834
1842
|
min-width: inherit !important;
|
|
1835
1843
|
}
|
|
1836
1844
|
|
|
1837
|
-
.ct-searchtable .ct-search-table-
|
|
1845
|
+
.ct-searchtable .ct-search-table-tag {
|
|
1838
1846
|
background-color: #fdf6ec;
|
|
1839
1847
|
border-color: #faecd8;
|
|
1840
1848
|
width: 100%;
|
|
1841
1849
|
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
|
|
1850
|
+
margin-bottom: 12px;
|
|
1842
1851
|
}
|
|
1843
1852
|
</style>
|
|
@@ -59,7 +59,11 @@
|
|
|
59
59
|
this.percentage = data.percentage;
|
|
60
60
|
if (data.flagFinished) {
|
|
61
61
|
if(this.progressType=='export' && data.content){
|
|
62
|
-
window.open(
|
|
62
|
+
var tempwindow=window.open('about:blank');
|
|
63
|
+
tempwindow.location=data.content;
|
|
64
|
+
// document.body.addEventListener('click', function() {
|
|
65
|
+
// window.open(data.content, "_blank");
|
|
66
|
+
// });
|
|
63
67
|
}
|
|
64
68
|
setTimeout(() => { self.$emit('finished',data); }, 800);
|
|
65
69
|
}
|