jeecg 3.6.5 版本页面

jeecg_3.6.5
zhangdaiscott 8 years ago
parent 527d343044
commit b7fbce2947

@ -1435,7 +1435,6 @@
<rtexprvalue>true</rtexprvalue>
<description>校验字段,默认为非空校验</description>
</attribute>
- Author:jg_xugj 许国杰 Date:20151209 for增加只读属性 -->
<attribute>
<name>readonly</name>
<rtexprvalue>true</rtexprvalue>
@ -1494,7 +1493,6 @@
<rtexprvalue>true</rtexprvalue>
<description>窗口高度</description>
</attribute>
- Author:jg_renjie Date:20160320 for增加传入值 -->
<attribute>
<name>departId</name>
<required>false</required>
@ -1539,7 +1537,6 @@
<rtexprvalue>true</rtexprvalue>
<description>窗口高度</description>
</attribute>
- Author:wangkun Date:20160327 for增加传入值 -->
<attribute>
<name>userName</name>
<required>false</required>

@ -19,7 +19,6 @@
<link id="easyuiTheme" rel="stylesheet" href="plug-in/easyui/themes/default/easyui.css" type="text/css"></link>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
<script type="text/javascript">
$(function(){
//1.从参数中获取ID
var id = '';
@ -37,7 +36,6 @@
});
//2.2 绑定change事件,并填充字段
$("#datasource").change(function(){
var dbId = $(this).val();
$.post(
@ -53,9 +51,7 @@
if(this.value!='')
$G('orgname').value= $(this).find("option:selected")[0].text;
});
});
function createElement(type, name)
{
var element = null;
@ -290,7 +286,6 @@ window.onload = function() {
if(arr1){
arr1= arr1.split('.');
var field = arr1[1]==null?'':arr1[1];
var id = '';
editor.ready(function() {
id = editor.queryCommandValue('serverparam').id; //返回参数值键值对的对象
@ -305,7 +300,6 @@ window.onload = function() {
$('#field').val(field);
$("#datasource").val(arr1[0]);
});
//$G('datasource').value = arr1[0];
//$G('field').value = field;
}
@ -410,7 +404,6 @@ dialog.onok = function (){
};
//longjinbo 系统字典
var systemCache=null;
function initCombox(val){
$('#selector').append('<option selected value="">请选择数据字典</option>');
var curl= "systemController.do?typeGroupGrid&field=id,typegroupname,typegroupcode";
@ -436,7 +429,6 @@ function initCombox(val){
$('#selector').change(function(){
onselectCode($(this).val());
});
function onselectCode(id){
var curl= "systemController.do?typeGrid&field=id,typename,typecode&typegroupid="+id;
$.ajax({

@ -1081,6 +1081,7 @@ UE.registerUI('button_preview',function(editor,uiName){
return btn;
});
//---update--begin---author:scott----date:20151027-----for:注释掉保存按钮------
/**
UE.registerUI('button_save',function(editor,uiName){
if(!this.options.toolleipi)
@ -1117,7 +1118,7 @@ UE.registerUI('button_save',function(editor,uiName){
return btn;
});
*/
//---update--end---author:scott----date:20151027-----for:注释掉保存按钮------
//longjb1 新增popup控件

@ -250,7 +250,6 @@ window.onload = function() {
editor.ready(function() {
id = editor.queryCommandValue('serverparam').id; //返回参数值键值对的对象
});
if( UE.plugins[thePlugins].editdom ){
oNode = UE.plugins[thePlugins].editdom;
@ -360,7 +359,6 @@ window.onload = function() {
} else {
initDataSource(id);
}
//合计,强制选择 int
$(".csum").click(function(){
if($(this).attr("checked"))
@ -404,9 +402,7 @@ dialog.onok = function (){
var datasource = $('#datasource').val();
var gTitle = '',gColType = '' ,gUnitValue='' ,gSum = '' ,gColValue = '' ,
nCount = 0,autofield='' ,isHide='' ,ruletype='',dict='',length='';
rows_count = $('#tbl1 tr').length;
for (var i = 1;i <= rows_count; i ++ ) {
var oItem = $G( "item_" + i ) ,
@ -548,7 +544,6 @@ function initDataSource(id){
}});
}
$(function(){
//绑定change事件,并填充字段
@ -606,7 +601,6 @@ function content(){
resetTrNum();
$(".delrow").click(function(){$(this).parent().parent().remove();resetTrNum();});
}
</script>
</body>
</html>

@ -19,7 +19,6 @@
<link id="easyuiTheme" rel="stylesheet" href="plug-in/easyui/themes/default/easyui.css" type="text/css"></link>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
<script type="text/javascript">
$(function(){
//1.从参数中获取ID
var id = '';
@ -37,7 +36,6 @@
});
//2.2 绑定change事件,并填充字段
$("#datasource").change(function(){
var dbId = $(this).val();
$.post(
@ -53,9 +51,7 @@
if(this.value!='')
$G('orgname').value= $(this).find("option:selected")[0].text;
});
});
function createElement(type, name)
{
var element = null;
@ -296,7 +292,6 @@ window.onload = function() {
if(arr1){
arr1= arr1.split('.');
var field= arr1[1]==null?'':arr1[1];
var id = '';
editor.ready(function() {
id = editor.queryCommandValue('serverparam').id; //返回参数值键值对的对象
@ -311,7 +306,6 @@ window.onload = function() {
$('#field').val(field);
$("#datasource").val(arr1[0]);
});
//$G('datasource').value = arr1[0];
//$G('field').value = field;
}
@ -418,7 +412,6 @@ dialog.onok = function (){
//longjinbo 增加支持系统字典
var systemCache=null;
function initCombox(val){
$('#selector').append('<option selected value="">请选择数据字典</option>');
var curl= "systemController.do?typeGroupGrid&field=id,typegroupname,typegroupcode";
@ -444,7 +437,6 @@ function initCombox(val){
$('#selector').change(function(){
onselectCode($(this).val());
});
function onselectCode(id){
var curl= "systemController.do?typeGrid&field=id,typename,typecode&typegroupid="+id;
$.ajax({

@ -19,7 +19,6 @@
<link id="easyuiTheme" rel="stylesheet" href="plug-in/easyui/themes/default/easyui.css" type="text/css"></link>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
<script type="text/javascript">
$(function(){
//1.从参数中获取ID
var id = '';
@ -37,7 +36,6 @@
});
//2.2 绑定change事件,并填充字段
$("#datasource").change(function(){
var dbId = $(this).val();
$.post(
@ -53,9 +51,7 @@
if(this.value!='')
$G('orgname').value= $(this).find("option:selected")[0].text;
});
});
function createElement(type, name)
{
@ -316,7 +312,6 @@ window.onload = function() {
if(arr1){
arr1= arr1.split('.');
var field = arr1[1]==null?'':arr1[1];
var id = '';
editor.ready(function() {
id = editor.queryCommandValue('serverparam').id; //返回参数值键值对的对象
@ -331,7 +326,6 @@ window.onload = function() {
$('#field').val(field);
$("#datasource").val(arr1[0]);
});
//$G('datasource').value = arr1[0];
//$G('field').value = field;
}
@ -478,7 +472,6 @@ dialog.onok = function (){
//longjinbo 增加支持系统字典
var systemCache=null;
function initCombox(val){
$('#selector').append('<option selected value="">请选择数据字典</option>');
var curl= "systemController.do?typeGroupGrid&field=id,typegroupname,typegroupcode";
@ -504,7 +497,6 @@ function initCombox(val){
$('#selector').change(function(){
onselectCode($(this).val());
});
function onselectCode(id){
var curl= "systemController.do?typeGrid&field=id,typename,typecode&typegroupid="+id;
$.ajax({

@ -127,9 +127,7 @@ window.onload = function() {
gValue = gValue==null ? '' : gValue;
gTitle = gTitle==null ? '' : gTitle;
var arr1= oNode.getAttribute('autofield');
var datatype = oNode.getAttribute('datatype');
if(arr1){
arr1= arr1.split('.');
@ -138,7 +136,6 @@ window.onload = function() {
//$("#datasource").val(arr1[0]);
//$("#field").val(field);
//$G('field').value = field;
var id = '';
editor.ready(function() {
id = editor.queryCommandValue('serverparam').id; //返回参数值键值对的对象
@ -153,7 +150,6 @@ window.onload = function() {
$('#field').val(field);
$("#datasource").val(arr1[0]);
});
}
$G('orgvalue').value = gValue;
@ -197,28 +193,22 @@ dialog.onok = function (){
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 field=$('#field').val();
var datatype = $G('datatype').value;
//如果只选择了数据源,没有选择字段,则提示选择字段,使得不会出现在提交后出现只有数据源而没有字段的情况
if(datasource !='' && field ==''){
alert('请选择字段');
return false;
}
var name= getName(datasource,field,gTitle);
if( !oNode ) {
try {
oNode = createElement('input','leipiNewField');
oNode.setAttribute('type','text');
oNode.setAttribute('title',gTitle);
oNode.setAttribute('value',gValue);
oNode.setAttribute('datatype',datatype);
oNode.setAttribute('name',name);
oNode.setAttribute('leipiPlugins',thePlugins);
if ( $G('orghide').checked ) {
oNode.setAttribute('orghide',1);
} else {
@ -266,11 +256,8 @@ dialog.onok = function (){
oNode.setAttribute('title', gTitle);
oNode.setAttribute('value', $G('orgvalue').value);
oNode.setAttribute('datatype',datatype);
oNode.setAttribute('name',name);
if( $G('orghide').checked ) {
oNode.setAttribute('orghide', 1);
} else {
@ -317,7 +304,6 @@ dialog.onok = function (){
delete UE.plugins[thePlugins].editdom;
}
};
//如果选择了数据源及字段则name为数据源.字段的形式,否则,则为控件名称(title)
function getName(datasource,field,title){
if(datasource !='' && field !=''){
@ -326,7 +312,6 @@ function getName(datasource,field,title){
return title;
}
}
$(function(){
//1.从参数中获取ID
var id = '';
@ -343,7 +328,6 @@ function getName(datasource,field,title){
$('#datasource').html(data.msg);
});
//2.2 绑定change事件,并填充字段
$("#datasource").change(function(){
var dbId = $(this).val();
$.post(
@ -359,9 +343,7 @@ function getName(datasource,field,title){
if(this.value!='')
$G('orgname').value= $(this).find("option:selected")[0].text;
});
});
function loadDataType(val){
$("#datatype").empty();
$("#datatype").append("<option value=''></option>");

@ -10,11 +10,9 @@ $.Datatype.need2 = function(gets, obj, curform, regxp) {
return numselected >= need ? true : "Please only select" + need + "item!";
};
$.Datatype.d=/^(\d*\.)?\d+$/;
$.Datatype.select1 = function(gets, obj, curform, regxp) {
var name = obj.attr("name") != undefined ? "name" : "comboname"; // select 或 combotree
var need = 1, numselected = 0;
if(name=="comboname"){
var value=$("#"+obj.attr(name)).combotree("getValues");
if(value!=""){
@ -23,7 +21,5 @@ $.Datatype.select1 = function(gets, obj, curform, regxp) {
}else{
numselected = curform.find("select[" + name + "='" + obj.attr(name) + "'] option[selected='selected']").length
}
return numselected >= need ? true : "Please only select" + need + "item!";
};

@ -10,11 +10,9 @@ $.Datatype.need2 = function(gets, obj, curform, regxp) {
return numselected >= need ? true : "请至少选择" + need + "项!";
};
$.Datatype.d=/^(\d*\.)?\d+$/;
$.Datatype.select1 = function(gets, obj, curform, regxp) {
var name = obj.attr("name") != undefined ? "name" : "comboname"; // select 或 combotree
var need = 1, numselected = 0;
if(name=="comboname"){
var value=$("#"+obj.attr(name)).combotree("getValues");
if(value!=""){
@ -23,7 +21,5 @@ $.Datatype.select1 = function(gets, obj, curform, regxp) {
}else{
numselected = curform.find("select[" + name + "='" + obj.attr(name) + "'] option[selected='selected']").length
}
return numselected >= need ? true : "请至少选择" + need + "项!";
};

@ -1,9 +1,9 @@
$(function() {
$("#nav").hide();
//easy ui树加载会在文档加载完执行,所以初始化菜单要延迟一秒 by jueyue
// update-start--Author:gaofeng Date:2014-01-09由于不需展示左侧的树因此降低刷新的延迟时间
setTimeout(InitLeftMenu,100);
//update-start--Author:gaofeng Date:2014-01-09由于不需展示左侧的树因此降低刷新的延迟时间
tabClose();
tabCloseEven();
// 释放内存
@ -30,13 +30,13 @@
var rowid="";
// 初始化左侧
function InitLeftMenu() {
// update-start--Author:刘洋 Date:2015-04-11 for:修改左侧菜单栏,当侧拉左侧菜单栏宽度,菜单高度不能自适应的问题
var navaa=$("#nav .panel");
var winheight = document.body.clientHeight - 157;
navaa.find(".panel-body").panel({//左侧菜单 宽度拉伸,自动调整
onResize:function(){ navaa.find(".panel-body").css("height",winheight); }
});
// update-end--Author:刘洋 Date:2014-04-11 for:修改左侧菜单栏,当侧拉左侧菜单栏宽度,菜单高度不能自适应的问题
$('.easyui-accordion li div').click(function() {
$('.easyui-accordion li div').removeClass("selected");
@ -46,7 +46,8 @@ function InitLeftMenu() {
}, function() {
$(this).parent().removeClass("hover");
});
// update-start--Author:gaofeng Date:2014-01-09 for:新增首页风格,一级菜单点击事件的切换操作
$(".shortcut li").live("click",function(){
$(this).find(".imag1").hide();
$(this).find(".imag2").show();
@ -60,7 +61,7 @@ function InitLeftMenu() {
var winheight = document.body.clientHeight - 157;//计算左侧二级菜单的行高度,以便自动判断是否需要滚动条
navaa.find(".panel-body").css("height",winheight);
});
// update-end--Author:gaofeng Date:2014-01-09 for:新增首页风格,一级菜单点击事件的切换操作
// begin author屈然博 2013-8-04 for避免监听树自带三角点击事件
$('.easyui-tree').tree({
@ -73,15 +74,15 @@ function InitLeftMenu() {
url: "loginController.do?primaryMenu",
async:false,
success: function (data) {
// update-begin--Author:zhangguoming Date:20140429 for一级菜单右侧有双引号且在ie下样式错位
// $(".shortcut").html(data);
$(".shortcut").html(data.replaceAll("\"", ""));
// update-end--Author:zhangguoming Date:20140429 for一级菜单右侧有双引号且在ie下样式错位
}
});
// update-start--Author:Peak Date:2014-01-09新增首页风格,初始化第一个菜单的内容显示
$(".shortcut li").eq(0).trigger("click");
//update-end--Author:Peak Date:2014-01-09新增首页风格,初始化第一个菜单的内容显示
$("#nav").show();
}
@ -259,11 +260,11 @@ function tabCloseEven() {
$('#mm-tabcloseall').click(function() {
$('.tabs-inner span').each(function(i, n) {
var t = $(n).text();
// update-begin--Author:zhangguoming Date:20140905 for不关闭首页
if (t != '首页') {
$('#maintabs').tabs('close', t);
}
// update-end--Author:zhangguoming Date:20140905 for不关闭首页
});
});
// 关闭除当前之外的TAB
@ -294,11 +295,11 @@ function tabCloseEven() {
}
prevall.each(function(i, n) {
var t = $('a:eq(0) span', $(n)).text();
// update-begin--Author:zhangguoming Date:20140612 for不关闭首页
if (t != '首页') {
$('#maintabs').tabs('close', t);
}
// update-end--Author:zhangguoming Date:20140612 for不关闭首页
});
return false;
});

@ -1998,7 +1998,6 @@ pre.prettyprint {
text-shadow: none !important;
/*update-begin--Author:jg_renjie Date:20150613 for<6F><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Сģʽ<C4A3>²˵<C2B2><CBB5>Ŀ<EFBFBD>ȣ<EFBFBD><C8A3>Ӷ<EFBFBD>ʹ<EFBFBD>ò<EFBFBD><C3B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ˵<D6B2><CBB5><EFBFBD><EFBFBD><EFBFBD>*/
/*font-size: 13px;*/
/*update-end--Author:jg_renjie Date:20150613 for<6F><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Сģʽ<C4A3>²˵<C2B2><CBB5>Ŀ<EFBFBD>ȣ<EFBFBD><C8A3>Ӷ<EFBFBD>ʹ<EFBFBD>ò<EFBFBD><C3B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ˵<D6B2><CBB5><EFBFBD><EFBFBD><EFBFBD>*/
text-decoration: none;
}
.nav-list > li > a > .menu-icon {
@ -2670,7 +2669,6 @@ body.mob-safari .sidebar.sidebar-fixed {
.sidebar.menu-min + .main-content {
margin-left: 51px;
}
/*update-end--Author:jg_renjie Date:20150613 for<6F><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Сģʽ<C4A3>²˵<C2B2><CBB5>ģ<EFBFBD><C4A3>Ӷ<EFBFBD>ʹ<EFBFBD>ò<EFBFBD><C3B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֲ˵<D6B2><CBB5><EFBFBD><EFBFBD><EFBFBD>*/
.sidebar.menu-min .nav-list a .badge,
.sidebar.menu-min .nav-list a .label {
position: relative;

@ -10449,6 +10449,7 @@ addSubGrid : function( pos, sind ) {
return this.each(function(){
var ts = this;
if (!ts.grid ) { return; }
//-------------------------
var subGridCell = function(trdiv,cell,pos)
{
var tddiv = $("<td align='"+ts.p.subGridModel[0].align[pos]+"'></td>").html(cell);

@ -30,9 +30,7 @@
<th align="center" bgcolor="#EEEEEE" mutiLang_id="controllength">控件长度</th>
<th align="center" bgcolor="#EEEEEE" mutiLang_id="isquery">是否查询</th>
<th align="center" bgcolor="#EEEEEE" mutiLang_id="querytype">查询类型</th>
<!-- add-start--Author:luobaoli Date:20150610 for页面上增加扩展参数字段 -->
<th align="center" bgcolor="#EEEEEE" mutiLang_id="extendJson">扩展参数</th>
<!-- add-end--Author:luobaoli Date:20150610 for页面上增加扩展参数字段 -->
</tr>
</tbody>
<tbody id="add_column_table_template_page">
@ -47,7 +45,6 @@
name="columns[#index#].isShow" style="width: 50px;"></td>
<td align="left"><input type="checkbox" checked="checked"
name="columns[#index#].isShowList" style="width: 50px;"></td>
<!-- add-start--Author:jg_renjie Date:20160413 forTASK #1019 【平台bug】ONLINE百度编辑器控件样式不好。 -->
<td align="left"><select name="columns[#index#].showType" onchange="getShowType(this)">
<option value="text">文本框</option>
<option value="password">密码</option>
@ -62,7 +59,6 @@
<option value="image">图片</option>
<option value="umeditor">UE编辑器</option>
</select></td>
<!-- add-end--Author:jg_renjie Date:20160413 forTASK #1019 【平台bug】ONLINE百度编辑器控件样式不好。 -->
<td align="left"><input name="columns[#index#].fieldLength"
value="120" type="text" style="width: 60px;"></td>
<td align="left"><input type="checkbox"
@ -71,10 +67,8 @@
<option value="single">普通查询</option>
<option value="group">范围查询</option>
</select></td>
<!-- add-start--Author:luobaoli Date:20150610 for页面上增加扩展参数字段 -->
<td align="left"><input name="columns[#index#].extendJson"
type="text" style="width: 200px;" titlemsg="extendJsonTip"></td>
<!-- add-end--Author:luobaoli Date:20150610 for页面上增加扩展参数字段 -->
</tr>
</tbody>
</table>
@ -84,12 +78,10 @@
<script>
$(document).ready(function(){
<!-- add-start--Author:luobaoli Date:20150611 for扩展字段上增加提示-->
$("[titlemsg]").each(function() {
var titlemsg = $(this).attr("titlemsg");
$(this).attr("title",eval(titlemsg));
});
<!-- add-end--Author:luobaoli Date:20150611 for扩展字段上增加提示 -->
$("[mutiLang_id]").each(function() {
this.innerText = eval(this.attributes["mutiLang_id"].value);

@ -64,12 +64,10 @@ function initData() {
getDataHanlder);
$.get("cgFormIndexController.do?getIndexList&id=" + $("#id").val(),
getDataHanlderIndex);
$('.t_table').height($(window).height()-300);
$(window).resize(function(){
$('.t_table').height($(window).height()-300);
});
}
@ -84,10 +82,8 @@ function addTableHead() {
}
}
// 兼容不同浏览器获取iframe 内容
//主要情况是ie11下的版本是火狐的标识倒是出差错
function getIframeDocument(id){
try {
if (window.frames["iframe_" + id].contentDocument) {
return window.frames["iframe_" + id].contentDocument;
@ -96,10 +92,8 @@ function getIframeDocument(id){
} catch (e) {
}
return document.getElementById("iframe_" + id).contentDocument;
}
/**
* 获取数据的回调
*
@ -163,6 +157,7 @@ function initTrData(item, filedType, orderMin) {
if (item[fieldName] != "Y" && item[fieldName] != "N") {
//--author: zhoujf -----start----date:20160331 -------for:online开发创建表单时 表属性设置增加一列checkbox设置传不了值的问题
$this.attr('type')=='checkbox'? $this.attr("checked", false):$this.val(item[fieldName]);
//--author: zhoujf -----end----date:20160331 -------for:online开发创建表单时 表属性设置增加一列checkbox设置传不了值的问题
} else {
item[fieldName] == "Y" ? $this.attr("checked", true) : $this
.attr("checked", false);
@ -199,6 +194,7 @@ function initTrDataIndex(item, filedType, orderMin) {
if (item[fieldName] != "Y" && item[fieldName] != "N") {
//--author: zhoujf -----start----date:20160331 -------for:online开发创建表单时 表属性设置增加一列checkbox设置传不了值的问题
$this.attr('type')=='checkbox'? $this.attr("checked", false):$this.val(item[fieldName]);
//--author: zhoujf -----end----date:20160331 -------for:online开发创建表单时 表属性设置增加一列checkbox设置传不了值的问题
} else {
item[fieldName] == "Y" ? $this.attr("checked", true) : $this
.attr("checked", false);

@ -857,9 +857,7 @@ a:hover.l-btn span.l-btn-left {
}
a:hover.l-btn-plain {
/* padding: 0 5px 0 0; */
/*update-start--Author: os_renjie Date:20160529 for:TASK #1044 【通用样式修改】让按钮别晃动*/
padding: 1px 6px 1px 1px;
/*update-start--Author: os_renjie Date:20160529 for:TASK #1044 【通用样式修改】让按钮别晃动*/
}
a:hover.l-btn-disabled {

@ -57,7 +57,6 @@ $('.userload').click(function(e) {
$('.userbox').hide();
});
});
$('#randCodeImage').click(function(){
reloadRandCodeImage();
});
@ -69,7 +68,6 @@ function reloadRandCodeImage() {
var img = document.getElementById("randCodeImage");
img.src='randCodeImage?a=' + date.getTime();
}
// 重置
$('#forgetpass').click(function(e) {
$(":input").each(function() {
@ -125,9 +123,7 @@ function Login(orgId) {
formData[this.name] =$("#"+this.name ).val();
});
formData['orgId'] = orgId ? orgId : "";
formData['langCode']=$("#langCode").val();
formData['langCode'] = $("#langCode option:selected").val();
$.ajax({
async : false,
@ -141,7 +137,6 @@ function Login(orgId) {
var d = $.parseJSON(data);
if (d.success) {
loginsuccess();
// todo zhanggm 没有处理多语言,暂时这样判断下吧
var title, okButton;
if($("#langCode").val() == 'en') {
@ -179,7 +174,6 @@ function Login(orgId) {
} else {
setTimeout("window.location.href='"+actionurl+"'", 1000);
}
} else {
if(d.msg == "a"){
$.dialog.confirm("数据库无数据,是否初始化数据?", function(){
@ -215,14 +209,12 @@ function getCookie()
if (COOKIE_NAME !=null) {
$("input[iscookie='true']").each(function() {
$($("#"+this.name).val( $.cookie(this.name)));
if("admin" == $.cookie(this.name)) {
$("#randCode").focus();
} else {
$("#password").val("");
$("#password").focus();
}
});
$("#on_off").attr("checked", true);
$("#on_off").val("1");
@ -231,9 +223,7 @@ function getCookie()
{
$("#on_off").attr("checked", false);
$("#on_off").val("0");
$("#randCode").focus();
}
}
//点击消息关闭提示

@ -3110,7 +3110,6 @@ z-index: 12;
z-index: 1;
/*update-begin--Author:zhangguoming Date:20140604 for云桌面全局视图添加纵向滚动条*/
overflow: auto !important;
/*update-end--Author:zhangguoming Date:20140604 for云桌面全局视图添加纵向滚动条*/
}
.amg_folder_appbutton {
display: block;
@ -3202,7 +3201,6 @@ z-index: 12;
.window {
/*background: url("../images/transparent.gif") repeat scroll 0 0 transparent;*/
}
/*update-end--Author:zhangguoming Date:20140617 for云桌面修改首页风格时的提示框样式*/
.window_title {
height: 25px;
text-align: center;

@ -172,7 +172,6 @@
}
},
sApp:{//侧边栏应用
/*'297e20104620167201462016b5fe001f':{
appid:'297e20104620167201462016b5fe001f',
icon:'plug-in/accordion/images/desk/user.png',
@ -230,6 +229,5 @@
name:'互联网搜索',
asc :6
}*/
}
};

@ -12,7 +12,6 @@ var datajson=null;
var iconjson=null;
var totalnum =null;
var DATA=new Object();
var iconCookieKey = "iconCookieKey";
var iconCookieKeyForSlider = "iconCookieKeyForSlider";
var cookieParam = {expires: 30};
@ -21,7 +20,6 @@ var defaultIconForSlider = [
// '297e20104620167201462016b5fe001f',/*用户管理*/
// '297e20104620167201462016b6020021' /*角色管理*/
];
//增加数据动态处理的过程
////这里使用menuString来替换掉每个一级二级菜单的数据
@ -49,7 +47,6 @@ function dataFlush(){
}
});
}
/**
* 转换用户的桌面
*/
@ -109,7 +106,6 @@ function calcuIconJson() {
}
//工具类
Util = {
formatmodel : function (str, model) {
@ -429,7 +425,6 @@ Deskpanel = function(me){
me.refreshIcon(firstLoad);
},
refreshIcon:function(firstLoad){//刷新应用
var r = ~~(me.height/112);
var curIndex = 1;
@ -466,7 +461,6 @@ Deskpanel = function(me){
$.cookie(iconCookieKeyForSlider, iconCookieDataForSlider, cookieParam);
}
},
moveIconTo:function(icon,idx2){//目标位置
var ids=(Panel.getIdx(icon.box));
if(idx>idx2){//往前移
@ -609,7 +603,6 @@ Sidebar=function(me){
},
createStartTool:function(){//开始设置
me.start = $("<a title='点击这里开始' class='dock_tool_icon dock_tool_start' href='javascript:void(0);'></a>");
me.start.powerFloat({
eventType: "click",
offsets:{x:getX,y:-100},
@ -628,7 +621,6 @@ Sidebar=function(me){
return 60;
}
}
},
createPinyinTool :function(){//输入法
me.pinyin =$(Util.formatmodel(tool_a,{
@ -676,18 +668,14 @@ Sidebar=function(me){
content :document.getElementById("themeSetting_wrap")
});
});
$("a",themsSetting).live("click",function(){
var a = $(this);
var themeid = a.attr("themeid");
var src = themeid.substring(themeid.indexOf("_")+1,themeid.length);
var h = $(window).height();
var w = $(window).width();
$("#zoomWallpaper").attr("src","plug-in/sliding/images/bg/"+src+".jpg").width(w).height(h);
$.cookie("myskin","plug-in/sliding/images/bg/"+src+".jpg",cookieParam);
$("#zoomWallpaperGrid").width(w).height(h);
$("a",themsSetting).removeClass("themeSetting_selected");
a.addClass("themeSetting_selected");
@ -918,11 +906,9 @@ Navbar =function(me){
});
var pagelet_search_suggest =$("<div class='pagelet_search_suggest' id='pagelet_search_suggest'style='display: none;' ></div>");
var sb_resultbox = $("<ul id='sb_resultBox' style='display: block;'></ul>");
var sb_app_item_1 =$("<div idx='-1' class='sb_resultList fsb_resultList sb_page'><a href='#'><span class='sb_pageTxt'><span id='sb_resultBox_key' class='sb_resultBox_key'>s</span>-在“百度”搜索...</span></a> </div>");
var sb_app_item_2 = $("<div idx='-2' class='sb_resultList fsb_resultList sb_app'><a href='#'><span class='sb_appTxt'><span id='sb_resultBox_key' class='sb_resultBox_key'>s</span>-去系统应用搜搜...</span></a></div>");
pagelet_search_suggest.append(sb_resultbox).append(sb_app_item_1).append(sb_app_item_2);
pagelet_search_bar.append(pageletSearchInput).append(pageletSearchButton);
Body.addPanel(pagelet_search_bar);
@ -949,12 +935,10 @@ Navbar =function(me){
$(this).val("");
}).blur(function(){
toggleSearchSuggest();
var searchhtnl=$(this).val();
$(this).val("搜索功能模块和应用...");
$(".fsb_resultList").show();
}).keyup(function(){
var _this = $(this);
var _val = _this.val();
@ -1025,10 +1009,8 @@ appManagerPanel = function(me){
var aMg_line_y = "<div class='aMg_line_y'></div>";//y轴线
var aMg_App_container = "<div class='aMg_folder_container'></div>";//应用容器
var folderitem ="<div class='folderItem'><div class='folder_bg folder_bg{key}'></div><div class='folderOuter' index='{index}' customacceptdrop='{key}'></div></div>";
// var folderinner ="<div class='folderInner' style='height: 100%; overflow-x: hidden; overflow-y: hidden; ' index='{index}' customacceptdrop='{key}'></div>";
var folderinner ="<div class='folderInner' style='height: 90%; overflow-x: hidden; overflow-y: hidden; ' index='{index}' customacceptdrop='{key}'></div>";
var scrollBar ="<div class='scrollBar' style='margin-top: 0px; height: 0px; display: none;' _olddisplay='block'></div>";
return me = {
@ -1342,7 +1324,6 @@ Windows = function(me){
var taskIds = BottomBar.getALLItemID();
var taskLen = taskIds.length;
var api=array[id];
function changeLhgDialogFocus() {
var foucsApi = null;
for(var obj in $.dialog.list){
@ -1390,7 +1371,6 @@ Windows = function(me){
}
}
},
hideWindow :function(id){//隐藏
$.dialog.list[id].hide();
@ -1436,13 +1416,10 @@ Windows = function(me){
me.showWindow(id);
BottomBar.setCurrent(task.box.attr("id"));
});
$.dialog({
id:id,
lock : false,
zIndex:1000+getDialogLength(),
width:width,
height:height,
title:title,
@ -1454,7 +1431,6 @@ Windows = function(me){
}
}).zindex();
/*art.dialog.open(url,*//** 弹出ART窗体*//*
{
"id" :id,
@ -1519,9 +1495,7 @@ appIcon_amg1 = appIcon_amg.extend({
appid:this.app.appid,
fileid : this.app.appid,
title:this.app.name,
url: this.app.url,
uid :"app_"+this.app.appid
});
@ -1534,7 +1508,6 @@ appIcon_amg1 = appIcon_amg.extend({
/*update-begin--Author:zhangguoming Date:20140509 for云桌面图标管理*/
// src:'plug-in/sliding/icon/'+this.app.icon,
src:this.app.icon,
/*update-end--Author:zhangguoming Date:20140509 for云桌面图标管理*/
"class":"appButton_appIconImg",
id:'icon_app_'+this.app.appid+'_'+this.app.asc+'_img'
@ -1563,7 +1536,6 @@ appIcon_amg1 = appIcon_amg.extend({
this.box.append(appIcon).append(nameDiv).append(notify).append(deleteDiv);
},
bindEvent:function(){
this.box.click(function(e){
e.preventDefault();
e.stopPropagation();
@ -1576,7 +1548,6 @@ appIcon_amg1 = appIcon_amg.extend({
appManagerPanel.hide();
Desktop.show();
});
}
@ -1617,7 +1588,6 @@ appIcon_t1 = appIcon_t0.extend({
/*update-begin--Author:zhangguoming Date:20140509 for云桌面图标管理*/
// src:'plug-in/sliding/icon/'+this.app.icon,
src:this.app.icon,
/*update-end--Author:zhangguoming Date:20140509 for云桌面图标管理*/
"class":"appButton_appIconImg",
id:'icon_app_'+this.app.appid+'_'+this.app.asc+'_img'
@ -1676,10 +1646,8 @@ appIcon_t2 = appIcon_t0.extend({
appid:this.sApp.appid,
fileid : this.sApp.appid,
title:this.sApp.name,
uid :"app_"+this.sApp.appid,
url:this.sApp.url
});
var appIcon =$("<div>",{
@ -1688,10 +1656,8 @@ appIcon_t2 = appIcon_t0.extend({
});
appIcon.append($("<img>",{
alt:this.sApp.name ,
// src:'plug-in/sliding/icon/'+this.sApp.icon,
src:this.sApp.icon,
"class":"appButton_appIconImg",
id:'icon_app_'+this.sApp.appid+'_'+this.sApp.asc+'_img'
@ -1733,13 +1699,10 @@ $(function() {
// dataFlush();
Desktop.init();
//替换icon的数组内容
// Deskpanel.init(iconjson).refresh();
Deskpanel.init(iconjson, true);
Sidebar.init({
location:'left',//初始化sidebar的位置为左侧
Icon:defaultIconForSlider
/*Icon:[
'appmarket',
@ -1749,14 +1712,12 @@ $(function() {
'internet',
'qq'
]*/
});
Navbar.init();//初始化导航条
BottomBar.init();//初始化下部栏
appManagerPanel.init();//初始化全局桌面
});
$(function(){
$(".fsb_resultList").live("click",function(){
@ -1770,7 +1731,6 @@ $(function(){
}
$(".fsb_resultList").hide();
})
var mychangeskin=$.cookie("myskin");
if(mychangeskin)
@ -1778,7 +1738,6 @@ $(function(){
$("#zoomWallpaper").attr("src",mychangeskin);
$.cookie("myskin",mychangeskin,cookieParam);//1为关掉浏览器不消失效果0为消失
}
});

@ -61,7 +61,6 @@ function addTreeNode(title,addurl,gname) {
* @param addurl//目标页面地址
* @param id//主键字段
*/
function update(title,url, id,width,height,isRestful) {
gridname=id;
var rowsData = $('#'+id).datagrid('getSelections');
@ -82,7 +81,6 @@ function update(title,url, id,width,height,isRestful) {
createwindow(title,url,width,height);
}
/**
* 如果页面是详细查看页面无效化所有表单元素只能进行查看
*/

@ -64,7 +64,6 @@ function addTreeNode(title,addurl,gname) {
* @param addurl//目标页面地址
* @param id//主键字段
*/
function update(title,url, id,width,height,isRestful) {
gridname=id;
var rowsData = $('#'+id).datagrid('getSelections');
@ -84,7 +83,6 @@ function update(title,url, id,width,height,isRestful) {
createwindow(title,url,width,height);
}
/**
* 如果页面是详细查看页面无效化所有表单元素只能进行查看
*/

@ -371,8 +371,8 @@ function clearLocalstorage(){
storage.removeAll();
$.messager.alert('信息', "浏览器缓存清除成功!");
}
//如果在最外层页面创建tools对象
if (window.top == window) {
var tools = {msg : "这是一个工具对象可以把常用属性放到这个对象上。如在任意页面用top.currDatagri可以获取当前的datagrid"};
}
//update-end--Author:钟世云 Date:20150610 foronline支持树配置----------------------

@ -1117,6 +1117,7 @@ var domUtils = dom.domUtils = {
POSITION_CONTAINS: 16,
//ie6使用其他的会有一段空白出现
fillChar: ie && browser.version == '6' ? '\ufeff' : '\u200B',
//-------------------------Node部分--------------------------------
keys: {
/*Backspace*/ 8: 1, /*Delete*/ 46: 1,
/*Shift*/ 16: 1, /*Ctrl*/ 17: 1, /*Alt*/ 18: 1,

@ -42,23 +42,19 @@
function initMainTableSourceSelect(){
var ztree = $.fn.zTree.getZTreeObj("dbSelect");
var node = ztree.getNodesByParam("pid", 0, null);
var options = "<option value=''>请选择主数据源</option>";
$.each(node,function(i,f){
options += "<option value='"+f.dbCode+"'>"+f.name+"</option>";
})
$("#mainTableSource").html(options);
}
$(function(){
$.fn.zTree.init($("#dbSelect"), setting, []);
var styleDate = eval('${styleSelect}');
var iconPath = "plug-in/ztree/css/img/diy/2.png";
$(styleDate).each(function(i){
this.icon = iconPath;
});
$.fn.zTree.init($("#styleSelect"), stylesetting, styleDate);
initMainTableSourceSelect();
@ -636,6 +632,8 @@ var leipiFormDesign = {
if(formEditor.hasContents()){
formEditor.sync();/*同步内容*/
//--------------以下仅参考-----------------------------------------------------------------------------------------------------
var type_value='',formid=0,fields=$("#fields").val(),formeditor='';
if( typeof type!=='undefined' ){

@ -14,10 +14,8 @@
var setting = {
check: {
enable: true,
chkStyle: "radio",
radioType: "level"
},
data: {
simpleData: {
@ -46,25 +44,21 @@
function initMainTableSourceSelect(){
var ztree = $.fn.zTree.getZTreeObj("dbSelect");
var node = ztree.getNodesByParam("pid", 0, null);
var options = "<option value=''>请选择主数据源</option>";
$.each(node,function(i,f){
options += "<option value='"+f.dbCode+"'>"+f.name+"</option>";
})
$("#mainTableSource").html(options);
$("#mainTableSource").val("${autoFormPage.mainTableSource}");
}
$(function(){
var dbDate = eval('${dbDate}');
$.fn.zTree.init($("#dbSelect"), setting, dbDate);
var styleDate = eval('${styleSelect}');
var iconPath = "plug-in/ztree/css/img/diy/2.png";
$(styleDate).each(function(i){
this.icon = iconPath;
});
$.fn.zTree.init($("#styleSelect"), stylesetting, styleDate);
initMainTableSourceSelect();
//自定义easyui表单验证规则
@ -617,6 +611,8 @@ var leipiFormDesign = {
if(formEditor.hasContents()){
formEditor.sync();/*同步内容*/
//--------------以下仅参考-----------------------------------------------------------------------------------------------------
var type_value='',formid=0,fields=$("#fields").val(),formeditor='';
if( typeof type!=='undefined' ){

@ -14,7 +14,6 @@
var url = "autoFormController.do?viewContent";
var param = $("#formobj").serialize();
url = url +"&"+param;
/* var tbDbKey = $("#tbDbKey").val();
if(tbDbKey!=''&&tbDbKey!=null){
url = url +"&"+tbDbKey;
@ -23,7 +22,6 @@
if(dbKey!=''&&dbKey!=null){
url = url +"&"+dbKey;
}
window.open(url,'mywin',"menubar=0,toolbar=0,status=0,resizable=1,left=0,top=0,scrollbars=1,width=" +(screen.availWidth-10) + ",height=" + (screen.availHeight-50) + "\"");
//document.formobj.action= "autoFormController.do?viewContent";
//document.formobj.submit();
@ -39,9 +37,7 @@
<legend><t:mutiLang langKey="form.db.param.input"/></legend>
<t:formvalid formid="formobj" dialog="false" layout="table" action="autoFormController.do?viewContent" tiptype="1">
<input id="formName" name="formName" type="hidden" value="${autoFormPage.formName }">
<!--add-start--author: gengjiajia-start-date:20160615 for:#1110 添加支持多数据源的数据源名称参数 -->
<input id="dbKey" name="dbKey" type="hidden" value="${dbKey}">
<!--add-end--author: gengjiajia-end-date:20160615 for:#1110 添加支持多数据源的数据源名称参数 -->
<table cellpadding="0" cellspacing="1" class="formtable" style="width: 100%">
<c:forEach items="${paramList}" var="poVal" varStatus="status">

@ -114,7 +114,6 @@
typeGroupCode="formDbType" hasLabel="false" title="form.db.type" defaultVal="sql"></t:dictSelect>
<span class="Validform_checktip"></span>
</td>
<!--add-start--Author:gengjiajia Date:20160616 for#1110 添加动态数据源 -->
<td align="center" width="100px">
<label class="Validform_label"><b><t:mutiLang langKey="动态数据源"/>:</b></label>
</td>
@ -127,7 +126,6 @@
</select>
<span class="Validform_checktip"></span>
</td>
<!--add-end--Author:gengjiajia Date:20160616 for#1110 添加动态数据源 -->
</tr>
<tr id="dataSourceTr">
<td align="center">
@ -194,7 +192,6 @@
</tr>
</table>
</div>
<!--add-end--Author:luobaoli Date:20150621 for新增数据源类型为“table”时的处理逻辑 -->
<div style="margin-top: 5px;border: 1px solid #E6E6E6" id="sql_div" class="formdbdiv">
<table cellpadding="0" cellspacing="1" style="width: 100%">
<tr>

@ -30,14 +30,11 @@
$("#autoFormParam").load("autoFormDbController.do?autoFormParamList&id=${autoFormDbPage.id}");
if($("#autoFormDbFieldForTable").length>0)
$("#autoFormDbFieldForTable").load("autoFormDbController.do?autoFormDbFieldForTableList&id=${autoFormDbPage.id}");
if($('#dbTableName').length > 0){
$('#dbTableName').change(function(){
$.ajax({
url:"autoFormDbController.do?getTableFields",
data:{dbKey:$("#tbDbKey").val(),tableName:$("#dbTableName").val()},
type:"Post",
dataType:"json",
success:function(data){
@ -57,7 +54,6 @@
});
});
}
hideDataSourceAndDataTable();
});
function hideDataSourceAndDataTable(){
@ -134,7 +130,6 @@
typeGroupCode="formDbType" hasLabel="false" title="form.db.type" defaultVal="${autoFormDbPage.dbType}"></t:dictSelect>
<span class="Validform_checktip"></span>
</td>
<!--add-start--Author:gengjiajia Date:20160616 for#1110 添加动态数据源 -->
<td align="center" width="100px">
<label class="Validform_label"><b><t:mutiLang langKey="动态数据源"/>:</b></label>
</td>
@ -147,7 +142,6 @@
</select>
<span class="Validform_checktip"></span>
</td>
<!--add-end--Author:gengjiajia Date:20160616 for#1110 添加动态数据源 -->
</tr>
<tr id="dataSourceTr">
<td align="right">
@ -262,7 +256,6 @@
JAVA类配置
</div>
</c:if>
<!--add-end--Author:luobaoli Date:20150621 for新增数据源类型为“table”时的处理逻辑 -->
</t:formvalid>
<!-- 添加 附表明细 模版 -->
<table style="display:none">
@ -337,7 +330,6 @@
</td>
</tr>
</tbody>
<!--add-end--Author:luobaoli Date:20150621 for新增数据源类型为“table”时的属性列表新增模块 -->
</table>
</body>
<script src = "webpage/jeecg/cgform/autoform/autoFormDb.js"></script>

@ -20,7 +20,6 @@ function setFieldText(){
}
})
}
var autoFormParams={};//存储查询参数
function storeParams(){
var paramNames=$("#add_autoFormParam_table").find("input[name$='paramName']");
@ -59,7 +58,6 @@ function setParams(){
}
}
$(function(){
$("body").append("<link href=\"plug-in/lhgDialog/skins/default.css\" rel=\"stylesheet\" id=\"lhgdialoglink\">");
var $btn = $("<div class=\"ui_buttons\" style=\"display:inline-block;padding:0px;\"><input style=\"position: relative;top: 0px;\" class=\"ui_state_highlight\" type=\"button\" value=\"sql解析\" id=\"sqlAnalyze\" /></div>");
@ -69,11 +67,9 @@ $(function(){
storeParams();
$.ajax({
url:"autoFormDbController.do?getFields",
data:{sql:$("#dbDynSql").val(),
dbKey:$("#dbKey").val()},
//data:{sql:$("#dbDynSql").val()},
type:"Post",
dataType:"json",
success:function(data){
@ -277,7 +273,6 @@ function decode(value, id) {//value传入值,id接受值
var filename = value.substring(last + 1, value.length);
$("#" + id).text(decodeURIComponent(filename));
}
function getTableName(){
var sql=$("#dbDynSql").val().toLowerCase();
if(sql.length==0)
@ -296,3 +291,4 @@ function getTableName(){
}
}
}
//<!--update-end--Author:zzl Date:20151101 forsql解析获取数据库表名填充数据源 -->

@ -17,17 +17,13 @@
<t:dgCol title="form.db.chname" field="dbChName" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="form.db.type" field="dbType" queryMode="single" dictionary="formDbType" 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新增填报数据源和填报数据库表显示-->
<t:dgCol title="form.tb.db.key" field="tbDbKey" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="form.tb.db.table.name" field="tbDbTableName" queryMode="single" width="120"></t:dgCol>
<!--add-end--Author: jg_huangxg Date:20150723 for新增填报数据源和填报数据库表显示-->
<t:dgCol title="form.db.synsql" field="dbDynSql" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="common.dynamic.dbsource" field="dbKey" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="common.operation" field="opt" width="100"></t:dgCol>
<t:dgDelOpt title="common.delete" url="autoFormDbController.do?doDel&id={id}" />
<!--add-start--Author:luobaoli Date:20150626 for新增表单数据源预览操作-->
<t:dgFunOpt title="form.db.preview" funname="goView(id)"></t:dgFunOpt>
<!--add-end--Author:luobaoli Date:20150626 for新增表单数据源预览操作-->
<%-- <t:dgToolBar title="common.add" icon="icon-add" url="autoFormDbController.do?goAdd" funname="add" height="600"></t:dgToolBar> --%>
<t:dgToolBar title="common.edit" icon="icon-edit" url="autoFormDbController.do?goUpdate" funname="update" height="600"></t:dgToolBar>
<t:dgToolBar title="common.query" icon="icon-search" url="autoFormDbController.do?goUpdate" funname="detail"></t:dgToolBar>

@ -275,6 +275,7 @@ var leipiEditor = UE.getEditor('ftlContent',{
alert("你点击了保存,这里可以异步提交,请自行处理....");
$("#ftl").val(leipiEditor.getContent());
return false;
//--------------以下仅参考-----------------------------------------------------------------------------------------------------
var type_value='',formid=0,fields=$("#fields").val(),formeditor='';
if( typeof type!=='undefined' ){

@ -28,19 +28,16 @@ $(function(){
data : {'action' :'edit','parseForm':html},
success : function(msg){
if(msg.success){
var d = msg.msg;
if(d != null && d != ''){
$('#preview').html(msg.msg.replace(new RegExp(/(&quot;)/g),"'"));
}
}else{
tip(msg.msg);
}
}
});
});
function parse_form(template,fields)
{
//正则 radios|checkboxs|select 匹配的边界 |--| 因为当使用 {} 时js报错 (plugins|fieldname|fieldflow)
@ -221,7 +218,6 @@ function parse_form(template,fields)
'add_fields':add_fields//新增控件
});
return JSON.stringify(parse_form);
}</script></body>
</html>

@ -37,7 +37,6 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
border-bottom: 1px solid #e6e6e6;
cursor: n-resize;
}
/*update-end--Author:liuht Date:20131207 for[333]OL模块增加一个特效 调整字段顺序(上下挪动)*/
</style>
</head>
<body style="overflow-y: hidden; overflow-x: hidden;" scroll="no">
@ -71,14 +70,12 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
class="inputxt" value="${cgFormHeadPage.jformPkSequence}" /> <span class="Validform_checktip"></span> <label class="Validform_label" style="display: none;"> <t:mutiLang langKey="sequence.name"/>:</label></td>
</tr>
<tr>
<!--add-start--Author:luobaoli Date:20150607 for增加表单分类下拉列表-->
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="form.category"/>:</label></td>
<td class="value"><select id="jformCategory" name="jformCategory">
<c:forEach items="${typeList}" var="type">
<option value="${type.typecode}" <c:if test="${type.typecode==cgFormHeadPage.jformCategory}">selected="selected"</c:if>>${type.typename}</option>
</c:forEach>
</select></td>
<!--add-end--Author:luobaoli Date:20150607 for增加表单分类下拉列表-->
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="table.type"/>: </label></td>
<td class="value"><select id="jformType" name="jformType" onchange="formTypeChange();">
@ -103,15 +100,10 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
</td>
</tr>
<tr>
<!--add-start--Author:张忠亮 Date:20150618 for增加表单模板选择-->
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="form.template.style_pc" />:</label></td>
<td class="value"><select id="formTemplate" name="formTemplate" temVal="${cgFormHeadPage.formTemplate}"></select></td>
<!--add-end--Author:张忠亮 Date:20150618 for增加表单模板选择-->
<!--add-start--Author:scott Date:20160301 foronline表单移动样式单独配置-->
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="form.template.style_mobile" />:</label></td>
<td class="value"><select id="formTemplateMobile" name="formTemplateMobile" temVal="${cgFormHeadPage.formTemplateMobile}"></select></td>
<!--add-start--Author:scott Date:20160301 foronline表单移动样式单独配置-->
</tr>
<tr>
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="show.checkbox"/>: </label></td>
@ -194,7 +186,6 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
<br><br><br>
</div>
</div>
<!-- add-start author wangkun date:20160611 for: TASK #1090 【online】online表单缺少索引配置 代码修改痕迹-->
<div title='<t:mutiLang langKey="common.index"/>' style="overflow: hidden;">
<div style="height: 25px;" class="datagrid-toolbar">
<a id="addColumnBtn1" class="easyui-linkbutton" data-options="iconCls:'icon-add'" onclick="addIndexBtnClick();" href="#"><t:mutiLang langKey="common.add.to"/></a>
@ -209,7 +200,6 @@ String langurl = basePath + "/plug-in/mutiLang/" + lang +".js";
<br><br><br>
</div>
</div>
<!-- add-end author wangkun date:20160611 for: TASK #1090 【online】online表单缺少索引配置 代码修改痕迹-->
</div>
</t:formvalid>
<script type="text/javascript">
@ -220,9 +210,7 @@ $(function() {
isTreeHandle();
});
getFormTemplateName();
<!--add-start--Author:scott Date:20160301 foronline表单移动样式单独配置-->
getFormTemplateName2();
<!--add-end--Author:scott Date:20160301 foronline表单移动样式单独配置-->
});
//根据是否为树形菜单隐藏或显示tree输入框
function isTreeHandle() {
@ -236,7 +224,6 @@ function isTreeHandle() {
$("tr.tree").find(":input").attr("disabled", true).removeAttr("datatype").end().hide();
}
}
<!--add-start--Author:张忠亮 Date:20150714 for根据表单类型获取风格-->
//获取表单风格模板名称
function getFormTemplateName(){
var type=$("#jformType").val();
@ -260,8 +247,6 @@ function getFormTemplateName(){
}
});
}
<!--add-start--Author:scott Date:20160301 foronline表单移动样式单独配置-->
//获取表单风格模板名称
function getFormTemplateName2(){
var type=$("#jformType").val();
@ -285,17 +270,13 @@ function getFormTemplateName2(){
}
});
}
<!--add-end--Author:scott Date:20160301 foronline表单移动样式单独配置-->
//表单类型改变 调用
function formTypeChange(){
jformTypeChange();
getFormTemplateName();
<!--add-start--Author:scott Date:20160301 foronline表单移动样式单独配置-->
getFormTemplateName2();
<!--add-end--Author:scott Date:20160301 foronline表单移动样式单独配置-->
}
<!--add-end--Author:张忠亮 Date:20150714 for根据表单类型获取风格-->
//add-start--Author:jg_renjie Date:20160413 forTASK #1019 【平台bug】ONLINE百度编辑器控件样式不好。
function getShowType(obj){
@ -370,7 +351,5 @@ function selectField(select){
<iframe id="iframe_database" src="plug-in/cgform/fields/cgformOfDatabase.html" style="display: none"></iframe>
<iframe id="iframe_key" src="plug-in/cgform/fields/cgformOfForeignKey.html" style="display: none"></iframe>
<iframe id="iframe_page" src="plug-in/cgform/fields/cgformOfPage.html" style="display: none"></iframe>
<!-- add-start author wangkun date:20160611 for: TASK #1090 【online】online表单缺少索引配置 代码修改痕迹-->
<iframe id="iframe_index" src="plug-in/cgform/fields/cgformOfIndex.html" style="display: none"></iframe>
<!-- add-end author wangkun date:20160611 for: TASK #1090 【online】online表单缺少索引配置 代码修改痕迹-->
</body>

@ -1,7 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<t:base type="jquery,easyui,tools,autocomplete"></t:base>
<!--add-start--Author:luobaoli Date:20150607 for增加表单树型列表-->
<script type="text/javascript">
$(function() {
$('#formtree').tree({
@ -23,7 +22,6 @@
$("#tablePropertyList").datagrid('reload',{jformCategory:jformCategory});
}
</script>
<!--add-end--Author:luobaoli Date:20150607 for增加表单树型列表-->
<div class="easyui-layout" fit="true">
<div region="west" style="width: 150px;" title="表单分类" split="true" collapsed="true">
<div class="easyui-panel" style="padding:0px;border:0px" fit="true" border="false">
@ -38,9 +36,7 @@
<t:dgCol title="common.id" field="id" hidden="true"></t:dgCol>
<t:dgCol title="table.type" field="jformType" replace="single.table_1,master.table_2,slave.table_3" query="true"></t:dgCol>
<t:dgCol title="table.name" field="tableName" query="true" autocomplete="true" />
<!--add-start--Author:luobaoli Date:20150607 for增加表单分类展现-->
<t:dgCol title="form.category" field="jformCategory" dictionary="bdfl"></t:dgCol>
<!--add-end--Author:luobaoli Date:20150607 for增加表单分类展现-->
<t:dgCol title="table.description" field="content"></t:dgCol>
<t:dgCol title="common.version" field="jformVersion"></t:dgCol>
<t:dgCol title="is.tree" field="isTree" hidden="true" replace="common.yes_Y,common.no_N"></t:dgCol>
@ -66,7 +62,6 @@
<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="java.enhance" icon="icon-edit" url="cgformEnhanceJavaController.do?addorupdate" funname="javaEnhance"></t:dgToolBar>
<!--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.import" icon="icon-put" url="cgformSqlController.do?inSqlFile" funname="toCgformMigrate"></t:dgToolBar>
<t:dgToolBar title="code.generate" icon="icon-add" url="generateController.do?gogenerate" funname="generate"></t:dgToolBar>
@ -186,9 +181,7 @@
*/
function popMenuLink(tableName,content){
$.dialog({
content: "url:cgFormHeadController.do?popmenulink&url=cgAutoListController.do?list&title="+tableName,
drag :false,
lock : true,
title:'<t:mutiLang langKey="common.menu.link"/>' + '['+content+']',

@ -15,11 +15,9 @@
alert("复制成功");
frameElement.api.close();
});
var url = "${url}&id=${title}";
clip.setText(url);
$("#menuLink").val(url);
clip.glue('copyBtn');
$("#closeBtn").click(function(){
frameElement.api.close();

@ -15,11 +15,9 @@
alert("复制成功");
frameElement.api.close();
});
var url = "${url}&id=${title}${params}";
clip.setText(url);
$("#menuLink").val(url);
clip.glue('copyBtn');
$("#closeBtn").click(function(){
frameElement.api.close();

@ -25,11 +25,9 @@
if(pro)
window.top.$.messager.progress('close');
$('#demo').html(d.msg);
if(id=="ThreeLevelLinkage"){
init_select();
}
}
}
});

@ -21,7 +21,7 @@
<t:datagrid name="jeecgDemoList" title="DEMO示例列表" autoLoadData="true" actionUrl="jeecgDemoController.do?datagrid" fitColumns="true"
idField="id" fit="true" queryMode="group" checkbox="true" queryBuilder="true">
<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:'*';}" defaultVal="小明" width="120"></t:dgCol>
<t:dgCol title="电话号码" sortable="false" field="mobilePhone" query="true" width="120"></t:dgCol>
<t:dgCol title="办公电话" field="officePhone" width="120"></t:dgCol>
<t:dgCol title="创建日期" field="createDate" editor="datebox" formatter="yyyy-MM-dd hh:mm:ss" query="true" queryMode="group" width="200"></t:dgCol>

@ -81,7 +81,6 @@
$('#'+gname).datagrid('beginEdit', index);
}
}
//取消编辑
function reject(title,addurl,gname){
$('#'+gname).datagrid('clearChecked');

@ -35,6 +35,7 @@ function WebOffice1_NotifyCtrlReady() {
document.all.WebOffice1.LoadOriginalFile("", sFileType);
}
}
// ---------------------== 关闭页面时调用此函数,关闭文件 ==---------------------- //
function window_onunload() {
document.all.WebOffice1.Close();
}
@ -48,12 +49,15 @@ function newDoc() {
function docOpen() {
document.all.WebOffice1.LoadOriginalFile("open", "doc");
}
// -----------------------------== 保存文档 ==------------------------------------ //
function newSave() {
document.all.WebOffice1.Save();
}
// -----------------------------== 另存为文档 ==------------------------------------ //
function SaveAsTo() {
document.all.WebOffice1.ShowDialog(84);
}
// -----------------------------== 上传文档 ==------------------------------------ //
function SaveDoc() {
var returnValue;
if(myform.DocTitle.value ==""){

@ -236,7 +236,6 @@
callback : function() {
iframe = this.iframe.contentWindow;
var orgId = $('#orgId', iframe.document).val();
formData['orgId'] = orgId ? orgId : "";
$.ajax({
async : false,
@ -250,7 +249,6 @@
window.location.href = actionurl;
}
});
this.close();
return false;
}

@ -653,7 +653,6 @@
}});
}
function clearLocalstorage(){
var storage=$.localStorage;
if(!storage)
@ -664,7 +663,6 @@
}
$(document).ready(function(){
//加载公告
var url = "noticeController.do?getNoticeList";

@ -690,7 +690,6 @@
}});
}
function clearLocalstorage(){
var storage=$.localStorage;
if(!storage)
@ -701,7 +700,6 @@
}
$(document).ready(function(){
//加载公告
var url = "noticeController.do?getNoticeList";

@ -1017,15 +1017,11 @@ fa fa-times
url: "loginController.do?primaryMenuDiy",
async:false,
success: function (data) {
// $(".shortcut").html(data);
$(".shortcut").html(data.replace(/\"/g,""));
}
});
$(".shortcut li").eq(0).trigger("click");
$("#nav").show();
//var tabs = $( "#tabs" ).tabs();

@ -236,4 +236,4 @@ function addPortalPanels(portalState) {
}
//-->
</script>
-end--Author:jg_renjie Date:20160315 for配合首页改造引入portal组件 -->
<!-- update-end--Author:jg_renjie Date:20160315 for配合首页改造引入portal组件 -->

@ -5,10 +5,8 @@
<head>
<title><t:mutiLang langKey="jeect.platform"/></title>
<t:base type="jquery,easyui,tools,DatePicker,autocomplete"></t:base>
<!-- add-start--Author:jg_renjie Date:20160315 for配合首页改造引入portal依赖的js及css文件 -->
<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">
<!-- add-end--Author:jg_renjie Date:20160315 for配合首页改造引入portal依赖的js及css文件 -->
<link rel="shortcut icon" href="images/favicon.ico">
<style type="text/css">
a {
@ -20,11 +18,9 @@ a:hover {
color: black;
text-decoration: none;
}
/*update-start--Author:zhangguoming Date:20140622 for左侧树调整加大宽度、更换节点图标、修改选中颜色*/
.tree-node-selected{
background: #eaf2ff;
}
/*update-end--Author:zhangguoming Date:20140622 for左侧树调整加大宽度、更换节点图标、修改选中颜色*/
</style>
<SCRIPT type="text/javascript">

@ -5,10 +5,8 @@
<head>
<title><t:mutiLang langKey="jeect.platform"/></title>
<t:base type="jquery,easyui,tools,DatePicker,autocomplete"></t:base>
<!-- add-start--Author:jg_renjie Date:20160315 for配合首页改造引入portal依赖的js及css文件 -->
<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">
<!-- add-end--Author:jg_renjie Date:20160315 for配合首页改造引入portal依赖的js及css文件 -->
<link rel="shortcut icon" href="images/favicon.ico">
<style type="text/css">
a {
@ -20,11 +18,9 @@ a:hover {
color: black;
text-decoration: none;
}
/*update-start--Author:zhangguoming Date:20140622 for左侧树调整加大宽度、更换节点图标、修改选中颜色*/
.tree-node-selected{
background: #eaf2ff;
}
/*update-end--Author:zhangguoming Date:20140622 for左侧树调整加大宽度、更换节点图标、修改选中颜色*/
</style>
<SCRIPT type="text/javascript">

@ -33,12 +33,10 @@
// var $script = $("script[src='plug-in/jquery/jquery-1.8.3.js']");
// $($script).remove();
// alert($script.attr("src"));
$(".dock_tool_theme").live("click",function(){
$("#themeSetting_wrap2").append("<div id='themeSetting_wrap' style='display:none;'></div>");
$("#themeSetting_wrap").html($("#themeSetting_wrap1").html());
$("#themeSetting_wrap").show();
})
});
</script>

@ -16,11 +16,9 @@
$("#parentId").val(node.id);
}
});
if ($('#id').val()) {
$('#categoryTree').combotree('disable');
}
});
</script>
</head>

@ -47,7 +47,6 @@
<script type="text/javascript">
<!--
$(function() {
var li_east = 0;
});
@ -105,6 +104,5 @@
function ExportXlsByT() {
JeecgExcelExport("departController.do?exportXlsByT","departList");
}
//-->
</script>

@ -5,6 +5,7 @@
<head>
<title>组织机构集合</title>
<t:base type="jquery"></t:base>
<!-- update--start--by:jg_renjie--at:20160318 for:#942 【组件封装】组织机构弹出模式,目前是列表,得改造成树方式 -->
<link rel="stylesheet" type="text/css" href="plug-in/ztree/css/zTreeStyle.css">
<script type="text/javascript" src="plug-in/ztree/js/jquery.ztree.core-3.5.min.js"></script>
<script type="text/javascript" src="plug-in/ztree/js/jquery.ztree.excheck-3.5.min.js"></script>
@ -66,5 +67,10 @@
<body style="overflow-y: hidden" scroll="no">
<input id="orgIds" name="orgIds" type="hidden" value="${orgIds}">
<ul id="departSelect" class="ztree" style="margin-top: 30px;"></ul>
<%-- <t:datagrid name="departList" title="common.department.list" actionUrl="departController.do?departSelectDataGrid" idField="id" checkbox="true" showRefresh="false">
<t:dgCol title="common.id" field="id" hidden="true"></t:dgCol>
<t:dgCol title="common.department.name" field="departname" width="50"></t:dgCol>
</t:datagrid> --%>
</body>
</html>
</html>
<!-- update--end--by:jg_renjie--at:20160318 for:#942 【组件封装】组织机构弹出模式,目前是列表,得改造成树方式 -->

@ -10,6 +10,5 @@
<t:dgDelOpt title="common.delete" url="userController.do?del&id={id}&userName={userName}" />
<t:dgToolBar title="common.add.param" langArg="common.user" icon="icon-add" url="userController.do?addorupdate&departid=${departid}" funname="add"></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添加有客户--%>
<t:dgToolBar title="common.add.exist.user" icon="icon-add" url="departController.do?goAddUserToOrg&orgId=${departid}" funname="add" width="500"></t:dgToolBar>
</t:datagrid>

@ -1,5 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@include file="/context/mytags.jsp" %>
<%--非当前组织机构的用户列表--%>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<div id="main_depart_list" class="easyui-layout" fit="true">
<div region="center" style="padding:0px;border:0px">

@ -10,10 +10,8 @@
$(function() {
$('#cc').combotree({
url : 'functionController.do?setPFunction&selfId=${function.id}',
panelHeight: 200,
width: 157,
onClick: function(node){
$("#functionId").val(node.id);
}

@ -1,7 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<%-- update-start--Author:duanql Date:20130619 for操作按钮窗口显示控制--%>
<div id="system_function_functionList" class="easyui-layout" fit="true"><%-- update-end--Author:duanql Date:20130619 for操作按钮窗口显示控制--%>
<div region="center" style="padding:0px;border:0px">
<t:datagrid name="functionList" title="menu.manage"
@ -14,7 +13,6 @@
<t:dgCol title="menu.order" field="functionOrder" treefield="order"></t:dgCol>
<t:dgCol title="common.operation" field="opt" width="100"></t:dgCol>
<t:dgDelOpt url="functionController.do?del&id={id}" title="common.delete"></t:dgDelOpt>
<%-- update-start--Author:anchao Date:20130415 for按钮权限控制--%>
<t:dgFunOpt funname="operationDetail(id)" title="button.setting"></t:dgFunOpt>
<t:dgFunOpt funname="operationData(id)" title="数据规则"></t:dgFunOpt>
<t:dgToolBar title="common.add.param" langArg="common.menu" icon="icon-add" url="functionController.do?addorupdate" funname="addFun"></t:dgToolBar>
@ -22,7 +20,6 @@
</t:datagrid>
</div>
</div>
<%-- update-start--Author:duanql Date:20130619 for操作按钮窗口显示控制--%>
<div data-options="region:'east',
title:'<t:mutiLang langKey="operate.button.list"/>',
collapsed:true,
@ -40,7 +37,6 @@
</div>
<script type="text/javascript">
<%-- update-start--Author:anchao Date:20130415 for按钮权限控制--%>
$(function() {
var li_east = 0;
});
@ -58,7 +54,6 @@ function operationDetail(functionId)
}
$('#operationDetailpanel').panel("refresh", "functionController.do?operation&functionId=" +functionId);
}
<%-- update-start--Author:jueyue Date:20130622 for菜单录入代入父菜单--%>
function addFun(title,url, id) {
var rowData = $('#'+id).datagrid('getSelected');
if (rowData) {

@ -7,7 +7,6 @@
<link href="plug-in/sliding/css/main.css" rel="stylesheet" type="text/css" />
<script>
$(function(){
$(".menuSearch_Info").live("click",function(){
//$(this).blur();
@ -19,7 +18,6 @@
createwindow(title,url,1000,500);
})
});
</script>
</head>
<body>

@ -17,8 +17,10 @@
<t:mutiLang langKey="common.view"/>
</a>
</span>
<!-- update---Author:赵俊夫 Date:20130507 for需要加name=searchColums属性 -->
<div name="searchColums" style="float: right; padding-right: 15px;">
<t:mutiLang langKey="log.level"/>:
<t:mutiLang langKey="log.level"/>: <!-- update---Author:宋双旺 Date:20130414 for改变值进行查询 -->
<select name="loglevel" id="loglevel" onchange="logListsearch();">
<option value="0"><t:mutiLang langKey="select.loglevel"/></option>
<option value="1"><t:mutiLang langKey="common.login"/></option>
@ -42,7 +44,6 @@
$(document).ready(function(){
$("input").css("height", "24px");
});
function logListsearch(){
var loglevel = $("#loglevel").val();
var operatetime_begin = $("#operatetime_begin").val();

@ -39,7 +39,6 @@ function setfunbyrole(id,roleName) {
//$('#function-panel').panel("refresh" );
}
function userListbyrole(id,roleName) {
$("#function-panel").panel(
{
@ -50,7 +49,6 @@ function userListbyrole(id,roleName) {
//$('#function-panel').panel("refresh" );
}
//删除角色
function delRole(id){
var tabName= 'roleList';

@ -10,12 +10,10 @@
<input name="id" type="hidden" value="${type.id }">
<input name="TSTypegroup.id" type="hidden" value="${typegroupid}">
<fieldset class="step">
<%--// add-start--Author:zhangguoming Date:20140928 for添加显示字段--%>
<div class="form">
<label class="Validform_label"> <t:mutiLang langKey="lang.dictionary.type"/>: </label>
<input readonly="true" class="inputxt" value="${typegroupname }">
</div>
<%--// add-end--Author:zhangguoming Date:20140928 for添加显示字段--%>
<div class="form">
<label class="Validform_label"> <t:mutiLang langKey="dict.name"/>: </label>
<input name="typename" class="inputxt" value="${type.typename }" datatype="s1-10">

@ -96,8 +96,6 @@ function typeGridTree_UpdateType() {
</t:datagrid>
<input type="hidden" id="typeGroupId" name="typeGroupId" value="">
--%>
<%--// add-start--Author:zhangguoming Date:20140928 for数据字典修改--%>
<div id="main_typegroup_list" class="easyui-layout" fit="true">
<div region="center" style="padding:0px;border:0px">
<t:datagrid name="typeGridTree" title="common.data.dictionary" actionUrl="systemController.do?typeGroupGrid" idField="id" treegrid="false" pagination="false" sortOrder="desc" sortName="id" onLoadSuccess="loadSuccess">
@ -148,4 +146,3 @@ function typeGridTree_UpdateType() {
$('#userListpanel').empty();
}
</script>
<%--// add-end--Author:zhangguoming Date:20140928 for数据字典修改--%>

@ -10,6 +10,11 @@
<t:formvalid formid="formobj" refresh="false" dialog="true" action="userController.do?savestyle" layout="table">
<table style="width: 550px" cellpadding="0" cellspacing="1" class="formtable">
<tbody><th>首页风格</th>
<!--
<tr>
<td class="value"><input type="radio" value="bootstrap" name="indexStyle" /> <span>BootStrap风格</span></td>
</tr>
-->
<tr>
<td class="value"><input type="radio" value="acele" name="indexStyle" /><span>ACE平面风格</span></td>
</tr>
@ -22,6 +27,15 @@
<tr>
<td class="value"><input type="radio" value="sliding" name="indexStyle" /><span>Sliding云桌面</span></td>
</tr>
<!--
<tr>
<td class="value"><input type="radio" value="ace" name="indexStyle" /><span>ACE2平面风格</span></td>
</tr>
<tr>
<td class="value"><input type="radio" value="diy" name="indexStyle" /><span>DIY平面风格</span></td>
</tr>
-->
<tr>
<td class="value"><input type="radio" value="hplus" name="indexStyle" /><span>H+平面风格</span></td>
</tr>
@ -38,6 +52,13 @@
return false;
}
});
/* var val2 = "${cssTheme}";
$("input[name='cssTheme']").each(function(){
if($(this).val()==val2){
$(this).attr("checked",true);
return false;
}
}); */
});
</script>
</html>

@ -5,8 +5,6 @@
<head>
<title>用户信息</title>
<t:base type="jquery,easyui,tools"></t:base>
<%--update-start--Author:jg_renjie Date:20160320 for#942 【组件封装】组织机构弹出模式,目前是列表,得改造成树方式--%>
<%--update-start--Author:zhangguoming Date:20140825 for添加组织机构combobox多选的处理方法--%>
<script>
<%-- // update-start--Author:zhangguoming Date:20140826 for将combobox修改为combotree
function setOrgIds() {
@ -28,7 +26,6 @@
$("#orgSelect").combotree("setValues", ${orgIdList});
}); --%>
function openDepartmentSelect() {
$.dialog.setting.zIndex = getzIndex();
@ -69,7 +66,6 @@
</script>
</head>
<body style="overflow-y: hidden" scroll="no">
<%--update-start--Author:zhangguoming Date:20140825 for格式化页面代码 并 添加组织机构combobox多选框--%>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="userController.do?saveUser" beforeSubmit="setOrgIds">
<input id="id" name="id" type="hidden" value="${user.id }">
<table style="width: 600px;" cellpadding="0" cellspacing="1" class="formtable">
@ -116,8 +112,6 @@
<tr>
<td align="right"><label class="Validform_label"> <t:mutiLang langKey="common.department"/>: </label></td>
<td class="value">
<%--update-start--Author:jg_renjie Date:20160320 for#942 【组件封装】组织机构弹出模式,目前是列表,得改造成树方式--%>
<%--update-start--Author:zhangguoming Date:20140826 for将combobox修改为combotree--%>
<%--<select class="easyui-combobox" data-options="multiple:true, editable: false" id="orgSelect" datatype="*">--%>
<%--<select class="easyui-combotree" data-options="url:'departController.do?getOrgTree', multiple:true, cascadeCheck:false"
id="orgSelect" name="orgSelect" datatype="select1">

@ -1,10 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<t:base type="jquery,easyui,tools,DatePicker"></t:base>
<%--update-start--Author:lijun Date:20160301 for组织机构查询条件修改为使用departSelect标签--%>
<%--update-start--Author:zhangguoming Date:20140827 for添加 组织机构查询条件--%>
<script>
$(function() {
var datagrid = $("#userListtb");
@ -30,7 +26,6 @@
fit="true" fitColumns="true" idField="id" queryMode="group" sortName="id" sortOrder="desc">
<t:dgCol title="common.id" field="id" hidden="true"></t:dgCol>
<t:dgCol title="common.username" sortable="false" field="userName" query="true"></t:dgCol>
<%--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" sortable="false" field="userOrgList.tsDepart.departname" query="false"></t:dgCol>
<t:dgCol title="common.real.name" field="realName" query="false"></t:dgCol>
@ -107,8 +102,6 @@ function lockuploadify(url, id) {
});
}
</script>
<%--update-start--Author:zhangguoming Date:20140827 for添加 组织机构查询条件:弹出 选择组织机构列表 相关操作--%>
<%--<a href="#" class="easyui-linkbutton" plain="true" icon="icon-search" onClick="choose_297e201048183a730148183ad85c0001()">选择</a>--%>
<%--<a href="#" class="easyui-linkbutton" plain="true" icon="icon-redo" onClick="clearAll_297e201048183a730148183ad85c0001();">清空</a>--%>
<script type="text/javascript">

Loading…
Cancel
Save