Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
Yezb
/
ss_new_ui_skin_and_page
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

优化环境对象编辑及miniInfo组件

apple 1 tydzień temu
rodzic
0c1a604638
commit
89a4208c15
4 zmienionych plików z 254 dodań i 151 usunięć
Zunifikowany widok Pokaż statystyki zmian
  1. 201 143
      page/env/addSure.jsp
  2. 1 0
      page/env/objEdit.jsp
  3. 46 2
      page/env/objInp.jsp
  4. 6 6
      ss/clip/miniInfo.jsp

+ 201 - 143
page/env/addSure.jsp
Wyświetl plik 

@@ -1,161 +1,219 @@
 
-<%@ page language="java" pageEncoding="UTF-8" isELIgnored="false" %>

-<%@ taglib uri="/ssTag" prefix="ss"%>

-<%pageContext.setAttribute("wdpageinformation","{'hastab':'0'}");%>

-<!DOCTYPE html>

-<html>

-<head>

+<%@ page language="java" pageEncoding="UTF-8" isELIgnored="false" %>
 
+<%@ taglib uri="/ssTag" prefix="ss"%>
 
+<%pageContext.setAttribute("wdpageinformation","{'hastab':'0'}");%>
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
 <meta http-equiv="pragma" content="no-cache">
 
 <meta http-equiv="pragma" content="no-cache">
 
 <meta http-equiv="cache-control" content="no-cache">
 
 <meta http-equiv="cache-control" content="no-cache">
 
-<meta http-equiv="expires" content="0">

-<script>window.loginStatus="${empty sessionScope['ssUser']?'0':'1'}"</script>

-<ss:skin file='main.css'/>

-<script type="text/javascript" src="/ss/jquery/jquery.js"></script>

-<script type="text/javascript" src="/ss/artdialog/artDialogUtil.js"></script>

-<script type="text/javascript" src="/ss/js/base.js"></script>

-<script> if(!window.wd) var wd={}; if(!wd.display) wd.display={}; wd.display.wdDialogId="addSure"; if(!wd.app) wd.app={};  wd.app.name='pms';</script>

-<script type="text/javascript" src="/ss/js/masklayer.js"></script>

-<script type="text/javascript" src="/ss/js/wdDialogInit.js"></script>

-<script type="text/javascript" src="/ss/js/common.js"></script>

-<script type="text/javascript" src="/ss/js/display.js"></script>

-<script type="text/javascript" src="/ss/js/edit.js"></script>

-<script type="text/javascript" src="/ss/nicescroll/jquery.nicescroll.js"></script>

-<script type="text/javascript" src="/ss/nicescroll/jquery.nicescroll.iframehelper.min.js"></script>

-<script type="text/javascript" src="/ss/js/common.js"></script>

-<script type="text/javascript" src="/ss/datePicker/WdatePicker.js"></script>

-<script type="text/javascript" src="/ss/js/edit.js"></script>

-<link rel="stylesheet" type="text/css" href="/ss/window/theme/dhtmlxwindows.css">

-<link rel="stylesheet" type="text/css" href="/ss/window/theme/dhx_blue/dhtmlxwindows_dhx_blue.css">

-<script type="text/javascript" src="/ss/window/dhtmlxcommon.js"></script>

-<script type="text/javascript" src="/ss/window/dhtmlxwindows.js"></script>

-<script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>

-<script type="text/javascript" src="/ss/js/display.js"></script>

-	<script type="text/javascript" src="/ss/js/growHeight.js"></script>

-	<script>

-		function addWdFitHeight(selecter,param){

-			console.log(selecter);

-			console.log(param);

-			var aa="";

-			if(param.minHeight){

-				aa+="min:"+param.minHeight+",";

-			}

-			if(param.maxHeight){

-				aa+="max:"+param.maxHeight+",";

-			}

-			if(param&&aa){

-				aa=aa.substr(0,aa.length-1)

-				document.querySelector(selecter).setAttribute("ssFith",aa);	// ("wdFitHeight",。Lin

-			}

-		}

-	</script>

-	<style type="text/css">

-		.longCardList-highlight a{

-			white-space: nowrap;

-			overflow: hidden;

-			text-overflow: ellipsis;

-			width: 90%;

-			display: inline-block;

-		}

-	</style>

-</head>

-<body style="padding-top: 12px;">

