eCoWorksV3.git - Gitblit

			@@ -155,6 +155,7 @@
			BaseBean baseBean = (BaseBean) gformInfo.get(BEAN_INFO);
			String formID = baseBean.formID;
			String data = getPageCode(fileName, baseBean);

			// --------从gform表获取是否显示大标题字段值(isTitle)判断是否显示大标题，并替换标识符-2012-02-20-syz--------[begin]----------------------
			if (GridUtils.prossRowSetDataType_Int(gformInfo, "isTitle") == 1) {// 如果配置了显示大标题
			String TopTitle = "<table id=\"top_table\" width=\"100%\" bgcolor=\"#DEEDF7\">\n" + "<tr>\n"
			@@ -168,9 +169,9 @@
			data = data.replace("[?TopAndTitle]", TopAndTitle_str);// 替换功能号标识符
			}
			// --------从gform表获取是否显示大标题字段值(isTitle)判断是否显示大标题，并替换标识符-2012-02-20-syz-----[end]-------------------------//
			// ----------------

			Map<String, String> endCreate = new HashMap<String, String>();// 延长生成文件
			String jspName = "";//jsp名称
			String jspName = "";//jsp名称(面板和格线有自定义控件时的名称 xin 2024-1-25 15:55:46)
			boolean isMainPanel = true;//是否是主面板
			String html = "";//没设置页卡时候的内容
			String htmlTab = "";//页卡内容
			@@ -202,7 +203,6 @@
			throw new ApplicationException("请在【9771】设置 "+formID+" 子功能号使其处于【生效】状态");
			}
			String[] data1 = null;
			String customJspName="";//面板和格线自定义控件用户 xin 2024-1-25 15:55:46
			for (Map<String, Object> map : sheMap) {
			if (baseBean.doc == "") {
			baseBean.doc = DBHelper.getValue(map, "SeekGroupID").toLowerCase();// 取得第一个功能号的关联字段
			@@ -222,12 +222,11 @@
			baseBean.id_info += "create\|" + DBHelper.getValue(map, "SeekGroupID").split(";")[0] + ","
			+ DBHelper.getValue(map, "FK").split(";")[0];// 前提是以主功能号组装格线中各个关联字段：0\|doccode,docede;1\|test,test;
			}
			// jspName = DBHelper.getValueInt(map, "formid") + "_grid.jsp";
			//需要进一步判断表格有没做自定义布局 by danaus 2024-04-08 15:28
			customJspName = DBHelper.getValueInt(map, "formid") + "_grid.jsp";
			jspName = DBHelper.getValueInt(map, "formid") + "_grid.jsp";
			boolean hasControlLayout = controlLayoutIfc.hasControlLayout(DBHelper.getValueInt(map, "formid")+"", baseBean.getUsrCode(), 1, ExprotType.Grid, false);
			if (hasControlLayout) {
			customJspName=DBHelper.getValueInt(map, "formid") +"_"+baseBean.getUsrCode()+ "_grid.jsp";
			jspName=DBHelper.getValueInt(map, "formid") +"_"+baseBean.getUsrCode()+ "_grid.jsp";
			baseBean.setCustomLayout(hasControlLayout);
			}
			// 是页卡进入处理 --xin 2019-10-14 16:27:08
			@@ -241,7 +240,7 @@

			tabData.put("t" + tabID + sortBy,
			"<div id=\"create" + (gridIndex == 0 ? "" : gridIndex) + "\" title=\"" + labelName
			+ "\" style=\"margin-top:5px;\">" + "<%@ include file=\"" + customJspName + "\" %>"
			+ "\" style=\"margin-top:5px;\">" + "<%@ include file=\"" + jspName + "\" %>"
			+ getPanFile(DBHelper.getValueInt(map, "formid")) + "\r<div id=\"mbcreate" + (gridIndex == 0 ? "" : gridIndex) + "\">"
			+ "<jsp:include page=\"" + DBHelper.getValueInt(map, "formid") + "_top.jsp\" flush=\"true\"/></div></div>\n");
			isTabs = true;
			@@ -257,7 +256,7 @@
			+ DBHelper.getValueInt(map, "formid") + "_top.jsp\" flush=\"true\"/></div>";

			}
			html += "<%@ include file=\"" + customJspName + "\" %>" + getPanFile(DBHelper.getValueInt(map, "formid"));
			html += "<%@ include file=\"" + jspName + "\" %>" + getPanFile(DBHelper.getValueInt(map, "formid"));
			nohtmlTab += html;//在设置有页卡但是个别没设置页卡的内容
			}
			// ---生成功能链接,通过增加top.jsp页面
			@@ -298,7 +297,7 @@
			dto.xxk = (isTabs ? 1 : 0); // DBHelper.getValueInt(map,"isStartupCollapsed");

			treeGrid.createGrid(DBHelper.getValueInt(map, "formtype"), DBHelper.getValueInt(map, "formid"), baseBean.URI,
			"app/" + baseBean.gPath + "/", new String[]{customJspName}, getTemPath(baseBean),
			"app/" + baseBean.gPath + "/", new String[]{jspName}, getTemPath(baseBean),
			"/" + baseBean.formID + "/" + baseBean.type + "/", dto, baseBean.dataBaseId, baseBean.getUsrCode(), baseBean.isCustomLayout());
			height1 = (height1 <= 0) ? 320 : height1 + 20;
			grid = "1";
			@@ -351,14 +350,16 @@
			getToPath(baseBean) + map.get("formid") + "_top.jsp",
			getFormInfo(DBHelper.getValueInt(map, "formid") + ""), this);
			// ---end
			jspName = DBHelper.getValueInt(map, "formid") + "_panel.jsp";//这个jspName是初始默认值

			//替换变量内容（如：@FT@）
			String panel = replaceCustom(mapIf.get("panHTML"), map, Integer.parseInt(formID), labelName, bol, "");
			panel = panel.replace("@grid@", grid);
			//这个jspName是初始默认值,下面还需要判断是否有自定义控件布局
			jspName = DBHelper.getValueInt(map, "formid") + "_panel.jsp";
			if(baseBean.isCustomLayout()){////有自定义控件布局
			jspName = DBHelper.getValueInt(map, "formid") + "_" + baseBean.getUsrCode() + "_panel.jsp";
			}
			buildPageCode(panel, jspName, baseBean);//生成默认jsp文件
			buildPageCode(panel, jspName, baseBean);//生成jsp文件
			buildPageCode(mapIf.get("panelControl"), "panelControl" + DBHelper.getValueInt(map, "formid") + ".jsp", baseBean);
			// 是页卡进入处理 --xin 2019-10-14 16:27:08
			if (tabID > 0 && !isMainPanel) {
			@@ -366,10 +367,9 @@
			sortBylit.add(sortBy);
			int heig = DBHelper.getValueInt(TabHeightMap, tabID + "");
			TabHeightMap.put(tabID + "", (heig > TabHeight ? heig : TabHeight));
			customJspName=DBHelper.getValueInt(map, "formid") + "@customJspName@_panel.jsp";
			tabData.put("t" + tabID + sortBy,
			"<div id=\"panl-" + panelIndex + "\" title=\"" + labelName
			+ "\" style=\"margin-top:5px;\"><jsp:include page=\"" + customJspName + "\" flush=\"true\"/>"
			+ "\" style=\"margin-top:5px;\"><jsp:include page=\"" + jspName + "\" flush=\"true\"/>"
			+ getPanFile(DBHelper.getValueInt(map, "formid")) + "\r<div id=\"mbpanl-" + panelIndex + "\">"
			+ "<jsp:include page=\"" + DBHelper.getValueInt(map, "formid") + "_top.jsp\" flush=\"true\"/></div></div>\n");
			isTabs = true;
			@@ -407,9 +407,7 @@
			String panelName = "panel.jsp";
			if(baseBean.isCustomLayout()){//有自定义控件布局
			panelName = baseBean.getUsrCode() + "_panel.jsp";
			htmlTab = htmlTab.replaceAll("@customJspName@", baseBean.getUsrCode());//面板和格线自定义控件用户
			}
			htmlTab = htmlTab.replaceAll("@customJspName@", "");//面板和格线自定义控件用户
			buildPageCode(endCreate.get("panel.jsp").replace("@include@", htmlTab).replace("@grid@", grid),
			panelName, baseBean);
			} else {

	src/com/yc/service/build/type/v2/T_496_Impl.java	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/com/yc/service/panel/SystemSettingsImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -298,7 +298,7 @@
			try {
			String sql="select usercode,formid,headflag,fieldid,statisid,fieldname,datatype,datatypelength,showongrid,gridcaption," +
			"visible,hidelabel,rowno,colno,lengthnum,heightnum,masterfieldshowlocation from gFieldCustomLayout " +
			"where UserCode='"+userCode+"' and FormId="+formId +" and formType="+formType;
			"where UserCode='"+userCode+"' and FormId="+formId;// +" and formType="+formType;
			if (primary == 0 \|\| primary == 1) {
			sql += " and HeadFlag=" + primary;
			}