mooho-base-admin-plus 2.4.50 → 2.4.52

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 (8) hide show
  1. package/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +10 -10
  3. package/package/mooho-base-admin-plus.min.js +3 -3
  4. package/package.json +1 -1
  5. package/src/api/customModel.js +3 -3
  6. package/src/api/dataSource.js +3 -3
  7. package/src/api/model.js +3 -3
  8. package/src/components/view/view-form.vue +1 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "mooho-base-admin-plus",
3
3
  "description": "MOOHO basic framework for admin by Vue3",
4
- "version": "2.4.50",
4
+ "version": "2.4.52",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/api/customModel.js CHANGED
@@ -73,7 +73,7 @@ export default {
73
73
  modelName: tableView.model,
74
74
  per: 100000,
75
75
  returnType: 1,
76
- viewCode: tableView.code
76
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
77
77
  };
78
78
 
79
79
  let result;
@@ -108,7 +108,7 @@ export default {
108
108
  modelName: tableView.model,
109
109
  per: 100000,
110
110
  returnType: 3,
111
- viewCode: tableView.code
111
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
112
112
  };
113
113
 
114
114
  let result;
@@ -143,7 +143,7 @@ export default {
143
143
  modelName: tableView.model,
144
144
  per: 1000,
145
145
  returnType: 2,
146
- viewCode: tableView.code
146
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
147
147
  };
148
148
 
149
149
  let result;
package/src/api/dataSource.js CHANGED
@@ -21,7 +21,7 @@ export default {
21
21
  ...filter,
22
22
  per: 100000,
23
23
  returnType: 1,
24
- viewCode: tableView.code,
24
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
25
25
  dataSource: tableView.dataSource
26
26
  };
27
27
 
@@ -42,7 +42,7 @@ export default {
42
42
  ...filter,
43
43
  per: 100000,
44
44
  returnType: 3,
45
- viewCode: tableView.code,
45
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
46
46
  dataSource: tableView.dataSource
47
47
  };
48
48
 
@@ -63,7 +63,7 @@ export default {
63
63
  ...filter,
64
64
  per: 1000,
65
65
  returnType: 2,
66
- viewCode: tableView.code,
66
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
67
67
  dataSource: tableView.dataSource
68
68
  };
69
69
 
package/src/api/model.js CHANGED
@@ -101,7 +101,7 @@ export default {
101
101
  ...filter,
102
102
  per: 100000,
103
103
  returnType: 1,
104
- viewCode: tableView.code
104
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
105
105
  };
106
106
 
107
107
  let result;
@@ -147,7 +147,7 @@ export default {
147
147
  ...filter,
148
148
  per: 100000,
149
149
  returnType: 3,
150
- viewCode: tableView.code
150
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
151
151
  };
152
152
 
153
153
  let result;
@@ -199,7 +199,7 @@ export default {
199
199
  ...filter,
200
200
  per: 1000,
201
201
  returnType: 2,
202
- viewCode: tableView.code
202
+ viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
203
203
  };
204
204
 
205
205
  let result;
package/src/components/view/view-form.vue CHANGED
@@ -721,7 +721,7 @@
721
721
  }
722
722
  }
723
723
  } else {
724
- if (item.dataType === 'Boolean') {
724
+ if ((item.controlType == 'Check' || item.controlType == 'Switch') && item.dataType === 'Boolean') {
725
725
  this.setData(data, item.code, false);
726
726
  } else {
727
727
  this.setData(data, item.code, null);