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

添加附件图表数据集功能

This commit is contained in:
datagear 2021-02-16 16:58:49 +08:00
parent c18d62a3a2
commit 71851812cc
12 changed files with 247 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Roadmap.txt
View File

@ -3,7 +3,7 @@
ok 驱动程序导入页面添加注意事项：要上传驱动所有依赖库；
看板页面i18n；
ok 全局看板资源管理功能；
附件图表数据集：
ok 附件图表数据集：
图表关联数据集时，可以将其标记为附件数据集，附件图表数据集不会用于绘制图表，
而仅作为用户扩展图表使用（比如构建服务端分页表格图表时需要的总记录数）；
集成发布包添加默认为空的lib/扩展库加载目录，便于用户添加扩展库（比如变更至MySQL数据库需要的JDBC驱动库）；

23
datagear-analysis/src/main/java/org/datagear/analysis/ChartDataSet.java
View File

@ -30,7 +30,10 @@ public class ChartDataSet
private Map<String, Set<String>> propertySigns = Collections.EMPTY_MAP;
/** 数据集别名 */
private String alias;
private String alias = "";
/** 是否附件数据集，不用作渲染图表 */
private boolean attachment = false;
/** 数据集参数值映射表 */
@SuppressWarnings("unchecked")
@ -91,6 +94,24 @@ public class ChartDataSet
this.alias = alias;
}
/**
* 是否作为附件。
* <p>
* 附件数据集不用作渲染图表，不需设置数据标记，仅作为图表的附件，通常用于扩展图表功能。
* </p>
*
* @return
*/
public boolean isAttachment()
{
return attachment;
}
public void setAttachment(boolean attachment)
{
this.attachment = attachment;
}
public Map<String, Object> getParamValues()
{
return paramValues;

1
datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java
View File

@ -137,6 +137,7 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter
super(new DataSetJson(chartDataSet.getDataSet()));
setPropertySigns(chartDataSet.getPropertySigns());
setAlias(chartDataSet.getAlias());
setAttachment(chartDataSet.isAttachment());
setParamValues(chartDataSet.getParamValues());
}

14
datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java
View File

@ -303,6 +303,7 @@ public class HtmlChartWidgetEntityServiceImpl
ChartDataSetVO chartDataSet = new ChartDataSetVO(dataSet);
chartDataSet.setPropertySigns(toPropertySigns(relation.getPropertySignsJson()));
chartDataSet.setAlias(relation.getAlias());
chartDataSet.setAttachment(relation.isAttachment());
chartDataSet.setParamValues(toParamValues(relation.getParamValuesJson()));
return chartDataSet;
@ -390,6 +391,7 @@ public class HtmlChartWidgetEntityServiceImpl
i + 1);
relation.setPropertySignsJson(propertySignsJson);
relation.setAlias(chartDataSet.getAlias());
relation.setAttachment(chartDataSet.isAttachment());
relation.setParamValuesJson(paramValuesJson);
list.add(relation);
@ -408,6 +410,8 @@ public class HtmlChartWidgetEntityServiceImpl
private String alias;
private boolean attachment;
private String paramValuesJson;
private int order;
@ -465,6 +469,16 @@ public class HtmlChartWidgetEntityServiceImpl
this.alias = alias;
}
public boolean isAttachment()
{
return attachment;
}
public void setAttachment(boolean attachment)
{
this.attachment = attachment;
}
public String getParamValuesJson()
{
return paramValuesJson;

2
datagear-management/src/main/resources/org/datagear/management/ddl/datagear.sql
View File

@ -755,3 +755,5 @@ ALTER TABLE DATAGEAR_VERSION DROP COLUMN VERSION_BUILD;
--version[2.3.0], DO NOT EDIT THIS LINE!
-----------------------------------------
--添加图表数据集附件列
ALTER TABLE DATAGEAR_HCW_DS ADD COLUMN DS_ATTACHMENT VARCHAR(20);

7
datagear-management/src/main/resources/org/datagear/management/mapper/HtmlChartWidgetEntityMapper.xml
View File

@ -19,11 +19,13 @@
<insert id="insertDataSetRelation">
INSERT INTO DATAGEAR_HCW_DS
(
HCW_ID, DS_ID, DS_PROPERTY_SIGNS, DS_ALIAS, DS_PARAM_VALUES, DS_ORDER
HCW_ID, DS_ID, DS_PROPERTY_SIGNS, DS_ALIAS, DS_ATTACHMENT,
DS_PARAM_VALUES, DS_ORDER
)
VALUES
(
#{widgetId}, #{dataSetId}, #{propertySignsJson, jdbcType=VARCHAR}, #{alias, jdbcType=VARCHAR}, #{paramValuesJson, jdbcType=VARCHAR}, #{order}
#{widgetId}, #{dataSetId}, #{propertySignsJson, jdbcType=VARCHAR}, #{alias, jdbcType=VARCHAR}, #{attachment, jdbcType=VARCHAR},
#{paramValuesJson, jdbcType=VARCHAR}, #{order}
)
</insert>
@ -71,6 +73,7 @@
DS_ID AS ${_iq_}dataSetId${_iq_},
DS_PROPERTY_SIGNS AS ${_iq_}propertySignsJson${_iq_},
DS_ALIAS AS ${_iq_}alias${_iq_},
DS_ATTACHMENT AS ${_iq_}attachment${_iq_},
DS_PARAM_VALUES AS ${_iq_}paramValuesJson${_iq_},
DS_ORDER AS ${_iq_}order${_iq_}
FROM

1
datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java
View File

@ -304,6 +304,7 @@ public class AbstractChartPluginAwareController extends AbstractDataAnalysisCont
setDataSet(ProfileDataSet.valueOf(chartDataSet.getDataSet()));
setPropertySigns(chartDataSet.getPropertySigns());
setAlias(chartDataSet.getAlias());
setAttachment(chartDataSet.isAttachment());
setParamValues(chartDataSet.getParamValues());
}

