Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
@@ -22,9 +22,9 @@ private String loadType; /** * 是否反向,TODO:树定义上已经没有使用这个字段了 * 是否反向,TODO:树定义上已经没有使用这个字段了(但是为了兼容以前的UI配置所以需要保留) */ //private boolean orientation = false; private String orientation; /** * 显示图标 @@ -77,13 +77,13 @@ this.loadType = loadType; } /*public boolean isOrientation() { public String getOrientation() { return orientation; } public void setOrientation(boolean orientation) { public void setOrientation(String orientation) { this.orientation = orientation; }*/ } public boolean isShowImage() { return showImage; Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -1267,19 +1267,6 @@ } catch (PLException vciError) { throw WebUtil.getVciBaseException(vciError); } /*if(!QUERY_BY_CACHE){ try { return uiComponentDO2VO(platformClientUtil.getUIService().getPLPageDefinationById(componentOid),true,attributeVOMap); } catch (PLException vciError) { throw WebUtil.getVciBaseException(vciError); } }else{ List<UIComponentVO> componentVOS = self.selectAllUIComponent(); List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(componentVOList)){ return componentVOList.get(0); } }*/ } /** @@ -1442,8 +1429,8 @@ treeDefineVO.setBtmType(componentDefineXO.getShowType()); treeDefineVO.setLinkType(componentDefineXO.getLinkType()); treeDefineVO.setLoadType("1".equalsIgnoreCase(componentDefineXO.getExpandMode())?"node":"all"); //TODO:这个属性现在由链接类型查询模板配置上控制，不在页面定义控制了 //treeDefineVO.setOrientation("positive".equalsIgnoreCase(componentDefineXO.getOrientation())?false:true); //TODO:这个属性现在由链接类型查询模板配置上控制，不在页面定义控制了,但是为了兼容以前的UI定义所以需要考虑保留 treeDefineVO.setOrientation(componentDefineXO.getOrientation()); treeDefineVO.setShowImage("1".equalsIgnoreCase(componentDefineXO.getIsShowImage())?true:false); treeDefineVO.setRootContent(componentDefineXO.getRootContent()); treeDefineVO.setFieldSep(StringUtils.isBlank(componentDefineXO.getSeparator())?",":componentDefineXO.getSeparator()); Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -3602,6 +3602,7 @@ d.setSearchTarger(searchTarger); d.setShowType(btmType); d.setTemplateId(txtVIName); d.setOrientation("positive"); d.setQueryTemplateName(txtQTName); d.setExpandCols(expandCols); d.setExpandMode(expandMode); @@ -3699,6 +3700,7 @@ d.setShowType(btmType); d.setLinkType(linkType); d.setTemplateId(queryTemplateName); d.setOrientation("positive"); d.setRootContent(showExpressionRoot.trim()); d.setShowAbs(showExpression.trim()); d.setShowLinkAbs(refTreeSet.trim()); Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -449,10 +449,14 @@ //TODO: 替换树定义上的正反向查询属性，因为正反向查询是由链接类型查询模板上控制的 boolean isOrientation = false; //是否反向，使用模板上配置的 String qtName = treeDefineVO.getQueryTemplateName(); if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName); QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName); isOrientation = qt.getDirection().equals("opposite"); if(Func.isNotBlank(treeDefineVO.getOrientation())){ isOrientation = treeDefineVO.getOrientation().equalsIgnoreCase("opposite"); }else{ if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName); QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName); isOrientation = qt.getDirection().equals("opposite"); } } if(treeQuery.getConditionMap() == null){ treeQuery.setConditionMap(new HashMap<>()); @@ -663,11 +667,16 @@ UITreeDefineVO treeDefineVO = componentVO.getTreeDefineVO(); boolean isOrientation = false; //是否反向，使用模板上配置的 String qtName = treeDefineVO.getQueryTemplateName(); if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName); QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName); isOrientation = qt.getDirection().equals("opposite"); if(Func.isNotBlank(treeDefineVO.getOrientation())){ isOrientation = treeDefineVO.getOrientation().equalsIgnoreCase("opposite"); }else{ if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName); QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName); isOrientation = qt.getDirection().equals("opposite"); } } String queryTemplate = StringUtils.isNotBlank(treeQuery.getQueryTemplate())?treeQuery.getQueryTemplate():(!CollectionUtils.isEmpty(treeQuery.getSourceData())? (String) treeQuery.getSourceData().getOrDefault("querytemplate",treeDefineVO.getQueryTemplateName()) :treeDefineVO.getQueryTemplateName()); Map<String, Object> replaceMap = wrapperReplaceMap(treeQuery.getSourceData()); List<String> queryFieldList = new ArrayList<>();