-<%--用于计算dxidName--%>

-<%-- 改为 <data@ss name="obj"/>。Lin

-<tab@ss name=""/> --%>

-<%-- <data@ss name="obj"/> 再去掉，好像不需要。Lin --%>

-

-<div ssFith='{min:111}'>

-<%-- 改为 <data@ss name="miniInfo"/> + <jsp@ss file="/ss/miniInfo.jsp"/>。Lin

-	<tab@ss name="miniInfo"/> --%>

-	<ss:data name='miniInfo'/>

-	<%@include file="/ss/clip/miniInfo.jsp"%>

-</div>

-

-<form name="tjform"

-<%-- 再改为 WebC.REQ_objName、WebC.REQ_objId、WebC.REQ_objIdName，避免与数据表里的 对象名、对象ID 字段重名。Lin

-		action="<func@ss name='sureAdd' parm='{dxm:"${dxm}",${dxidName}:"${dxid}"}'/>" --%>

-		action="<ss:func name='sureAdd' parm='{ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}"}'/>"

-		method="post" id="form">

-	<div class="content-div" style="height: 351px;">

-		<table class='form'>

-			<tr id="bpmtjgwid_tr">

-				<th>岗位</th>

-				<td>

-					<input name="bpmtjgwid" type="hidden" value="" placeholder="提交岗位"/>

-					<ss:objp name='bpmtjgwid' cb='bpmtjgwid'/>

-				</td>

-			</tr>

-

-			<script>

-				try{

-					if(wd.edit.objectPicker.getInstance("bpmtjgwid").getOptionsSize()==0)

-						$("#bpmtjgwid_tr").remove();

-				}catch(e){

-					console.log(e);

-				}

-			</script>

-

-			<tr>

-<%-- 再改为 WebC.REQ_objName，避免与数据表里的 对象名 字段重名。用到再确认。Lin

-				<equal@ss val="${dxm}" val2="ws"> // 改 equal：val1='${dxm=="ws"}' val2='true'。Lin --%>

-				<ss:equal val='${ssObjName}' val2='ws'>

-					<th width="117px">拟办意见</th>

-				</ss:equal>

-<%-- 再改为 WebC.REQ_objName，避免与数据表里的 对象名 字段重名。用到再确认。Lin

-				<notEqual@ss val="${dxm}" val2="ws"> // 改 equal：val1='${dxm=="ws"}' val2='false'。Lin --%>

-				<ss:notEqual val='${ssObjName}' val2='ws'>

-					<th width="88px">说明</th>

-				</ss:notEqual>

-				<td style="padding:0;">

-					<div id="sqmsEdit" name="msEdit" type="text/plain" class="editplus"  style="width:calc(100%);min-height: 185px;"></div>

-					<input type="hidden" name="sqmswj" value="${sqmswj}" />

-					<input type='hidden' name='ueditorpath' value='sqmswj'/>

-<script type="text/javascript" charset="utf-8" src="/ss/js/edit.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/wdEditor.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/wdEditor.config.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/ueditor.config.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/ueditor.all.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/zh-cn.js"></script>

-<script type="text/javascript" charset="utf-8" src="/ss/ueditor/editorgenerator.js"></script>

-<script type="text/javascript">

-EditorManager.getWDEditor("sqms",<ss:editor name='toolbars' parm='{"toolbars":[[{"key":"sqfjid","value":"${sqfjid}"}]],"mode":"edit"}'/>);

-</script>

-				</td>

-			</tr>

-		</table>

-	</div>

-	<div class="bottom-div">

-		<div class="bottom-down-div border-top">

-			<ss:equal val='${empty print}' val2='false'> <%-- 这里的 print}，是否需要改为 prt}。和 打印功能 有关吗？？？Lin --%>

-				<input type="button" value="打印" class="bottom-button" onclick='document.querySelector("#printFrame iframe").contentWindow.wd.display.printArea(".content-div");' style="letter-spacing: 6px;"/>

-			</ss:equal>

-			<input type="submit" value="确定" class="bottom-button" onclick="wd.display.submitToTopTab(this);" style=""/>

-		</div>

-	</div>

-<input name='wdComponentID' type='hidden' value='addSure'/></form>

+<meta http-equiv="expires" content="0">
 
+<script>window.loginStatus="${empty sessionScope['ssUser']?'0':'1'}"</script>
 
