Commit da065e86 by WeiCong

dsp修改

parent ad5888ba
......@@ -543,6 +543,9 @@ public class NoUiPresentation extends AbstractNullPresentation {
HttpServletRequest req = ((NoUiContext) ctx).getNoUiRequest().getHttpRequest();
HttpSession session = req.getSession(true);
ZkContext zkContext = new ZkContext(ctx);
if (panels != null && panels.length != 0) {
zkContext.setPanel(panels[0]);
}
ZkUtils.setZkContext(session,zkContext);
ServletContext servletContext = session.getServletContext();
Session zkSession = WebManager.getSession(session.getServletContext(), req);
......
......@@ -28,11 +28,11 @@ import java.util.*;
public class NoUiPresentationUtil {
protected static final Log log = LogFactory.getLog(NoUiPresentationUtil.class);
public static void handleInput(){
public static void handleInput() {
NoUiContext noUiContext = NoUiContextManager.getNoUiContext();
NoUiRequest noUiRequest = NoUiContextManager.getNoUiRequest();
Alias alias = AliasFactory.getAlias(noUiRequest.getMappingUrl(), noUiContext);
handleInput(noUiContext,noUiRequest,alias);
handleInput(noUiContext, noUiRequest, alias);
}
public static void handleInput(NoUiContext context, NoUiRequest request, Alias alias) {
......@@ -56,20 +56,17 @@ public class NoUiPresentationUtil {
throw new NoUiException("not found url :" + url + " ,alias name is:" + aliasKey);
} else {
Object value = dataMap.get(aliasKey);
if (null != value) {
if (baseObject instanceof IDatafield<?>) {
IDatafield<Object> dataField = (IDatafield<Object>) baseObject;
handleDatafield(context, dataField, value);
}
if (baseObject instanceof IModuleList<?> && value instanceof List<?>) {
IModuleList<IModule> moduleList = (IModuleList<IModule>) baseObject;
moduleList.clear();
List<Map<String, Object>> valueList = (List<Map<String, Object>>) value;
for (Map<String, Object> m : valueList) {
IModule module = moduleList.add();
for (Map.Entry<String, Object> entry : m.entrySet()) {
handleDatafield(context, (IDatafield<Object>) module.get(obfuscationPath(entry.getKey())), entry.getValue());
}
if (baseObject instanceof IDatafield<?>) {
IDatafield<Object> dataField = (IDatafield<Object>) baseObject;
handleDatafield(context, dataField, value);
} else if (baseObject instanceof IModuleList<?> && null != value && value instanceof List<?>) {
IModuleList<IModule> moduleList = (IModuleList<IModule>) baseObject;
moduleList.clear();
List<Map<String, Object>> valueList = (List<Map<String, Object>>) value;
for (Map<String, Object> m : valueList) {
IModule module = moduleList.add();
for (Map.Entry<String, Object> entry : m.entrySet()) {
handleDatafield(context, (IDatafield<Object>) module.get(obfuscationPath(entry.getKey())), entry.getValue());
}
}
}
......@@ -136,8 +133,13 @@ public class NoUiPresentationUtil {
}
private static void handleDatafield(IContext context, IDatafield<Object> dataField, Object value) {
if (null == value || dataField == null)
if (dataField == null) {
return;
}
if (value == null) {
dataField.setValue(null);
return;
}
Class<?> dataType = dataField.getDataType();
if (dataType.equals(String.class)) {
String valStr = value.toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment