xinyb
2024-04-20 f68ab46945071b3a07fb2a74a6c46924ad388838
调整自定义布局控件获取数据问题
4个文件已修改
10 ■■■■ 已修改文件
src/com/yc/action/build/v2/FormsBuilded.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/service/build/type/v2/BaseImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/service/build/type/v2/T_496_Impl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/service/build/type/v2/T_BasedList_Impl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/com/yc/action/build/v2/FormsBuilded.java
@@ -708,7 +708,7 @@
                        panelDataIfc.setDocVersionProcess(dto.getFormid());
                    }
                    if(formVO.formID.equals(dto.getFormid())){//当前页面功能号和遍历出来的功能号一样就检查是否有自定义控件布局 xin 2024-1-15 09:10:46
                        baseBean.setCustomLayout(controlLayoutIfc.hasControlLayout(formVO.getFormID(),formVO.getUserCode(), formVO.getFormType(), ExprotType.Panel,false));//true表示有 false表示没有
                        baseBean.setCustomLayout(controlLayoutIfc.hasControlLayout(dto.getFormid(),formVO.getUserCode(), dto.getType(), ExprotType.Panel,false));//true表示有 false表示没有
                    }
                    //System.out.println(dto.getFormid()+"--开始生成功能号页面.....");
                    returnError = base.build(baseBean);
src/com/yc/service/build/type/v2/BaseImpl.java
@@ -156,7 +156,7 @@
            fileName=baseBean.getUsrCode()+"_"+fileName;
//            panelControl=baseBean.getUsrCode()+"_"+panelControl;
            if (StringUtils.isNotBlank(map.get("customPanHTML"))) {//客户自定义控件布局文件 xin 2024-1-12 17:27:12
                buildPageCode(map.get("customPanHTML"), baseBean.getUsrCode() + fileName, baseBean);
                buildPageCode(map.get("customPanHTML"), fileName, baseBean);
            }
        }
        buildPageCode(map.get("panelControl"), panelControl, baseBean);
src/com/yc/service/build/type/v2/T_496_Impl.java
@@ -431,7 +431,7 @@
                    if (endCreate.get("panelCustom.jsp") != null) {//自定义控件布局 xin 2024-1-23 08:48:50
                        customhtmlTab = customhtmlTab.replaceAll("@customJspName@", baseBean.getUsrCode());//面板和格线自定义控件用户
                        buildPageCode(endCreate.get("panelCustom.jsp").replace("@include@", customhtmlTab).replace("@grid@", grid),
                                baseBean.getUsrCode() + "_panel.jsp", baseBean);
                                panelName, baseBean);
                    }
                }
            } else {
src/com/yc/service/build/type/v2/T_BasedList_Impl.java
@@ -48,10 +48,10 @@
        String panelControl="panelControl" + baseBean.formID + ".jsp";
        buildPageCode(map.get("panHTML"), panelName, baseBean);
        if(baseBean.customLayout){
            panelName=baseBean.getUsrCode()+"_"+panelName;
            fileName=baseBean.getUsrCode()+"_"+panelName;
//            panelControl=baseBean.getUsrCode()+"_"+panelControl;
            if (StringUtils.isNotBlank(map.get("customPanHTML"))) {//客户自定义控件布局文件 xin 2024-1-12 17:27:12
                buildPageCode(map.get("customPanHTML"), baseBean.getUsrCode() + fileName, baseBean);
                buildPageCode(map.get("customPanHTML"), fileName, baseBean);
            }
        }
        buildPageCode(map.get("panelControl"), panelControl, baseBean);