p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

修改关联JSON数据集的图表编辑报错的BUG

This commit is contained in:
datagear 2020-08-11 11:31:31 +08:00
parent d6fb94a9e3
commit 60b4a5324d
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java
View File

@ -10,7 +10,6 @@ package org.datagear.management.domain;
import org.datagear.analysis.ChartDataSet;
import org.datagear.analysis.DataSet;
import org.datagear.analysis.DataSetResult;
import org.datagear.analysis.support.SqlDataSet;
import com.fasterxml.jackson.annotation.JsonIgnore;
@ -32,14 +31,14 @@ public class ChartDataSetVO extends ChartDataSet
super(dataSet);
}
public SqlDataSet getSqlDataSet()
/**
* 设置{@linkplain SummaryDataSetEntity}，仅用于保存操作。
*
* @param dataSetEntity
*/
public void setSummaryDataSetEntity(SummaryDataSetEntity dataSetEntity)
{
return (SqlDataSet) super.getDataSet();
}
public void setSqlDataSet(SqlDataSet sqlDataSet)
{
super.setDataSet(sqlDataSet);
super.setDataSet(dataSetEntity);
}
@JsonIgnore

6
datagear-management/src/main/java/org/datagear/management/domain/SummaryDataSetEntity.java
View File

@ -11,12 +11,16 @@ import java.util.Collections;
import java.util.Date;
import java.util.Map;
import org.datagear.analysis.DataSet;
import org.datagear.analysis.DataSetException;
import org.datagear.analysis.DataSetResult;
import org.datagear.analysis.support.AbstractDataSet;
/**
* 概要数据集实体。
* 概要{@linkplain DataSetEntity}。
* <p>
* 此类不表示任何具体的{@linkplain DataSet}实现，仅用于表示{@linkplain DataSetEntity}结构。
* </p>
*
* @author datagear@163.com
*

3
datagear-management/src/main/java/org/datagear/management/service/DataSetEntityService.java
View File

@ -8,7 +8,6 @@
package org.datagear.management.service;
import org.datagear.analysis.DataSet;
import org.datagear.analysis.support.SqlDataSet;
import org.datagear.management.domain.DataSetEntity;
/**
@ -20,7 +19,7 @@ import org.datagear.management.domain.DataSetEntity;
public interface DataSetEntityService extends DataPermissionEntityService<String, DataSetEntity>
{
/**
* 获取可用于执行分析的{@linkplain SqlDataSet}。
* 获取可用于执行分析的{@linkplain DataSet}。
*
* @param id
* @return

7
datagear-web/src/main/java/org/datagear/web/controller/ChartController.java
View File

@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.datagear.analysis.ChartPluginManager;
import org.datagear.analysis.DataSetParam;
import org.datagear.analysis.DataSetResult;
import org.datagear.analysis.RenderContext;
import org.datagear.analysis.TemplateDashboardWidgetResManager;
@ -427,10 +428,12 @@ public class ChartController extends AbstractChartPluginAwareController implemen
{
for (ChartDataSetVO vo : chartDataSetVOs)
{
if (vo.getSqlDataSet().hasParam())
List<DataSetParam> params = vo.getDataSet().getParams();
if (params != null && !params.isEmpty())
{
Map<String, Object> paramValues = getDataSetParamValueConverter().convert(vo.getParamValues(),
vo.getSqlDataSet().getParams());
params);
vo.setParamValues(paramValues);
}
}

2
datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_form.ftl
View File

@ -297,7 +297,7 @@ readonly 是否只读操作，允许为null
propertySigns[signName] = signValues;
});
re.push({ "sqlDataSet": { "id": dataSetId, "params": dataSetParams }, "propertySigns": propertySigns, "alias": alias, "paramValues": paramValues });
re.push({ "summaryDataSetEntity": { "id": dataSetId, "params": dataSetParams }, "propertySigns": propertySigns, "alias": alias, "paramValues": paramValues });
});
return re;