diff --git a/src/main/java/com/nis/web/controller/TagController.java b/src/main/java/com/nis/web/controller/TagController.java index e470d77ce..ebedf03a1 100644 --- a/src/main/java/com/nis/web/controller/TagController.java +++ b/src/main/java/com/nis/web/controller/TagController.java @@ -26,6 +26,7 @@ public class TagController extends BaseController { model.addAttribute("selectIds", request.getParameter("selectIds")); // 指定默认选中的ID model.addAttribute("isAll", request.getParameter("isAll")); // 是否读取全部数据，不进行权限过滤 model.addAttribute("module", request.getParameter("module")); // 过滤栏目模型（仅针对CMS的Category树） + model.addAttribute("title", request.getParameter("title")); return "/sys/tagTreeselect"; } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index bd3ea1c43..d6d6e9fb6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1085,4 +1085,7 @@ reject_or_monit_ip=IP Block/Monitor reject_ip=IP Block monit_ip=IP Monitor ir_ip=IP Reuseing -ratelimit_ip=IP Ratelimit \ No newline at end of file +ratelimit_ip=IP Ratelimit +app_code=Application No +app_name=Application Name +app_desc=Application Description \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2b88a76b9..d342e8434 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1089,4 +1089,7 @@ reject_or_monit_ip=IP\u963B\u65AD/\u76D1\u6D4B reject_ip=IP\u963B\u65AD monit_ip=IP\u76D1\u6D4B ir_ip=IP\u590D\u7528 -ratelimit_ip=IP\u9650\u6D41 \ No newline at end of file +ratelimit_ip=IP\u9650\u6D41 +app_code=\u5E94\u7528\u5E8F\u53F7 +app_name=\u5E94\u7528\u540D\u79F0 +app_desc=\u5E94\u7528\u63CF\u8FF0 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 8fdf0d777..e2520f1d6 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -26,6 +26,7 @@ <%@ attribute name="showParentName" type="java.lang.String" required="false" description="显示父类名称"%> <%@ attribute name="checkedPS" type="java.lang.String" required="false" description="复选框选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> +<%@ attribute name="rootNodeName" type="java.lang.String" required="false" description="根节点显示的名称"%>
", 320, 420, { + top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&title=${title}", " ", 320, 420, { ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"":"ok", "":"clear","":true}, submit:function(v, h, f){ if (v == "ok"){ var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents(); @@ -87,14 +88,12 @@ data:{'deptId':nodes[i].id}, dateType:"json", success:function(data){ - var data=eval('('+data+')'); names.push(data[0].parentName); }, error: function(e) { - names.push(nodes[i].name); } @@ -109,14 +108,14 @@ break; // 如果为非复选框选择，则返回第一个选择 } $("#${id}Id").val(ids.join(",").replace(/u_/ig,"")); - if(types.length>0){ - $("#${id}Id").attr('cfgtype',types.join(",")); - } + //if(types.length>0){ + // $("#${id}Id").attr('cfgtype',types.join(",")); + //} $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(names.join(",")); }else if (v == "clear"){ $("#${id}Id").val(""); - $("#${id}Id").removeAttr('cfgtype'); + //$("#${id}Id").removeAttr('cfgtype'); $("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到 $("#${id}Name").val(""); } diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp index e63111243..7de27cc83 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" %> +laow<%@ page contentType="text/html;charset=UTF-8" %> <%@ include file="/WEB-INF/include/taglib.jsp"%> @@ -92,7 +92,9 @@ $(this).find("a").unbind("click"); } }); - + $(".protocol_code").html('*:'); + $(".protocol_name").html('*:'); + $(".protocol_desc").html('*:'); }else{ $(".cfgType").each(function(){ if($(this).attr("cfgType")!=$("[name='cfgType']").val()){ @@ -104,6 +106,15 @@ $(this).find("input").unbind("click"); } }); + if($("[name='cfgType']").val()==1){ + $(".protocol_code").html('*:'); + $(".protocol_name").html('*:'); + $(".protocol_desc").html('*:'); + }else{ + $(".protocol_code").html('*:'); + $(".protocol_name").html('*:'); + $(".protocol_desc").html('*:'); + } } $(".tabs-left li").on("click",function(){ var cfgType=$(this).attr("cfgType"); @@ -118,6 +129,15 @@ $(this).find("[name='parent.specServiceName']").removeAttr("name"); } }); + if(cfgType==1){ + $(".protocol_code").html('*:'); + $(".protocol_name").html('*:'); + $(".protocol_desc").html('*:'); + }else{ + $(".protocol_code").html('*:'); + $(".protocol_name").html('*:'); + $(".protocol_desc").html('*:'); + } }); }); @@ -164,30 +184,30 @@
- +
- +
- + + title="${dict.itemValue}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${dict.itemCode}" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>
- +
- +
@@ -217,7 +237,7 @@
--%>
- +
diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp index 0dba33a3c..026c03de2 100644 --- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp +++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp @@ -56,10 +56,14 @@ for(var i=0;i