centaline-data-driven 1.4.65 → 1.4.67
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/dynamicLayout/src/dynamicLayout.vue +1 -1
- package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue +15 -2
- package/src/centaline/loader/src/ctl/CellLayout.js +2 -2
- package/src/centaline/progress/src/progress.vue +1 -2
- package/src/main.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js +3 -3
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
|
@@ -97,7 +97,7 @@
|
|
|
97
97
|
getValue(data, val) {
|
|
98
98
|
return val.split('.').reduce((data, currentVal) => {
|
|
99
99
|
var rtn = data[currentVal];
|
|
100
|
-
if (typeof rtn !== 'undefined') {
|
|
100
|
+
if (typeof rtn !== 'undefined' && typeof (rtn) == 'string') {
|
|
101
101
|
rtn = rtn.replace(/"/g, "'");
|
|
102
102
|
rtn = rtn.replace(/>/g, ">");
|
|
103
103
|
rtn = rtn.replace(/</g, "<");
|
|
@@ -121,7 +121,6 @@
|
|
|
121
121
|
sideBarRight:0,
|
|
122
122
|
sideBarMenuRight:0,
|
|
123
123
|
sideBarStatus:'',
|
|
124
|
-
sideBarStatus:'',
|
|
125
124
|
sideBarApi:'',
|
|
126
125
|
sideBarApiParam:null,
|
|
127
126
|
sideBarPageType:'',
|
|
@@ -188,7 +187,16 @@
|
|
|
188
187
|
this.$emit('refreshParent');
|
|
189
188
|
},
|
|
190
189
|
resize() {
|
|
191
|
-
this.$refs.table
|
|
190
|
+
if(this.$refs.table){
|
|
191
|
+
this.$refs.table.setTableHeight();
|
|
192
|
+
}
|
|
193
|
+
},
|
|
194
|
+
resizeSearchList() {
|
|
195
|
+
if(this.flagSideBar && this.flagSideBarOfData){
|
|
196
|
+
if(this.sideBarStatus=='open'){
|
|
197
|
+
this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
192
200
|
},
|
|
193
201
|
showTitleHandler() {
|
|
194
202
|
if (this.$refs.table.model && this.$refs.table.model.flagShowTitle) {
|
|
@@ -203,6 +211,7 @@
|
|
|
203
211
|
}
|
|
204
212
|
},
|
|
205
213
|
tableLoaded() {
|
|
214
|
+
var self = this;
|
|
206
215
|
if (typeof this.$refs.table.model.cellLayout !== "undefined") {
|
|
207
216
|
this.$refs.screen.LoadLayout();
|
|
208
217
|
}
|
|
@@ -235,6 +244,10 @@
|
|
|
235
244
|
this.sideMenuClickHandler(status);
|
|
236
245
|
}
|
|
237
246
|
}
|
|
247
|
+
|
|
248
|
+
window.addEventListener("resize", (ev) => {
|
|
249
|
+
self.resizeSearchList();
|
|
250
|
+
});
|
|
238
251
|
}
|
|
239
252
|
else{
|
|
240
253
|
this.flagSideBarOfData=false;
|
|
@@ -55,8 +55,8 @@ const CellLayout = function (source, actionRouter,rowdata, forname, forrowindex)
|
|
|
55
55
|
return b.id === source.routerKey;
|
|
56
56
|
});
|
|
57
57
|
if (typeof field !== "undefined") {
|
|
58
|
-
if ((!field.rightField || rowdata[forname][forrowindex][field.rightField] == 1) && field.show) {
|
|
59
|
-
forrightRouter=true;
|
|
58
|
+
if ((!field.rightField || (typeof rowdata[forname][forrowindex] !== "undefined" && rowdata[forname][forrowindex][field.rightField] == 1)) && field.show) {
|
|
59
|
+
forrightRouter = true;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
return forrightRouter;
|
package/src/main.js
CHANGED
|
@@ -47,7 +47,7 @@ Vue.use(centaline, {
|
|
|
47
47
|
getRequestHeaders: function () {
|
|
48
48
|
return {
|
|
49
49
|
oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
|
|
50
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
50
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzk0KwjAQBeC7ZN2BZn4yE3epaTYeolQbQVdiKyji3W3xEG4_Hu-9t5sfR7dz1GknWRRCEgbGnsGyFuCQWbNp2SceQpGMqAqkxWDvWwLElKHdopQpBm2HzDEZMsFKtDb5HqyjBChsTEU4qrjG1efN7XxQI-QosXGXcfkBkskGj7neD_X1j3PX5bLO8oiep5OC-MmAz4hwRKswhRFHCZX0dHafLwAAAP__.shTXzeB9x00F9bs4SvdWhHe0KlzLxaL0F0y0EW4LXUM',
|
|
51
51
|
|
|
52
52
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
53
53
|
EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',
|