8
datagear-web/src/main/resources/org/datagear/web/i18n/message.properties
View File

@ -760,7 +760,7 @@ chart.htmlChartPlugin=图表类型
chart.chartDataSets=数据集
chart.chartDataSets.desc=设置图表使用的一个或多个数据集，图表将使用它们的数据绘制内容，一个数据集通常对应图表的一个系列
chart.updateInterval=更新间隔
chart.updateInterval.desc=设置图表展示时，多久自动刷新一次数据
chart.updateInterval.desc=设置图表展示时，页面多久自动刷新一次图表数据
chart.createUser=创建用户
chart.createTime=创建时间
chart.addDataSign=添加数据标记
@ -775,8 +775,10 @@ chart.updateInterval.interval=间隔
chart.updateIntervalUnit=毫秒
chart.updateIntervalWithUnit={0}毫秒
chart.auth.resouceTypeLabel=图表
chart.chartDataSet.alias=数据集别名
chart.chartDataSet.alias.desc=定义图表展示时的数据集别名
chart.chartDataSet.alias=别名
chart.chartDataSet.alias.desc=图表展示时的数据集别名
chart.chartDataSet.attachment=附件
chart.chartDataSet.attachment.desc=数据集不用作渲染图表，不需设置数据标记，仅作为图表的附件，通常用于扩展图表功能
chart.chartDataSet.paramValue=参数值
chart.setDataSetParamValue=设置数据集参数值
chart.chartDataSet.clearParamValueTip=清除数据集参数值，可在图表展示时设置

6
datagear-web/src/main/resources/org/datagear/web/i18n/message_en.properties
View File

@ -775,8 +775,10 @@ chart.updateInterval.interval=Interval
chart.updateIntervalUnit=ms
chart.updateIntervalWithUnit={0} ms
chart.auth.resouceTypeLabel=Chart
chart.chartDataSet.alias=Data set alias
chart.chartDataSet.alias.desc=Define the data set alias when chart is shown
chart.chartDataSet.alias=Alias
chart.chartDataSet.alias.desc=Data set alias when chart shown
chart.chartDataSet.attachment=Attachment
chart.chartDataSet.attachment.desc=Data set is not for rendering chart, only as attachment
chart.chartDataSet.paramValue=Parameter
chart.setDataSetParamValue=Set parameter value
chart.chartDataSet.clearParamValueTip=Clear parameter value, can be set later when chart is shown

44
datagear-web/src/main/resources/org/datagear/web/static/css/common.css
View File

