From 0d504c9313b621066438e275e3ee80c0ffcdd7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Fri, 29 Jul 2022 10:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20colorpicker=20=E7=9A=84?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=83=E7=B4=A0=E4=B8=8A=E7=9A=84=20lay-op?=
 =?UTF-8?q?tions=20=E5=B1=9E=E6=80=A7=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/colorpicker.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/colorpicker.js b/src/modules/colorpicker.js
index 24231101..887be098 100644
--- a/src/modules/colorpicker.js
+++ b/src/modules/colorpicker.js
@@ -175,6 +175,9 @@ layui.define(['jquery', 'lay'], function(exports){
       });
       return that;
     }
+
+    // 合并 lay-options 属性上的配置信息
+    that.config = $.extend(options, lay.options(elem[0]));
     
     //颜色选择框对象
     var elemColorBox = $(['<div class="layui-unselect layui-colorpicker">'