+<ss:skin file='main.css'/>
 
+<script type="text/javascript" src="/ss/jquery/jquery.js"></script>
 
+<script type="text/javascript" src="/ss/artdialog/artDialogUtil.js"></script>
 
+<script type="text/javascript" src="/ss/js/base.js"></script>
 
+<script> if(!window.wd) var wd={}; if(!wd.display) wd.display={}; wd.display.wdDialogId="addSure"; if(!wd.app) wd.app={};  wd.app.name='pms';</script>
 
+<script type="text/javascript" src="/ss/js/masklayer.js"></script>
 
+<script type="text/javascript" src="/ss/js/wdDialogInit.js"></script>
 
+<script type="text/javascript" src="/ss/js/common.js"></script>
 
+<script type="text/javascript" src="/ss/js/display.js"></script>
 
+<script type="text/javascript" src="/ss/js/edit.js"></script>
 
+<script type="text/javascript" src="/ss/nicescroll/jquery.nicescroll.js"></script>
 
+<script type="text/javascript" src="/ss/nicescroll/jquery.nicescroll.iframehelper.min.js"></script>
 
+<script type="text/javascript" src="/ss/js/common.js"></script>
 
+<script type="text/javascript" src="/ss/datePicker/WdatePicker.js"></script>
 
+<script type="text/javascript" src="/ss/js/edit.js"></script>
 
+<link rel="stylesheet" type="text/css" href="/ss/window/theme/dhtmlxwindows.css">
 
+<link rel="stylesheet" type="text/css" href="/ss/window/theme/dhx_blue/dhtmlxwindows_dhx_blue.css">
 
+<script type="text/javascript" src="/ss/window/dhtmlxcommon.js"></script>
 
+<script type="text/javascript" src="/ss/window/dhtmlxwindows.js"></script>
 
+<script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>
 
+<script type="text/javascript" src="/ss/js/display.js"></script>
 
+	<script type="text/javascript" src="/ss/js/growHeight.js"></script>
 
+	<script>
 
+		function addWdFitHeight(selecter,param){
 
+			console.log(selecter);
 
+			console.log(param);
 
+			var aa="";
 
+			if(param.minHeight){
 
+				aa+="min:"+param.minHeight+",";
 
+			}
 
+			if(param.maxHeight){
 
+				aa+="max:"+param.maxHeight+",";
 
+			}
 
+			if(param&&aa){
 
+				aa=aa.substr(0,aa.length-1)
 
+				document.querySelector(selecter).setAttribute("ssFith",aa);	// ("wdFitHeight",。Lin
 
+			}
 
+		}
 
+	</script>
 
+	<style type="text/css">
 
+		.longCardList-highlight a{
 
+			white-space: nowrap;
 
+			overflow: hidden;
 
+			text-overflow: ellipsis;
 
+			width: 90%;
 
+			display: inline-block;
 
+		}
 
+		#editField,.bottom-div{
 
+			background-color: #fff;
 
+		}
 
+	</style>
 
+	<script src="/js/load.js"></script>
 
+	<script type="text/javascript" src="/js/base.js"></script>
 
+	<script type="text/javascript" src="/js/display.js"></script>
 
+</head>
 
+<body style="padding-top: 12px;">
 
+<%--用于计算dxidName--%>
 
+<%-- 改为 <data@ss name="obj"/>。Lin
 
+<tab@ss name=""/> --%>
 
+<%-- <data@ss name="obj"/> 再去掉，好像不需要。Lin --%>
 
+
 
+<div id="app">
 
+<form name="tjform"
 
+<%-- 再改为 WebC.REQ_objName、WebC.REQ_objId、WebC.REQ_objIdName，避免与数据表里的 对象名、对象ID 字段重名。Lin
 
+		action="<func@ss name='sureAdd' parm='{dxm:"${dxm}",${dxidName}:"${dxid}"}'/>" --%>
 
+		action="<ss:func name='sureAdd' parm='{ssObjName:"${ssObjName}","${ssObjIdName}":"${ssObjId}"}'/>"
 
+		method="post" id="form">
 
+	<div class="content-div" style="height: 351px;">
 
+		
+			<ss:data name='miniInfo'/>
 
+			<ss:rpt name='objectList' id='item'>
 
+				<iframe
 
+					style="border: 1px solid #d2d2d2;box-sizing: border-box;height: 100%;"
 
