centaline-data-driven 1.3.86 → 1.3.87
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/dynamicSearchList/src/dynamicSearchTable.vue +1 -1
- package/src/centaline/dynamicTree/src/dynamicSearchTree.vue +4 -1
- package/src/centaline/dynamicTree/src/dynamicTreeList.vue +10 -4
- package/src/centaline/loader/src/ctl/FormList.js +11 -3
- package/src/main.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
|
@@ -864,7 +864,7 @@
|
|
|
864
864
|
self.$common.viewerfile(field, MediaAlbum, 0, 0);
|
|
865
865
|
}
|
|
866
866
|
}
|
|
867
|
-
else if (field.isUrlInLayer) {//URL
|
|
867
|
+
else if (field.isUrlInLayer) {//URL页面（弹层iframe）
|
|
868
868
|
var dialogOption = {
|
|
869
869
|
title: field.pageTitle,
|
|
870
870
|
pane: self.$common.getParentPane(self),
|
|
@@ -22,7 +22,7 @@ export default {
|
|
|
22
22
|
searchConditionApi: String,
|
|
23
23
|
searchDataApi: String,
|
|
24
24
|
flagsearch: Boolean,
|
|
25
|
-
searchtreeHeight:
|
|
25
|
+
searchtreeHeight: Number,
|
|
26
26
|
screenPara: {
|
|
27
27
|
type: Object,
|
|
28
28
|
default: () => { }
|
|
@@ -388,6 +388,9 @@ export default {
|
|
|
388
388
|
//filterText(val) {
|
|
389
389
|
// this.$refs.trees.filter(val);
|
|
390
390
|
//}
|
|
391
|
+
searchtreeHeight: function (val) {
|
|
392
|
+
this.setTreeHeight();
|
|
393
|
+
}
|
|
391
394
|
},
|
|
392
395
|
created() {
|
|
393
396
|
this.model = this.vmodel;
|
|
@@ -43,7 +43,7 @@ export default {
|
|
|
43
43
|
vmodel: Object,
|
|
44
44
|
searchConditionApi: String,
|
|
45
45
|
searchDataApi: String,
|
|
46
|
-
leftWidth:
|
|
46
|
+
leftWidth: String,
|
|
47
47
|
},
|
|
48
48
|
data() {
|
|
49
49
|
return {
|
|
@@ -91,10 +91,16 @@ export default {
|
|
|
91
91
|
},
|
|
92
92
|
created() {
|
|
93
93
|
this.model = this.vmodel;
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
},
|
|
95
|
+
mounted() {
|
|
96
|
+
let self = this;
|
|
97
|
+
window.addEventListener('resize', function () {
|
|
98
|
+
self.$nextTick(() => {
|
|
99
|
+
self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
|
|
100
|
+
})
|
|
96
101
|
})
|
|
97
|
-
|
|
102
|
+
self.searchtreeHeight = self.$refs.tree_left.$el.offsetHeight;
|
|
103
|
+
},
|
|
98
104
|
}
|
|
99
105
|
|
|
100
106
|
</script>
|
|
@@ -69,7 +69,7 @@ const FormList = function (source, master) {
|
|
|
69
69
|
},
|
|
70
70
|
getFormObj() {
|
|
71
71
|
let rtnFormArr = [];
|
|
72
|
-
|
|
72
|
+
debugger
|
|
73
73
|
for (let i = 1; i < rtn.rows.length; i++) {
|
|
74
74
|
let rtnFormObj = {};
|
|
75
75
|
rtn.rows[i].field.forEach((s) => {
|
|
@@ -464,8 +464,10 @@ const FormList = function (source, master) {
|
|
|
464
464
|
deleteAll() {
|
|
465
465
|
if(rtn._rows && rtn._rows.length>1){
|
|
466
466
|
let index=0;
|
|
467
|
+
//如果是接口返回的数据需要保留，并且标识成删除
|
|
467
468
|
var newRows=[]
|
|
468
469
|
rtn._rows.forEach((r) => {
|
|
470
|
+
//排除表头数据
|
|
469
471
|
if(index>0){
|
|
470
472
|
if (!r.isNewFlag) {
|
|
471
473
|
r.deleted = true;
|
|
@@ -476,9 +478,15 @@ const FormList = function (source, master) {
|
|
|
476
478
|
index++;
|
|
477
479
|
}
|
|
478
480
|
});
|
|
481
|
+
//清空列表数据需要保留表头数据
|
|
479
482
|
rtn._tableData.splice(0,rtn._tableData.length);
|
|
480
|
-
source.rows.splice(1, source.rows.length-1
|
|
481
|
-
rtn._rows.splice(1, rtn._rows.length-1
|
|
483
|
+
source.rows.splice(1, source.rows.length-1);
|
|
484
|
+
rtn._rows.splice(1, rtn._rows.length-1);
|
|
485
|
+
if(newRows.length>0)
|
|
486
|
+
{
|
|
487
|
+
source.rows.push(newRows);
|
|
488
|
+
rtn._rows.push(newRows);
|
|
489
|
+
}
|
|
482
490
|
}
|
|
483
491
|
},
|
|
484
492
|
insertRow(rows) {
|
package/src/main.js
CHANGED
|
@@ -43,7 +43,7 @@ Vue.use(centaline, {
|
|
|
43
43
|
getRequestHeaders: function () {
|
|
44
44
|
return {
|
|
45
45
|
oldToken: '42ccd644-040d-4e01-9521-1623f1884058',
|
|
46
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
46
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZh7_b27uj0wMaPIEs8EqyMQKIx_rsYoaP3FZPMa2ZeMM4dVOBXcCc22riCO7HREnH0JA0eok_IwhYDpYCJJfGpbmw61lBAftygIhHh0lG0BQw6_YSl4L9iHvP9nJ__OHedhmWWXci9CqNxJiOrCaidWarPpFEu2pcM7w8AAAD__w.JeIxQIdxvfdXeznKFoGbBpDvbEZYK_5QcpXp3XNAG4c',
|
|
47
47
|
|
|
48
48
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
49
49
|
EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
|