|
|
@@ -740,63 +740,7 @@
|
|
|
|
|
|
url=wd.base.setRowCountPerPage(url,high-this.Yi,width);
|
|
|
|
|
|
- // if ( params.bjgd && params.wdFitHeightAttrs && params.wdFitHeightAttrs.length > 0 ){
|
|
|
- // var minHigh = params.bjgd;
|
|
|
- // var maxHigh = params.bjgd;
|
|
|
- // for( var i = 0 ; i < params.wdFitHeightAttrs.length; i ++ ){
|
|
|
- // var attr = params.wdFitHeightAttrs[i];
|
|
|
- // var max = attr.max;
|
|
|
- // var min = attr.min;
|
|
|
- // if( typeof(max) == 'string' ) {
|
|
|
- // var temp = /\d+/.exec(max);
|
|
|
- // if ( temp != null ) {
|
|
|
- // max = parseInt(temp[0]);
|
|
|
- // }else{
|
|
|
- // max = null;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if( typeof(min) == 'string' ) {
|
|
|
- // var temp = /\d+/.exec(min);
|
|
|
- // if ( temp != null ) {
|
|
|
- // min = parseInt(temp[0]);
|
|
|
- // } else {
|
|
|
- // min = null;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if( max != null ) {
|
|
|
- // maxHigh += max;
|
|
|
- // }
|
|
|
- // if ( min != null ) {
|
|
|
- // minHigh += min;
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if(minHigh + 38 > wd.topWindow.innerHeight) {
|
|
|
- // high = minHigh + 38;
|
|
|
- // showNameOrId = 'wdFullScreen';
|
|
|
- // fullScreenLimitHeight = false;
|
|
|
- // } else if ( maxHigh + 38 < wd.topWindow.innerHeight ){
|
|
|
- // high = maxHigh + 38;
|
|
|
- // } else {
|
|
|
- // showNameOrId = 'wdFullScreen';
|
|
|
- // }
|
|
|
|
|
|
- // }
|
|
|
-
|
|
|
- // var topBodyHeight = wd.topWindow.document.body.offsetHeight;
|
|
|
- //var dialogHeight = wd.topWindow.document.querySelector('.dhtmlx_window_active').offsetHeight;
|
|
|
- // var dialogClientHeight = wd.topWindow.document.querySelector('.dhtmlx_wins_body_inner').offsetHeight;
|
|
|
- //var maxDialogClientHeight = topBodyHeight-(dialogHeight-dialogClientHeight);
|
|
|
- // if ( !!params.maxHigh && !!params.minHigh ) {
|
|
|
-
|
|
|
- // if(params.minHigh + 38 > topBodyHeight ) {
|
|
|
- // high = params.minHigh + 38;
|
|
|
- // showNameOrId = 'wdFullScreen';
|
|
|
- // }else if(params.maxHigh + 38 < topBodyHeight){
|
|
|
- // high = params.maxHigh + 38;
|
|
|
- // }else {
|
|
|
- // showNameOrId = 'wdFullScreen';
|
|
|
- // }
|
|
|
- // }
|
|
|
|
|
|
|
|
|
var title = params.title || "无题，可能没找到部件"; // 窗口标题，（可选参数，可以不填）
|
|
|
@@ -854,34 +798,6 @@
|
|
|
var positionParam = oneNameOrId.position;
|
|
|
var btnParam = oneNameOrId.button;
|
|
|
|
|
|
- /**
|
|
|
- * 下面是原来有 show:[{"name":"wdDialog","size":"450*380"}]
|
|
|
- * 这一part时，会走到的代码，但是这部分代码与wddialog这部分分离了，暂时不要了，以后看如何重写
|
|
|
- *
|
|
|
- * if(nameParam){ //参数格式为json的弹出窗口 if(selfParam){ //在本窗口弹出
|
|
|
- * if(!window.dhxWins){ window.dhxWins = new dhtmlXWindows(); } var
|
|
|
- * dhxWins = window.dhxWins;
|
|
|
- * dhxWinsdhxWins.setImagePath('/wd/theme/window/dhx_blue/image/active/'); //
|
|
|
- * //alert(dhxWinsdhxWins.vp.style.border);
|
|
|
- * //dhxWinsdhxWins.vp.style.border = ""; //
|
|
|
- * dhxWins.enableAutoViewport(true);
|
|
|
- * //dhxWins.attachViewportTo("dt");
|
|
|
- * //把当前窗口的window对象，保存到window窗口中，以便关闭窗口时使用 var ele =
|
|
|
- * {dom:window,wdDialogId:wdDialogId}; wd.display.windowToObj(ele);
|
|
|
- * var winParam =
|
|
|
- * {dom:window,wdDialogId:wdDialogId,btnParam:btnParam,sizeParam:sizeParam,title:titleParam,url:url,positionParam:positionParam};
|
|
|
- * wd.display.setDhtmlXWinParam(winParam); }else{ //弹窗在顶层
|
|
|
- * //把当前窗口的window对象，保存到wd.topWindow窗口中，以便关闭窗口时使用 var ele =
|
|
|
- * {dom:wd.topWindow,wdDialogId:wdDialogId};
|
|
|
- * wd.display.windowToObj(ele);
|
|
|
- *
|
|
|
- * if(!wd.topWindow.wd.display.wdDialogOpeners)
|
|
|
- * wd.topWindow.wd.display.wdDialogOpeners = {};
|
|
|
- * wd.topWindow.wd.display.wdDialogOpeners[wdDialogId]=window; var
|
|
|
- * winParam =
|
|
|
- * {dom:wd.topWindow,wdDialogId:wdDialogId,btnParam:btnParam,sizeParam:sizeParam,title:titleParam,url:url,positionParam:positionParam};
|
|
|
- * wd.display.setDhtmlXWinParam(winParam); } }
|
|
|
- */
|
|
|
|
|
|
// wd.display.showComponent({show:[{"name":"wdDialog","size":"450*380"}],hide:[],url:"/service?wdApplication=jw&wdService=ty_gg_ck&wdOutputComponent=44786&wdtest=false&ggid=44000059",dest:"gg.ty_gg_ck",title:"查看",width:450,high:380,wdDialogId:44786,form:""})
|
|
|
if (typeof (oneNameOrId) == 'object') {
|
|
|
@@ -1008,37 +924,11 @@
|
|
|
w.button('close').setAttribute("title", "关闭"); // 修改关闭按钮提示
|
|
|
var containerObj = wd.topWindow.wd.display;
|
|
|
var currentDialogZIndex = w.zi; // 弹出窗口的z-index
|
|
|
- // wd.display.createMaskDiv(containerObj,wd.topWindow.wd.display.wdDialogOpeners[wdDialogId],currentDialogZIndex);
|
|
|
- /*
|
|
|
- * wd.display.createMaskDiv(containerObj, wd.topWindow,
|
|
|
- * currentDialogZIndex);
|
|
|
- */
|
|
|
- wd.display.dxwindowsCreateMaskDiv(currentDialogZIndex);
|
|
|
- /*
|
|
|
- * var parentWdDialogId = wd.display.getwdDialogId(); if(typeof
|
|
|
- * parentWdDialogId != 'undefined' && parentWdDialogId ){ var
|
|
|
- * parentDialog = wd.topWindow.dhxWins.window(parentWdDialogId);
|
|
|
- * if( typeof parentDialog != 'undefined' && parentDialog ){
|
|
|
- * //parentDialog.button('close').disable(); } }
|
|
|
- */
|
|
|
-
|
|
|
- // // 点击时弹出帮助提示信息
|
|
|
- // w.button("help").attachEvent("onClick", function () {
|
|
|
- // alert("button \"help\" was clicked");
|
|
|
- // });
|
|
|
|
|
|
+ wd.display.dxwindowsCreateMaskDiv(currentDialogZIndex);
|
|
|
+
|
|
|
w.attachEvent("onClose", function (win) {
|
|
|
- /*
|
|
|
- * var containerObj = wd.topWindow.wd.display.mask; var
|
|
|
- * currentMaskEleID = containerObj.pop(); // var currMaskEle = //
|
|
|
- * wd.topWindow.wd.display.wdDialogOpeners[wdDialogId].document.getElementById(currentMaskEleID);
|
|
|
- * var currMaskEle = wd.topWindow.document
|
|
|
- * .getElementById(currentMaskEleID); if (typeof currMaskEle !=
|
|
|
- * 'undefined' && currMaskEle) { if (typeof
|
|
|
- * currMaskEle.remove != 'undefined') {
|
|
|
- * currMaskEle.remove(); } else { currMaskEle.parentNode
|
|
|
- * .removeChild(currMaskEle); } }
|
|
|
- */
|
|
|
+
|
|
|
wd.display.dxwindowsCloseMaskDiv();
|
|
|
|
|
|
/*
|
apple