@ -2632,15 +2632,17 @@ table.dataTable tbody tr td select{
width: 60%;
height: 100%;
min-height: 10em;
padding: 0.3em 0.3em;
padding: 0.41em 0.41em;
overflow: auto;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.page-form-chart .data-set-wrapper .data-set-item{
padding: 0.3em 0.3em;
margin-top: 0.5em;
padding: 0.41em 0.41em;
margin-top: 0.6em;
border-bottom-width: 3px;
border-right-width: 3px;
}
.page-form-chart .data-set-wrapper .data-set-item:first-child{
margin-top: 0;
@ -2652,31 +2654,39 @@ table.dataTable tbody tr td select{
.page-form-chart .data-set-wrapper .data-set-item .item-head{
padding: 0.2em 0.2em;
}
.page-form-chart .data-set-wrapper .data-set-item .item-alias{
.page-form-chart .data-set-wrapper .data-set-item .item-setting{
padding: 0.4em 0.2em;
margin-bottom: 0.5em;
margin-top: 0.5em;
border-top-width: 1px;
border-left-width: 0;
border-top-width: 0;
border-right-width: 0;
border-bottom-width: 1px;
border-bottom-width: 0;
position: relative;
}
.page-form-chart .data-set-wrapper .data-set-item .item-alias .alias-label{
.page-form-chart .data-set-wrapper .data-set-item .item-setting .setting-item{
padding-top: 0.2em;
padding-bottom: 0.2em;
}
.page-form-chart .data-set-wrapper .data-set-item .item-setting .setting-item > label{
display: inline-block;
padding-left: 0.2em;
width: 30%;
padding-left: 1em;
width: 25%;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.page-form-chart .data-set-wrapper .data-set-item .item-alias input{
width: 40%!important;
.page-form-chart .data-set-wrapper .data-set-item .item-setting .setting-item > input,
.page-form-chart .data-set-wrapper .data-set-item .item-setting .setting-item > .input{
width: 30% !important;
}
.page-form-chart .data-set-wrapper .data-set-item .item-alias button{
float: right;
.page-form-chart .data-set-wrapper .data-set-item .item-setting .ui-checkboxradio-label.ui-button{
padding: 0.2em 1em;
}
.page-form-chart .data-set-wrapper .data-set-item .item-setting .dataSetParamValueButton{
position: absolute;
right: 0.1em;
top: 0.6em;
border: 0;
padding-top: 0.2em;
padding-bottom: 0.2em;
margin-right: 0.3em;
}
.page-form-chart .data-set-wrapper .data-set-item .item-signs{
margin-top: 0.3em;

105
datagear-web/src/main/resources/org/datagear/web/static/script/datagear-chartSupport.js
View File

@ -150,6 +150,11 @@
|| dataType == chartSupport.DataSetPropertyDataType.DECIMAL);
};
chartSupport.isChartDataSetAttachment = function(chartDataSet)
{
return (chartDataSet && chartDataSet.attachment);
};
/**
* 提取对象/对象数组的指定属性值。
*
@ -637,6 +642,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -800,6 +809,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -975,6 +988,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -1115,16 +1132,20 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
var np = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.name);
var npv = chart.resultColumnArrays(result, np);
var vp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.value);
var nvv = chart.resultNameValueObjects(result, np, vp);
legendData = legendData.concat(npv);
if(i == 0)
if(!seriesName)
seriesName = dataSetName;
seriesData = seriesData.concat(nvv);
@ -1347,6 +1368,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -1515,6 +1540,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -1705,6 +1734,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -1926,6 +1959,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -1935,7 +1972,7 @@
var nvv = chart.resultNameValueObjects(result, np, vp);
legendData = legendData.concat(npv);
if(i == 0)
if(!seriesName)
seriesName = dataSetName;
seriesData = seriesData.concat(nvv);
@ -2172,6 +2209,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -2190,7 +2231,7 @@
var vp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.value);
var nvv = chart.resultNameValueObjects(result, np, vp);
if(i == 0)
if(!seriesName)
seriesName = dataSetName;
seriesData = seriesData.concat(nvv);
@ -2321,6 +2362,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -2353,8 +2398,8 @@
}
}
legendData[i] = dataSetName;
series[i] = chartSupport.optionsSeries(renderOptions, i, { name: dataSetName, data: data });
legendData.push(dataSetName);
series.push(chartSupport.optionsSeries(renderOptions, i, { name: dataSetName, data: data }));
chartSupport.setChartOriginalDataIndexForRange(chart, series.length-1, 0, data.length, i);
}
@ -2494,6 +2539,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
//取任一不为空的地图名列值
@ -2507,7 +2556,7 @@
}
}
if(i == 0)
if(!seriesName)
seriesName = chart.chartDataSetName(chartDataSet);
var sip = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.sourceId);
@ -2770,6 +2819,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var dataSetName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -2922,6 +2975,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
seriesName = chart.chartDataSetName(chartDataSet);
var result = chart.resultAt(results, i);
@ -3284,9 +3341,13 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
if(i == 0)
if(!seriesName)
seriesName = chart.chartDataSetName(chartDataSet);
var np = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.name);
@ -3455,9 +3516,13 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
if(i == 0)
if(!seriesName)
seriesName = chart.chartDataSetName(chartDataSet);
var snp = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.sourceName);
@ -3650,9 +3715,13 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
if(i == 0)
if(!seriesName)
seriesName = chart.chartDataSetName(chartDataSet);
var sip = chart.dataSetPropertyOfSign(chartDataSet, signNameMap.sourceId);
@ -3951,6 +4020,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
var data = chart.resultNameValueObjects(result, chart.dataSetPropertyOfSign(chartDataSet, signNameMap.name),
@ -4094,6 +4167,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
var nps = chart.dataSetPropertiesOfSign(chartDataSet, signNameMap.name);
@ -4491,6 +4568,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
var resultDatas = chart.resultDatas(result);
@ -4994,6 +5075,10 @@
for(var i=0; i<chartDataSets.length; i++)
{
var chartDataSet = chartDataSets[i];
if(chartSupport.isChartDataSetAttachment(chartDataSet))
continue;
var result = chart.resultAt(results, i);
var nps = chart.dataSetPropertiesOfSign(chartDataSet, signNameMap.name);

114
datagear-web/src/main/resources/org/datagear/web/templates/analysis/chart/chart_form.ftl
View File

@ -291,6 +291,7 @@ readonly 是否只读操作，允许为null
var dataSetId = po.element(".chartDataSetId", this).val();
var propertySigns = {};
var alias = po.element(".chartDataSetAlias", this).val();
var attachment = po.element(".chartDataSetAttachment", this).prop("checked");
var dataSetParams = (po.element(".dataSetParamValueButton", this).data("dataSetParams") || []);
var paramValues = (po.element(".dataSetParamValueButton", this).data("paramValues") || {});
@ -307,7 +308,14 @@ readonly 是否只读操作，允许为null
propertySigns[signName] = signValues;
});
re.push({ "summaryDataSetEntity": { "id": dataSetId, "params": dataSetParams }, "propertySigns": propertySigns, "alias": alias, "paramValues": paramValues });
re.push(
{
"summaryDataSetEntity": { "id": dataSetId, "params": dataSetParams },
"propertySigns": propertySigns,
"alias": alias,
"attachment": attachment,
"paramValues": paramValues
});
});
return re;
@ -362,6 +370,8 @@ readonly 是否只读操作，允许为null
po.renderChartDataSetItem($parent, chartPlugin, po.chartDataSets[i]);
};
po.chartDataSetAttachmentIdSeq = 0;
po.renderChartDataSetItem = function($parent, chartPlugin, chartDataSet)
{
var dataSet = chartDataSet.dataSet;
@ -378,49 +388,6 @@ readonly 是否只读操作，允许为null
.attr("title", "<@spring.message code='delete' />").appendTo($head);
</#if>
var $aliasDiv = $("<div class='item-alias ui-widget ui-widget-content' />").appendTo($item);
$("<div class='alias-label' />").html("<@spring.message code='chart.chartDataSet.alias' />")
.attr("title", "<@spring.message code='chart.chartDataSet.alias.desc' />").appendTo($aliasDiv);
$("<input type='text' class='chartDataSetAlias ui-widget ui-widget-content' />")
.attr("value", (chartDataSet.alias || "")).appendTo($aliasDiv);
if(dataSet.params && dataSet.params.length > 0)
{
var $pvButton = $("<button type='button' class='dataSetParamValueButton ui-button ui-corner-all ui-widget'><@spring.message code='chart.chartDataSet.paramValue' /></button>")
.appendTo($aliasDiv);
$pvButton.data("dataSetParams", dataSet.params).data("paramValues", (chartDataSet.paramValues || {}));
$pvButton.click(function(event)
{
var $this = $(this);
po.showDataSetParamValuePanel($this,
{
submit: function(formData)
{
$this.data("paramValues", formData);
po.element(".data-set-param-value-panel").hide();
},
readonly: <#if readonly>true<#else>false</#if>,
render: function()
{
$("select, input, textarea", this).addClass("ui-widget ui-widget-content");
$("button", this).addClass("ui-button ui-corner-all ui-widget");
<#if !readonly>
var $foot = chartFactory.chartSetting.getDataSetParamValueFormFoot(this);
var $button = $(" <button type='button' class='ui-button ui-corner-all ui-widget' style='margin-left:1em;' />")
.html("<@spring.message code='clear' />").attr("title", "<@spring.message code='chart.chartDataSet.clearParamValueTip' />").appendTo($foot);
$button.click(function()
{
$this.data("paramValues", {});
po.element(".data-set-param-value-panel").hide();
});
</#if>
}
});
});
}
var $signs = $("<div class='item-signs' />").appendTo($item);
for(var i=0; i<dataSetProperties.length; i++)
{
@ -461,6 +428,62 @@ readonly 是否只读操作，允许为null
.appendTo($valuesWrapper);
</#if>
}
var $settingDiv = $("<div class='item-setting ui-widget ui-widget-content' />").appendTo($item);
var $aliasSetting = $("<div class='setting-item' />").appendTo($settingDiv);
$("<label class='tip-label' />").html("<@spring.message code='chart.chartDataSet.alias' />")
.attr("title", "<@spring.message code='chart.chartDataSet.alias.desc' />").appendTo($aliasSetting);
$("<input type='text' class='chartDataSetAlias ui-widget ui-widget-content' />")
.attr("value", (chartDataSet.alias || "")).appendTo($aliasSetting);
var $attachment = $("<div class='setting-item' />").appendTo($settingDiv);
var atchChkId = "${pageId}-attachmentChk-" + (po.chartDataSetAttachmentIdSeq++);
$("<label class='tip-label' />").html("<@spring.message code='chart.chartDataSet.attachment' />")
.attr("title", "<@spring.message code='chart.chartDataSet.attachment.desc' />").appendTo($attachment);
var $chkWrapper = $("<span class='input' />").appendTo($attachment);
$("<label />").attr("for", atchChkId).html("").appendTo($chkWrapper);
var $atchChk = $("<input type='checkbox' class='chartDataSetAttachment ui-widget ui-widget-content' />")
.attr("id", atchChkId).attr("value", "true")
.appendTo($chkWrapper).checkboxradio();
$atchChk.prop("checked", chartDataSet.attachment).checkboxradio("refresh");
if(dataSet.params && dataSet.params.length > 0)
{
var $pvButton = $("<button type='button' class='dataSetParamValueButton ui-button ui-corner-all ui-widget'><@spring.message code='chart.chartDataSet.paramValue' /></button>")
.appendTo($settingDiv);
$pvButton.data("dataSetParams", dataSet.params).data("paramValues", (chartDataSet.paramValues || {}));
$pvButton.click(function(event)
{
var $this = $(this);
po.showDataSetParamValuePanel($this,
{
submit: function(formData)
{
$this.data("paramValues", formData);
po.element(".data-set-param-value-panel").hide();
},
readonly: <#if readonly>true<#else>false</#if>,
render: function()
{
$("select, input, textarea", this).addClass("ui-widget ui-widget-content");
$("button", this).addClass("ui-button ui-corner-all ui-widget");
<#if !readonly>
var $foot = chartFactory.chartSetting.getDataSetParamValueFormFoot(this);
var $button = $(" <button type='button' class='ui-button ui-corner-all ui-widget' style='margin-left:1em;' />")
.html("<@spring.message code='clear' />").attr("title", "<@spring.message code='chart.chartDataSet.clearParamValueTip' />").appendTo($foot);
$button.click(function()
{
$this.data("paramValues", {});
po.element(".data-set-param-value-panel").hide();
});
</#if>
}
});
});
}
};
po.addPropertySignItem = function($parent, value, label)
@ -658,6 +681,9 @@ readonly 是否只读操作，允许为null
var $chartDataSetItem = $($chartDataSetItems[i]);
var $itemSigns = $(".item-signs" , $chartDataSetItem);
if(po.element(".chartDataSetAttachment", $chartDataSetItem).prop("checked"))
continue;
var setSigns = [];
$(".chartDataSetPropertySignValue", $itemSigns).each(function()
{