From 19ec0269a9ce3a57ccfcd1d36585bb1c31977b60 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 10 一月 2025 10:25:22 +0800
Subject: [PATCH] ui定义为树或树表时默认设置orientation为positive
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 17 ++---------------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 2 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java | 10 +++++-----
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java | 25 +++++++++++++++++--------
4 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
index a4bbc1d..583b517 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
+++ b/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:鏍戝畾涔変笂宸茬粡娌℃湁浣跨敤杩欎釜瀛楁浜�(浣嗘槸涓轰簡鍏煎浠ュ墠鐨刄I閰嶇疆鎵�浠ラ渶瑕佷繚鐣�)
*/
- //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;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 4f00074..36e4986 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/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:杩欎釜灞炴�х幇鍦ㄧ敱閾炬帴绫诲瀷鏌ヨ妯℃澘閰嶇疆涓婃帶鍒讹紝涓嶅湪椤甸潰瀹氫箟鎺у埗浜�,浣嗘槸涓轰簡鍏煎浠ュ墠鐨刄I瀹氫箟鎵�浠ラ渶瑕佽�冭檻淇濈暀
+ treeDefineVO.setOrientation(componentDefineXO.getOrientation());
treeDefineVO.setShowImage("1".equalsIgnoreCase(componentDefineXO.getIsShowImage())?true:false);
treeDefineVO.setRootContent(componentDefineXO.getRootContent());
treeDefineVO.setFieldSep(StringUtils.isBlank(componentDefineXO.getSeparator())?",":componentDefineXO.getSeparator());
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
index 9991f8b..572c517 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
+++ b/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());
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index 7a75659..78105b6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
+++ b/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<>();
--
Gitblit v1.9.3