msb-public-java
/
jeecg
mirror of https://gitee.com/jeecg/jeecg.git
1
0
Code Issues Projects Releases Wiki Activity

jeecg 3.6.5 页面注释调整

Browse Source
jeecg_3.6.5
zhangdaiscott 9 years ago
parent 8c6c47b91f
commit 90c2e6d848
63 changed files with 0 additions and 197 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/org/jeecgframework/web/cgform/engine/jform.ftl
Unescape View File

@ -29,7 +29,6 @@
</label> </label>
</td> </td>
<td class="value"> <td class="value">
<!--update-begin--Author:钟世云 Date:20150610 for：online支持树配置-->
<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name> <#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
<!--如果为树形菜单，父id输入框设置为select--> <!--如果为树形菜单，父id输入框设置为select-->
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@ -73,7 +72,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -340,11 +338,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/java/org/jeecgframework/web/cgform/engine/jformunion.ftl
Unescape View File

@ -76,11 +76,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/boostrap01/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

2
src/main/resources/online/template/boostrap01/html/jform.ftl
Unescape View File

@ -70,11 +70,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/default/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

4
src/main/resources/online/template/default/html/jform.ftl
Unescape View File

@ -29,7 +29,6 @@
</label> </label>
</td> </td>
<td class="value"> <td class="value">
<!--update-begin--Author:钟世云 Date:20150610 for：online支持树配置-->
<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name> <#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
<!--如果为树形菜单，父id输入框设置为select--> <!--如果为树形菜单，父id输入框设置为select-->
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@ -73,7 +72,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -702,11 +700,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/default/html/jformunion.ftl
Unescape View File

@ -76,11 +76,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/default2/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

4
src/main/resources/online/template/default2/html/jform.ftl
Unescape View File

@ -29,7 +29,6 @@
</label> </label>
</td> </td>
<td class="value"> <td class="value">
<!--update-begin--Author:钟世云 Date:20150610 for：online支持树配置-->
<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name> <#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
<!--如果为树形菜单，父id输入框设置为select--> <!--如果为树形菜单，父id输入框设置为select-->
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@ -73,7 +72,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -405,11 +403,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/default2/html/jformunion.ftl
Unescape View File

@ -76,11 +76,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/ledefault/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

3
src/main/resources/online/template/ledefault/html/jform.ftl
Unescape View File

@ -127,7 +127,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -459,11 +458,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

1
src/main/resources/online/template/ledefault/html/jformhead.ftl
Unescape View File

@ -63,7 +63,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"

2
src/main/resources/online/template/ledefault/html/jformunion.ftl
Unescape View File

@ -122,11 +122,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/ledefault2/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

3
src/main/resources/online/template/ledefault2/html/jform.ftl
Unescape View File

@ -109,7 +109,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -441,11 +440,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

1
src/main/resources/online/template/ledefault2/html/jformhead.ftl
Unescape View File

@ -63,7 +63,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"

2
src/main/resources/online/template/ledefault2/html/jformunion.ftl
Unescape View File

@ -122,11 +122,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/resources/online/template/moblieCommon001/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

2
src/main/resources/online/template/moblieCommon002/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

2
src/main/resources/online/template/nopopform/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

2
src/main/resources/online/template/nopopform/html/jform.ftl
Unescape View File

@ -37,7 +37,6 @@
</label> </label>
</td> </td>
<td class="value"> <td class="value">
<!--update-begin--Author:钟世云 Date:20150610 for：online支持树配置-->
<#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name> <#if head.isTree=='Y' && head.treeParentIdFieldName==po.field_name>
<!--如果为树形菜单，父id输入框设置为select--> <!--如果为树形菜单，父id输入框设置为select-->
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
@ -81,7 +80,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" style="width: 150px" class="inputxt" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"

2
src/main/resources/online/template/o2mTableStyle/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

3
src/main/resources/online/template/o2mTableStyle/html/jform.ftl
Unescape View File

@ -89,7 +89,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -422,11 +421,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

1
src/main/resources/online/template/o2mTableStyle/html/jformhead.ftl
Unescape View File

@ -59,7 +59,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"

2
src/main/resources/online/template/olstyle00002/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

2
src/main/resources/online/template/rowsEdit/html/autolist.ftl
Unescape View File

@ -1,6 +1,4 @@
${config_iframe} ${config_iframe}
<!--update-start--Author:luobaoli Date:20150703 for：将本文档中所有href="#"修改为href="javascript:void(0)",避免rest风格下新增/删除等操作跳转到主页问题-->
<script type="text/javascript"> <script type="text/javascript">
/** /**
*表单的高度,表单的宽度 *表单的高度,表单的宽度

3
src/main/resources/online/template/rowsEdit/html/jform.ftl
Unescape View File

@ -109,7 +109,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"
@ -441,11 +440,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

1
src/main/resources/online/template/rowsEdit/html/jformhead.ftl
Unescape View File

@ -63,7 +63,6 @@
} }
} }
"> ">
<!--update-end--Author:钟世云 Date:20150610 for：online支持树配置-->
<#elseif po.show_type=='text'> <#elseif po.show_type=='text'>
<input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text" <input id="${po.field_name}" ${po.extend_json?if_exists} name="${po.field_name}" type="text"
class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}" class="form-control" value="${data['${tableName}']['${po.field_name}']?if_exists?html}"

2
src/main/resources/online/template/rowsEdit/html/jformunion.ftl
Unescape View File

@ -122,11 +122,9 @@
} }
function uploadFile(data){ function uploadFile(data){
if(!$("input[name='id']").val()){ if(!$("input[name='id']").val()){
<!--update-start--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
if(data.obj!=null && data.obj!='undefined'){ if(data.obj!=null && data.obj!='undefined'){
$("input[name='id']").val(data.obj.id); $("input[name='id']").val(data.obj.id);
} }
<!--update-end--Author:luobaoli Date:20150614 for：需要判断data.obj存在，才能取id值-->
} }
if($(".uploadify-queue-item").length>0){ if($(".uploadify-queue-item").length>0){
upload(); upload();

2
src/main/webapp/init.jsp
Unescape View File

@ -4,7 +4,6 @@
<html> <html>
<body> <body>
数据库初始化中..... 数据库初始化中.....
<%--update-begin--Author:zhangguoming Date:20140609 for：云桌面，清除桌面图标的cookie历史记录--%>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.min.js"></script> <script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="plug-in/sliding/js/jquery.cookie.js"></script> <script type="text/javascript" src="plug-in/sliding/js/jquery.cookie.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -13,7 +12,6 @@
$.cookie(iconCookieKey, null); $.cookie(iconCookieKey, null);
$.cookie(iconCookieKeyForSlider, null); $.cookie(iconCookieKeyForSlider, null);
</script> </script>
<%--update-end--Author:zhangguoming Date:20140609 for：云桌面，清除桌面图标的cookie历史记录--%>
<script type="text/javascript"> <script type="text/javascript">
window.setTimeout(function() { window.setTimeout(function() {
window.location.replace('repairController.do?repair'); window.location.replace('repairController.do?repair');

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html
Unescape View File

@ -337,7 +337,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -354,7 +353,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var gTitle=$G('orgname').value.replace(/\"/g,"&quot;"); var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
var gChecked = 'orgchecked0'; var gChecked = 'orgchecked0';
if ($G('orgchecked1').checked) gChecked = 'orgchecked1'; if ($G('orgchecked1').checked) gChecked = 'orgchecked1';

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html
Unescape View File

@ -377,7 +377,6 @@ if( UE.plugins[thePlugins].editdom ) {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#tbl1').children().eq(0).children().eq(3).children().find("option:selected"); var selectedField=$('#tbl1').children().eq(0).children().eq(3).children().find("option:selected");
var flag=false; var flag=false;
@ -394,7 +393,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var gName=$G('orgname').value.replace(/\"/g,"&quot;"),gWidth=$G('orgwidth').value; var gName=$G('orgname').value.replace(/\"/g,"&quot;"),gWidth=$G('orgwidth').value;
if( gName == '') { if( gName == '') {

8
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/popup.html
Unescape View File

@ -48,7 +48,6 @@ function createElement(type, name)
<th><span>字段</span> </th> <th><span>字段</span> </th>
</tr> </tr>
<tr> <tr>
<!--update-begin--Author:zzl Date:20151105 for：数据源及字段可选 -->
<td> <td>
<select id="datasource"></select> <select id="datasource"></select>
@ -58,7 +57,6 @@ function createElement(type, name)
<option selected value=''>请先选择数据源</option> <option selected value=''>请先选择数据源</option>
</select> </select>
</td> </td>
<!--update-end--Author:zzl Date:20151105 for：数据源及字段可选 -->
</tr> </tr>
<tr> <tr>
<th ><span >PopUp报表</span></th> <th ><span >PopUp报表</span></th>
@ -143,7 +141,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -160,17 +157,14 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var datasource=$('#datasource').val(); var datasource=$('#datasource').val();
var field=$('#field').val(); var field=$('#field').val();
<!--update-begin--Author:zzl Date:20151105 for：数据源及字段可选 -->
var gTitle=$G('orgname').value.replace(/\"/g,"&quot;"); var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
if(datasource !='' && field ==''){ if(datasource !='' && field ==''){
alert('请选择字段'); alert('请选择字段');
return false; return false;
} }
var name= getName(datasource,field,gTitle); var name= getName(datasource,field,gTitle);
<!--update-end--Author:zzl Date:20151105 for：数据源及字段可选 -->
var gSize = $G('orgsize').value ; var gSize = $G('orgsize').value ;
if ( gSize == null || isNaN( gSize ) || gSize < 1 ) { if ( gSize == null || isNaN( gSize ) || gSize < 1 ) {
gSize = '' ; gSize = '' ;
@ -248,7 +242,6 @@ function getName(datasource,field,title){
return title; return title;
} }
} }
<!--update-begin--Author:zzl Date:20151105 for：数据源及字段可选 -->
$(function(){ $(function(){
var id = ''; var id = '';
editor.ready(function() { editor.ready(function() {
@ -279,7 +272,6 @@ $(function(){
}); });
}); });
<!--update-end--Author:zzl Date:20151105 for：数据源及字段可选 -->
function loadDataType(val){ function loadDataType(val){
$("#datatype").empty(); $("#datatype").empty();
$("#datatype").append("<option value=''>无</option>"); $("#datatype").append("<option value=''>无</option>");

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radio.html
Unescape View File

@ -246,7 +246,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -263,7 +262,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if( oListText.options.length == 0 ) { if( oListText.options.length == 0 ) {
alert('请添加选项！'); alert('请添加选项！');
return false; return false;

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html
Unescape View File

@ -345,7 +345,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -362,7 +361,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var gTitle=$G('orgname').value.replace(/\"/g,"&quot;"); var gTitle=$G('orgname').value.replace(/\"/g,"&quot;");
var datasource=$G('datasource').value; var datasource=$G('datasource').value;
var field=$G('field').value; var field=$G('field').value;

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html
Unescape View File

@ -355,7 +355,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -372,7 +371,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if( oListText.options.length == 0 ) { if( oListText.options.length == 0 ) {
alert('请添加下拉菜单选项！'); alert('请添加下拉菜单选项！');
return false; return false;

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html
Unescape View File

@ -178,7 +178,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -195,7 +194,6 @@ dialog.onok = function (){
return false; return false;
} }
} }
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gAlign=$G('orgalign').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value,gType=$G('orgtype').value; var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gAlign=$G('orgalign').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value,gType=$G('orgtype').value;
var datasource=$('#datasource').val(); var datasource=$('#datasource').val();
var field=$('#field').val(); var field=$('#field').val();

8
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html
Unescape View File

@ -32,7 +32,6 @@
<th><span>字段</span> </th> <th><span>字段</span> </th>
</tr> </tr>
<tr> <tr>
<!--update-begin--Author:zzl Date:20151106 for：数据源及字段可选 -->
<td> <td>
<select id="datasource"></select> <select id="datasource"></select>
@ -42,7 +41,6 @@
<option selected value=''>请先选择数据源</option> <option selected value=''>请先选择数据源</option>
</select> </select>
</td> </td>
<!--update-end--Author:zzl Date:20151106 for：数据源及字段可选 -->
</tr> </tr>
<tr> <tr>
<th><span>输入框样式</span> </th> <th><span>输入框样式</span> </th>
@ -130,7 +128,6 @@ dialog.oncancel = function () {
} }
}; };
dialog.onok = function (){ dialog.onok = function (){
<!--update-begin--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
if($G('orgname').value==''){ if($G('orgname').value==''){
var selectedField=$('#field').find("option:selected"); var selectedField=$('#field').find("option:selected");
var flag=false; var flag=false;
@ -148,17 +145,14 @@ dialog.onok = function (){
} }
} }
var datatype = $G('datatype').value; var datatype = $G('datatype').value;
<!--update-end--Author:zzl Date:20151108 for：控件名称为空时优先使用字段名称 -->
var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value; var gValue=$G('orgvalue').value.replace(/\"/g,"&quot;"),gTitle=$G('orgname').value.replace(/\"/g,"&quot;"),gFontSize=$G('orgfontsize').value,gWidth=$G('orgwidth').value,gHeight=$G('orgheight').value;
var datasource=$G('datasource').value; var datasource=$G('datasource').value;
var field=$G('field').value; var field=$G('field').value;
<!--update-begin--Author:zzl Date:20151106 for：数据源及字段可选 -->
if(datasource !='' && field ==''){ if(datasource !='' && field ==''){
alert('请选择字段'); alert('请选择字段');
return false; return false;
} }
var name= getName(datasource,field,gTitle); var name= getName(datasource,field,gTitle);
<!--update-end--Author:zzl Date:20151106 for：数据源及字段可选 -->
if( !oNode ) { if( !oNode ) {
try { try {
var html = '<textarea '; var html = '<textarea ';
@ -258,7 +252,6 @@ function getName(datasource,field,title){
return title; return title;
} }
} }
<!--update-begin--Author:zzl Date:20151106 for：数据源及字段可选 -->
$(function(){ $(function(){
var id = ''; var id = '';
editor.ready(function() { editor.ready(function() {
@ -290,7 +283,6 @@ $(function(){
}); });
<!--update-end--Author:zzl Date:20151106 for：数据源及字段可选 -->
function loadDataType(val){ function loadDataType(val){
$("#datatype").empty(); $("#datatype").empty();
$("#datatype").append("<option value=''>无</option>"); $("#datatype").append("<option value=''>无</option>");

23
src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-add.jsp
Unescape View File

@ -30,7 +30,6 @@
hideDataSourceAndDataTable(); hideDataSourceAndDataTable();
}); });
}); });
<!--update-begin--Author:zzl Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
function hideDataSourceAndDataTable(){ function hideDataSourceAndDataTable(){
var checkedVal=$("input[name='dbType']:checked").val(); var checkedVal=$("input[name='dbType']:checked").val();
if(checkedVal=='table'){ if(checkedVal=='table'){
@ -39,8 +38,6 @@
$("#dataSourceTr").show(); $("#dataSourceTr").show();
} }
} }
<!--update-end--Author:zzl Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
<!--update-begin--Author:zzl Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
function setDataSourceVal(){ function setDataSourceVal(){
var checkedVal=$("input[name='dbType']:checked").val(); var checkedVal=$("input[name='dbType']:checked").val();
if(checkedVal=='table'){ if(checkedVal=='table'){
@ -48,7 +45,6 @@
$("#tbDbTableName").val($("#dbTableName").find("option:selected").val()); $("#tbDbTableName").val($("#dbTableName").find("option:selected").val());
} }
} }
<!--update-end--Author:zzl Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
/*每次只能提交一种数据类型的数据，不能同时提交 /*每次只能提交一种数据类型的数据，不能同时提交
function onlySubmit(){ function onlySubmit(){
@ -80,14 +76,9 @@
<label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label>
</td> </td>
<td class="value" > <td class="value" >
<!--update-begin--Author:luobaoli Date:20150626 for：增加数据源名称的非空校验 -->
<!--update-begin--Author:jg_renjie Date:20150720 for：增加数据源名称的唯一性校验 -->
<input id="dbName" name="dbName" type="text" style="width: 150px" ajaxurl="autoFormDbController.do?checkDbName" class="inputxt" errorMsg="不能为中文" nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!" datatype="/^[A-Za-z\d-._]+$/" > <input id="dbName" name="dbName" type="text" style="width: 150px" ajaxurl="autoFormDbController.do?checkDbName" class="inputxt" errorMsg="不能为中文" nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!" datatype="/^[A-Za-z\d-._]+$/" >
<!--update-end--Author:jg_renjie Date:20150720 for：增加数据源名称的唯一性校验 -->
<!--update-end--Author:luobaoli Date:20150626 for：增加数据源名称的非空校验 -->
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
<!--update-begin--Author:zzl Date:20151028 for：增加数据源名称 -->
<td align="center" width="100px"> <td align="center" width="100px">
<label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label>
</td> </td>
@ -95,7 +86,6 @@
<input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!" > <input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!" >
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
<!--update-end--Author:zzl Date:20151028 for：增加数据源名称 -->
</tr> </tr>
<!-- <!--
<tr> <tr>
@ -139,7 +129,6 @@
</td> </td>
<!--add-end--Author:gengjiajia Date:20160616 for：#1110 添加动态数据源 --> <!--add-end--Author:gengjiajia Date:20160616 for：#1110 添加动态数据源 -->
</tr> </tr>
<!--update-begin--Author: jg_huangxg Date:20150723 for：增加填报数据源和填报数据库表显示 -->
<tr id="dataSourceTr"> <tr id="dataSourceTr">
<td align="center"> <td align="center">
<label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label>
@ -168,9 +157,7 @@
<td class="value"> <td class="value">
</td> </td>
</tr> </tr>
<!--update-end--Author: jg_huangxg Date:20150723 for：增加填报数据源和填报数据库表显示 -->
</table> </table>
<!--add-begin--Author:luobaoli Date:20150621 for：新增数据源类型为“table”时的处理逻辑 -->
<div style="margin-top: 20px;border: 1px solid #E6E6E6;display: none" id="table_div" class="formdbdiv"> <div style="margin-top: 20px;border: 1px solid #E6E6E6;display: none" id="table_div" class="formdbdiv">
<table cellpadding="0" cellspacing="1" class="formtable"> <table cellpadding="0" cellspacing="1" class="formtable">
<tr> <tr>
@ -179,12 +166,10 @@
</td> </td>
<td class="value"> <td class="value">
<select id="dbKey" name="dbKey"> <select id="dbKey" name="dbKey">
<!--update-begin--Author:luobaoli Date:20150701 for：表单数据源新增时增加数据源显示逻辑 -->
<option value="">平台数据源</option> <option value="">平台数据源</option>
<c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity"> <c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity">
<option value="${dynamicDataSourceEntity.dbKey}">${dynamicDataSourceEntity.dbKey}</option> <option value="${dynamicDataSourceEntity.dbKey}">${dynamicDataSourceEntity.dbKey}</option>
</c:forEach> </c:forEach>
<!--update-end--Author:luobaoli Date:20150701 for：表单数据源新增时增加数据源显示逻辑 -->
</select> </select>
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
@ -193,11 +178,9 @@
</td> </td>
<td class="value"> <td class="value">
<select id="dbTableName" name="dbTableName"> <select id="dbTableName" name="dbTableName">
<!--update-begin--Author:luobaoli Date:20150701 for：增加初始化数据表显示 -->
<c:forEach items="${tableNames}" var="tableName"> <c:forEach items="${tableNames}" var="tableName">
<option value="${tableName}">${tableName}</option> <option value="${tableName}">${tableName}</option>
</c:forEach> </c:forEach>
<!--update-end--Author:luobaoli Date:20150701 for：增加初始化数据表显示 -->
</select> </select>
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
@ -234,22 +217,18 @@
</tr> </tr>
<tr> <tr>
<td class="value" colspan="4"> <td class="value" colspan="4">
<!--update-begin--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
<fieldset style="border: 1px solid #E6E6E6;"> <fieldset style="border: 1px solid #E6E6E6;">
<legend><t:mutiLang langKey="form.db.query.param"/></legend> <legend><t:mutiLang langKey="form.db.query.param"/></legend>
<div style="width:100%;height:100%" title="form.db.query.param" id="autoFormParam"></div> <div style="width:100%;height:100%" title="form.db.query.param" id="autoFormParam"></div>
</fieldset> </fieldset>
<!--update-end--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="value" colspan="4"> <td class="value" colspan="4">
<!--update-begin--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
<fieldset style="border: 1px solid #E6E6E6;"> <fieldset style="border: 1px solid #E6E6E6;">
<legend><t:mutiLang langKey="form.db.query.data.column"/></legend> <legend><t:mutiLang langKey="form.db.query.data.column"/></legend>
<div style="width:100%;height:100%" title="form.db.query.data.column" id="autoFormDbField"></div> <div style="width:100%;height:100%" title="form.db.query.data.column" id="autoFormDbField"></div>
</fieldset> </fieldset>
<!--update-end--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
</td> </td>
</tr> </tr>
</table> </table>
@ -314,7 +293,6 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<!--add-begin--Author:luobaoli Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->
<tbody id="add_autoFormDbFieldForTable_table_template"> <tbody id="add_autoFormDbFieldForTable_table_template">
<tr> <tr>
<td align="center"><div style="width: 40px;" name="xh"></div></td> <td align="center"><div style="width: 40px;" name="xh"></div></td>
@ -332,7 +310,6 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<!--add-begin--Author:luobaoli Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->
</table> </table>
</body> </body>
<script src = "webpage/jeecg/cgform/autoform/autoFormDb.js"></script> <script src = "webpage/jeecg/cgform/autoform/autoFormDb.js"></script>

20
src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDb-update.jsp
Unescape View File

@ -60,7 +60,6 @@
hideDataSourceAndDataTable(); hideDataSourceAndDataTable();
}); });
<!--update-begin--Author:zzl Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
function hideDataSourceAndDataTable(){ function hideDataSourceAndDataTable(){
var checkedVal=$("input[name='dbType']:checked").val(); var checkedVal=$("input[name='dbType']:checked").val();
if(checkedVal=='table'){ if(checkedVal=='table'){
@ -69,8 +68,6 @@
$("#dataSourceTr").show(); $("#dataSourceTr").show();
} }
} }
<!--update-end--Author:zzl Date:20151113 for：数据源类型是数据库表时,隐藏填报数据源和填报数据库表 -->
<!--update-begin--Author:zzl Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
function setDataSourceVal(){ function setDataSourceVal(){
var checkedVal=$("input[name='dbType']:checked").val(); var checkedVal=$("input[name='dbType']:checked").val();
if(checkedVal=='table'){ if(checkedVal=='table'){
@ -78,7 +75,6 @@
$("#tbDbTableName").val($("#dbTableName").find("option:selected").val()); $("#tbDbTableName").val($("#dbTableName").find("option:selected").val());
} }
} }
<!--update-end--Author:zzl Date:20151113 for：填报数据源和填报数据库表隐藏时，表单提交需赋值 -->
</script> </script>
</head> </head>
<body style="overflow-x: hidden;"> <body style="overflow-x: hidden;">
@ -100,14 +96,9 @@
<label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.db.name"/>:</label>
</td> </td>
<td class="value" > <td class="value" >
<!--update-begin--Author:luobaoli Date:20150626 for：增加数据源名称的非空校验 -->
<!--update-begin--Author:jg_renjie Date:20150720 for：增加数据源名称的唯一性校验 -->
<input id="dbName" name="dbName" type="text" style="width: 150px" ajaxurl="autoFormDbController.do?checkDbName&cVal=${autoFormDbPage.dbName}" class="inputxt" value='${autoFormDbPage.dbName}' nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!" errorMsg="不能为中文" datatype="/^[A-Za-z\d-._]+$/" > <input id="dbName" name="dbName" type="text" style="width: 150px" ajaxurl="autoFormDbController.do?checkDbName&cVal=${autoFormDbPage.dbName}" class="inputxt" value='${autoFormDbPage.dbName}' nullmsg="<t:mutiLang langKey="form.db.name"/>不能为空!" errorMsg="不能为中文" datatype="/^[A-Za-z\d-._]+$/" >
<!--update-end--Author:jg_renjie Date:20150720 for：增加数据源名称的唯一性校验 -->
<!--update-end--Author:luobaoli Date:20150626 for：增加数据源名称的非空校验 -->
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
<!--update-begin--Author:zzl Date:20151028 for：增加数据源名称 -->
<td align="center" width="100px"> <td align="center" width="100px">
<label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.db.chname"/>:</label>
</td> </td>
@ -115,7 +106,6 @@
<input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!" value='${autoFormDbPage.dbChName}' /> <input id="dbChName" name="dbChName" type="text" style="width: 150px" class="inputxt" datatype="*" nullmsg="<t:mutiLang langKey="form.db.chname"/>不能为空!" value='${autoFormDbPage.dbChName}' />
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
<!--update-end--Author:zzl Date:20151028 for：增加数据源名称 -->
</tr> </tr>
<!-- <!--
<tr> <tr>
@ -159,7 +149,6 @@
</td> </td>
<!--add-end--Author:gengjiajia Date:20160616 for：#1110 添加动态数据源 --> <!--add-end--Author:gengjiajia Date:20160616 for：#1110 添加动态数据源 -->
</tr> </tr>
<!--update-begin--Author: jg_huangxg Date:20150723 for：增加填报数据源和填报数据库表显示 -->
<tr id="dataSourceTr"> <tr id="dataSourceTr">
<td align="right"> <td align="right">
<label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label> <label class="Validform_label"><t:mutiLang langKey="form.tb.db.key"/>:</label>
@ -188,10 +177,8 @@
<td class="value"> <td class="value">
</td> </td>
</tr> </tr>
<!--update-end--Author: jg_huangxg Date:20150723 for：增加填报数据源和填报数据库表显示 -->
</tr> </tr>
</table> </table>
<!--add-begin--Author:luobaoli Date:20150621 for：新增数据源类型为“table”时的处理逻辑 -->
<c:if test="${autoFormDbPage.dbType == 'table'}"> <c:if test="${autoFormDbPage.dbType == 'table'}">
<div style="margin-top: 5px;border: 1px solid #E6E6E6;" id="table_div" class="formdbdiv"> <div style="margin-top: 5px;border: 1px solid #E6E6E6;" id="table_div" class="formdbdiv">
<table cellpadding="0" cellspacing="1" class="formtable"> <table cellpadding="0" cellspacing="1" class="formtable">
@ -201,12 +188,10 @@
</td> </td>
<td class="value"> <td class="value">
<select id="dbKey" name="dbKey"> <select id="dbKey" name="dbKey">
<!--update-begin--Author:luobaoli Date:20150701 for：表单数据源编辑时增加数据源正确显示逻辑 -->
<option value="" <c:if test='${empty autoFormDbPage.dbKey}'>selected="selected"</c:if>>平台数据源</option> <option value="" <c:if test='${empty autoFormDbPage.dbKey}'>selected="selected"</c:if>>平台数据源</option>
<c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity"> <c:forEach items="${dynamicDataSourceEntitys}" var="dynamicDataSourceEntity">
<option value="${dynamicDataSourceEntity.dbKey}" <c:if test='${autoFormDbPage.dbKey==dynamicDataSourceEntity.dbKey}'>selected="selected"</c:if>>${dynamicDataSourceEntity.dbKey}</option> <option value="${dynamicDataSourceEntity.dbKey}" <c:if test='${autoFormDbPage.dbKey==dynamicDataSourceEntity.dbKey}'>selected="selected"</c:if>>${dynamicDataSourceEntity.dbKey}</option>
</c:forEach> </c:forEach>
<!--update-end--Author:luobaoli Date:20150701 for：表单数据源编辑时增加数据源正确显示逻辑 -->
</select> </select>
<span class="Validform_checktip"></span> <span class="Validform_checktip"></span>
</td> </td>
@ -255,22 +240,18 @@
</tr> </tr>
<tr> <tr>
<td class="value" colspan="4"> <td class="value" colspan="4">
<!--update-begin--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
<fieldset style="border: 1px solid #E6E6E6;"> <fieldset style="border: 1px solid #E6E6E6;">
<legend>查询参数</legend> <legend>查询参数</legend>
<div style="width:100%;height:100%" title="表单参数" id="autoFormParam"></div> <div style="width:100%;height:100%" title="表单参数" id="autoFormParam"></div>
</fieldset> </fieldset>
<!--update-end--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="value" colspan="4"> <td class="value" colspan="4">
<!--update-begin--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
<fieldset style="border: 1px solid #E6E6E6;"> <fieldset style="border: 1px solid #E6E6E6;">
<legend>查询数据列</legend> <legend>查询数据列</legend>
<div style="width:100%;height:100%" title="表单数据源属性" id="autoFormDbField"></div> <div style="width:100%;height:100%" title="表单数据源属性" id="autoFormDbField"></div>
</fieldset> </fieldset>
<!--update-end--Author:luobaoli Date:20150630 for：新增fieldset标签 -->
</td> </td>
</tr> </tr>
</table> </table>
@ -339,7 +320,6 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<!--add-begin--Author:luobaoli Date:20150621 for：新增数据源类型为“table”时的属性列表新增模块 -->
<tbody id="add_autoFormDbFieldForTable_table_template"> <tbody id="add_autoFormDbFieldForTable_table_template">
<tr> <tr>
<td align="center"><div style="width: 40px;" name="xh"></div></td> <td align="center"><div style="width: 40px;" name="xh"></div></td>

2
src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbFieldList.jsp
Unescape View File

@ -35,7 +35,6 @@
<a id="addAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a> <a id="addAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormDbFieldBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a>
</div> </div>
<table border="0" cellpadding="2" cellspacing="0" id="autoFormDbField_table"> <table border="0" cellpadding="2" cellspacing="0" id="autoFormDbField_table">
<!--update-begin--Author:luobaoli Date:20150621 for：将表头列宽设置为固定值-->
<tr bgcolor="#E6E6E6"> <tr bgcolor="#E6E6E6">
<td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td> <td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td>
<td align="center" width="40px" bgcolor="#EEEEEE">选择</td> <td align="center" width="40px" bgcolor="#EEEEEE">选择</td>
@ -43,7 +42,6 @@
<td align="left" width="120px" bgcolor="#EEEEEE"><t:mutiLang langKey="form.field.content"/></td> <td align="left" width="120px" bgcolor="#EEEEEE"><t:mutiLang langKey="form.field.content"/></td>
<td align="center" width="50px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.operation"/></td> <td align="center" width="50px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.operation"/></td>
</tr> </tr>
<!--update-end--Author:luobaoli Date:20150621 for：将表头列宽设置为固定值-->
<tbody id="add_autoFormDbField_table"> <tbody id="add_autoFormDbField_table">
<!-- <!--
<c:if test="${fn:length(autoFormDbFieldList) <= 0 }"> <c:if test="${fn:length(autoFormDbFieldList) <= 0 }">

4
src/main/webapp/webpage/jeecg/cgform/autoform/autoFormDbList.jsp
Unescape View File

@ -9,17 +9,13 @@
<t:dgCol title="common.createby" field="createBy" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="common.createby" field="createBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="common.updateName" field="updateName" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="common.updateName" field="updateName" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="common.updateBy" field="updateBy" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="common.updateBy" field="updateBy" hidden="true" queryMode="single" width="120"></t:dgCol>
<!--update-end--Author:luobaoli Date:20150617 for：调整国际化编码-->
<t:dgCol title="common.depart.code" field="sysOrgCode" hidden="true" queryMode="single" dictionary="t_s_depart,id,departname" width="120"></t:dgCol> <t:dgCol title="common.depart.code" field="sysOrgCode" hidden="true" queryMode="single" dictionary="t_s_depart,id,departname" width="120"></t:dgCol>
<!--update-end--Author:luobaoli Date:20150617 for：调整国际化编码-->
<t:dgCol title="common.company.code" field="sysCompanyCode" hidden="true" queryMode="single" dictionary="t_s_depart,id,departname" width="120"></t:dgCol> <t:dgCol title="common.company.code" field="sysCompanyCode" hidden="true" queryMode="single" dictionary="t_s_depart,id,departname" width="120"></t:dgCol>
<t:dgCol title="common.createDate" field="createDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="common.createDate" field="createDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="common.updateDate" field="updateDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="common.updateDate" field="updateDate" formatter="yyyy-MM-dd" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="form.db.name" field="dbName" queryMode="single" width="120"></t:dgCol> <t:dgCol title="form.db.name" field="dbName" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="form.db.chname" field="dbChName" queryMode="single" width="120"></t:dgCol> <t:dgCol title="form.db.chname" field="dbChName" queryMode="single" width="120"></t:dgCol>
<!--update-end--Author:luobaoli Date:20150701 for：显示中文数据源类型-->
<t:dgCol title="form.db.type" field="dbType" queryMode="single" dictionary="formDbType" width="120"></t:dgCol> <t:dgCol title="form.db.type" field="dbType" queryMode="single" dictionary="formDbType" width="120"></t:dgCol>
<!--update-end--Author:luobaoli Date:20150701 for：显示中文数据源类型-->
<t:dgCol title="form.db.tablename" field="dbTableName" queryMode="single" width="120"></t:dgCol> <t:dgCol title="form.db.tablename" field="dbTableName" queryMode="single" width="120"></t:dgCol>
<!--add-start--Author: jg_huangxg Date:20150723 for：新增填报数据源和填报数据库表显示--> <!--add-start--Author: jg_huangxg Date:20150723 for：新增填报数据源和填报数据库表显示-->
<t:dgCol title="form.tb.db.key" field="tbDbKey" queryMode="single" width="120"></t:dgCol> <t:dgCol title="form.tb.db.key" field="tbDbKey" queryMode="single" width="120"></t:dgCol>

2
src/main/webapp/webpage/jeecg/cgform/autoform/autoFormParamList.jsp
Unescape View File

@ -44,7 +44,6 @@
<a id="addAutoFormParamBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormParamBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a> <a id="addAutoFormParamBtn" href="#"><t:mutiLang langKey="common.add"/></a> <a id="delAutoFormParamBtn" href="#"><t:mutiLang langKey="common.batch.delete"/></a>
</div> </div>
<table border="0" cellpadding="2" cellspacing="0" id="autoFormParam_table"> <table border="0" cellpadding="2" cellspacing="0" id="autoFormParam_table">
<!--update-begin--Author:luobaoli Date:20150621 for：将表头列宽设置为固定值-->
<tr bgcolor="#E6E6E6"> <tr bgcolor="#E6E6E6">
<td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td> <td align="center" width="40px" bgcolor="#EEEEEE"><t:mutiLang langKey="common.code"/></td>
<td align="center" width="40px" bgcolor="#EEEEEE">选择</td> <td align="center" width="40px" bgcolor="#EEEEEE">选择</td>
@ -64,7 +63,6 @@
<t:mutiLang langKey="common.operation"/> <t:mutiLang langKey="common.operation"/>
</td> </td>
</tr> </tr>
<!--update-end--Author:luobaoli Date:20150621 for：将表头列宽设置为固定值-->
<tbody id="add_autoFormParam_table"> <tbody id="add_autoFormParam_table">
<!-- <!--
<c:if test="${fn:length(autoFormParamList) <= 0 }"> <c:if test="${fn:length(autoFormParamList) <= 0 }">

4
src/main/webapp/webpage/jeecg/cgform/config/cgFormHeadList.jsp
Unescape View File

@ -25,9 +25,7 @@
</script> </script>
<!--add-end--Author:luobaoli Date:20150607 for：增加表单树型列表--> <!--add-end--Author:luobaoli Date:20150607 for：增加表单树型列表-->
<div class="easyui-layout" fit="true"> <div class="easyui-layout" fit="true">
<!--update-start--Author:luobaoli Date:20150609 for：panel调整为默认关闭-->
<div region="west" style="width: 150px;" title="表单分类" split="true" collapsed="true"> <div region="west" style="width: 150px;" title="表单分类" split="true" collapsed="true">
<!--update-end--Author:luobaoli Date:20150609 for：panel调整为默认关闭-->
<div class="easyui-panel" style="padding:0px;border:0px" fit="true" border="false"> <div class="easyui-panel" style="padding:0px;border:0px" fit="true" border="false">
<ul id="formtree"> <ul id="formtree">
</ul> </ul>
@ -67,7 +65,6 @@
<t:dgToolBar title="custom.button" icon="icon-edit" url="cgformButtonController.do?cgformButton" funname="cgFormButton"></t:dgToolBar> <t:dgToolBar title="custom.button" icon="icon-edit" url="cgformButtonController.do?cgformButton" funname="cgFormButton"></t:dgToolBar>
<t:dgToolBar title="js.enhance" icon="icon-edit" url="cgformEnhanceJsController.do?addorupdate" funname="enhanceJs"></t:dgToolBar> <t:dgToolBar title="js.enhance" icon="icon-edit" url="cgformEnhanceJsController.do?addorupdate" funname="enhanceJs"></t:dgToolBar>
<t:dgToolBar title="sql.enhance" icon="icon-edit" url="cgformButtonSqlController.do?addorupdate" funname="cgFormButtonSql"></t:dgToolBar> <t:dgToolBar title="sql.enhance" icon="icon-edit" url="cgformButtonSqlController.do?addorupdate" funname="cgFormButtonSql"></t:dgToolBar>
<!--add-begin--Author:luobaoli Date:20150630 for：新增java增强按钮 -->
<t:dgToolBar title="java.enhance" icon="icon-edit" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar> <t:dgToolBar title="java.enhance" icon="icon-edit" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar>
<!--add-end--Author:luobaoli Date:20150630 for：新增java增强按钮 --> <!--add-end--Author:luobaoli Date:20150630 for：新增java增强按钮 -->
<t:dgToolBar title="form.export" icon="icon-putout" url="cgformSqlController.do?doMigrateOut" funname="doMigrateOut"></t:dgToolBar> <t:dgToolBar title="form.export" icon="icon-putout" url="cgformSqlController.do?doMigrateOut" funname="doMigrateOut"></t:dgToolBar>
@ -325,7 +322,6 @@
function toCgformMigrate(){ function toCgformMigrate(){
openuploadwin('<t:mutiLang langKey="form.sqlimport"/>', 'cgformSqlController.do?toCgformMigrate', "tablePropertyList"); openuploadwin('<t:mutiLang langKey="form.sqlimport"/>', 'cgformSqlController.do?toCgformMigrate', "tablePropertyList");
} }
<%-- update-end--Author:duanqilu Date:20130910 for#211 升级SQL导入导出--%>
//代码生成 //代码生成
function generate(title,url,id){ function generate(title,url,id){
var rowsData = $('#'+id).datagrid('getSelections'); var rowsData = $('#'+id).datagrid('getSelections');

2
src/main/webapp/webpage/jeecg/cgform/enhance/cgformEnhanceJava.jsp
Unescape View File

@ -28,9 +28,7 @@
</tr> </tr>
<tr> <tr>
<td align="center" width="150px"><label class="Validform_label"> <t:mutiLang langKey="common.value"/>: </label></td> <td align="center" width="150px"><label class="Validform_label"> <t:mutiLang langKey="common.value"/>: </label></td>
<!--update-end--Author:luobaoli Date:20150701 for：取消非空校验-->
<td class="value"><input id="cgJavaValue" name="cgJavaValue" style="width: 200px;height: 20px" value="${cgformEnhanceJavaPage.cgJavaValue}"/><span class="Validform_checktip"></span></td> <td class="value"><input id="cgJavaValue" name="cgJavaValue" style="width: 200px;height: 20px" value="${cgformEnhanceJavaPage.cgJavaValue}"/><span class="Validform_checktip"></span></td>
<!--update-end--Author:luobaoli Date:20150701 for：取消非空校验-->
</tr> </tr>
</table> </table>
</t:formvalid> </t:formvalid>

2
src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-add.jsp
Unescape View File

@ -113,7 +113,6 @@
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td>
<td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*"></textarea> <span class="Validform_checktip"></span></td> <td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*"></textarea> <span class="Validform_checktip"></span></td>
</tr> </tr>
<!--update-begin--Author:huangzq Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-->
<tr> <tr>
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td>
<td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt"> <span class="Validform_checktip"></span></td> <td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt"> <span class="Validform_checktip"></span></td>
@ -122,7 +121,6 @@
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td>
<td class="value" colspan="2"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="1" /><span class="Validform_checktip"></span></td> <td class="value" colspan="2"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="1" /><span class="Validform_checktip"></span></td>
</tr> </tr>
<!--update-end--Author:huangzq Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-->
</table> </table>
<div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%> <div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%>
<div style="width: 800px; height: 1px;"></div> <div style="width: 800px; height: 1px;"></div>

2
src/main/webapp/webpage/jeecg/cgreport/core/cgreportConfigHead-update.jsp
Unescape View File

@ -111,7 +111,6 @@
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.description"/>:</label></td>
<td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*">${cgreportConfigHeadPage.content}</textarea> <span class="Validform_checktip"></span></td> <td class="value" colspan="5"><textarea rows="3" cols="150" id="content" name="content" datatype="*">${cgreportConfigHeadPage.content}</textarea> <span class="Validform_checktip"></span></td>
</tr> </tr>
<!-- update-begin--Author:huangzq Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-------------------- -->
<tr> <tr>
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returnvalfield"/>:</label></td>
<td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt" value="${cgreportConfigHeadPage.returnValField}"> <span class="Validform_checktip"></span></td> <td class="value"><input id="returnValField" name="returnValField" type="text" style="width: 150px" class="inputxt" value="${cgreportConfigHeadPage.returnValField}"> <span class="Validform_checktip"></span></td>
@ -120,7 +119,6 @@
<td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td> <td align="right"><label class="Validform_label"><t:mutiLang langKey="common.returntxttype"/>:</label></td>
<td class="value" colspan="3"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="${cgreportConfigHeadPage.popRetype}"/><span class="Validform_checktip"></span></td> <td class="value" colspan="3"> <t:dictSelect field="popRetype" typeGroupCode="pop_retype" hasLabel="false" defaultVal="${cgreportConfigHeadPage.popRetype}"/><span class="Validform_checktip"></span></td>
</tr> </tr>
<!-- update-end--Author:huangzq Date:20151129 for：[753]【在线报表】扩展增加俩字段，非必填-------------------- -->
</table> </table>
<div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%> <div style="width: auto; height: 200px;"><%-- 增加一个div，用于调节页面大小，否则默认太小 --%>
<div style="width: 800px; height: 1px;"></div> <div style="width: 800px; height: 1px;"></div>

1
src/main/webapp/webpage/jeecg/demo/base/AJAX/select.jsp
Unescape View File

@ -53,7 +53,6 @@
</tr> </tr>
</table> </table>
</t:formvalid> </t:formvalid>
<!--update-begin--Author:huangzq Date:20151127 for：三级联调 -->
<script type="text/javascript"> <script type="text/javascript">
var province_city_county_data=[ var province_city_county_data=[
{ {

2
src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList.jsp
Unescape View File

@ -20,8 +20,6 @@
<div region="center" style="padding:0px;border:0px"> <div region="center" style="padding:0px;border:0px">
<t:datagrid name="jeecgDemoList" title="DEMO示例列表" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid" fitColumns="true" <t:datagrid name="jeecgDemoList" title="DEMO示例列表" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid" fitColumns="true"
idField="id" fit="true" queryMode="group" checkbox="true" queryBuilder="true"> idField="id" fit="true" queryMode="group" checkbox="true" queryBuilder="true">
<%-- update-end--Author:tanghan Date:20130713 for添加checkbox--%>
<%--update-begin--Author:fangwenrong Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol> <t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
<t:dgCol title="用户名" field="userName" query="true" frozenColumn="true" extend="{style:{width:'300px';color:'red'};datatype:'*';}" width="120"></t:dgCol> <t:dgCol title="用户名" field="userName" query="true" frozenColumn="true" extend="{style:{width:'300px';color:'red'};datatype:'*';}" width="120"></t:dgCol>
<t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true" width="120"></t:dgCol> <t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true" width="120"></t:dgCol>

3
src/main/webapp/webpage/jeecg/demo/jeecgDemo/jeecgDemoList2.jsp
Unescape View File

@ -5,8 +5,6 @@
<div region="center" style="padding:0px;border:0px"> <div region="center" style="padding:0px;border:0px">
<t:datagrid name="jeecgDemoList2" title="DEMO查询默认值" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid2&status=${status}" sortName="userName" <t:datagrid name="jeecgDemoList2" title="DEMO查询默认值" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid2&status=${status}" sortName="userName"
idField="id" fit="true" queryMode="group" checkbox="true"> idField="id" fit="true" queryMode="group" checkbox="true">
<%-- update-end--Author:tanghan Date:20130713 for添加checkbox--%>
<%--update-begin--Author:fangwenrong Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
<t:dgCol title="编号" field="id" hidden="true"></t:dgCol> <t:dgCol title="编号" field="id" hidden="true"></t:dgCol>
<t:dgCol title="用户名" field="userName" query="true" frozenColumn="true" width="120"></t:dgCol> <t:dgCol title="用户名" field="userName" query="true" frozenColumn="true" width="120"></t:dgCol>
<t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true" width="120"></t:dgCol> <t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true" width="120"></t:dgCol>
@ -19,7 +17,6 @@
<t:dgCol title="性别" sortable="true" field="sex" dictionary="sex" query="true" width="60"></t:dgCol> <t:dgCol title="性别" sortable="true" field="sex" dictionary="sex" query="true" width="60"></t:dgCol>
<t:dgCol title="状态" field="status" replace="未处理_0,已处理_1" width="60" query="true"></t:dgCol> <t:dgCol title="状态" field="status" replace="未处理_0,已处理_1" width="60" query="true"></t:dgCol>
<t:dgCol title="操作" field="opt" width="150"></t:dgCol> <t:dgCol title="操作" field="opt" width="150"></t:dgCol>
<%--update-end--Author:fangwenrong Date:20150510 for：添加各项显示长度，解决显示排版问题--%>
<!-- <t:dgFunOpt exp="status#eq#0" operationCode="szqm" funname="szqm(id)" title="审核" />--> <!-- <t:dgFunOpt exp="status#eq#0" operationCode="szqm" funname="szqm(id)" title="审核" />-->
<t:dgDelOpt operationCode="del" title="删除" url="jeecgDemoController.do?del&id={id}" /> <t:dgDelOpt operationCode="del" title="删除" url="jeecgDemoController.do?del&id={id}" />
<t:dgToolBar operationCode="add" title="录入" icon="icon-add" url="jeecgDemoController.do?addorupdate" funname="add"></t:dgToolBar> <t:dgToolBar operationCode="add" title="录入" icon="icon-add" url="jeecgDemoController.do?addorupdate" funname="add"></t:dgToolBar>

4
src/main/webapp/webpage/login/login3.jsp
Unescape View File

@ -89,14 +89,12 @@ label.iPhoneCheckLabelOn span {
<div class="tip"> <div class="tip">
<input class="password" name="password" type="password" id="password" title="" value="123456" nullmsg="" /> <input class="password" name="password" type="password" id="password" title="" value="123456" nullmsg="" />
</div> </div>
<%--update-begin--Author:zhangguoming Date:20140226 for：添加验证码--%>
<div> <div>
<div style="float: right; margin-left:-150px; margin-right: 20px;"> <div style="float: right; margin-left:-150px; margin-right: 20px;">
<img id="randCodeImage" src="randCodeImage" /> <img id="randCodeImage" src="randCodeImage" />
</div> </div>
<input class="randCode" name="randCode" type="text" id="randCode" title="" value="" nullmsg="" /> <input class="randCode" name="randCode" type="text" id="randCode" title="" value="" nullmsg="" />
</div> </div>
<%--update-end--Author:zhangguoming Date:20140226 for：添加验证码--%>
<div class="loginButton"> <div class="loginButton">
<div style="float: left; margin-left: -9px;"> <div style="float: left; margin-left: -9px;">
@ -113,10 +111,8 @@ label.iPhoneCheckLabelOn span {
<%-- <%--
<div style="float: left; margin-left: 30px;"><a href="init.jsp"><span class="f_help"><t:mutiLang langKey="common.init.data"/></span></a></div> <div style="float: left; margin-left: 30px;"><a href="init.jsp"><span class="f_help"><t:mutiLang langKey="common.init.data"/></span></a></div>
--%> --%>
<%--update-begin--Author:ken Date:20140629 for：添加语言选择--%>
<br> <br>
<t:dictSelect id="langCode" field="langCode" typeGroupCode="lang" hasLabel="false" defaultVal="zh-cn"></t:dictSelect> <t:dictSelect id="langCode" field="langCode" typeGroupCode="lang" hasLabel="false" defaultVal="zh-cn"></t:dictSelect>
<%--update-begin--Author:ken Date:20140629 for：添加语言选择--%>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

2
src/main/webapp/webpage/main/home.jsp
Unescape View File

@ -1,9 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<link rel="stylesheet" type="text/css" href="plug-in/accordion/css/accordion.css"> <link rel="stylesheet" type="text/css" href="plug-in/accordion/css/accordion.css">
<!-- add-begin--Author:jg_renjie Date:20150610 for：今天需要提醒的【系统信息】 -->
<script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script> <script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script>
<!-- add-begin--Author:jg_renjie Date:20150610 for：今天需要提醒的【系统信息】 -->
<div style="margin-top: 14px;"> <div style="margin-top: 14px;">
<h3>简介</h3> <h3>简介</h3>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;JEECG（J2EE Code Generation）是一款基于代码生成器的微云快速开发平台，引领新开发模式(智能开发\在线开发\插件开发\移动开发\流程开发)， 可以帮助解决Java项目80%的重复工作，让开发更多关注业务逻辑。既能快速提高开发效率，帮助公司节省人力成本，同时又不失灵活性。 JEECG快速开发宗旨是：简单功能由代码生成器生成使用; 复杂业务采用表单自定义，业务流程使用工作流实现、扩展出业务接口，供开发编写业务逻辑。 实现了流程任务节点和任务接口的灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量</p> <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;JEECG（J2EE Code Generation）是一款基于代码生成器的微云快速开发平台，引领新开发模式(智能开发\在线开发\插件开发\移动开发\流程开发)， 可以帮助解决Java项目80%的重复工作，让开发更多关注业务逻辑。既能快速提高开发效率，帮助公司节省人力成本，同时又不失灵活性。 JEECG快速开发宗旨是：简单功能由代码生成器生成使用; 复杂业务采用表单自定义，业务流程使用工作流实现、扩展出业务接口，供开发编写业务逻辑。 实现了流程任务节点和任务接口的灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量</p>

2
src/main/webapp/webpage/main/homeTab.jsp
Unescape View File

@ -9,9 +9,7 @@
<script type="text/javascript" src="plug-in/easyui/portal/jquery.portal.js"></script> <script type="text/javascript" src="plug-in/easyui/portal/jquery.portal.js"></script>
<link rel="stylesheet" type="text/css" href="plug-in/easyui/portal/portal.css"> <link rel="stylesheet" type="text/css" href="plug-in/easyui/portal/portal.css">
</c:if> </c:if>
<!-- add-begin--Author:jg_renjie Date:20150610 for：今天需要提醒的【系统信息】 -->
<script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script> <script type="text/javascript" src="plug-in/login/js/getMsgs.js"></script>
<!-- add-begin--Author:jg_renjie Date:20150610 for：今天需要提醒的【系统信息】 -->
<script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/highcharts.src.js"></script> <script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/highcharts.src.js"></script>
<script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/modules/exporting.src.js"></script> <script type="text/javascript" src="plug-in/Highcharts-2.2.5/js/modules/exporting.src.js"></script>

2
src/main/webapp/webpage/main/shortcut_main.jsp
Unescape View File

@ -232,12 +232,10 @@ a:hover {
</div> </div>
</div> </div>
</div> </div>
<%--update-begin--Author:JueYue Date:20140616 for：首页上方可以折叠--%>
<div style="float: left; margin-left: 8px;margin-right: 5px; margin-top: 5px;"> <div style="float: left; margin-left: 8px;margin-right: 5px; margin-top: 5px;">
<img src="plug-in/easyui/themes/default/images/layout_button_up.gif" <img src="plug-in/easyui/themes/default/images/layout_button_up.gif"
style="cursor:pointer" onclick="panelCollapase()" /> style="cursor:pointer" onclick="panelCollapase()" />
</div> </div>
<%--update-end--Author:JueYue Date:20140616 for：首页上方可以折叠--%>
</div> </div>
</td> </td>
</tr> </tr>

6
src/main/webapp/webpage/main/sliding_main.jsp
Unescape View File

@ -4,9 +4,7 @@
<html> <html>
<head> <head>
<title>JEECG 微云快速开发平台</title> <title>JEECG 微云快速开发平台</title>
<%--update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
<t:base type="jquery-webos,easyui,tools,DatePicker,autocomplete"></t:base> <t:base type="jquery-webos,easyui,tools,DatePicker,autocomplete"></t:base>
<%--update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
<link rel="shortcut icon" href="images/favicon.ico"> <link rel="shortcut icon" href="images/favicon.ico">
<link href="plug-in/sliding/css/main.css" rel="stylesheet" type="text/css" /> <link href="plug-in/sliding/css/main.css" rel="stylesheet" type="text/css" />
<link href="plug-in/sliding/css/themesetting.css" rel="stylesheet" type="text/css" > <link href="plug-in/sliding/css/themesetting.css" rel="stylesheet" type="text/css" >
@ -14,12 +12,8 @@
<link href="plug-in/sliding/css/powerFloat.css" rel="stylesheet" type="text/css"/> <link href="plug-in/sliding/css/powerFloat.css" rel="stylesheet" type="text/css"/>
<link href="plug-in/sliding/css/smartMenu.css" rel="stylesheet" type="text/css" /> <link href="plug-in/sliding/css/smartMenu.css" rel="stylesheet" type="text/css" />
<link href="plug-in/sliding/css/skins/opera.css" rel="stylesheet" type="text/css" /> <link href="plug-in/sliding/css/skins/opera.css" rel="stylesheet" type="text/css" />
<%--update-begin--Author:zhangguoming Date:20140604 for：云桌面全局视图，添加纵向滚动条--%>
<link href="plug-in/sliding/css/scrollStyle.css" rel="stylesheet" type="text/css" /> <link href="plug-in/sliding/css/scrollStyle.css" rel="stylesheet" type="text/css" />
<%--update-end--Author:zhangguoming Date:20140604 for：云桌面全局视图，添加纵向滚动条--%>
<%--update-begin--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
<%--<script type="text/javascript" src="plug-in/webos1.2/js/jquery-1.7.1.min.js"></script>--%> <%--<script type="text/javascript" src="plug-in/webos1.2/js/jquery-1.7.1.min.js"></script>--%>
<%--update-end--Author:zhangguoming Date:20140521 for：云桌面图标拖拽、用户自定义桌面--%>
<script type="text/javascript" src="plug-in/sliding/js/jquery-powerFloat-min.js"></script> <script type="text/javascript" src="plug-in/sliding/js/jquery-powerFloat-min.js"></script>
<script type="text/javascript" src="plug-in/sliding/js/jquery-smartMenu-min.js"></script> <script type="text/javascript" src="plug-in/sliding/js/jquery-smartMenu-min.js"></script>
<script type="text/javascript" src="plug-in/sliding/js/jquery-class.js"></script> <script type="text/javascript" src="plug-in/sliding/js/jquery-class.js"></script>

1
src/main/webapp/webpage/system/depart/departUserList.jsp
Unescape View File

@ -12,5 +12,4 @@
<t:dgToolBar title="common.edit.param" langArg="common.user" icon="icon-edit" url="userController.do?addorupdate&departid=${departid}" funname="update"></t:dgToolBar> <t:dgToolBar title="common.edit.param" langArg="common.user" icon="icon-edit" url="userController.do?addorupdate&departid=${departid}" funname="update"></t:dgToolBar>
<%--update-start--Author:zhangguoming Date:20140826 for：添加有客户--%> <%--update-start--Author:zhangguoming Date:20140826 for：添加有客户--%>
<t:dgToolBar title="common.add.exist.user" icon="icon-add" url="departController.do?goAddUserToOrg&orgId=${departid}" funname="add" width="500"></t:dgToolBar> <t:dgToolBar title="common.add.exist.user" icon="icon-add" url="departController.do?goAddUserToOrg&orgId=${departid}" funname="add" width="500"></t:dgToolBar>
<%--update-end--Author:zhangguoming Date:20140826 for：添加有客户--%>
</t:datagrid> </t:datagrid>

2
src/main/webapp/webpage/system/document/files.jsp
Unescape View File

@ -15,9 +15,7 @@
<span class="Validform_checktip">标题名称在3~50位字符,且不为空</span> <span class="Validform_checktip">标题名称在3~50位字符,且不为空</span>
</div> </div>
<div class="form"> <div class="form">
<!-- update-begin--Author:huangzq Date:20151205 for：[733]上传下载，没有编辑功能-->
<t:upload name="fiels" buttonText="上传文件" uploader="systemController.do?saveFiles&fileKey=${doc.id}" extend="office" id="file_upload" formData="documentTitle"></t:upload> <t:upload name="fiels" buttonText="上传文件" uploader="systemController.do?saveFiles&fileKey=${doc.id}" extend="office" id="file_upload" formData="documentTitle"></t:upload>
<!-- update-end--Author:huangzq Date:20151205 for：[733]上传下载，没有编辑功能-->
</div> </div>
<div class="form" id="filediv" style="height: 50px"></div> <div class="form" id="filediv" style="height: 50px"></div>
</fieldset> </fieldset>

2
src/main/webapp/webpage/system/document/filesList.jsp
Unescape View File

@ -12,8 +12,6 @@
<t:dgOpenOpt width="800" height="700" url="commonController.do?openViewFile&fileid={id}&subclassname={subclassname}" title="预览"></t:dgOpenOpt> <t:dgOpenOpt width="800" height="700" url="commonController.do?openViewFile&fileid={id}&subclassname={subclassname}" title="预览"></t:dgOpenOpt>
<t:dgDelOpt url="systemController.do?delDocument&id={id}" title="删除"></t:dgDelOpt> <t:dgDelOpt url="systemController.do?delDocument&id={id}" title="删除"></t:dgDelOpt>
<t:dgToolBar title="文件录入" icon="icon-add" funname="add" url="systemController.do?addFiles"></t:dgToolBar> <t:dgToolBar title="文件录入" icon="icon-add" funname="add" url="systemController.do?addFiles"></t:dgToolBar>
<!-- update-begin--Author:huangzq Date:20151205 for：[733]上传下载，没有编辑功能-->
<t:dgToolBar title="编辑" icon="icon-edit" funname="update" url="systemController.do?editFiles"></t:dgToolBar> <t:dgToolBar title="编辑" icon="icon-edit" funname="update" url="systemController.do?editFiles"></t:dgToolBar>
<!-- update-end--Author:huangzq Date:20151205 for：[733]上传下载，没有编辑功能-->
</t:datagrid></div> </t:datagrid></div>
</div> </div>

2
src/main/webapp/webpage/system/function/function.jsp
Unescape View File

@ -103,7 +103,6 @@
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<%--update-begin--Author:zhangguoming Date:20140509 for：云桌面图标管理--%>
<div class="form"> <div class="form">
<label class="Validform_label"> <t:mutiLang langKey="desktop.icon"/>: </label> <label class="Validform_label"> <t:mutiLang langKey="desktop.icon"/>: </label>
<select name="TSIconDesk.id"> <select name="TSIconDesk.id">
@ -114,7 +113,6 @@
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<%--update-end--Author:zhangguoming Date:20140509 for：云桌面图标管理--%>
<div class="form" id="funorder"><label class="Validform_label"> <t:mutiLang langKey="menu.order"/>: </label> <input name="functionOrder" class="inputxt" value="${function.functionOrder}" datatype="n1-3"></div> <div class="form" id="funorder"><label class="Validform_label"> <t:mutiLang langKey="menu.order"/>: </label> <input name="functionOrder" class="inputxt" value="${function.functionOrder}" datatype="n1-3"></div>
</fieldset> </fieldset>
</t:formvalid> </t:formvalid>

3
src/main/webapp/webpage/system/function/functionList.jsp
Unescape View File

@ -17,7 +17,6 @@
<%-- update-start--Author:anchao Date:20130415 for：按钮权限控制--%> <%-- update-start--Author:anchao Date:20130415 for：按钮权限控制--%>
<t:dgFunOpt funname="operationDetail(id)" title="button.setting"></t:dgFunOpt> <t:dgFunOpt funname="operationDetail(id)" title="button.setting"></t:dgFunOpt>
<t:dgFunOpt funname="operationData(id)" title="数据规则"></t:dgFunOpt> <t:dgFunOpt funname="operationData(id)" title="数据规则"></t:dgFunOpt>
<%-- update-end--Author:anchao Date:20130415 for：按钮权限控制--%>
<t:dgToolBar title="common.add.param" langArg="common.menu" icon="icon-add" url="functionController.do?addorupdate" funname="addFun"></t:dgToolBar> <t:dgToolBar title="common.add.param" langArg="common.menu" icon="icon-add" url="functionController.do?addorupdate" funname="addFun"></t:dgToolBar>
<t:dgToolBar title="common.edit.param" langArg="common.menu" icon="icon-edit" url="functionController.do?addorupdate" funname="update"></t:dgToolBar> <t:dgToolBar title="common.edit.param" langArg="common.menu" icon="icon-edit" url="functionController.do?addorupdate" funname="update"></t:dgToolBar>
</t:datagrid> </t:datagrid>
@ -59,7 +58,6 @@ function operationDetail(functionId)
} }
$('#operationDetailpanel').panel("refresh", "functionController.do?operation&functionId=" +functionId); $('#operationDetailpanel').panel("refresh", "functionController.do?operation&functionId=" +functionId);
} }
<%-- update-end--Author:anchao Date:20130415 for：按钮权限控制--%>
<%-- update-start--Author:jueyue Date:20130622 for：菜单录入代入父菜单--%> <%-- update-start--Author:jueyue Date:20130622 for：菜单录入代入父菜单--%>
function addFun(title,url, id) { function addFun(title,url, id) {
var rowData = $('#'+id).datagrid('getSelected'); var rowData = $('#'+id).datagrid('getSelected');
@ -68,6 +66,5 @@ function addFun(title,url, id) {
} }
add(title,url,'functionList'); add(title,url,'functionList');
} }
<%-- update-end--Author:jueyue Date:20130622 for：菜单录入代入父菜单--%>
</script> </script>

4
src/main/webapp/webpage/system/user/user.jsp
Unescape View File

@ -66,9 +66,7 @@
$(function(){ $(function(){
$("#departname").prev().hide(); $("#departname").prev().hide();
}); });
<%--update-end--Author:zhangguoming Date:20140825 for：添加组织机构combobox多选的处理方法--%>
</script> </script>
<%--update-end--Author:jg_renjie Date:20160320 for：#942 【组件封装】组织机构弹出模式，目前是列表，得改造成树方式--%>
</head> </head>
<body style="overflow-y: hidden" scroll="no"> <body style="overflow-y: hidden" scroll="no">
<%--update-start--Author:zhangguoming Date:20140825 for：格式化页面代码 并 添加组织机构combobox多选框--%> <%--update-start--Author:zhangguoming Date:20140825 for：格式化页面代码 并 添加组织机构combobox多选框--%>
@ -134,7 +132,6 @@
<input id="orgIds" name="orgIds" type="hidden" value="${orgIds}"> <input id="orgIds" name="orgIds" type="hidden" value="${orgIds}">
<a href="#" class="easyui-linkbutton" plain="true" icon="icon-search" id="departSearch" onclick="openDepartmentSelect()">选择</a> <a href="#" class="easyui-linkbutton" plain="true" icon="icon-search" id="departSearch" onclick="openDepartmentSelect()">选择</a>
<a href="#" class="easyui-linkbutton" plain="true" icon="icon-redo" id="departRedo" onclick="callbackClean()">清空</a> <a href="#" class="easyui-linkbutton" plain="true" icon="icon-redo" id="departRedo" onclick="callbackClean()">清空</a>
<%--update-end--Author:jg_renjie Date:20160320 for：#942 【组件封装】组织机构弹出模式，目前是列表，得改造成树方式--%>
<span class="Validform_checktip"><t:mutiLang langKey="please.muti.department"/></span> <span class="Validform_checktip"><t:mutiLang langKey="please.muti.department"/></span>
</td> </td>
</tr> </tr>
@ -171,5 +168,4 @@
</tr> </tr>
</table> </table>
</t:formvalid> </t:formvalid>
<%--update-end--Author:zhangguoming Date:20140825 for：格式化页面代码 并 添加组织机构combobox多选框--%>
</body> </body>

4
src/main/webapp/webpage/system/user/userList.jsp
Unescape View File

@ -25,8 +25,6 @@
<t:departSelect></t:departSelect> <t:departSelect></t:departSelect>
</div> </div>
</div> </div>
<%--update-end--Author:zhangguoming Date:20140827 for：添加 组织机构查询条件--%>
<%--update-end--Author:lijun Date:20160302 for：组织机构查询条件修改为使用departSelect标签--%>
<t:datagrid name="userList" title="common.operation" actionUrl="userController.do?datagrid" <t:datagrid name="userList" title="common.operation" actionUrl="userController.do?datagrid"
fit="true" fitColumns="true" idField="id" queryMode="group" sortName="id" sortOrder="desc"> fit="true" fitColumns="true" idField="id" queryMode="group" sortName="id" sortOrder="desc">
@ -35,7 +33,6 @@
<%--update-start--Author:zhangguoming Date:20140827 for：通过用户对象的关联属性值获取组织机构名称（多对多关联）--%> <%--update-start--Author:zhangguoming Date:20140827 for：通过用户对象的关联属性值获取组织机构名称（多对多关联）--%>
<%--<t:dgCol title="common.department" field="TSDepart_id" query="true" replace="${departsReplace}"></t:dgCol>--%> <%--<t:dgCol title="common.department" field="TSDepart_id" query="true" replace="${departsReplace}"></t:dgCol>--%>
<t:dgCol title="common.department" sortable="false" field="userOrgList.tsDepart.departname" query="false"></t:dgCol> <t:dgCol title="common.department" sortable="false" field="userOrgList.tsDepart.departname" query="false"></t:dgCol>
<%--update-end--Author:zhangguoming Date:20140827 for：通过用户对象的关联属性值获取组织机构名称（多对多关联）--%>
<t:dgCol title="common.real.name" field="realName" query="false"></t:dgCol> <t:dgCol title="common.real.name" field="realName" query="false"></t:dgCol>
<t:dgCol title="common.role" field="userKey" ></t:dgCol> <t:dgCol title="common.role" field="userKey" ></t:dgCol>
<t:dgCol title="common.createby" field="createBy" hidden="true"></t:dgCol> <t:dgCol title="common.createby" field="createBy" hidden="true"></t:dgCol>
@ -175,4 +172,3 @@ function lockuploadify(url, id) {
JeecgExcelExport("userController.do?exportXlsByT", "userList"); JeecgExcelExport("userController.do?exportXlsByT", "userList");
} }
</script> </script>
<%--update-end--Author:zhangguoming Date:20140827 for：添加 组织机构查询条件：弹出 选择组织机构列表 相关操作--%>

Write Preview
Loading…
Cancel
Save