diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 87b76d096..de5268da0 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -388,9 +388,6 @@ ul.plug-file-upload-view-file li {
/**
* 颜色选择插件
*/
-#colorpanel {
- z-index: 10000;
-}
button.colorpicker-submit:hover, button.colorpicker-submit:active, button.colorpicker-submit:focus {
background-color: #fff;
}
diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js
index 580e771f2..d641004a8 100755
--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -2555,35 +2555,39 @@ $(function()
// 颜色选择器
if($('.colorpicker-submit').length > 0)
{
- $('.colorpicker-submit').colorpicker(
- {
- fillcolor:true,
- success:function(o, color)
- {
- var style_arr = (o.context.dataset.colorStyle || 'color').split('|');
- var style_value = {};
- for(var i in style_arr)
- {
- style_value[style_arr[i]] = color;
- }
- $(o.context.dataset.inputTag).css(style_value);
- $(o.context.dataset.colorTag).val(color);
- $(o.context.dataset.colorTag).trigger('change');
- },
- reset:function(o)
- {
- var color = '';
- var style_arr = (o.context.dataset.colorStyle || 'color').split('|');
- var style_value = {};
- for(var i in style_arr)
- {
- style_value[style_arr[i]] = color;
- }
- $(o.context.dataset.inputTag).css(style_value);
- $(o.context.dataset.colorTag).val(color);
- $(o.context.dataset.colorTag).trigger('change');
- }
- });
+ $('.colorpicker-submit').each(function(k, v)
+ {
+ $(this).colorpicker(
+ {
+ target: $(this),
+ fillcolor: true,
+ success: function(o, color)
+ {
+ var style_arr = (o.context.dataset.colorStyle || 'color').split('|');
+ var style_value = {};
+ for(var i in style_arr)
+ {
+ style_value[style_arr[i]] = color;
+ }
+ $(o.context.dataset.inputTag).css(style_value);
+ $(o.context.dataset.colorTag).val(color);
+ $(o.context.dataset.colorTag).trigger('change');
+ },
+ reset: function(o)
+ {
+ var color = '';
+ var style_arr = (o.context.dataset.colorStyle || 'color').split('|');
+ var style_value = {};
+ for(var i in style_arr)
+ {
+ style_value[style_arr[i]] = color;
+ }
+ $(o.context.dataset.inputTag).css(style_value);
+ $(o.context.dataset.colorTag).val(color);
+ $(o.context.dataset.colorTag).trigger('change');
+ }
+ });
+ });
}
diff --git a/public/static/common/lib/colorpicker/jquery.colorpicker.js b/public/static/common/lib/colorpicker/jquery.colorpicker.js
index cd2be263c..5cc648636 100755
--- a/public/static/common/lib/colorpicker/jquery.colorpicker.js
+++ b/public/static/common/lib/colorpicker/jquery.colorpicker.js
@@ -11,6 +11,7 @@
var SpColorHex=new Array('FF0000','00FF00','0000FF','FFFF00','00FFFF','FF00FF');
$.fn.colorpicker = function(options) {
var opts = jQuery.extend({}, jQuery.fn.colorpicker.defaults, options);
+ var index = parseInt(Math.random()*1000001);
initColor();
return this.each(function(){
var obj = $(this);
@@ -26,45 +27,46 @@
var ttop = $(this).offset().top; //控件的定位点高
var thei = $(this).outerHeight(); //控件本身的高
var tleft = $(this).offset().left+$(this).outerWidth()-232; //控件的定位点宽
- $("#colorpanel").css({
+ $('#colorpanel'+index).css({
"top":ttop+thei+top_inc-top_dec,
"left":tleft+left_inc-left_dec,
"position":position
}).show();
var target = opts.target ? $(opts.target) : obj;
- if(target.data("color") == null){
- target.data("color",target.css("color"));
+ if(target.data('color') == null){
+ target.data('color',target.css('color'));
}
- if(target.data("value") == null){
- target.data("value",target.val());
+ if(target.data('value') == null){
+ target.data('value',target.val());
}
- $("#_creset").bind("click",function(){
- target.css("color", target.data("color")).val(target.data("value"));
- $("#colorpanel").hide();
+ $('#_creset'+index).bind('click',function(){
+ target.css('color', target.data('color')).val(target.data('value'));
+ $('#colorpanel'+index).hide();
opts.reset(obj);
});
- $("#_determine").bind("click",function(){
- var color = $("#HexColor").val();
- target.css("color", color);
- $("#colorpanel").hide();
+ $('#_determine'+index).bind('click',function(){
+ var color = $('#HexColor'+index).val();
+ target.css('color', color);
+ $('#colorpanel'+index).hide();
opts.success(obj,color);
}).css({
"padding-left":"8px"
});
- $("#CT tr td").unbind("click").mouseover(function(){
+ $('#CT'+index+' tr td').unbind('click').mouseover(function(){
var color=$(this).css("background-color");
- $("#DisColor").css("background",color);
- $("#HexColor").val($(this).attr("rel"));
+ $('#DisColor'+index).css("background",color);
+ $('#HexColor'+index).val($(this).attr("rel"));
}).click(function(){
var color=$(this).attr("rel");
color = opts.ishex ? color : getRGBColor(color);
if(opts.fillcolor) target.val(color);
- target.css("color",color);
- $("#colorpanel").hide();
- $("#_creset").unbind("click");
+ target.css('color',color);
+ $('#colorpanel'+index).hide();
+ $('#_creset'+index).unbind('click');
+ $('#_determine'+index).unbind('click');
opts.success(obj,color);
});
@@ -72,7 +74,7 @@
});
function initColor(){
- $("body").append('
');
+ $('body').append('');
var colorTable = '';
var colorValue = '';
for(i=0;i<2;i++){
@@ -93,13 +95,15 @@
colorTable=''
- +''
+ +'';
- $("#colorpanel").html(colorTable);
- $("#_cclose").on('click',function(){
- $("#colorpanel").hide();
+ $('#colorpanel'+index).html(colorTable);
+ $('#_cclose'+index).on('click',function(){
+ $('#colorpanel'+index).hide();
+ $('#_creset'+index).unbind('click');
+ $('#_determine'+index).unbind('click');
return false;
});
}