mooho-base-admin-plus 2.4.13 → 2.4.15

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/history.md +2 -0
  2. package/package/mooho-base-admin-plus.min.esm.js +12 -11
  3. package/package/mooho-base-admin-plus.min.js +8 -8
  4. package/package.json +1 -1
  5. package/src/api/customModel.js +4 -4
  6. package/src/mixins/page.js +3 -3
  7. package/src/pages/template/processPage.vue +8 -9
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.13",
4
+ "version": "2.4.15",
5
5
  "author": "jinyifan <jinyifan@mooho.com.cn>",
6
6
  "license": "MIT",
7
7
  "private": false,
package/src/api/customModel.js CHANGED
@@ -82,14 +82,14 @@ export default {
82
82
  data.groupColumn = JSON.parse(tableView.groupColumn);
83
83
  data.groupMethod = JSON.parse(tableView.groupMethod);
84
84
 
85
- await request({
85
+ result = await request({
86
86
  url: `api/${res}/group`,
87
87
  method: 'post',
88
88
  responseType: 'blob',
89
89
  data
90
90
  });
91
91
  } else {
92
- await request({
92
+ result = await request({
93
93
  url: `api/${res}/query`,
94
94
  method: 'post',
95
95
  responseType: 'blob',
@@ -117,14 +117,14 @@ export default {
117
117
  data.groupColumn = JSON.parse(tableView.groupColumn);
118
118
  data.groupMethod = JSON.parse(tableView.groupMethod);
119
119
 
120
- await request({
120
+ result = await request({
121
121
  url: `api/${res}/group`,
122
122
  method: 'post',
123
123
  responseType: 'blob',
124
124
  data
125
125
  });
126
126
  } else {
127
- await request({
127
+ result = await request({
128
128
  url: `api/${res}/query`,
129
129
  method: 'post',
130
130
  responseType: 'blob',
package/src/mixins/page.js CHANGED
@@ -270,7 +270,7 @@ export default {
270
270
  try {
271
271
  result = dateFormat(new Date(value * 1000), format);
272
272
  } catch (e) {
273
- console.log(e);
273
+ console.log(e, value);
274
274
  }
275
275
 
276
276
  return result;
@@ -314,7 +314,7 @@ export default {
314
314
 
315
315
  result = array.join(', ');
316
316
  } catch (e) {
317
- console.log(e);
317
+ console.log(e, value);
318
318
  }
319
319
 
320
320
  return result;
@@ -323,7 +323,7 @@ export default {
323
323
  try {
324
324
  result = dateFormat(new Date(parseInt(value) * 1000), format);
325
325
  } catch (e) {
326
- console.log(e);
326
+ console.log(e, value);
327
327
  }
328
328
 
329
329
  return result;
package/src/pages/template/processPage.vue CHANGED
@@ -32,13 +32,7 @@
32
32
  <Button type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
33
33
  <Button
34
34
  type="warning"
35
- v-if="
36
- $refs.form &&
37
- $refs.form.data &&
38
- $refs.form.data.application &&
39
- $refs.form.data.applicationID &&
40
- ($refs.form.data.application.status == 'Draft' || $refs.form.data.application.status == 'Rejected')
41
- "
35
+ v-if="$refs.form && $refs.form.data && $refs.form.data.application && ($refs.form.data.application.status == 'Draft' || $refs.form.data.application.status == 'Rejected')"
42
36
  custom-icon="fa fa-trash-alt"
43
37
  @click="cancel"
44
38
  >
@@ -46,7 +40,7 @@
46
40
  </Button>
47
41
  <Button
48
42
  type="info"
49
- v-if="$refs.form && $refs.form.data && $refs.form.data.applicationID"
43
+ v-if="$refs.form && $refs.form.data && $refs.form.data.application && $refs.form.data.application.processInstID"
50
44
  custom-icon="fa fa-history"
51
45
  @click="$refs.approvalHistoryTable.open({ processInstID: $refs.form.data.application.processInstID })"
52
46
  >
@@ -71,7 +65,12 @@
71
65
  >
72
66
  发表意见
73
67
  </Button>
74
- <Button type="info" custom-icon="fa fa-history" @click="$refs.approvalHistoryTable.open({ processInstID: $refs.showForm.data.application.processInstID })">
68
+ <Button
69
+ type="info"
70
+ v-if="$refs.showForm && $refs.showForm.data && $refs.showForm.data.application && $refs.showForm.data.application.processInstID"
71
+ custom-icon="fa fa-history"
72
+ @click="$refs.approvalHistoryTable.open({ processInstID: $refs.showForm.data.application.processInstID })"
73
+ >
75
74
  {{ $t('Front_Btn_History') }}
76
75
  </Button>
77
76
  </template>