" data-msg-required="${dataMsgRequired}" placeholder="${(empty value or value eq extId)?labelValue:value}"
@@ -45,7 +46,7 @@
return true;
}
// 正常打开
- top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}&enableSearch=${enableSearch}", "
", 320, 420, {
+ top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&checkedPS=${checkedPS}&unCheckedPS=${unCheckedPS}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}&enableSearch=${enableSearch}", "
", 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();
@@ -90,6 +91,11 @@
top.$.jBox.tip("
（"+nodes[i].name+"）
");
return false;
}//
+ if("${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+ if("${extId}"==nodes[i].id){
+ continue;
+ }
+ }
ids.push(nodes[i].id);
//
if (nodes[i].id != null ){
@@ -109,7 +115,7 @@
names.push(nodes[i].name);
}
- });
+ });
}//
//
@@ -119,7 +125,9 @@
break; // 如果为非复选框选择，则返回第一个选择
//
}
-
+ if(ids.length==0&&"${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+ ids.push("${labelEmptyValue}");
+ }
$("#${id}Id").val(ids.join(",").replace(/u_/ig,""));
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val(names.join(","));
@@ -127,7 +135,11 @@
$("#${id}Name").attr("placeholder","");
}
}else if (v == "clear"){
- $("#${id}Id").val("");
+ if("${labelEmptyValue}"&&""!="${labelEmptyValue}"){
+ $("#${id}Id").val("${labelEmptyValue}");
+ }else{
+ $("#${id}Id").val("");
+ }
$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
$("#${id}Name").val("");
$("#${id}Name").attr("placeholder","");
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
index c2859f844..1cfc57e5d 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
@@ -194,9 +194,18 @@ label.errorShow {
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 192d5d99c..a759a1330 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -539,11 +539,11 @@ $(function(){
}
});
- $("#classifyId,#attributeId,#lableId").on("change",function(){
+ /*$("#classifyId,#attributeId,#lableId").on("change",function(){
if($(this).val()==0 || $(this).val()==''){
$(this).val(0);
}
- });
+ });*/
//配置修改时已经展开的域上的加号隐藏
$(".boxSolid:visible").each(function(){
$(this).prev("h4").find(".glyphicon-plus").addClass("hidden");
From 7915c4216b254ff5e667efb62712353e4872b70e Mon Sep 17 00:00:00 2001
From: leijun
Date: Tue, 9 Oct 2018 14:59:49 +0800
Subject: [PATCH 5/9] =?UTF-8?q?Special=20task=E7=9A=84=E5=9B=BD=E9=99=85?=
=?UTF-8?q?=E5=8C=96=E6=94=B9=E6=88=90Task?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/messages/message_en.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 7019bc4d1..6138724c4 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -49,7 +49,7 @@ Request_from=Letter Office
classification_manage=Classification
area_manage=Area
feature_scope_manage=Feature Scope
-special_tasks=Special Task
+special_tasks=Task
label_manage=Custom Tag
protect_list=Protect List
effect_range=Effective Range
From 4ee273acb308653e7dd56c7bdf8ed26f681709fa Mon Sep 17 00:00:00 2001
From: wangxin
Date: Tue, 9 Oct 2018 15:29:55 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3EDGE=E4=B8=8BIP=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E5=8A=A0=E5=85=A5=E8=B6=85=E9=93=BE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/views/index.jsp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index 116397fff..7adfa54ce 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -2,6 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
+