(1)修复app等选择行为的时候表达式为与表达式

(2)http,dns,mail,ftp,url配置导入提交
This commit is contained in:
wangxin
2018-10-20 23:38:56 +08:00
parent 16e8b9b855
commit 3be9eb7aea
12 changed files with 450 additions and 67 deletions

View File

@@ -95,6 +95,9 @@
onClick="javascript:window.location='${ctx}/ntc/fileTransfer/ftpForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission>
</div>
@@ -466,6 +469,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/fileTransfer/ftpList?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

View File

@@ -92,6 +92,9 @@
onClick="javascript:window.location='${ctx}/ntc/mail/mailForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission>
</div>
@@ -463,6 +466,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/mail/mailList?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

View File

@@ -91,6 +91,9 @@
onClick="javascript:window.location='${ctx}/ntc/website/dnsForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission>
</div>
@@ -468,6 +471,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/website/dnsList?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

View File

@@ -236,6 +236,9 @@
onClick="javascript:window.location='${ctx}/ntc/website/httpForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
<!-- 导入功能按钮 -->
<%-- <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle green" data-toggle="dropdown">
@@ -620,6 +623,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/website/httpList?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

View File

@@ -91,6 +91,9 @@
onClick="javascript:window.location='${ctx}/ntc/whitelist/domain/form?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</shiro:hasPermission>
</div>
@@ -462,6 +465,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/whitelist/domain/list?functionId=${cfg.functionId}"/>
<!-- 模板导入start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>