centaline-data-driven 1.5.87 → 1.5.88

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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +6 -0
  3. package/src/SearchList.vue +3 -1
  4. package/src/centaline/dynamicForm/src/dynamicForm.vue +189 -70
  5. package/src/main.js +3 -2
  6. package/wwwroot/static/centaline/centaline-data-driven.js +188 -72
  7. package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.5.87",
3
+ "version": "1.5.88",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,9 @@
1
+ # v1.5.88
2
+ 2023-12-28
3
+ 优化
4
+
5
+ 表单异步支持202处理
6
+
1
7
  # v1.5.87
2
8
  2023-12-21
3
9
  优化
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>
package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -336,49 +336,110 @@
336
336
 
337
337
  if (field.flagAsync) {
338
338
  field.doAction(self.getFormObj(), (res) => {
339
- if (res.content && res.content.action) {
340
- var dialogOption = {
341
- title: field.pageTitle || field.label,
342
- content: [{
343
- component: 'ct-progress',
344
- attrs: {
345
- progressAction: res.content.action,
346
- progressKey: res.content.key,
347
- progressType: field.isExport ? 'export' : 'import',
348
- width: '350px',
349
- height: '165px'
350
- },
351
- on: {
352
- finished(data) {
353
- field.disabled = false;
354
- self.model.pageDisabled = false;
355
- self.$common.closeDialog(dialogOption.dialog);
356
- if (data.rtnMsg) {
339
+ if (res.rtnCode === 200) {
340
+ if (res.content && res.content.action) {
341
+ var dialogOption = {
342
+ title: field.pageTitle || field.label,
343
+ content: [{
344
+ component: 'ct-progress',
345
+ attrs: {
346
+ progressAction: res.content.action,
347
+ progressKey: res.content.key,
348
+ progressType: field.isExport ? 'export' : 'import',
349
+ width: '350px',
350
+ height: '165px'
351
+ },
352
+ on: {
353
+ finished(data) {
354
+ field.disabled = false;
355
+ self.model.pageDisabled = false;
356
+ self.$common.closeDialog(dialogOption.dialog);
357
+ if (data.rtnMsg) {
358
+ self.$message({
359
+ message: data.rtnMsg,
360
+ type: 'success',
361
+ showClose:true,
362
+ });
363
+ }
364
+ if (data.notification === 17) {
365
+ self.clickHandler(self.model.getRtnRouter(data.content), null)
366
+ }
367
+ self.$emit('submit', { formData: self.model, responseData: data });
368
+ },
369
+ error(data) {
370
+ field.disabled = false;
371
+ self.model.pageDisabled = false;
372
+ self.$common.closeDialog(dialogOption.dialog);
357
373
  self.$message({
358
374
  message: data.rtnMsg,
359
- type: 'success',
375
+ type: 'warning',
360
376
  showClose:true,
361
377
  });
362
378
  }
363
- if (data.notification === 17) {
364
- self.clickHandler(self.model.getRtnRouter(data.content), null)
365
- }
366
- self.$emit('submit', { formData: self.model, responseData: data });
367
- },
368
- error(data) {
369
- field.disabled = false;
370
- self.model.pageDisabled = false;
371
- self.$common.closeDialog(dialogOption.dialog);
372
- self.$message({
373
- message: data.rtnMsg,
374
- type: 'warning',
375
- showClose:true,
376
- });
379
+ }
380
+ }]
381
+ };
382
+ self.$common.openDialog(dialogOption);
383
+ }
384
+ }
385
+ else if (res.rtnCode === 202) {
386
+ self.$common.confirm(res.rtnMsg, '提示', {
387
+ confirmButtonText: '确定',
388
+ cancelButtonText: '取消',
389
+ type: 'warning'
390
+ }).then(() => {
391
+ field.doAction(self.getFormObj({ flagHaveAlert: '1' }), (res202) => {
392
+ if (res202.rtnCode === 200) {
393
+ if (res202.content && res202.content.action) {
394
+ var dialogOption = {
395
+ title: field.pageTitle || field.label,
396
+ content: [{
397
+ component: 'ct-progress',
398
+ attrs: {
399
+ progressAction: res202.content.action,
400
+ progressKey: res202.content.key,
401
+ progressType: field.isExport ? 'export' : 'import',
402
+ width: '350px',
403
+ height: '165px'
404
+ },
405
+ on: {
406
+ finished(data) {
407
+ field.disabled = false;
408
+ self.model.pageDisabled = false;
409
+ self.$common.closeDialog(dialogOption.dialog);
410
+ if (data.rtnMsg) {
411
+ self.$message({
412
+ message: data.rtnMsg,
413
+ type: 'success',
414
+ showClose:true,
415
+ });
416
+ }
417
+ if (data.notification === 17) {
418
+ self.clickHandler(self.model.getRtnRouter(data.content), null)
419
+ }
420
+ self.$emit('submit', { formData: self.model, responseData: data });
421
+ },
422
+ error(data) {
423
+ field.disabled = false;
424
+ self.model.pageDisabled = false;
425
+ self.$common.closeDialog(dialogOption.dialog);
426
+ self.$message({
427
+ message: data.rtnMsg,
428
+ type: 'warning',
429
+ showClose:true,
430
+ });
431
+ }
432
+ }
433
+ }]
434
+ };
435
+ self.$common.openDialog(dialogOption);
377
436
  }
378
437
  }
379
- }]
380
- };
381
- self.$common.openDialog(dialogOption);
438
+ });
439
+ }).catch(() => {
440
+ field.disabled = false;
441
+ self.model.pageDisabled = false;
442
+ });
382
443
  }
383
444
  });
384
445
  }
@@ -630,47 +691,105 @@
630
691
  submitData = field.getActionPara(submitData).para;
631
692
  if (field.flagAsync) {
632
693
  field.doAction(submitData, (res) => {
633
- if (res.content && res.content.action) {
634
- var dialogOption = {
635
- title: field.pageTitle || field.label,
636
- content: [{
637
- component: 'ct-progress',
638
- attrs: {
639
- progressAction: res.content.action,
640
- progressKey: res.content.key,
641
- progressType: field.isExport ? 'export' : 'import',
642
- width: '350px',
643
- height: '165px'
644
- },
645
- on: {
646
- finished(data) {
647
- self.$common.closeDialog(dialogOption.dialog);
648
- if (data.rtnMsg) {
694
+ if (res.rtnCode === 200) {
695
+ if (res.content && res.content.action) {
696
+ var dialogOption = {
697
+ title: field.pageTitle || field.label,
698
+ content: [{
699
+ component: 'ct-progress',
700
+ attrs: {
701
+ progressAction: res.content.action,
702
+ progressKey: res.content.key,
703
+ progressType: field.isExport ? 'export' : 'import',
704
+ width: '350px',
705
+ height: '165px'
706
+ },
707
+ on: {
708
+ finished(data) {
709
+ self.$common.closeDialog(dialogOption.dialog);
710
+ if (data.rtnMsg) {
711
+ self.$message({
712
+ message: data.rtnMsg,
713
+ type: 'success',
714
+ showClose:true,
715
+ });
716
+ }
717
+ if (field && field.changeCallBackFunName) {
718
+ self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
719
+ }
720
+ else {
721
+ self.model.doAction(data);
722
+ }
723
+ },
724
+ error(data) {
725
+ self.$common.closeDialog(dialogOption.dialog);
649
726
  self.$message({
650
727
  message: data.rtnMsg,
651
- type: 'success',
728
+ type: 'warning',
652
729
  showClose:true,
653
730
  });
654
731
  }
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
732
  }
733
+ }]
734
+ };
735
+ self.$common.openDialog(dialogOption);
736
+ }
737
+ }
738
+ else if (res.rtnCode === 202) {
739
+ submitData.flagHaveAlert='1';
740
+ if(submitData.jsonData)submitData.jsonData.flagHaveAlert='1';
741
+ self.$common.confirm(res.rtnMsg, '提示', {
742
+ confirmButtonText: '确定',
743
+ cancelButtonText: '取消',
744
+ type: 'warning'
745
+ }).then(() => {
746
+ field.doAction(submitData, (res202) => {
747
+ if (res202.rtnCode === 200) {
748
+ if (res202.content && res202.content.action) {
749
+ var dialogOption = {
750
+ title: field.pageTitle || field.label,
751
+ content: [{
752
+ component: 'ct-progress',
753
+ attrs: {
754
+ progressAction: reres202s.content.action,
755
+ progressKey: res202.content.key,
756
+ progressType: field.isExport ? 'export' : 'import',
757
+ width: '350px',
758
+ height: '165px'
759
+ },
760
+ on: {
761
+ finished(data) {
762
+ self.$common.closeDialog(dialogOption.dialog);
763
+ if (data.rtnMsg) {
764
+ self.$message({
765
+ message: data.rtnMsg,
766
+ type: 'success',
767
+ showClose:true,
768
+ });
769
+ }
770
+ if (field && field.changeCallBackFunName) {
771
+ self.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
772
+ }
773
+ else {
774
+ self.model.doAction(data);
775
+ }
776
+ },
777
+ error(data) {
778
+ self.$common.closeDialog(dialogOption.dialog);
779
+ self.$message({
780
+ message: data.rtnMsg,
781
+ type: 'warning',
782
+ showClose:true,
783
+ });
784
+ }
785
+ }
786
+ }]
787
+ };
788
+ self.$common.openDialog(dialogOption);
670
789
  }
671
- }]
672
- };
673
- self.$common.openDialog(dialogOption);
790
+ } });
791
+ }).catch(() => {
792
+ });
674
793
  }
675
794
  });
676
795
  }
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:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOwiAURf-FuS8B3gMe3Qq0ix_RlIKJTsa2icb472rUzd0z3OEs597EsmXRisSdpDggxF4boOQMdINjCJFZBu2QAo_-A_yYL6NS5J2yPXTeRSBLCKwiQyQbaUg9xpBEI-rlJFrlJGrtHdlGHKb1LRQhvsS21POuXv9x7rgenll2qMteFsjMBajUGViWCtIaM5uc7ZSruD8AAAD__w.4CB0AIN43pBM-JyLE1Y2TpovqmGf8O_9NEBB6qmWlyQ"}',
60
+ authObject: '{token:"1080-1740240291341930496"}',
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"}',