完善图表数据集属性排序相关功能

joode · Nov 3, 2021 · 66f0574 · 66f0574
1 parent 9184af8
commit 66f0574
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/datagear-web/src/main/resources/org/datagear/web/static/script/chartSetting.js b/datagear-web/src/main/resources/org/datagear/web/static/script/chartSetting.js
@@ -1619,7 +1619,7 @@
 	chartSetting.initChartDataSetDataTable = function(chart, chartDataSets, index, $parent)
 	{
 		var chartDataSet = chartDataSets[index];
-		var dataSetProperties = (chartDataSet.dataSet.properties || []);
+		var dataSetProperties = chart.dataSetProperties(chartDataSet);
 		var propertySigns = (chartDataSet.propertySigns || {});
 		var dataSigns = (chart.plugin && chart.plugin.dataSigns ? chart.plugin.dataSigns : []);
 		var signProperties = [];

diff --git a/datagear-web/src/main/resources/org/datagear/web/static/script/chartSupport.js b/datagear-web/src/main/resources/org/datagear/web/static/script/chartSupport.js
@@ -4789,7 +4789,7 @@
 	{
 		var cps = chart.dataSetPropertiesOfSign(chartDataSet, columnSign);
 		if(!cps || cps.length == 0)
-			cps =(chartDataSet && chartDataSet.dataSet ? (chartDataSet.dataSet.properties || []) : []);
+			cps = chart.dataSetProperties(chartDataSet);
 
 		return cps;
 	};

diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/chart/chart_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/chart/chart_form.ftl
@@ -636,7 +636,7 @@ readonly 是否只读操作，允许为null
 				.html("<@spring.message code='chart.chartDataSet.propertyOrder' />").appendTo($propertyOrder);
 			var $orderInputWrapper = $("<div class='item-lv-v' />").appendTo($propertyOrder);
 			$("<input type='text' class='chartDataSetPropertyOrder ui-widget ui-widget-content ui-corner-all' />")
-				.attr("placeholder", i).val(propertyOrders[dsp.name] || "")
+				.attr("placeholder", i).val(propertyOrders[dsp.name] != null ? propertyOrders[dsp.name] : "")
 				.appendTo($orderInputWrapper);
 			$propertyOrder.appendTo($dsProp);
 		}

diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dashboard/dashboard_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dashboard/dashboard_form.ftl
@@ -626,6 +626,7 @@ readonly 是否只读操作，允许为null
 		{name: "chart.dataSetParamValueFirst", value: "dataSetParamValueFirst(", caption: "dataSetParamValueFirst() ", meta: "chart"},
 		{name: "chart.dataSetParamValues", value: "dataSetParamValues(", caption: "dataSetParamValues() ", meta: "chart"},
 		{name: "chart.dataSetParamValuesFirst", value: "dataSetParamValuesFirst(", caption: "dataSetParamValuesFirst() ", meta: "chart"},
+		{name: "chart.dataSetProperties", value: "dataSetProperties(", caption: "dataSetProperties() ", meta: "chart"},
 		{name: "chart.dataSetPropertiesOfSign", value: "dataSetPropertiesOfSign(", caption: "dataSetPropertiesOfSign() ", meta: "chart"},
 		{name: "chart.dataSetProperty", value: "dataSetProperty(", caption: "dataSetProperty() ", meta: "chart"},
 		{name: "chart.dataSetPropertyAlias", value: "dataSetPropertyAlias(", caption: "dataSetPropertyAlias() ", meta: "chart"},