mooho-base-admin-plus 0.4.46 → 0.4.47
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.
- package/.env +1 -1
- package/dist/mooho-base-admin-plus.min.esm.js +9 -4
- package/dist/mooho-base-admin-plus.min.js +2 -2
- package/dist/style.css +1 -1
- package/package.json +1 -1
- package/src/components/view/column-check.vue +1 -1
- package/src/components/view/column-select.vue +3 -1
- package/src/components/view/group-method.vue +6 -1
package/package.json
CHANGED
|
@@ -185,7 +185,7 @@
|
|
|
185
185
|
column: {
|
|
186
186
|
code: groupMethod.property,
|
|
187
187
|
name: groupMethod.property,
|
|
188
|
-
dataType: groupMethod.aggregateType == 'Count' ? 'Integer' : groupMethod.dataType
|
|
188
|
+
dataType: groupMethod.aggregateType == 'Count' ? 'Integer' : groupMethod.aggregateType == 'Avg' ? 'Double' : groupMethod.dataType
|
|
189
189
|
},
|
|
190
190
|
title: groupMethod.aggregateType + (groupMethod.aggregateType == 'Count' ? '' : ' - ' + groupMethod.columnExp) + ' (' + groupMethod.property + ')'
|
|
191
191
|
// children: convertList(item.columns, columns, isGroupBy, groupColumns)
|
|
@@ -167,13 +167,15 @@
|
|
|
167
167
|
this.data = convertList(res, columns);
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
+
console.log('bbb');
|
|
171
|
+
|
|
170
172
|
// 聚合函数生成的字段
|
|
171
173
|
groupMethods.forEach(groupMethod => {
|
|
172
174
|
this.data.push({
|
|
173
175
|
column: {
|
|
174
176
|
code: groupMethod.property,
|
|
175
177
|
name: groupMethod.property,
|
|
176
|
-
dataType: groupMethod.aggregateType == 'Count' ? 'Integer' : groupMethod.dataType
|
|
178
|
+
dataType: groupMethod.aggregateType == 'Count' ? 'Integer' : groupMethod.aggregateType == 'Avg' ? 'Double' : groupMethod.dataType
|
|
177
179
|
},
|
|
178
180
|
title: groupMethod.aggregateType + (groupMethod.aggregateType == 'Count' ? '' : ' - ' + groupMethod.columnExp) + ' (' + groupMethod.property + ')',
|
|
179
181
|
checked: columns.some(column => {
|
|
@@ -94,7 +94,12 @@
|
|
|
94
94
|
this.$refs.columnCheck.open(model, column => {
|
|
95
95
|
data.columnExp = column.code;
|
|
96
96
|
data.property = column.code.split('.').pop();
|
|
97
|
-
|
|
97
|
+
|
|
98
|
+
if (this.$refs.form.data.aggregateType == 'Avg') {
|
|
99
|
+
data.dataType = 'Double';
|
|
100
|
+
} else {
|
|
101
|
+
data.dataType = column.dataType;
|
|
102
|
+
}
|
|
98
103
|
|
|
99
104
|
//this.$forceUpdate();
|
|
100
105
|
});
|