mooho-base-admin-plus 2.5.16 → 2.5.17

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 (12) hide show
  1. package/history.md +1 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +9 -9
  3. package/package/mooho-base-admin-plus.min.js +3 -3
  4. package/package/style.css +1 -1
  5. package/package.json +1 -1
  6. package/src/api/customModel.js +1 -1
  7. package/src/api/dataSource.js +1 -1
  8. package/src/api/model.js +1 -1
  9. package/src/components/view/view-table.vue +4 -4
  10. package/src/pages/template/processPage.vue +3 -1
  11. package/src/pages/template/reportPage.vue +3 -1
  12. package/src/pages/template/viewPage.vue +3 -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.5.16",
4
+ "version": "2.5.17",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/api/customModel.js CHANGED
@@ -71,7 +71,7 @@ export default {
71
71
  let data = {
72
72
  ...filter,
73
73
  modelName: tableView.model,
74
- per: 100000,
74
+ per: tableView.maxExportCount == null ? 1000000 : tableView.maxExportCount,
75
75
  returnType: 1,
76
76
  viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
77
77
  };
package/src/api/dataSource.js CHANGED
@@ -19,7 +19,7 @@ export default {
19
19
  async exportExcel(tableView, filter, path = 'query') {
20
20
  let data = {
21
21
  ...filter,
22
- per: 100000,
22
+ per: tableView.maxExportCount == null ? 1000000 : tableView.maxExportCount,
23
23
  returnType: 1,
24
24
  viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code,
25
25
  dataSource: tableView.dataSource
package/src/api/model.js CHANGED
@@ -99,7 +99,7 @@ export default {
99
99
 
100
100
  let data = {
101
101
  ...filter,
102
- per: 1000000,
102
+ per: tableView.maxExportCount == null ? 1000000 : tableView.maxExportCount,
103
103
  returnType: 1,
104
104
  viewCode: !!(tableView.exportDataViewCode || '').trim() ? tableView.exportDataViewCode : tableView.code
105
105
  };
package/src/components/view/view-table.vue CHANGED
@@ -713,11 +713,11 @@
713
713
  * 初始化完成事件
714
714
  */
715
715
  this.$emit('after-init');
716
- });
717
- }
718
716
 
719
- if (this.viewCode && this.autoLoad) {
720
- this.loadData();
717
+ if (this.autoLoad && !this.tableView.autoLoadDisable) {
718
+ this.loadData();
719
+ }
720
+ });
721
721
  }
722
722
  },
723
723
  activated() {
package/src/pages/template/processPage.vue CHANGED
@@ -161,7 +161,9 @@
161
161
  }
162
162
 
163
163
  this.$refs.table.init(this.page.tableViewCode, () => {
164
- this.$refs.table.loadData();
164
+ if (!this.$refs.table.tableView.autoLoadDisable) {
165
+ this.$refs.table.loadData();
166
+ }
165
167
  });
166
168
 
167
169
  if (!!(this.page.formViewCode || '').trim()) {
package/src/pages/template/reportPage.vue CHANGED
@@ -53,7 +53,9 @@
53
53
 
54
54
  setTimeout(() => {
55
55
  this.$refs.table.init(this.page.tableViewCode, () => {
56
- this.$refs.table.loadData();
56
+ if (!this.$refs.table.tableView.autoLoadDisable) {
57
+ this.$refs.table.loadData();
58
+ }
57
59
  });
58
60
 
59
61
  this.$refs.chart.initWithTable(this.tableView, this.$refs.table.data);
package/src/pages/template/viewPage.vue CHANGED
@@ -91,7 +91,9 @@
91
91
 
92
92
  setTimeout(() => {
93
93
  this.$refs.table.init(this.page.tableViewCode, () => {
94
- this.$refs.table.loadData();
94
+ if (!this.$refs.table.tableView.autoLoadDisable) {
95
+ this.$refs.table.loadData();
96
+ }
95
97
  });
96
98
 
97
99
  if (!!(this.page.formViewCode || '').trim()) {