centaline-data-driven 1.5.14 → 1.5.16
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/release-log.md +18 -0
- package/src/Form.vue +2 -2
- package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue +3 -0
- package/src/centaline/dynamicSearchList/src/dynamicSearchSideMenu.vue +9 -3
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +3 -25
- package/src/centaline/mixins/dynamicElement.js +3 -2
- package/src/main.js +9 -6
- 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
package/release-log.md
CHANGED
package/src/Form.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
|
|
3
3
|
<!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
|
|
4
|
-
<ct-form :api="'/
|
|
4
|
+
<ct-form :api="'/PropertyTranToActive/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
|
|
5
5
|
<ct-dialog-list></ct-dialog-list>
|
|
6
6
|
</div>
|
|
7
7
|
</template>
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
data() {
|
|
13
13
|
return {
|
|
14
14
|
apiParam:{
|
|
15
|
-
"
|
|
15
|
+
"chanceID":"10155931","actionType":2
|
|
16
16
|
},
|
|
17
17
|
topHeight:10,
|
|
18
18
|
}
|
|
@@ -39,12 +39,18 @@
|
|
|
39
39
|
width: 15px;
|
|
40
40
|
height: 48px;
|
|
41
41
|
position: absolute;
|
|
42
|
-
top:
|
|
42
|
+
top: 50%;
|
|
43
|
+
transform: translateY(-50%);
|
|
43
44
|
cursor: pointer;
|
|
44
|
-
background-color:
|
|
45
|
+
background-color: var(--chinaRed);
|
|
46
|
+
color: #fff;
|
|
47
|
+
|
|
48
|
+
|
|
45
49
|
}
|
|
46
50
|
.toggler >span{
|
|
47
|
-
|
|
51
|
+
position: absolute;
|
|
52
|
+
top: 50%;
|
|
53
|
+
transform: translateY(-50%);
|
|
48
54
|
}
|
|
49
55
|
.sidebar > .toggler {
|
|
50
56
|
-webkit-border-top-left-radius: 4px;
|
|
@@ -175,7 +175,7 @@
|
|
|
175
175
|
</td>
|
|
176
176
|
</tr>
|
|
177
177
|
<!--适配滚动条-->
|
|
178
|
-
<tr v-else v-bind:style="{ height: row.$heigth + 'px' }"></tr>
|
|
178
|
+
<tr v-else v-bind:style="{ height: (row.$heigth || 31) + 'px' }"></tr>
|
|
179
179
|
</tbody>
|
|
180
180
|
</table>
|
|
181
181
|
</div>
|
|
@@ -659,36 +659,14 @@ export default {
|
|
|
659
659
|
this.pageRowMax = this.firstRow + this.displayRowNumber;
|
|
660
660
|
this.pageRowMin = this.firstRow - this.displayRowNumber;
|
|
661
661
|
this.pageRowMin = this.pageRowMin > 0 ? this.pageRowMin : 0;
|
|
662
|
-
if (
|
|
662
|
+
if (this.pageRowMin > 0 && this.model.listData[this.pageRowMin].$rowspan === 0) {
|
|
663
663
|
for (let i = this.pageRowMin; i >= 0; i--) {
|
|
664
664
|
if (this.model.listData[i].$rowspan > 0) {
|
|
665
665
|
this.pageRowMin = i;
|
|
666
666
|
break;
|
|
667
667
|
}
|
|
668
668
|
}
|
|
669
|
-
}
|
|
670
|
-
|
|
671
|
-
//let index = this.model.listData.length - 1;
|
|
672
|
-
//let isSet = false;
|
|
673
|
-
//for (; index >= 0; index--) {
|
|
674
|
-
// if (Math.abs(index - this.firstRow) < this.displayRowNumber || typeof (this.model.listData[index].$heigth) === 'undefined') {
|
|
675
|
-
// //this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
|
|
676
|
-
// }
|
|
677
|
-
// else {
|
|
678
|
-
// if (index < this.firstRow && !isSet) {
|
|
679
|
-
// if (this.model.listData[index].$rowspan === 0) {
|
|
680
|
-
// this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
|
|
681
|
-
// continue;
|
|
682
|
-
// }
|
|
683
|
-
// else {
|
|
684
|
-
// isSet = true;
|
|
685
|
-
// this.$set(this.model.listData[index], "$trLazyLoadingShow", true);
|
|
686
|
-
// continue;
|
|
687
|
-
// }
|
|
688
|
-
// }
|
|
689
|
-
// this.$set(this.model.listData[index], "$trLazyLoadingShow", false);
|
|
690
|
-
// }
|
|
691
|
-
//}
|
|
669
|
+
}
|
|
692
670
|
},
|
|
693
671
|
setTableHeight() {
|
|
694
672
|
var self = this;
|
|
@@ -102,9 +102,9 @@ export default {
|
|
|
102
102
|
var self = this;
|
|
103
103
|
setTimeout(() => {
|
|
104
104
|
//通用校验
|
|
105
|
-
self.validMessage="";
|
|
106
105
|
var time = (new Date()).getTime();
|
|
107
106
|
if (time > (self.inputTime + 500) || self.valid) {
|
|
107
|
+
self.validMessage="";
|
|
108
108
|
if (this.model.validating) {
|
|
109
109
|
let validtemp = this.model.validating('change', self.inputOld, self.inputOld1);
|
|
110
110
|
self.valid = validtemp.valid;
|
|
@@ -124,6 +124,8 @@ export default {
|
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
+
self.$emit('change', e);
|
|
128
|
+
|
|
127
129
|
if(!self.valid){
|
|
128
130
|
return false;
|
|
129
131
|
}
|
|
@@ -135,7 +137,6 @@ export default {
|
|
|
135
137
|
self.changeOld1 = self.model.value1;
|
|
136
138
|
}
|
|
137
139
|
|
|
138
|
-
self.$emit('change', e);
|
|
139
140
|
}, 1);
|
|
140
141
|
},
|
|
141
142
|
|
package/src/main.js
CHANGED
|
@@ -15,14 +15,16 @@ Vue.use(ElementUI, { size: 'mini'});
|
|
|
15
15
|
Vue.config.productionTip = false;
|
|
16
16
|
Vue.use(centaline, {
|
|
17
17
|
// baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
|
|
18
|
-
baseUrl: "http://10.
|
|
18
|
+
baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
|
|
19
|
+
// baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
|
|
19
20
|
// baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
|
|
20
21
|
// baseUrl: "http://10.25.10.67:8080/",
|
|
21
22
|
// baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router",
|
|
22
23
|
// baseUrl: "http://10.88.22.69:8080/api/",
|
|
23
24
|
// baseUrl: "http://10.88.22.40:8080/api/",
|
|
25
|
+
// baseUrl: "http://10.58.2.108:8080/",
|
|
24
26
|
// baseUrl: "http://tjcptest.centaline.com.cn/",
|
|
25
|
-
|
|
27
|
+
flagRouterSelf: true,
|
|
26
28
|
zindex: 999,
|
|
27
29
|
showRequestSuccessMessage: true,
|
|
28
30
|
showRequestErrorMessage: true,
|
|
@@ -50,14 +52,15 @@ Vue.use(centaline, {
|
|
|
50
52
|
// 获取请求头
|
|
51
53
|
getRequestHeaders: function () {
|
|
52
54
|
return {
|
|
53
|
-
oldToken: '
|
|
54
|
-
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
55
|
-
|
|
55
|
+
oldToken: 'af4e8a8b-4fa8-4c39-9464-ce571f45ca7d',
|
|
56
|
+
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fXamy7xp-EQUT5GggqRRAIh7g5IoaNnildMM--hlm1UjUJ20iY2ECx5IDYWhHKGoJkFs0aMsZcd-DFfenJB2jY5IN0xULYJpA4ZUGwXKbUuJlaVKreLagx7QjFoqFKnYd2FJvmIbSnXQ7n_49x5Pb2zRsTNftIw8jQDWZxAdBEoHu041_U82KN6vgAAAP__.igNZCkByKZVx7ci5HTbVgN6sWu70SyMo-hcZvYadMBw',
|
|
57
|
+
authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOivZ2fXamy7xp-EQUT5GggqRRAIh7g5IoaNnildMM--hlm1UjUJ20iY2ECx5IDYWhHKGoJkFs0aMsZcd-DFfenJB2jY5IN0xULYJpA4ZUGwXKbUuJlaVKreLagx7QjFoqFKnYd2FJvmIbSnXQ7n_49x5Pb2zRsTNftIw8jQDWZxAdBEoHu041_U82KN6vgAAAP__.igNZCkByKZVx7ci5HTbVgN6sWu70SyMo-hcZvYadMBw"}',
|
|
58
|
+
|
|
56
59
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
57
60
|
EstateInfo: '{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
|
|
58
61
|
estateId: '20210729104021C49F04B55C50F6AF58',
|
|
59
62
|
|
|
60
|
-
authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
|
|
63
|
+
// authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
|
|
61
64
|
AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
|
|
62
65
|
};
|
|
63
66
|
},
|