From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 04 十二月 2024 10:47:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java index 07010d9..95f9f5c 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIEngineServiceI.java @@ -1,10 +1,12 @@ package com.vci.web.service; +import com.vci.corba.common.PLException; +import com.vci.corba.portal.data.PLAction; import com.vci.corba.portal.data.PLTabButton; import com.vci.corba.portal.data.PLUILayout; import com.vci.corba.portal.data.PortalVI; -import com.vci.corba.portal.data.PLAction; -import com.vci.web.pageModel.*; +import com.vci.pagemodel.*; + import java.util.Collection; import java.util.List; import java.util.Map; @@ -89,7 +91,7 @@ * @param queryDetail 鏌ヨ鏄庣粏 * @return 鏄剧ず瀵硅薄 */ - UITableDefineVO tableDO2VO(PortalVI prm,boolean queryDetail); + UITableDefineVO tableDO2VO(PortalVI prm, boolean queryDetail, Map<String, OsAttributeVO> attributeVOMap) throws PLException; /** * 浣跨敤琛ㄦ牸鐨勮嫳鏂囧悕绉拌幏鍙栬〃鍗� @@ -97,7 +99,7 @@ * @param btmId 涓氬姟绫诲瀷 * @return 琛ㄥ崟鐨勫畾涔� */ - UITableDefineVO getTableById(String btmId,String id); + UITableDefineVO getTableById(String btmId,String id) throws PLException; /** * 浣跨敤琛ㄦ牸鐨勮嫳鏂囧悕绉拌幏鍙栬〃鍗� @@ -132,7 +134,6 @@ * @return 鏄剧ず瀵硅薄 */ UIActionVO actionDO2VO(PLAction action); - /** * 鏌ヨ鎵�鏈夌殑UI涓婁笅鏂� @@ -169,7 +170,7 @@ * @param componentOid 缁勪欢鐨勪富閿� * @return 涓婚敭鐨勬樉绀哄璞� */ - UIComponentVO getComponentByOid(String componentOid); + UIComponentVO getComponentByOid(String componentOid, Map<String, OsAttributeVO> attributeVOMap); /** * 鑾峰彇鏌愪釜缁勪欢鐨勬寜閽� @@ -190,7 +191,7 @@ * @param button 鎸夐挳鐨勬暟鎹璞� * @return 鏄剧ず瀵硅薄 */ - UIButtonDefineVO buttonDO2VO(PLTabButton button) ; + UIButtonDefineVO buttonDO2VO(PLTabButton button,Map<String, UIActionVO> actionVOMap) ; /** * 鏌ヨ鎵�鏈夌殑缁勪欢 @@ -208,5 +209,5 @@ // UIContentVO UIContentDO2VO(PLPageLayoutDefination pageLayoutDefination, boolean queryDetail); UIContentVO UIContentDO2VO(PLUILayout pageLayoutDefination, boolean queryDetail); -; + } -- Gitblit v1.9.3