+					width="100%"
 
+					height="100%"
 
+					frameborder="0"
 
+					src="<ss:serv name='${item.play.servName}' dest='${item.play.dest}' parm='${item.play.parm}'/>">
 
+				</iframe>
 
+			</ss:rpt>
 
+		
+		<%-- <table class='form'>
 
+			<tr id="bpmtjgwid_tr">
 
+				<th>岗位</th>
 
+				<td>
 
+					<input name="bpmtjgwid" type="hidden" value="" placeholder="提交岗位"/>
 
+					<ss:objp name='bpmtjgwid' cb='bpmtjgwid'/>
 
+				</td>
 
+			</tr>
 
+
 
+			<script>
 
+				try{
 
+					if(wd.edit.objectPicker.getInstance("bpmtjgwid").getOptionsSize()==0)
 
+						$("#bpmtjgwid_tr").remove();
 
+				}catch(e){
 
+					console.log(e);
 
+				}
 
+			</script>
 
+		</table> --%>
 
+	</div>
 
+	<div class="" style="width: 100%;height:65px;border-top: 1px solid rgb(210, 210, 210);">
 
+		<input type='hidden' name='ynrid' value='' />
 
+		<div id='ynrEdit' data-shid="${shid}" style="height: 63px;"></div>
 
+		<script type="text/javascript" charset="utf-8" src="/ss/js/edit.js"></script>
 
+		<ss:inper />
 
+		<ss:equal val="${empty inputter.encode_ynrid}" val2="false">
 
+			<input type="hidden" name="ynr_WATCHURL" value='ss.display.showComponent({show:["ssDialog"],url:"<ss:serv parm='{"id":"ssVal{id}"}' dest='convInp'/>",title:"转换",width:1024,height:350});' />
 
+		</ss:equal>
 
+		<script>
 
+			document.querySelector('form').addEventListener('submit', function(){
 
+				if(typeof saveEditor != 'undefined' && saveEditor instanceof Function)
 
+					saveEditor('ynrEdit');
 
+			});
 
+			HTMLFormElement.prototype.subfun = HTMLFormElement.prototype.submit;
 
+			HTMLFormElement.prototype.submit = function(){
 
+				if(typeof saveEditor != 'undefined' && saveEditor instanceof Function)
 
+					saveEditor('ynrEdit');
 
+				this.subfun();
 
+			};
 
+			function addCyy() {
 
+				wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='p_gryy_zj' dest='gryyInp'/>",title:"录入常用语",width:571,height:105,minHeight:54,maxHeight:158});
 
+			}
 
+			function fjidfjEdit(){
 
+				var fjName='fjid';var fjid=document.getElementsByName('fjid')[0].value;
 
+				if(fjid==null||fjid==''){
 
+					$.ajax({type:'post',url:'<ss:serv name='makeAttCms'/>',async:false,data:{name:'fjid',ssNrObjName:'sh',ssNrObjId:'${shid}'},success:function(_fjid){fjid=_fjid;document.getElementsByName('fjid')[0].value=fjid;}});
 
+				};
 
+				var str='&nrid=T-'+fjid+'&objectId='+fjid+'&objectName='+fjName+'&callback='+(window['fjidCallbackName']||'');
 
+				wd.display.showComponent({show: ['wdDialog'],url:'<ss:serv name='regCms' dest='cmsHome'/>'+str,title: '编辑',width: 900,high: 664});
 
+			}
 
+			var inputterfjJson={"fj":{"key":"fjid","value":"","name":null,"jlztm":null}};
 
+		</script>
 
+	</div>
 
+	<div class="bottom-div" style="border: none; display:flex;flex-direction: column;position: absolute;">
 
+		<input type="button" id="sureSubmitButton" value="确定" class="bottom-button" onclick="wd.display.submitToTopTab(this);" style="display:none;"/>
 
+		<div class="bottom-div-button" style="width: 100%;display:flex;justify-content: flex-end; gap:10px;padding-bottom: 10px;padding-top: 10px;">
 
+			<ss-bottom-button
 
+				text="关闭"
 
+				@click="onDialogClose"
 
+				icon-class="bottom-div-close"
 
+			></ss-bottom-button>
 
+			<ss:equal val='${empty print}' val2='false'>
 
+				<ss-bottom-button
 
+					text="打印"
 
