centaline-data-driven 1.5.87 → 1.5.89
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 +14 -0
- package/src/SearchList.vue +3 -1
- package/src/centaline/dynamicBtn/src/dynamicBtn.vue +2 -2
- package/src/centaline/dynamicForm/src/dynamicForm.vue +197 -77
- package/src/main.js +3 -2
- package/wwwroot/static/centaline/centaline-data-driven.js +199 -82
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
package/release-log.md
CHANGED
package/src/SearchList.vue
CHANGED
|
@@ -107,7 +107,9 @@
|
|
|
107
107
|
|
|
108
108
|
<!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/HolidayTypeList/getLayoutOfSearch'" :searchDataApi="'/HolidayTypeList/getListOfSearchModel'"></ct-searchlist> -->
|
|
109
109
|
|
|
110
|
-
<ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist>
|
|
110
|
+
<!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/SystemLogList/getLayoutOfSearch'" :searchDataApi="'/SystemLogList/getListOfSearchModel'"></ct-searchlist> -->
|
|
111
|
+
|
|
112
|
+
<ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/AttendanceBalanceAlertList/getLayoutOfSearch'" :searchDataApi="'/AttendanceBalanceAlertList/getListOfSearchModel'"></ct-searchlist>
|
|
111
113
|
|
|
112
114
|
|
|
113
115
|
<ct-dialog-list></ct-dialog-list>
|
|
@@ -87,11 +87,11 @@
|
|
|
87
87
|
:disabled="model.disabled || model.locked">
|
|
88
88
|
<div v-if="flagAppMode" :title="model.label">
|
|
89
89
|
<img :src="model.imgUrl" :height="model.buttonHeight+'px'" />
|
|
90
|
-
<div style="margin-top:5px;" class="labelText"
|
|
90
|
+
<div style="margin-top:5px;" class="labelText" v-html="model.label"></div>
|
|
91
91
|
</div>
|
|
92
92
|
<div v-else>
|
|
93
93
|
<img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'" />
|
|
94
|
-
<span v-else
|
|
94
|
+
<span v-else v-html="model.label"></span>
|
|
95
95
|
</div>
|
|
96
96
|
</el-button>
|
|
97
97
|
</template>
|
|
@@ -319,15 +319,11 @@
|
|
|
319
319
|
//若不是客户端方法，则直接访问接口
|
|
320
320
|
if (!field.isClientFuntion) {
|
|
321
321
|
let verified = true;
|
|
322
|
-
if (field.isSubmit) {
|
|
322
|
+
if (field.isSubmit) {
|
|
323
323
|
if (field.flagVerifyData) {
|
|
324
324
|
verified = self.validExcute();
|
|
325
325
|
}
|
|
326
326
|
if (verified) {
|
|
327
|
-
if (field.flagVerifyData && typeof field.onClick !== 'undefined') {
|
|
328
|
-
verified = self.$common.excute.call(self.model.scripts, field.onClick);
|
|
329
|
-
}
|
|
330
|
-
|
|
331
327
|
if (verified) {
|
|
332
328
|
//action有值，提交到后台
|
|
333
329
|
if (field.action) {
|
|
@@ -336,49 +332,110 @@
|
|
|
336
332
|
|
|
337
333
|
if (field.flagAsync) {
|
|
338
334
|
field.doAction(self.getFormObj(), (res) => {
|
|
339
|
-
if (res.
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
335
|
+
if (res.rtnCode === 200) {
|
|
336
|
+
if (res.content && res.content.action) {
|
|
337
|
+
var dialogOption = {
|
|
338
|
+
title: field.pageTitle || field.label,
|
|
339
|
+
content: [{
|
|
340
|
+
component: 'ct-progress',
|
|
341
|
+
attrs: {
|
|
342
|
+
progressAction: res.content.action,
|
|
343
|
+
progressKey: res.content.key,
|
|
344
|
+
progressType: field.isExport ? 'export' : 'import',
|
|
345
|
+
width: '350px',
|
|
346
|
+
height: '165px'
|
|
347
|
+
},
|
|
348
|
+
on: {
|
|
349
|
+
finished(data) {
|
|
350
|
+
field.disabled = false;
|
|
351
|
+
self.model.pageDisabled = false;
|
|
352
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
353
|
+
if (data.rtnMsg) {
|
|
354
|
+
self.$message({
|
|
355
|
+
message: data.rtnMsg,
|
|
356
|
+
type: 'success',
|
|
357
|
+
showClose:true,
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
if (data.notification === 17) {
|
|
361
|
+
self.clickHandler(self.model.getRtnRouter(data.content), null)
|
|
362
|
+
}
|
|
363
|
+
self.$emit('submit', { formData: self.model, responseData: data });
|
|
364
|
+
},
|
|
365
|
+
error(data) {
|
|
366
|
+
field.disabled = false;
|
|
367
|
+
self.model.pageDisabled = false;
|
|
368
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
357
369
|
self.$message({
|
|
358
370
|
message: data.rtnMsg,
|
|
359
|
-
type: '
|
|
371
|
+
type: 'warning',
|
|
360
372
|
showClose:true,
|
|
361
373
|
});
|
|
362
374
|
}
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
375
|
+
}
|
|
376
|
+
}]
|
|
377
|
+
};
|
|
378
|
+
self.$common.openDialog(dialogOption);
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
else if (res.rtnCode === 202) {
|
|
382
|
+
self.$common.confirm(res.rtnMsg, '提示', {
|
|
383
|
+
confirmButtonText: '确定',
|
|
384
|
+
cancelButtonText: '取消',
|
|
385
|
+
type: 'warning'
|
|
386
|
+
}).then(() => {
|
|
387
|
+
field.doAction(self.getFormObj({ flagHaveAlert: '1' }), (res202) => {
|
|
388
|
+
if (res202.rtnCode === 200) {
|
|
389
|
+
if (res202.content && res202.content.action) {
|
|
390
|
+
var dialogOption = {
|
|
391
|
+
title: field.pageTitle || field.label,
|
|
392
|
+
content: [{
|
|
393
|
+
component: 'ct-progress',
|
|
394
|
+
attrs: {
|
|
395
|
+
progressAction: res202.content.action,
|
|
396
|
+
progressKey: res202.content.key,
|
|
397
|
+
progressType: field.isExport ? 'export' : 'import',
|
|
398
|
+
width: '350px',
|
|
399
|
+
height: '165px'
|
|
400
|
+
},
|
|
401
|
+
on: {
|
|
402
|
+
finished(data) {
|
|
403
|
+
field.disabled = false;
|
|
404
|
+
self.model.pageDisabled = false;
|
|
405
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
406
|
+
if (data.rtnMsg) {
|
|
407
|
+
self.$message({
|
|
408
|
+
message: data.rtnMsg,
|
|
409
|
+
type: 'success',
|
|
410
|
+
showClose:true,
|
|
411
|
+
});
|
|
412
|
+
}
|
|
413
|
+
if (data.notification === 17) {
|
|
414
|
+
self.clickHandler(self.model.getRtnRouter(data.content), null)
|
|
415
|
+
}
|
|
416
|
+
self.$emit('submit', { formData: self.model, responseData: data });
|
|
417
|
+
},
|
|
418
|
+
error(data) {
|
|
419
|
+
field.disabled = false;
|
|
420
|
+
self.model.pageDisabled = false;
|
|
421
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
422
|
+
self.$message({
|
|
423
|
+
message: data.rtnMsg,
|
|
424
|
+
type: 'warning',
|
|
425
|
+
showClose:true,
|
|
426
|
+
});
|
|
427
|
+
}
|
|
428
|
+
}
|
|
429
|
+
}]
|
|
430
|
+
};
|
|
431
|
+
self.$common.openDialog(dialogOption);
|
|
377
432
|
}
|
|
378
433
|
}
|
|
379
|
-
}
|
|
380
|
-
}
|
|
381
|
-
|
|
434
|
+
});
|
|
435
|
+
}).catch(() => {
|
|
436
|
+
field.disabled = false;
|
|
437
|
+
self.model.pageDisabled = false;
|
|
438
|
+
});
|
|
382
439
|
}
|
|
383
440
|
});
|
|
384
441
|
}
|
|
@@ -630,47 +687,105 @@
|
|
|
630
687
|
submitData = field.getActionPara(submitData).para;
|
|
631
688
|
if (field.flagAsync) {
|
|
632
689
|
field.doAction(submitData, (res) => {
|
|
633
|
-
if (res.
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
690
|
+
if (res.rtnCode === 200) {
|
|
691
|
+
if (res.content && res.content.action) {
|
|
692
|
+
var dialogOption = {
|
|
693
|
+
title: field.pageTitle || field.label,
|
|
694
|
+
content: [{
|
|
695
|
+
component: 'ct-progress',
|
|
696
|
+
attrs: {
|
|
697
|
+
progressAction: res.content.action,
|
|
698
|
+
progressKey: res.content.key,
|
|
699
|
+
progressType: field.isExport ? 'export' : 'import',
|
|
700
|
+
width: '350px',
|
|
701
|
+
height: '165px'
|
|
702
|
+
},
|
|
703
|
+
on: {
|
|
704
|
+
finished(data) {
|
|
705
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
706
|
+
if (data.rtnMsg) {
|
|
707
|
+
self.$message({
|
|
708
|
+
message: data.rtnMsg,
|
|
709
|
+
type: 'success',
|
|
710
|
+
showClose:true,
|
|
711
|
+
});
|
|
712
|
+
}
|
|
713
|
+
if (field && field.changeCallBackFunName) {
|
|
714
|
+
self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
|
|
715
|
+
}
|
|
716
|
+
else {
|
|
717
|
+
self.model.doAction(data);
|
|
718
|
+
}
|
|
719
|
+
},
|
|
720
|
+
error(data) {
|
|
721
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
649
722
|
self.$message({
|
|
650
723
|
message: data.rtnMsg,
|
|
651
|
-
type: '
|
|
724
|
+
type: 'warning',
|
|
652
725
|
showClose:true,
|
|
653
726
|
});
|
|
654
727
|
}
|
|
655
|
-
if (field && field.changeCallBackFunName) {
|
|
656
|
-
self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
|
|
657
|
-
}
|
|
658
|
-
else {
|
|
659
|
-
self.model.doAction(data);
|
|
660
|
-
}
|
|
661
|
-
},
|
|
662
|
-
error(data) {
|
|
663
|
-
self.$common.closeDialog(dialogOption.dialog);
|
|
664
|
-
self.$message({
|
|
665
|
-
message: data.rtnMsg,
|
|
666
|
-
type: 'warning',
|
|
667
|
-
showClose:true,
|
|
668
|
-
});
|
|
669
728
|
}
|
|
729
|
+
}]
|
|
730
|
+
};
|
|
731
|
+
self.$common.openDialog(dialogOption);
|
|
732
|
+
}
|
|
733
|
+
}
|
|
734
|
+
else if (res.rtnCode === 202) {
|
|
735
|
+
submitData.flagHaveAlert='1';
|
|
736
|
+
if(submitData.jsonData)submitData.jsonData.flagHaveAlert='1';
|
|
737
|
+
self.$common.confirm(res.rtnMsg, '提示', {
|
|
738
|
+
confirmButtonText: '确定',
|
|
739
|
+
cancelButtonText: '取消',
|
|
740
|
+
type: 'warning'
|
|
741
|
+
}).then(() => {
|
|
742
|
+
field.doAction(submitData, (res202) => {
|
|
743
|
+
if (res202.rtnCode === 200) {
|
|
744
|
+
if (res202.content && res202.content.action) {
|
|
745
|
+
var dialogOption = {
|
|
746
|
+
title: field.pageTitle || field.label,
|
|
747
|
+
content: [{
|
|
748
|
+
component: 'ct-progress',
|
|
749
|
+
attrs: {
|
|
750
|
+
progressAction: reres202s.content.action,
|
|
751
|
+
progressKey: res202.content.key,
|
|
752
|
+
progressType: field.isExport ? 'export' : 'import',
|
|
753
|
+
width: '350px',
|
|
754
|
+
height: '165px'
|
|
755
|
+
},
|
|
756
|
+
on: {
|
|
757
|
+
finished(data) {
|
|
758
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
759
|
+
if (data.rtnMsg) {
|
|
760
|
+
self.$message({
|
|
761
|
+
message: data.rtnMsg,
|
|
762
|
+
type: 'success',
|
|
763
|
+
showClose:true,
|
|
764
|
+
});
|
|
765
|
+
}
|
|
766
|
+
if (field && field.changeCallBackFunName) {
|
|
767
|
+
self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
|
|
768
|
+
}
|
|
769
|
+
else {
|
|
770
|
+
self.model.doAction(data);
|
|
771
|
+
}
|
|
772
|
+
},
|
|
773
|
+
error(data) {
|
|
774
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
775
|
+
self.$message({
|
|
776
|
+
message: data.rtnMsg,
|
|
777
|
+
type: 'warning',
|
|
778
|
+
showClose:true,
|
|
779
|
+
});
|
|
780
|
+
}
|
|
781
|
+
}
|
|
782
|
+
}]
|
|
783
|
+
};
|
|
784
|
+
self.$common.openDialog(dialogOption);
|
|
670
785
|
}
|
|
671
|
-
}
|
|
672
|
-
}
|
|
673
|
-
|
|
786
|
+
} });
|
|
787
|
+
}).catch(() => {
|
|
788
|
+
});
|
|
674
789
|
}
|
|
675
790
|
});
|
|
676
791
|
}
|
|
@@ -751,8 +866,13 @@
|
|
|
751
866
|
}
|
|
752
867
|
}
|
|
753
868
|
|
|
754
|
-
if (field.isSubmit && field.flagVerifyData
|
|
755
|
-
|
|
869
|
+
if (field.isSubmit && field.flagVerifyData) {
|
|
870
|
+
if(typeof field.onClick !== 'undefined'){
|
|
871
|
+
self.$common.excute.call(self.model.scripts, field.onClick)
|
|
872
|
+
}
|
|
873
|
+
if(!self.validExcute()){
|
|
874
|
+
return;
|
|
875
|
+
}
|
|
756
876
|
}
|
|
757
877
|
|
|
758
878
|
if (field.alert) {
|
package/src/main.js
CHANGED
|
@@ -16,7 +16,8 @@ Vue.config.productionTip = false;
|
|
|
16
16
|
Vue.use(centaline, {
|
|
17
17
|
// baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
|
|
18
18
|
// baseUrl: "http://10.88.22.46:6060/onecard-api/",
|
|
19
|
-
baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
|
|
19
|
+
// baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
|
|
20
|
+
baseUrl: "http://10.88.22.13:6060/onecard-api/",
|
|
20
21
|
// baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
|
|
21
22
|
// baseUrl: "http://10.25.10.63:22026/service-api/v1/form/router",
|
|
22
23
|
// baseUrl: "http://10.25.10.67:8080/",
|
|
@@ -56,7 +57,7 @@ Vue.use(centaline, {
|
|
|
56
57
|
return {
|
|
57
58
|
oldToken: '1f487e18-c090-4d24-b9a7-630de58cfccc',
|
|
58
59
|
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOwjAQBP_iOifZuYvvnC62k4ZHRDYxElSIJBII8XeCgI6eKbaYYnfval6zalWUTlMYEEJfN0CRG-gGFvBBRPuakbyM7gP8iC-jMeTY2B46xwHIEoKYIBDIBhpij8FHValyPavWsDZSO22bSh3T8hZMtX2JdS6XXbn949xpOW6znFyZChNkmQhIo4U8ZYTDfqvQyWDCoh5PAAAA__8.819W_FW6PWIm3sqKcC1EXrcMlKujBUCQj6I0-_sIa_Y',
|
|
59
|
-
authObject: '{token:"
|
|
60
|
+
authObject: '{token:"1080-1740569404179091456"}',
|
|
60
61
|
|
|
61
62
|
// originalRequestURL: 'http://10.88.22.67:8080',
|
|
62
63
|
EstateInfo: '{"estateId":"2209221422412F69767A067443EEAAD6","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E6%A5%BC%E4%BB%B7"}',
|