diff --git a/README.md b/README.md
index 453a75a9c4..fd9336bc85 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
-
+
@@ -104,6 +104,11 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash
[](https://star-history.com/#dataease/dataease&Date)
+## FOSSA Status
+
+[](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_large)
+
+
## License
Copyright (c) 2014-2023 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved.
diff --git a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
index f1c81f851c..95af14d0ae 100644
--- a/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
+++ b/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java
@@ -56,6 +56,7 @@ public interface ShareApi {
@PostMapping("/removeShares")
void removeShares(PanelShareRemoveRequest request);
+ @DePermission(type = DePermissionType.PANEL)
@ApiOperation("删除仪表板所有分享")
@PostMapping("/removePanelShares/{panelId}")
void removePanelShares(@PathVariable("panelId") String panelId);
diff --git a/frontend/src/components/canvas/components/editor/ViewTrackBar.vue b/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
index b044107dfa..23a4e9a263 100644
--- a/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
+++ b/frontend/src/components/canvas/components/editor/ViewTrackBar.vue
@@ -1,6 +1,7 @@
-
+
= yAxis.length ? (y.yAxisIndex = 1) : (y.yAxisIndex = 0)
+ // get max
+ if (i >= yAxis.length) {
+ const valueList = []
+ y.data.forEach(ele => {
+ valueList.push(ele.value)
+ })
+ yAxisExtSeriesMaxList.push(Math.max.apply(null, valueList))
+ } else {
+ const valueList = []
+ y.data.forEach(ele => {
+ valueList.push(ele.value)
+ })
+ yAxisSeriesMaxList.push(Math.max.apply(null, valueList))
+ }
+
y.selectedMode = true
y.select = BASE_ECHARTS_SELECT
chart_option.series.push(y)
}
}
componentStyle(chart_option, chart)
+
+ // 若轴值中最大值小于data的最大值,则轴值最大值设置失效
+ if (yAxisSeriesMaxList.length > 0 && !isNaN(chart_option.yAxis[0].max)) {
+ const max = Math.max.apply(null, yAxisSeriesMaxList)
+ if (max > chart_option.yAxis[0].max) {
+ delete chart_option.yAxis[0].max
+ }
+ }
+ if (yAxisExtSeriesMaxList.length > 0 && !isNaN(chart_option.yAxis[1].max)) {
+ const max = Math.max.apply(null, yAxisExtSeriesMaxList)
+ if (max > chart_option.yAxis[1].max) {
+ delete chart_option.yAxis[1].max
+ }
+ }
+
seniorCfg(chart_option, chart)
return chart_option
}
diff --git a/frontend/src/views/panel/filter/FilterDialog.vue b/frontend/src/views/panel/filter/FilterDialog.vue
index fe04b0923d..916727fae7 100644
--- a/frontend/src/views/panel/filter/FilterDialog.vue
+++ b/frontend/src/views/panel/filter/FilterDialog.vue
@@ -755,7 +755,7 @@ export default {
type = 'NUM'
}
datasetParams(tableId, type).then(res => {
- this.datasetParams = res.data
+ this.datasetParams = res.data || []
})
},
comLoadField(tableId) {