mooho-base-admin-plus 0.4.53 → 0.4.55
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/package.json
CHANGED
|
@@ -173,6 +173,22 @@
|
|
|
173
173
|
filter[key] = staticData[key];
|
|
174
174
|
}
|
|
175
175
|
|
|
176
|
+
// 排序
|
|
177
|
+
if (this.tableView.sorting) {
|
|
178
|
+
// 排序
|
|
179
|
+
let obj = JSON.parse(this.tableView.sorting);
|
|
180
|
+
let arr = [];
|
|
181
|
+
for (let key in obj) {
|
|
182
|
+
if (obj[key] === 'desc') {
|
|
183
|
+
arr.push('-' + key);
|
|
184
|
+
} else {
|
|
185
|
+
arr.push('+' + key);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
filter.orderBy = arr.join(',');
|
|
190
|
+
}
|
|
191
|
+
|
|
176
192
|
if (this.tableView.isGroupBy) {
|
|
177
193
|
filter.isGroupBy = true;
|
|
178
194
|
filter.groupColumn = JSON.parse(this.tableView.groupColumn);
|
|
@@ -352,7 +368,7 @@
|
|
|
352
368
|
|
|
353
369
|
return {
|
|
354
370
|
type: 'pie',
|
|
355
|
-
radius: (this.setting.
|
|
371
|
+
radius: (this.setting.chartItemWidth == null ? 70 : this.setting.chartItemWidth) / count,
|
|
356
372
|
center: [(100 / (count + 1)) * (index + 1) + '%', '50%'],
|
|
357
373
|
datasetIndex: index,
|
|
358
374
|
data: Object.keys(keyData).map(key => {
|
|
@@ -414,7 +430,7 @@
|
|
|
414
430
|
option.series = chartSeries.map((item, index) => {
|
|
415
431
|
return {
|
|
416
432
|
type: 'pie',
|
|
417
|
-
radius: (this.setting.
|
|
433
|
+
radius: (this.setting.chartItemWidth == null ? 70 : this.setting.chartItemWidth) + 100 / count,
|
|
418
434
|
center: [(100 / (count + 1)) * (index + 1) + '%', '50%'],
|
|
419
435
|
datasetIndex: index,
|
|
420
436
|
data: this.data.map(data => {
|