jeecg 3.6 支持oracle11g 脚本

9 years ago · 9b7d5245e8
parent a902dbd532
commit 9b7d5245e8
3 changed files with 11501 additions and 2 deletions
--- a/docs/db/jeecg-oracle11g-20151207.sql
+++ b/docs/db/jeecg-oracle11g-20151207.sql
--- a/src/main/java/org/jeecgframework/web/cgreport/engine/core/cgreportlist.ftl
+++ b/src/main/java/org/jeecgframework/web/cgreport/engine/core/cgreportlist.ftl
@ -22,7 +22,7 @@ $(function(){$('#${config_id}List').datagrid(
 					 	<#if x_has_next>
 						{field:'${x['field_name']}',
 						 title:'${x['field_txt']}',
-					 	 <#if x['field_href'] != "">
+					 	 <#if x['field_href']?? && x['field_href']!="">
 						 	formatter:function(value,rec,index){
 						 		var href='';
 						 		href+=applyHref('字段链接','${x['field_href']}',value,rec,index);
--- a/src/main/java/org/jeecgframework/web/graphreport/engine/core/graphreportlist.ftl
+++ b/src/main/java/org/jeecgframework/web/graphreport/engine/core/graphreportlist.ftl
@ -237,7 +237,7 @@ function showReport(data, tabName) {
 var columns = new Array();
 <#list config_fieldList as x> 
 	<#if x["is_show"]== "Y">
-		columns.push({field:"${x['field_name']}",title:"${x['field_txt']}",width:120, sortable: true});
+		columns.push({field:"${x['field_name']}",title:"<#if x['field_txt']??>${x['field_txt']}</#if>",width:120, sortable: true});
 	</#if> 
 </#list>
 columns = [columns];