floraachy/layui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1105 from layui/2.x

Browse Source 
优化 colorpicker 属性 lay-options 合并细节
This commit is contained in:
贤心 2022-07-29 11:16:02 +08:00 committed by GitHub
commit cbe4a03ac3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/layui.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/modules/colorpicker.js
View File

@ -177,7 +177,7 @@ layui.define(['jquery', 'lay'], function(exports){
} }
// 合并 lay-options 属性上的配置信息 // 合并 lay-options 属性上的配置信息
that.config = $.extend(options, lay.options(elem[0])); $.extend(options, lay.options(elem[0]));
//颜色选择框对象 //颜色选择框对象
var elemColorBox = $(['<div class="layui-unselect layui-colorpicker">' var elemColorBox = $(['<div class="layui-unselect layui-colorpicker">'