From ffe3c1ffc36078e694d0dab80bba237b2aef7a3a Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 28 May 2018 10:18:37 +0800
Subject: [PATCH] =?UTF-8?q?classify=E3=80=81label=E3=80=81attribute?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=88=AA=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/appCfgList.jsp   | 36 +++++++++++----
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    | 38 +++++++++++-----
 .../WEB-INF/views/cfg/complexCfgList.jsp      | 36 +++++++++++----
 .../WEB-INF/views/cfg/multipleCfgList.jsp     | 45 ++++++++++++++-----
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 43 ++++++++++++++----
 5 files changed, 151 insertions(+), 47 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
index de8913569..59c92f065 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
@@ -369,35 +369,53 @@
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
-									<td>
+									<c:set var="classify"></c:set>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
 									</td>
-									<td>
+									<c:set var="attribute"></c:set>
 									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
 											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
-											${xz.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
 									</td>
-									<td>
+									<c:set var="lableInfo"></c:set>
 									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
 											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
-											${lable.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index cc88c6c72..93b931523 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -654,35 +654,53 @@
 										<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>${indexCfg.requestName }</td>
-									<td>
+									<c:set var="classify"></c:set>
 									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
-										<c:forEach items="${fls}" var="fl" >
+										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.classify,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
 									</td>
-									<td>
+									<c:set var="attribute"></c:set>
 									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
 											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
-											${xz.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.attribute,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
 									</td>
-									<td>
+									<c:set var="lableInfo"></c:set>
 									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
 											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
-											${lable.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(indexCfg.lable,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
 									</td>
 								    <td>
 										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index e1ea35f7a..f455744a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -324,35 +324,53 @@
 										<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
 									<td>${cfg.requestName }</td>
-									<td>
+									<c:set var="classify"></c:set>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.classify,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
 									</td>
-									<td>
+									<c:set var="attribute"></c:set>
 									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
 											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
-											${xz.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.attribute,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
 									</td>
-									<td>
+									<c:set var="lableInfo"></c:set>
 									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
 											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
-											${lable.itemValue}
-											<c:if test="${status.index+1 ne fn:length(fn:split(cfg.lable,','))}">,</c:if>
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
 									</td>
 									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index f9c9c912c..ddf35b3a2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -524,30 +524,55 @@
 										<c:if test="${bean.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${bean.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 									</td>
-									<td>
-									<c:forEach items="${fn:split(bean.classify,',')}" var="classifyId">
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(bean.classify,',')}" var="classifyId" varStatus="status">
 										<c:forEach items="${fls}" var="fl">
 											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-											${fl.itemValue},
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
 											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${classify }">
+										${fns:abbr(classify,20)}
 									</td>
-									<td>
-									<c:forEach items="${fn:split(bean.attribute,',')}" var="attributeId">
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(bean.attribute,',')}" var="attributeId" varStatus="status">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${attribute }">
+										${fns:abbr(attribute,20)}
 									</td>
-									<td>
-									<c:forEach items="${fn:split(bean.lable,',')}" var="lableId">
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(bean.lable,',')}" var="lableId" varStatus="status">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
 										</c:forEach>
 									</c:forEach>
+									<td title="${lableInfo }">
+										${fns:abbr(lableInfo,20)}
 									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<%-- <td>${bean.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${bean.isValid==0}"><spring:message code="no"/></c:if>
 										<c:if test="${bean.isValid==1}"><spring:message code="yes"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 9429d90ef..56491d902 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -315,28 +315,53 @@
 												<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
 											</td>
 											<td>${cfg.requestName }</td>
-											<td>
-											<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
+											<c:set var="classify"></c:set>
+											<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId" varStatus="status">
 												<c:forEach items="${fls}" var="fl">
 													<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
-													${fl.itemValue},
+													<c:if test="${status.index+1 eq 1}">
+														<c:set var="classify" value="${fl.itemValue}"></c:set>
+													</c:if>
+													<c:if test="${status.index+1 ne 1}">
+														<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+													</c:if>
 													</c:if>
 												</c:forEach>
 											</c:forEach>
+											<td title="${classify }">
+												${fns:abbr(classify,20)}
 											</td>
-											<td>
-											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+											<c:set var="attribute"></c:set>
+											<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId" varStatus="status">
 												<c:forEach items="${xzs}" var="xz">
-													<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
+													<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+													<c:if test="${status.index+1 eq 1}">
+														<c:set var="attribute" value="${xz.itemValue}"></c:set>
+													</c:if>
+													<c:if test="${status.index+1 ne 1}">
+														<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+													</c:if>
+													</c:if>
 												</c:forEach>
 											</c:forEach>
+											<td title="${attribute }">
+												${fns:abbr(attribute,20)}
 											</td>
-											<td>
-											<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+											<c:set var="lableInfo"></c:set>
+											<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId" varStatus="status">
 												<c:forEach items="${lables}" var="lable">
-													<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
+													<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+													<c:if test="${status.index+1 eq 1}">
+														<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+													</c:if>
+													<c:if test="${status.index+1 ne 1}">
+														<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+													</c:if>
+													</c:if>
 												</c:forEach>
 											</c:forEach>
+											<td title="${lableInfo }">
+												${fns:abbr(lableInfo,20)}
 											</td>
 										</c:otherwise>
 									</c:choose>