centaline-data-driven 1.6.3 → 1.6.5

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 (13) hide show
  1. package/package.json +1 -1
  2. package/release-log.md +14 -0
  3. package/src/Form.vue +2 -2
  4. package/src/centaline/api/index.js +1 -0
  5. package/src/centaline/dynamicForm/src/dynamicForm.vue +68 -3
  6. package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue +31 -1
  7. package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +54 -2
  8. package/src/centaline/loader/src/ctl/Cb.js +13 -0
  9. package/src/centaline/loader/src/ctl/lib/LibFunction.js +1 -0
  10. package/src/centaline/progress/src/progress.vue +10 -3
  11. package/src/main.js +2 -2
  12. package/wwwroot/static/centaline/centaline-data-driven.js +164 -18
  13. 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.6.3",
3
+ "version": "1.6.5",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
package/release-log.md CHANGED
@@ -1,3 +1,17 @@
1
+ # v1.6.5
2
+ 2024-04-18
3
+
4
+ 优化
5
+
6
+ 导出按钮返回文件地址修改在父级下载，之前是在弹层下载
7
+
8
+ # v1.6.4
9
+ 2024-04-12
10
+
11
+ 优化
12
+
13
+ CheckBox插件：在表单下controlLabel为空时，自动占位对齐
14
+
1
15
  # v1.6.3
2
16
  2024-04-11
3
17
 
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="'/PropertyRET/getLayoutOfEdit'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
4
+ <ct-form :api="'/Employee/readDetail'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></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
- chanceID: "10149009", actionType: 3
15
+ rowGUID: "{6A7B0DE3-49A4-4A10-BD53-8B0586B54E28}", actionType: 3
16
16
  },
17
17
  topHeight:10,
18
18
  }
package/src/centaline/api/index.js CHANGED
@@ -209,6 +209,7 @@ const api = {
209
209
  progressAction: data.content.action,
210
210
  progressKey: data.content.key,
211
211
  progressType: 'export',
212
+ flagNotification: '1',
212
213
  width: '350px',
213
214
  height: '165px'
214
215
  },
package/src/centaline/dynamicForm/src/dynamicForm.vue CHANGED
@@ -410,6 +410,19 @@
410
410
  field.disabled = false;
411
411
  self.model.pageDisabled = false;
412
412
  self.$common.closeDialog(dialogOption.dialog);
