图表/看板展示页面添加图表数据透视表功能，并扩展"dg-chart-disable-setting"属性功能可控制是否开启

Roadmap.txt

@@ -3,8 +3,8 @@
 	ok 内置图表添加processRenderOptions、processUpdateOptions选项；
 	ok 看板编辑页面添加搜索功能；
 	ok 添加更多内置图表插件；
+	ok 图表、看板展示页面添加数据透视表功能；
 	全局看板资源管理功能；
-	图表、看板展示页面添加数据透视图功能；
 
 待定：
 

datagear-web/src/main/resources/org/datagear/web/static/css/analysis.css

@@ -182,8 +182,6 @@
 .dg-chart-setting-box .dg-chart-setting-panel .dg-chart-setting-panel-content{
 	overflow: auto;
 	font-size: 0.9em;
-	max-width: 41em;
-	min-height: 4.1em;
 }
 .dg-chart-setting-box .dg-chart-setting-panel .dg-chart-setting-panel-foot{
 	padding-top: 0.41em;
@@ -197,14 +195,14 @@
 	border-width: 1px;
 	border-style: solid;
 }
-.dg-chart-setting-box .dg-chart-setting-panel .dg-param-value-form-wrapper{
+.dg-chart-setting-box .dg-chart-setting-panel .dg-chartdataset-section{
 	border-width: 1px;
 	border-style: solid;
 	padding: 0.5em 0.5em;
 	margin: 0.5em 0;
 	border-radius: 3px;
 }
-.dg-chart-setting-box .dg-chart-setting-panel .dg-param-value-form-head{
+.dg-chart-setting-box .dg-chart-setting-panel .dg-chartdataset-section-head{
 	font-weight: bold;
 	overflow: hidden;
 	white-space: nowrap;
@@ -232,6 +230,15 @@
 	border-color: red !important;
 	color: red !important;
 }
+.dg-chart-setting-box .dg-chart-setting-panel table.dataTable td.dataTables_empty{
+	display: none;/*隐藏初始未加载数据时的空行，避免影响样式*/
+}
+.dg-chart-setting-box .dg-chart-setting-panel table.dataTable thead th,
+.dg-chart-setting-box .dg-chart-setting-panel table.dataTable thead td{
+	padding: 0.41em 1em 0.41em 10px;
+	text-align: left;
+	white-space: nowrap;
+}
 
 /*datetimepicker组件扩展样式*/
 .xdsoft_datetimepicker .xdsoft_calendar td,

datagear-web/src/main/resources/org/datagear/web/static/script/datagear-chartFactory.js

@@ -522,22 +522,30 @@
 		if(disableSetting == null)
 			disableSetting = $(document.body).attr("dg-chart-disable-setting");
 
-		if(disableSetting == "false" || disableSetting == null)
-			disableSetting = false;
+		var setting =
+		{
+			param: false,
+			//通常情况下图表不需显示数据透视表，所以这里默认禁用
+			data: true
+		};
+
+		if(disableSetting == "false")
+		{
+			setting.param = false;
+			setting.data = false;
+		}
 		else if(disableSetting == "true")
-			disableSetting = true;
+		{
+			setting.param = true;
+			setting.data = true;
+		}
 		else
 		{
-			disableSetting = chartFactory.evalSilently(disableSetting, {});
-
-			if(disableSetting.param == null)
-				disableSetting.param = false;
-
-			if(disableSetting.data == null)
-				disableSetting.data = false;
+			var tmpSetting = chartFactory.evalSilently(disableSetting, {});
+			setting = $.extend(setting, tmpSetting);
 		}
 
-		this.disableSetting(disableSetting);
+		this.disableSetting(setting);
 	};
 
 	/**
@@ -700,25 +708,25 @@
 		else
 			this._echartsThemeName = themeName;
 	};
-
+	
 	/**
-	 * 获取/设置初始图表是否禁用交互设置。
+	 * 获取/设置初始图表是否禁用设置。
 	 * 
-	 * @param disable 可选，是否禁用图表交互设置，没有则执行获取操作且不会返回null。
-	 * 					允许格式为：true、false、
+	 * @param setting 可选，禁用设置，没有则执行获取操作且不会返回null。
+	 * 					禁用设置格式为：
 	 *					{
 	 *						//是否禁用参数
-	 *						param: true || false,
-	 *						//是否禁用数据表格
+	 *						param: false || true,
+	 *						//是否禁用数据透视表
 	 *						data: true || false
 	 *					}
 	 */
-	chartBase.disableSetting = function(disable)
+	chartBase.disableSetting = function(setting)
 	{
-		if(disable === undefined)
-			return (this._disableSetting == null ? false :  this._disableSetting);
+		if(setting === undefined)
+			return (this._disableSetting == null ? {param: false, data: true} :  this._disableSetting);
 		else
-			this._disableSetting = disable;
+			this._disableSetting = setting;
 	};
 
 	/**