+					@click="onPrint"
 
+				></ss-bottom-button>
 
+			</ss:equal>
 
+			<ss-bottom-button
 
+				text="确定"
 
+				@click="onSubmit"
 
+				icon-class="bottom-div-save"
 
+			></ss-bottom-button>
 
+		</div>
 
+	</div>
 
+<input name='wdComponentID' type='hidden' value='addSure'/></form>
 
+</div>
 
 <script type="text/javascript">var wdRecordValue='${wdRecordValue}';</script>
 
 <script type="text/javascript">var wdRecordValue='${wdRecordValue}';</script>
 
 <script type="text/javascript" src="/ss/js/wdRecord.js"></script>
 
 <script type="text/javascript" src="/ss/js/wdRecord.js"></script>
 
-<script type="text/javascript">(function(){wdRecord("addSure");})();</script>

-<script type="text/javascript" src="/ss/js/wdFitHeight.js"></script>

-<script type="text/javascript">initWdFitHeight(404)</script>

-<script type="text/javascript">initWdFitHeightFunction=function(){initWdFitHeight(404);};</script>

+<script type="text/javascript">(function(){wdRecord("addSure");})();</script>
 
+<script type="text/javascript" src="/ss/js/wdFitHeight.js"></script>
 
+<script type="text/javascript">initWdFitHeight(404)</script>
 
+<script type="text/javascript">initWdFitHeightFunction=function(){initWdFitHeight(404);};</script>
 
 <ss:equal val="${empty resizeComponent}" val2="false">
 
 <ss:equal val="${empty resizeComponent}" val2="false">
 
 <script>{var iframe=wd.display.getFrameOfWindow();
 
 <script>{var iframe=wd.display.getFrameOfWindow();
 
 if(iframe&&iframe.contentWindow==window)
 
 if(iframe&&iframe.contentWindow==window)
 
 wd.display.resizeComponent(${resizeComponent.width}, ${resizeComponent.height}, ${empty resizeComponent.minHeight?'null':resizeComponent.minHeight}, ${empty resizeComponent.maxHeight?'null':resizeComponent.maxHeight});}</script>
 
 wd.display.resizeComponent(${resizeComponent.width}, ${resizeComponent.height}, ${empty resizeComponent.minHeight?'null':resizeComponent.minHeight}, ${empty resizeComponent.maxHeight?'null':resizeComponent.maxHeight});}</script>
 
-</ss:equal>

-<ss:help/>

-</body>

+</ss:equal>
 
+<ss:help/>
 
+<script type="module">
 
+SS.ready(function () {
 
+	wd.edit.initInputter("ynr",${inputter.ynrid},${inputter.encode_shid},${inputter.encode_ynrid});
 
+
 
+	const ynrEditContent = $('#ynrEdit').html();
 
+	window.SS.dom.initializeFormApp({
 
+		el: '#app',
 
+		data() {
 
+			return {};
 
+		},
 
+		methods: {
 
+			onSubmit() {
 
+				document.getElementById('sureSubmitButton').click();
 
+			},
 
+			onPrint() {
 
+				document.querySelector("#printFrame iframe").contentWindow.wd.display.printArea(".content-div");
 
+			},
 
+			onDialogClose() {
 
+				wd.display.closeDialog();
 
+			}
 
+		},
 
+		mounted() {
 
+			$('#ynrEdit').html(ynrEditContent);
 
+		}
 
+	});
 
+});
 
+</script>
 
+</body>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 try{wd.display.showMsgPopup('${msg}');
 
 try{wd.display.showMsgPopup('${msg}');
 
 }catch(err){console.error(err);}
 
 }catch(err){console.error(err);}
 
-</script>

+</script>
 
 <ss:equal val="${empty wdclosewindowparam}" val2="false">
 
 <ss:equal val="${empty wdclosewindowparam}" val2="false">
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 
 try{wd.display.setCloseWindowParam('${wdclosewindowparam}');
 
 }catch(err){console.error(err);}
 
 }catch(err){console.error(err);}
 
 </script>
 
 </script>
 
-</ss:equal>

-</html>

+</ss:equal>
 
+</html>
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
 tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 
 tokenCleanser("<ss:serv name='ss.clearPageToken'/>", {tokenList:"<%= pageContext.getAttribute(ss.page.PageC.PAGE_tokenList)%>"});
 
-</script>