413
+ if(field.isExport){
414
+ if(data.content.indexOf(".zip") > -1){
415
+ window.location.href = encodeURI(data.content);
416
+ }
417
+ else{
418
+ if (data.content.indexOf("?") > -1) {
419
+ self.downloadUrl = data.content + "&" + Math.random();
420
+ }
421
+ else {
422
+ self.downloadUrl = data.content + "?" + Math.random();
423
+ }
424
+ }
425
+ }
413
426
  if (data.rtnMsg) {
414
427
  self.$message({
415
428
  message: data.rtnMsg,
@@ -467,7 +480,20 @@
467
480
  finished(data) {
468
481
  field.disabled = false;
469
482
  self.model.pageDisabled = false;
470
- self.$common.closeDialog(dialogOption.dialog);
483
+ self.$common.closeDialog(dialogOption.dialog);
484
+ if(field.isExport){
485
+ if(data.content.indexOf(".zip") > -1){
486
+ window.location.href = encodeURI(data.content);
487
+ }
488
+ else{
489
+ if (data.content.indexOf("?") > -1) {
490
+ self.downloadUrl = data.content + "&" + Math.random();
491
+ }
492
+ else {
493
+ self.downloadUrl = data.content + "?" + Math.random();
494
+ }
495
+ }
496
+ }
471
497
  if (data.rtnMsg) {
472
498
  self.$message({
473
499
  message: data.rtnMsg,
@@ -781,6 +807,19 @@
781
807
  on: {
782
808
  finished(data) {
783
809
  self.$common.closeDialog(dialogOption.dialog);
810
+ if(field.isExport){
811
+ if(data.content.indexOf(".zip") > -1){
812
+ window.location.href = encodeURI(data.content);
813
+ }
814
+ else{
815
+ if (data.content.indexOf("?") > -1) {
816
+ self.downloadUrl = data.content + "&" + Math.random();
817
+ }
818
+ else {
819
+ self.downloadUrl = data.content + "?" + Math.random();
820
+ }
821
+ }
822
+ }
784
823
  if (data.rtnMsg) {
785
824
  self.$message({
786
825
  message: data.rtnMsg,
@@ -833,7 +872,20 @@
833
872
  },
834
873
  on: {
835
874
  finished(data) {
836
- self.$common.closeDialog(dialogOption.dialog);
875
+ self.$common.closeDialog(dialogOption.dialog);
876
+ if(field.isExport){
877
+ if(data.content.indexOf(".zip") > -1){
878
+ window.location.href = encodeURI(data.content);
879
+ }
880
+ else{
881
+ if (data.content.indexOf("?") > -1) {
882
+ self.downloadUrl = data.content + "&" + Math.random();
883
+ }
884
+ else {
885
+ self.downloadUrl = data.content + "?" + Math.random();
886
+ }
887
+ }
888
+ }
837
889
  if (data.rtnMsg) {
838
890
  self.$message({
839
891
  message: data.rtnMsg,
@@ -985,7 +1037,20 @@
985
1037
  },
986
1038
  on: {
987
1039
  finished(data) {
988
- self.$common.closeDialog(dialogOption.dialog);
1040
+ self.$common.closeDialog(dialogOption.dialog);
1041
+ if(field.isExport){
1042
+ if(data.content.indexOf(".zip") > -1){
1043
+ window.location.href = encodeURI(data.content);
1044
+ }
1045
+ else{
1046
+ if (data.content.indexOf("?") > -1) {
1047
+ self.downloadUrl = data.content + "&" + Math.random();
1048
+ }
1049
+ else {
1050
+ self.downloadUrl = data.content + "?" + Math.random();
1051
+ }
1052
+ }
1053
+ }
989
1054
  if (data.rtnMsg) {
990
1055
  self.$message({
991
1056
  message: data.rtnMsg,
package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue CHANGED
@@ -40,6 +40,9 @@
40
40
  <div v-if="isLoading" v-loading="isLoading" style="min-height:100px">
41
41
  </div>
42
42
  <div ref="doClosePopover"></div>
43
+ <iframe :src="downloadUrl"
44
+ style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
45
+ </iframe>
43
46
  </div>
44
47
  </template>
45
48
  <script>
@@ -73,6 +76,7 @@ import dynamicElement from '../../mixins/dynamicElement';
73
76
  highScreen: false,
74
77
  showScreen: true,
75
78
  isLayout: false,
79
+ downloadUrl: "",
76
80
  }
77
81
  },
78
82
  mounted() {
@@ -196,6 +200,19 @@ import dynamicElement from '../../mixins/dynamicElement';
196
200
  field.disabled = false;
197
201
  self.model.pageDisabled = false;
198
202
  self.$common.closeDialog(dialogOption.dialog);
203
+ if(field.isExport){
204
+ if(data.content.indexOf(".zip") > -1){
205
+ window.location.href = encodeURI(data.content);
206
+ }
207
+ else{
208
+ if (data.content.indexOf("?") > -1) {
209
+ self.downloadUrl = data.content + "&" + Math.random();
210
+ }
211
+ else {
212
+ self.downloadUrl = data.content + "?" + Math.random();
213
+ }
214
+ }
215
+ }
199
216
  if (data.rtnMsg) {
200
217
  self.$message({
201
218
  message: data.rtnMsg,
@@ -205,7 +222,7 @@ import dynamicElement from '../../mixins/dynamicElement';
205
222
  }
206
223
  if (data.notification === 17) {
207
224
  self.clickHandler(self.model.getRtnRouter(data.content), null)
208
- }
225
+ }
209
226
  self.$emit('submit', { formData: self.model, responseData: data });
210
227
  },
211
228
  error(data) {
@@ -444,6 +461,19 @@ import dynamicElement from '../../mixins/dynamicElement';
444
461
  on: {
445
462
  finished(data) {
446
463
  self.$common.closeDialog(dialogOption.dialog);
464
+ if(field.isExport){
465
+ if(data.content.indexOf(".zip") > -1){
466
+ window.location.href = encodeURI(data.content);
467
+ }
468
+ else{
469
+ if (data.content.indexOf("?") > -1) {
470
+ self.downloadUrl = data.content + "&" + Math.random();
471
+ }
472
+ else {
473
+ self.downloadUrl = data.content + "?" + Math.random();
474
+ }
475
+ }
476
+ }
447
477
  if (data.rtnMsg) {
448
478
  self.$message({
449
479
  message: data.rtnMsg,
package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue CHANGED
@@ -1340,6 +1340,19 @@ export default {
1340
1340
  on: {
1341
1341
  finished(data) {
1342
1342
  self.$common.closeDialog(dialogOption.dialog);
1343
+ if(field.isExport){
1344
+ if(data.content.indexOf(".zip") > -1){
1345
+ window.location.href = encodeURI(data.content);
1346
+ }
1347
+ else{
1348
+ if (data.content.indexOf("?") > -1) {
1349
+ self.downloadUrl = data.content + "&" + Math.random();
1350
+ }
1351
+ else {
1352
+ self.downloadUrl = data.content + "?" + Math.random();
1353
+ }
1354
+ }
1355
+ }
1343
1356
  if (data.rtnMsg) {
1344
1357
  self.$message({
1345
1358
  message: data.rtnMsg,
@@ -1381,8 +1394,21 @@ export default {
1381
1394
  height: '165px'
1382
1395
  },
1383
1396
  on: {
1384
- finished(data) {
1397
+ finished(data) {
1385
1398
  self.$common.closeDialog(dialogOption.dialog);
1399
+ if(field.isExport){
1400
+ if(data.content.indexOf(".zip") > -1){
1401
+ window.location.href = encodeURI(data.content);
1402
+ }
1403
+ else{
1404
+ if (data.content.indexOf("?") > -1) {
1405
+ self.downloadUrl = data.content + "&" + Math.random();
1406
+ }
1407
+ else {
1408
+ self.downloadUrl = data.content + "?" + Math.random();
1409
+ }
1410
+ }
1411
+ }
1386
1412
  if (data.rtnMsg) {
1387
1413
  self.$message({
1388
1414
  message: data.rtnMsg,
@@ -2096,7 +2122,20 @@ export default {
2096
2122
  },
2097
2123
  on: {
2098
2124
  finished(data) {
2099
- self.$common.closeDialog(dialogOption.dialog);
2125
+ self.$common.closeDialog(dialogOption.dialog);
2126
+ if(field.isExport){
2127
+ if(data.content.indexOf(".zip") > -1){
2128
+ window.location.href = encodeURI(data.content);
2129
+ }
2130
+ else{
2131
+ if (data.content.indexOf("?") > -1) {
2132
+ self.downloadUrl = data.content + "&" + Math.random();
2133
+ }
2134
+ else {
2135
+ self.downloadUrl = data.content + "?" + Math.random();
2136
+ }
2137
+ }
2138
+ }
2100
2139
  if (data.rtnMsg) {
2101
2140
  self.$message({
2102
2141
  message: data.rtnMsg,
@@ -2138,6 +2177,19 @@ export default {
2138
2177
  on: {
2139
2178
  finished(data) {
2140
2179
  self.$common.closeDialog(dialogOption.dialog);
2180
+ if(field.isExport){
2181
+ if(data.content.indexOf(".zip") > -1){
2182
+ window.location.href = encodeURI(data.content);
2183
+ }
2184
+ else{
2185
+ if (data.content.indexOf("?") > -1) {
2186
+ self.downloadUrl = data.content + "&" + Math.random();
2187
+ }
2188
+ else {
2189
+ self.downloadUrl = data.content + "?" + Math.random();
2190
+ }
2191
+ }
2192
+ }
2141
2193
  if (data.rtnMsg) {
2142
2194
  self.$message({
2143
2195
  message: data.rtnMsg,
package/src/centaline/loader/src/ctl/Cb.js CHANGED
@@ -6,6 +6,19 @@ const Cb = function (source, callBack) {
6
6
  var self = this;
7
7
  var init = function (data) {
8
8
  var rtn = {
9
+ get label() {
10
+ let l='';
11
+ if(source.controlLabel){
12
+ l=source.controlLabel;
13
+ }
14
+ if(source.labelDelimiter){
15
+ l=l+source.labelDelimiter;
16
+ }
17
+ if(l=='' && !rtn.isList){
18
+ l=' ';
19
+ }
20
+ return l;
21
+ },
9
22
  get value() {
10
23
  return data.code1 === "1";
11
24
  },
package/src/centaline/loader/src/ctl/lib/LibFunction.js CHANGED
@@ -395,6 +395,7 @@ const LibFunction = {
395
395
  item.value = "暂不支持该组件";
396
396
  break;
397
397
  }
398
+ item.isList = isList;
398
399
 
399
400
  if (item instanceof Object) {
400
401
  var item1 = {
package/src/centaline/progress/src/progress.vue CHANGED
@@ -27,6 +27,10 @@ export default {
27
27
  type: String,
28
28
  default: 'export'
29
29
  },
30
+ flagNotification: {
31
+ type: String,
32
+ default: '0'
33
+ },
30
34
  },
31
35
  data() {
32
36
  return {
@@ -74,7 +78,7 @@ export default {
74
78
  this.progressFlag = true;
75
79
  this.percentage = data.percentage;
76
80
  if (data.flagFinished) {
77
- if (this.progressType == 'export' && data.content) {
81
+ if (this.progressType == 'export' && data.content && this.flagNotification=='1') {
78
82
  if(data.content.indexOf(".zip") > -1){
79
83
  window.location.href = encodeURI(data.content);
80
84
  }
@@ -89,10 +93,13 @@ export default {
89
93
  // document.body.addEventListener('click', function() {
90
94
  // window.open(data.content, "_blank");
91
95
  // });
96
+ setTimeout(() => {
97
+ self.$emit('finished', data);
98
+ }, 800);
92
99
  }
93
- setTimeout(() => {
100
+ else{
94
101
  self.$emit('finished', data);
95
- }, 800);
102
+ }
96
103
  }
97
104
  else {
98
105
  setTimeout(() => {
package/src/main.js CHANGED
@@ -17,7 +17,7 @@ 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
19
  // baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
20
- // baseUrl: "http://10.88.22.13:6060/onecard-api/",
20
+ baseUrl: "http://10.88.22.13:6060/onecard-api/",
21
21
  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
22
22
  // baseUrl: "http://10.25.10.63:9999/service-api/",
23
23
  // baseUrl: "http://10.25.10.69:8080/",
@@ -57,7 +57,7 @@ Vue.use(centaline, {
57
57
  return {
58
58
  oldToken: '763fb249-88a4-460e-a5f3-f73421436baf',
59
59
  token:'1080-1762727915918856192',
60
- authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s_au6RInaThEZIeNFCpEEgmEuDsgoKNnildMM--mlq2onWq51ph6B6mzHrAlD3VPDE1i1o0lhw0P8QP8mC-DMRjJhA7qSAkwoAM2iSFhSNi3nUtNqyoll5PaGTLWB0faV2rO61sgkXuJbZHzXq7_OHdc52dWS_Eu-xGmyBpQpgycRUDYH6wrhWQM6v4AAAD__w.zqngb3rbGwePCOUeU466Z8hvUr-bSk1aW36KpP6gBKw"}',
60
+ authObject: '{token:"1080-1778612338593763328"}',
61
61
 
62
62
  // originalRequestURL: 'http://10.88.22.67:8080',
63
63
  // EstateInfo: '{"estateId":"2403121157406A5CD9C9DDD445A6B665","estateName":"%E4%BA%91%E5%A4%A9%E5%8D%8E%E5%BA%AD-%E6%A5%BC%E4%BB%B7","estDeptPath":"087.002.001"}',