Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
飞鱼0526
ShopXO
提交
d63e5e93
ShopXO
项目概览
飞鱼0526
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d63e5e93
编写于
6月 10, 2021
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
颜色组件优化
上级
def95a35
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
62 addition
and
57 deletion
+62
-57
public/static/common/css/common.css
public/static/common/css/common.css
+0
-3
public/static/common/js/common.js
public/static/common/js/common.js
+33
-29
public/static/common/lib/colorpicker/jquery.colorpicker.js
public/static/common/lib/colorpicker/jquery.colorpicker.js
+29
-25
未找到文件。
public/static/common/css/common.css
浏览文件 @
d63e5e93
...
...
@@ -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
;
}
...
...
public/static/common/js/common.js
浏览文件 @
d63e5e93
...
...
@@ -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
'
);
}
});
});
}
...
...
public/static/common/lib/colorpicker/jquery.colorpicker.js
浏览文件 @
d63e5e93
...
...
@@ -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
(
'
<div id="colorpanel" style="position: absolute; display: none
;"></div>
'
);
$
(
'
body
'
).
append
(
'
<div id="colorpanel
'
+
index
+
'
" style="position: absolute; display: none;z-index:10000
;"></div>
'
);
var
colorTable
=
''
;
var
colorValue
=
''
;
for
(
i
=
0
;
i
<
2
;
i
++
){
...
...
@@ -93,13 +95,15 @@
colorTable
=
'
<table width=232 border="0" cellspacing="0" cellpadding="0" style="border:1px solid #333;height: 24px;line-height: 21px;">
'
+
'
<tr><td colspan=21 bgcolor=#cccccc>
'
+
'
<table cellpadding="0" cellspacing="1" border="0" style="border-collapse: collapse">
'
+
'
<tr><td width="3"><td><input type="text" id="DisColor" size="3" disabled style="border:solid 1px #000000;background-color:#000000;padding:0;"></td>
'
+
'
<td width="3"><td><input type="text" id="HexColor
" style="border:inset 1px;font-family:Arial;width:58px;" value="#000000"><a href="javascript:void(0);" id="_determine">确定</a> | <a href="javascript:void(0);" id="_cclose">关闭</a> | <a href="javascript:void(0);" id="_creset
">清除</a></td></tr></table></td></table>
'
+
'
<table id="CT" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;border-color:#333;border-width:0 1px 1px 1px;border-style:solid;">
'
+
'
<tr><td width="3"><td><input type="text" id="DisColor
'
+
index
+
'
" size="3" disabled style="border:solid 1px #000000;background-color:#000000;padding:0;"></td>
'
+
'
<td width="3"><td><input type="text" id="HexColor
'
+
index
+
'
" style="border:inset 1px;font-family:Arial;width:58px;" value="#000000"><a href="javascript:void(0);" id="_determine
'
+
index
+
'
">确定</a> | <a href="javascript:void(0);" id="_cclose
'
+
index
+
'
">关闭</a> | <a href="javascript:void(0);" id="_creset
'
+
index
+
'
">清除</a></td></tr></table></td></table>
'
+
'
<table id="CT
'
+
index
+
'
" border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse;border-color:#333;border-width:0 1px 1px 1px;border-style:solid;">
'
+
colorTable
+
'
</table>
'
;
$
(
"
#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
;
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录