Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java

@@ -10,12 +10,16 @@
import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.util.*;
import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.enumpck.UIComponentDisplayTypeEnum;
import com.vci.web.enumpck.UIComponentTypeEnum;
import com.vci.web.enumpck.UIFieldTypeEnum;
import com.vci.web.enumpck.UILayoutAreaTypeEnum;
import com.vci.web.other.AllActionThreadLocal;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIEngineServiceI;
@@ -659,7 +663,7 @@
                  && !UIFieldTypeEnum.CUSTOM.getValue().equalsIgnoreCase(s.getFieldType())).forEach(fieldVO->{
               //列表里面不放edit，而查询里面需要放edit
               UITableFieldVO queryFieldVO = new UITableFieldVO();
               BeanUtil.convert(fieldVO,queryFieldVO);
               BeanUtilForVCI.convert(fieldVO,queryFieldVO);
               canQueryFields.add(queryFieldVO);
            });
            tableDefineVO.setSeniorQueryColumns(canQueryFields);
@@ -927,7 +931,7 @@
                  List<UIComponentVO> southCompVO = componentVOs.stream().filter(s->!s.getOid().equals(firstCompVO.getOid())).collect(Collectors.toList());

                  UILayoutVO centerVO = new UILayoutVO();
                  BeanUtil.convert(layoutVO,centerVO);
                  BeanUtilForVCI.convert(layoutVO,centerVO);
                  centerVO.setOid(centerVO.getOid() + "_center");
                  centerVO.setLayoutAreaType(UILayoutAreaTypeEnum.CENTER.getValue());
                  centerVO.setOrderNum(0);
@@ -945,7 +949,7 @@
                  //其余的作为south
                  if(!CollectionUtils.isEmpty(southCompVO)) {
                     UILayoutVO southVO = new UILayoutVO();
                     BeanUtil.convert(layoutVO, southVO);
                     BeanUtilForVCI.convert(layoutVO, southVO);
                     southVO.setOid(centerVO.getOid() + "_south");
                     southVO.setLayoutAreaType(UILayoutAreaTypeEnum.SOUTH.getValue());
                     southVO.setOrderNum(0);
@@ -1080,6 +1084,11 @@
      Map<String, OsAttributeVO> attributeVOMap;
      if(pages != null && pages.size() > 0){
         attributeVOMap = attrService.selectAllAttributeMap();
         Map<String, UIActionVO> actionVOMap = AllActionThreadLocal.get();
         if(actionVOMap == null || actionVOMap.isEmpty()){
            actionVOMap = selectAllActionMap();
            AllActionThreadLocal.set(actionVOMap);
         }
      }else{
         attributeVOMap = null;
      }
@@ -1097,6 +1106,7 @@
            }
         });
      }
      AllActionThreadLocal.remove();
      return contentVOS;
   }

@@ -1309,7 +1319,7 @@
            if(tableDefineVO != null) {

               UITreeTableDefineVO treeTableDefineVO = new UITreeTableDefineVO();
               BeanUtil.convert(tableDefineVO, treeTableDefineVO);
               BeanUtilForVCI.convert(tableDefineVO, treeTableDefineVO);
               if(isLink){
                  treeTableDefineVO.setTreeCurrentField("t_oid");
                  treeTableDefineVO.setTreeParentField("f_oid");
@@ -1364,7 +1374,8 @@
            treeDefineVO.setBtmType(componentDefineXO.getShowType());
            treeDefineVO.setLinkType(componentDefineXO.getLinkType());
            treeDefineVO.setLoadType("1".equalsIgnoreCase(componentDefineXO.getExpandMode())?"node":"all");
            treeDefineVO.setOrientation("positive".equalsIgnoreCase(componentDefineXO.getOrientation())?false:true);
            //TODO:这个属性现在由链接类型查询控制，不由页面定义控制了
            //treeDefineVO.setOrientation("positive".equalsIgnoreCase(componentDefineXO.getOrientation())?false:true);
            treeDefineVO.setShowImage("1".equalsIgnoreCase(componentDefineXO.getIsShowImage())?true:false);
            treeDefineVO.setRootContent(componentDefineXO.getRootContent());
            treeDefineVO.setFieldSep(StringUtils.isBlank(componentDefineXO.getSeparator())?",":componentDefineXO.getSeparator());
@@ -1456,9 +1467,15 @@
   public List<UIButtonDefineVO> buttonDO2VOs(Collection<com.vci.corba.portal.data.PLTabButton> buttons){
      List<UIButtonDefineVO> buttonDefineVOS = new ArrayList<>();
      if(buttons != null && buttons.size() > 0){
         Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
//         Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
         Map<String, UIActionVO> actionVOMap = null;
         actionVOMap = AllActionThreadLocal.get();
         if(actionVOMap == null ){
            actionVOMap = self.selectAllActionMap();
         }
         Map<String, UIActionVO> finalActionVOMap = actionVOMap;
         Optional.ofNullable(buttons).orElseGet(()->new ArrayList<>()).stream().forEach(button->{
            buttonDefineVOS.add(buttonDO2VO(button, actionVOMap));
            buttonDefineVOS.add(buttonDO2VO(button, finalActionVOMap));
         });
      }