diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 6d5db4164..e3f2c150e 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -8,6 +8,8 @@ */ package com.nis.domain.configuration; +import org.apache.commons.lang3.StringEscapeUtils; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -129,6 +131,11 @@ public class BaseStringCfg extends BaseCfg { */ public String getCfgKeywords() { + cfgKeywords = StringEscapeUtils.unescapeHtml4(cfgKeywords); + /*cfgKeywords = cfgKeywords.replace("&", "\\&"); + cfgKeywords = cfgKeywords.replace(" ", "\\b"); + cfgKeywords = cfgKeywords.replace("\\", "\\\\"); + cfgKeywords = cfgKeywords.replace(",", "&");*/ return cfgKeywords; } } diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index b22dadc96..6122a94df 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -28,7 +28,7 @@ - + -
- -

- - -

- - - -
- - - <%-- - - - - --%> - <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> -
- - -
- +
@@ -339,6 +313,33 @@
+ +
+ +

+ + +

+ + + +
+ + + <%-- + + + + --%> + <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> +
+ + +
+
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp index 45bf9bd69..d4268ce16 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp @@ -22,22 +22,6 @@ }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); - $(".httpResCfg").addClass("hidden").addClass("disabled"); - $(".httpReqCfg").removeClass("hidden").removeClass( - "disabled"); - $("li").on("click", function() { - var region = ($(this).find("a").attr("for")); - if(region=="httpReqCfg"){ - $(".httpResCfg").addClass("hidden").addClass("disabled"); - $(".httpReqCfg").removeClass("hidden").removeClass( - "disabled"); - }else{ - $(".httpReqCfg").addClass("hidden").addClass("disabled"); - $(".httpResCfg").removeClass("hidden").removeClass( - "disabled"); - } - - }); $("#cfgFrom").validate( { errorPlacement : function(error, element) { @@ -64,7 +48,7 @@ $(".disabled").each(function(){ $(this).remove(); }); - + $("input[name$='exprType']").attr("disabled",false); form.submit(); }, errorContainer : "#messageBox", @@ -186,7 +170,7 @@ -
+ @@ -219,14 +203,14 @@ -
+ -
+ diff --git a/src/main/webapp/static/global/css/jquery.tagsinput.css b/src/main/webapp/static/global/css/jquery.tagsinput.css new file mode 100644 index 000000000..1caf18b29 --- /dev/null +++ b/src/main/webapp/static/global/css/jquery.tagsinput.css @@ -0,0 +1,7 @@ +div.tagsinput { border:1px solid #CCC; background: #FFF; padding:5px; width:300px; height:100px; overflow-y: auto;} +div.tagsinput span.tag { border: 1px solid #a5d24a; -moz-border-radius:2px; -webkit-border-radius:2px; display: block; float: left; padding: 5px; text-decoration:none; background: #cde69c; color: #638421; margin-right: 5px; margin-bottom:5px;font-family: helvetica; font-size:13px;} +div.tagsinput span.tag a { font-weight: bold; color: #82ad2b; text-decoration:none; font-size: 11px; } +div.tagsinput input { width:100px; margin:0px; font-family: helvetica; font-size: 13px; border:1px solid transparent; padding:5px; background: transparent; color: #000; outline:0px; margin-right:5px; margin-bottom:5px; } +div.tagsinput div { display:block; float: left; } +.tags_clear { clear: both; width: 100%; height: 0px; } +.not_valid {background: #FBD8DB !important; color: #90111A !important;} diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 2f3000786..c52834c70 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -199,6 +199,54 @@ $(function(){ } }); areaControlInit(); + /*=====关键字与表达式处理 开始=====*/ + var tagsInputSettings="#tags"; + $("input[name$='cfgKeywords']").each(function(){ + var tagsId = $(this).attr("id"); + var objNamePrefix = $(this).attr("name").split(".cfgKeywords")[0]; + var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理 + if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){ + //表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中 + $("input:radio[name='"+objNamePrefix+".exprType']").attr("disabled",true); + tagsInputSettings = tagsInputSettings+",#"+tagsId; + } + + }); + $(tagsInputSettings).tagsInput({ + width:$(".form-control").width(), + defaultText:'please input keywords', + onAddTag:function(tag,size){ + //var keywordValue = ""; + var objNamePrefix = $(this).attr("name").split(".cfgKeywords")[0]; + /*$("span[class='tag']").each(function(){ + keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); + }); + $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ + exprTypeChecked(objNamePrefix,size); + }, + onRemoveTag:function(tag,size){ + //var keywordValue = ""; + var objNamePrefix = $(this).attr("name").split(".cfgKeywords")[0]; + /*$("span[class='tag']").each(function(){ + keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim(); + }); + $(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/ + exprTypeChecked(objNamePrefix,size); + } + }); + $(".tagsinput").popover({ + animation:true, + container:'body', + placement:'right', + html:true, + trigger:"hover", + title:"", + content:function(){ + var content = "可同时输入多条关键字，请以英文逗号或者回车键隔开。"; + return content; + } + }); + /*=====关键字与表达式处理 结束=====*/ }); var switchIpType=function(obj){ var type=$(obj).val(); @@ -484,4 +532,21 @@ function switchSubCfgTabInfo(flag,index){ $("i[name='tabFlag"+index+"']").removeClass("fa-angle-double-down"); $("i[id='"+flag+index+"']").addClass("fa-angle-double-down"); $("i[id='"+flag+index+"']").removeClass("fa-angle-double-up"); +} +function isLicit(str,regStr) {//判断是否为合格字符 //s 包括空格回车等特殊字符 + regStr = App.isEmpty(regStr)?"^[_0-9a-zA-Z\u4e00-\u9fa5\.@&]*$":regStr; + var re = new RegExp(regStr); + //var re = "^[_0-9a-zA-Z\.@]*$"; + return re.test(str); +} +function exprTypeChecked(objNamePrefix,size){ + if(size>1) { + $("input:radio[name='"+objNamePrefix+".exprType'][value=1]").prop("checked",true); //选中是 + }else { + $("input:radio[name='"+objNamePrefix+".exprType'][value=0]").prop("checked",true); //选中否 + } +} +function validateDataIsLicit(){ + var fdfz = $.trim($("#tags_1").val()).replace(/,/g,""); + return isLicit(fdfz); } \ No newline at end of file diff --git a/src/main/webapp/static/global/scripts/jquery.tagsinput.js b/src/main/webapp/static/global/scripts/jquery.tagsinput.js new file mode 100644 index 000000000..af3319997 --- /dev/null +++ b/src/main/webapp/static/global/scripts/jquery.tagsinput.js @@ -0,0 +1,360 @@ +/* + + jQuery Tags Input Plugin 1.3.3 + + Copyright (c) 2011 XOXCO, Inc + + Documentation for this plugin lives here: + http://xoxco.com/clickable/jquery-tags-input + + Licensed under the MIT license: + http://www.opensource.org/licenses/mit-license.php + + ben@xoxco.com + +*/ + +(function($) { + + var delimiter = new Array(); + var tags_callbacks = new Array(); + $.fn.doAutosize = function(o){ + var minWidth = $(this).data('minwidth'), + maxWidth = $(this).data('maxwidth'), + val = '', + input = $(this), + testSubject = $('#'+$(this).data('tester_id')); + + if (val === (val = input.val())) {return;} + + // Enter new content into testSubject + var escaped = val.replace(/&/g, '&').replace(/\s/g,' ').replace(//g, '>'); + testSubject.html(escaped); + // Calculate new width + whether to change + var testerWidth = testSubject.width(), + newWidth = (testerWidth + o.comfortZone) >= minWidth ? testerWidth + o.comfortZone : minWidth, + currentWidth = input.width(), + isValidWidthChange = (newWidth < currentWidth && newWidth >= minWidth) + || (newWidth > minWidth && newWidth < maxWidth); + + // Animate width + if (isValidWidthChange) { + input.width(newWidth); + } + + + }; + $.fn.resetAutosize = function(options){ + // alert(JSON.stringify(options)); + var minWidth = $(this).data('minwidth') || options.minInputWidth || $(this).width(), + maxWidth = $(this).data('maxwidth') || options.maxInputWidth || ($(this).closest('.tagsinput').width() - options.inputPadding), + val = '', + input = $(this), + testSubject = $('').css({ + position: 'absolute', + top: -9999, + left: -9999, + width: 'auto', + fontSize: input.css('fontSize'), + fontFamily: input.css('fontFamily'), + fontWeight: input.css('fontWeight'), + letterSpacing: input.css('letterSpacing'), + whiteSpace: 'nowrap' + }), + testerId = $(this).attr('id')+'_autosize_tester'; + if(! $('#'+testerId).length > 0){ + testSubject.attr('id', testerId); + testSubject.appendTo('body'); + } + + input.data('minwidth', minWidth); + input.data('maxwidth', maxWidth); + input.data('tester_id', testerId); + input.css('width', minWidth); + }; + + $.fn.addTag = function(value,options) { + options = jQuery.extend({focus:false,callback:true},options); + this.each(function() { + var id = $(this).attr('id'); + var tagslist = $(this).val().split(delimiter[id]); + if (tagslist[0] == '') { + tagslist = new Array(); + } + + value = jQuery.trim(value); + + if (options.unique) { + var skipTag = $(this).tagExist(value); + if(skipTag == true) { + //Marks fake input as not_valid to let styling it + $('#'+id+'_tag').addClass('not_valid'); + } + } else { + var skipTag = false; + } + + if (value !='' && skipTag != true) { + $('').addClass('tag').append( + $('').text(value).append('  '), + $('', { + href : '#', + title : 'Removing tag', + text : 'x' + }).click(function () { + return $('#' + id).removeTag(escape(value)); + }) + ).insertBefore('#' + id + '_addTag'); + + tagslist.push(value); + + $('#'+id+'_tag').val(''); + if (options.focus) { + $('#'+id+'_tag').focus(); + } else { + $('#'+id+'_tag').blur(); + } + + $.fn.tagsInput.updateTagsField(this,tagslist); + + if (options.callback && tags_callbacks[id] && tags_callbacks[id]['onAddTag']) { + var f = tags_callbacks[id]['onAddTag']; + var tag_size = $('#'+id+'_tagsinput .tag').length + f.call(this, value,tag_size); + } + if(tags_callbacks[id] && tags_callbacks[id]['onChange']) + { + var i = tagslist.length; + var f = tags_callbacks[id]['onChange']; + f.call(this, $(this), tagslist[i-1]); + } + } + + }); + + return false; + }; + + $.fn.removeTag = function(value) { + value = unescape(value); + this.each(function() { + var id = $(this).attr('id'); + + var old = $(this).val().split(delimiter[id]); + + $('#'+id+'_tagsinput .tag').remove(); + str = ''; + for (i=0; i< old.length; i++) { + if (old[i]!=value) { + str = str + delimiter[id] +old[i]; + } + } + + $.fn.tagsInput.importTags(this,str); + + if (tags_callbacks[id] && tags_callbacks[id]['onRemoveTag']) { + var f = tags_callbacks[id]['onRemoveTag']; + var tag_size = $('#'+id+'_tagsinput .tag').length + f.call(this, value,tag_size); + } + }); + + return false; + }; + + $.fn.tagExist = function(val) { + var id = $(this).attr('id'); + var tagslist = $(this).val().split(delimiter[id]); + return (jQuery.inArray(val, tagslist) >= 0); //true when tag exists, false when not + }; + + // clear all existing tags and import new ones from a string + $.fn.importTags = function(str) { + id = $(this).attr('id'); + $('#'+id+'_tagsinput .tag').remove(); + $.fn.tagsInput.importTags(this,str); + } + + $.fn.tagsInput = function(options) { + var settings = jQuery.extend({ + interactive:true, + defaultText:'add a tag', + minChars:0, + width:'300px', + height:'100px', + autocomplete: {selectFirst: false }, + 'hide':true, + 'delimiter':',', + 'unique':true, + removeWithBackspace:true, + placeholderColor:'#666666', + autosize: true, + comfortZone: 20, + inputPadding: 6*2 + },options); + + this.each(function() { + if (settings.hide) { + $(this).hide(); + } + var id = $(this).attr('id'); + if (!id || delimiter[$(this).attr('id')]) { + id = $(this).attr('id', 'tags' + new Date().getTime()).attr('id'); + } + + var data = jQuery.extend({ + pid:id, + real_input: '#'+id, + holder: '#'+id+'_tagsinput', + input_wrapper: '#'+id+'_addTag', + fake_input: '#'+id+'_tag' + },settings); + + delimiter[id] = data.delimiter; + + if (settings.onAddTag || settings.onRemoveTag || settings.onChange) { + tags_callbacks[id] = new Array(); + tags_callbacks[id]['onAddTag'] = settings.onAddTag; + tags_callbacks[id]['onRemoveTag'] = settings.onRemoveTag; + tags_callbacks[id]['onChange'] = settings.onChange; + } + + var markup = '
'; + + if (settings.interactive) { + + markup = markup + ''; + } + + markup = markup + '
'; + + $(markup).insertAfter(this); + + $(data.holder).css('width',settings.width); + $(data.holder).css('min-height',settings.height); + $(data.holder).css('height','100%'); + + if ($(data.real_input).val()!='') { + $.fn.tagsInput.importTags($(data.real_input),$(data.real_input).val()); + } + if (settings.interactive) { + $(data.fake_input).val($(data.fake_input).attr('data-default')); + $(data.fake_input).css('color',settings.placeholderColor); + $(data.fake_input).resetAutosize(settings); + + $(data.holder).bind('click',data,function(event) { + $(event.data.fake_input).focus(); + }); + + $(data.fake_input).bind('focus',data,function(event) { + if ($(event.data.fake_input).val()==$(event.data.fake_input).attr('data-default')) { + $(event.data.fake_input).val(''); + } + $(event.data.fake_input).css('color','#000000'); + }); + + if (settings.autocomplete_url != undefined) { + autocomplete_options = {source: settings.autocomplete_url}; + for (attrname in settings.autocomplete) { + autocomplete_options[attrname] = settings.autocomplete[attrname]; + } + + if (jQuery.Autocompleter !== undefined) { + $(data.fake_input).autocomplete(settings.autocomplete_url, settings.autocomplete); + $(data.fake_input).bind('result',data,function(event,data,formatted) { + if (data) { + $('#'+id).addTag(data[0] + "",{focus:true,unique:(settings.unique)}); + } + }); + } else if (jQuery.ui.autocomplete !== undefined) { + $(data.fake_input).autocomplete(autocomplete_options); + $(data.fake_input).bind('autocompleteselect',data,function(event,ui) { + $(event.data.real_input).addTag(ui.item.value,{focus:true,unique:(settings.unique)}); + return false; + }); + } + + + } else { + // if a user tabs out of the field, create a new tag + // this is only available if autocomplete is not used. + $(data.fake_input).bind('blur',data,function(event) { + var d = $(this).attr('data-default'); + if ($(event.data.fake_input).val()!='' && $(event.data.fake_input).val()!=d) { + if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) ) + $(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)}); + } else { + $(event.data.fake_input).val($(event.data.fake_input).attr('data-default')); + $(event.data.fake_input).css('color',settings.placeholderColor); + } + return false; + }); + + } + + // if user types a comma, create a new tag + $(data.fake_input).bind('keypress',data,function(event) { + + //if (event.which==event.data.delimiter.charCodeAt(0) || event.which==38 || event.which==13) { + //38Ϊ& + if (event.which==event.data.delimiter.charCodeAt(0)||event.which==13) { + event.preventDefault(); + if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) ) + $(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)}); + $(event.data.fake_input).resetAutosize(settings); + return false; + }else if (event.data.autosize) { + $(event.data.fake_input).doAutosize(settings); + + } + }); + //Delete last tag on backspace + data.removeWithBackspace && $(data.fake_input).bind('keydown', function(event) + { + if(event.keyCode == 8 && $(this).val() == '') + { + event.preventDefault(); + var last_tag = $(this).closest('.tagsinput').find('.tag:last').text(); + var id = $(this).attr('id').replace(/_tag$/, ''); + last_tag = last_tag.replace(/[\s]+x$/, ''); + $('#' + id).removeTag(escape(last_tag)); + $(this).trigger('focus'); + } + }); + $(data.fake_input).blur(); + + //Removes the not_valid class when user changes the value of the fake input + if(data.unique) { + $(data.fake_input).keydown(function(event){ + if(event.keyCode == 8 || String.fromCharCode(event.which).match(/\w+|[áéíóúÁÉÍÓÚñÑ,\/]+/)) { + $(this).removeClass('not_valid'); + } + }); + } + } // if settings.interactive + }); + + return this; + + }; + + $.fn.tagsInput.updateTagsField = function(obj,tagslist) { + var id = $(obj).attr('id'); + $(obj).val(tagslist.join(delimiter[id])); + }; + + $.fn.tagsInput.importTags = function(obj,val) { + $(obj).val(''); + var id = $(obj).attr('id'); + var tags = val.split(delimiter[id]); + for (i=0; i