+</script>

+ 1 - 0
page/env/objEdit.jsp
Wyświetl plik 

@@ -193,6 +193,7 @@ const data = {
 
 			onclick: function(){
 
 			onclick: function(){
 
 					// 左侧区域隐藏
 
 					// 左侧区域隐藏
 
 					const app = window.SS.dom.currentApp;
 
 					const app = window.SS.dom.currentApp;
 
+					console.log("app:",app)
 
 					// 等待iframe加载完成后执行
 
 					// 等待iframe加载完成后执行
 
 					const $iframe = $('#sub-tab-iframe');
 
 					const $iframe = $('#sub-tab-iframe');
 
 					if ($iframe.length) {
 
 					if ($iframe.length) {

+ 46 - 2
page/env/objInp.jsp
Wyświetl plik 

@@ -72,7 +72,7 @@
 
 			<ss-bottom-button
 
 			<ss-bottom-button
 
 					id="saveAndCommit"
 
 					id="saveAndCommit"
 
 					text="${saveAndCommitButtonValue}"
 
 					text="${saveAndCommitButtonValue}"
 
-					onclick='ss.form.submit({url:"<ss:serv name='${saveAndCommit}' dest='${saveAndCommitDest}' parm='${saveAndCommitParam}'/>",width:${saveAndCommitwidth},height:${saveAndCommitheight},minHeight:${saveAndCommitminheight},maxHeight:${saveAndCommitmaxheight},targetWin:null});'<%-- 最后一个参数原来为targetWin:parent导致刷新了顶层窗口，改为null Ben(20251215) --%>
 
+					onclick='ss.objInp.submitAndCollapseParent({url:"<ss:serv name='${saveAndCommit}' dest='${saveAndCommitDest}' parm='${saveAndCommitParam}'/>",width:${saveAndCommitwidth},height:${saveAndCommitheight},minHeight:${saveAndCommitminheight},maxHeight:${saveAndCommitmaxheight},targetWin:null});'<%-- 最后一个参数原来为targetWin:parent导致刷新了顶层窗口，改为null Ben(20251215) --%>
 
 					icon-class="bottom-div-save"
 
 					icon-class="bottom-div-save"
 
 			></ss-bottom-button>
 
 			></ss-bottom-button>
 
 			<!-- 保存并提交按钮 start -->
 
 			<!-- 保存并提交按钮 start -->
 
@@ -215,7 +215,51 @@
 
 </html>
 
 </html>
 
 
 
 <script type="module">
 
 <script type="module">
 
-	
+	window.ss.objInp = window.ss.objInp || {};
 
+
 
+	window.ss.objInp.findParentSubTabContext = function () {
 
+		let currentWindow = window.parent;
 
+		while (currentWindow && currentWindow !== window) {
 
+			try {
 
+				const app = currentWindow.SS && currentWindow.SS.dom && currentWindow.SS.dom.currentApp;
 
+				if (app && app.$data && Object.prototype.hasOwnProperty.call(app.$data, "leftDisplay")) {
 
+					return { app, win: currentWindow };
 
+				}
 
+			} catch (e) {
 
+				return null;
 
+			}
 
+			if (currentWindow === currentWindow.parent) {
 
+				break;
 
+			}
 
+			currentWindow = currentWindow.parent;
 
+		}
 
+		return null;
 
+	};
 
+
 
+	window.ss.objInp.collapseParentObjEdit = function () {
 
+		try {
 
+			const context = window.ss.objInp.findParentSubTabContext();
 
+			if (!context || !context.app) {
 
+				return false;
 
+			}
 
+
 
+			context.app.$data.leftDisplay = false;
 
+			if (context.win && context.win.jQuery) {
 
+				context.win.jQuery(".project-edit-container .content-area").css("margin", "0");
 
+			}
 
+			return true;
 
+		} catch (e) {
 
+			return false;
 
+		}
 
+	};
 
+
 
+	window.ss.objInp.submitAndCollapseParent = function (param) {
 
+		const submitResult = ss.form.submit(param);
 
+		if (submitResult) {
 
+			window.ss.objInp.collapseParentObjEdit();
 
+		}
 
+		return submitResult;
 
+	};
 
 
 
 	const data = {};
 
 	const data = {};
 
 	if (window.SS.dom.formElemConfig) {
 
 	if (window.SS.dom.formElemConfig) {

+ 6 - 6
ss/clip/miniInfo.jsp
Wyświetl plik 

@@ -2,8 +2,8 @@
 
 <div class="longCardList-div" style="box-sizing: border-box;">

 <div class="longCardList-div" style="box-sizing: border-box;">

 	<table class="scrollbar" style="max-height: 100%;width: 100%;">

 	<table class="scrollbar" style="max-height: 100%;width: 100%;">

 		<tbody style="width: 100%;padding: 0px 16px 0px 11px;box-sizing: border-box;"> <%-- 去掉 id="wdTbody0"，好像没用到。Lin --%>

 		<tbody style="width: 100%;padding: 0px 16px 0px 11px;box-sizing: border-box;"> <%-- 去掉 id="wdTbody0"，好像没用到。Lin --%>

-		<ss:rpt name='objList' id='item'>

-			<tr

+		<ss:rpt name='objectList' id='item'>
 
+			<tr
 
 					<ss:equal val='${item.rauth}' val2='0'>

 					<ss:equal val='${item.rauth}' val2='0'>

 						class="xxxfilter"

 						class="xxxfilter"

 <%-- 再改为 WebC.REQ_objName、WebC.REQ_objId，避免与数据表里的 对象名、对象ID 字段重名。Lin

 <%-- 再改为 WebC.REQ_objName、WebC.REQ_objId，避免与数据表里的 对象名、对象ID 字段重名。Lin

@@ -14,10 +14,10 @@
 
 				<td class="hLine"

 				<td class="hLine"

 						<ss:equal val='${empty item.play}' val2='false'>

 						<ss:equal val='${empty item.play}' val2='false'>

 							titlexxx="${item.play.title}"

 							titlexxx="${item.play.title}"

-							onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${item.play.service}' dest='${item.play.dest}' parm='${item.play.parm}'/>",title:"${item.play.title}",width:"${item.play.width}",height:"${item.play.height}",minHeight:"${item.play.minHeight}",maxHeight:"${item.play.maxHeight}"});'

+							onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${item.play.servName}' dest='${item.play.dest}' parm='${item.play.parm}'/>",title:"${item.play.title}",width:"${item.play.width}",height:"${item.play.height}",minHeight:"${item.play.minHeight}",maxHeight:"${item.play.maxHeight}"});'
 
 						</ss:equal>

 						</ss:equal>

 					>

 					>

-					<ss:equal val='${empty item.thumbnail}' val2='false'>

+					<ss:equal val='${empty item.thn}' val2='false'>
 
 						<div class="longCardList-thumbnail" style="margin-right: 18px;margin-bottom: 2px;">

 						<div class="longCardList-thumbnail" style="margin-right: 18px;margin-bottom: 2px;">

 <%-- 再增加 type="img"。Lin

 <%-- 再增加 type="img"。Lin

 							<img src="<ss@serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thn}"}'/>"/> --%>

 							<img src="<ss@serv name='dlByHttp' parm='{"wdConfirmationCaptchaService":"0","path":"${item.thn}"}'/>"/> --%>

@@ -30,11 +30,11 @@
 
 								<ss:equal val='${empty item.title}' val2='false'>

 								<ss:equal val='${empty item.title}' val2='false'>

 									<%--不带codebook--%>

 									<%--不带codebook--%>

 									<ss:equal val='${empty item.title.cbName}' val2='true'>

 									<ss:equal val='${empty item.title.cbName}' val2='true'>

-										<ss:txt val='${item.title.value}' fmt='${item.title.fmt}'/>

+										<ss:txt val='${empty item.title.value?item.title.val:item.title.value}' fmt='${item.title.fmt}'/>
 
 									</ss:equal>

 									</ss:equal>

 									<%--带codebook--%>

 									<%--带codebook--%>

 									<ss:equal val='${empty item.title.cbName}' val2='false'>

 									<ss:equal val='${empty item.title.cbName}' val2='false'>

-										<ss:cbTrans cb='${item.title.cbName}' val='${item.title.value}'/>

+										<ss:cbTrans cb='${item.title.cbName}' val='${empty item.title.value?item.title.val:item.title.value}'/>
 
 									</ss:equal>

 									</ss:equal>

 								</ss:equal>

 								</ss:equal>

 								<%--缺标题显示属性start--%>

 								<%--缺标题显示属性start--%>