From 6a0b77a6eb83ccf7b89874b9f4f7309cec0a4f8d Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 2 Dec 2020 09:55:07 +0800
Subject: [PATCH] =?UTF-8?q?BI-77323=20fix:=20=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=80=8F=E6=98=8E=E7=84=B6=E5=90=8E=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BB=80=E4=B9=88=E9=83=BD=E4=B8=8D=E5=81=9A?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=80=89=E4=B8=AD=E4=BA=86=E8=87=AA=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                    | 1 +
 src/case/colorchooser/colorchooser.popup.hex.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index b91d3fb21e..2e1fac6dda 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-12)
+- 修复了colorChooser选择透明后, 打开更多选色面板, 直接点保存会选中自动的问题
 - bi.file支持限制上传文件数
 
 2.0(2020-11)
diff --git a/src/case/colorchooser/colorchooser.popup.hex.js b/src/case/colorchooser/colorchooser.popup.hex.js
index cd665ba8c3..91175357b4 100644
--- a/src/case/colorchooser/colorchooser.popup.hex.js
+++ b/src/case/colorchooser/colorchooser.popup.hex.js
@@ -130,8 +130,12 @@ BI.HexColorChooserPopup = BI.inherit(BI.Widget, {
                                                 self.more.hideView();
                                                 break;
                                             case 1:
-                                                self.setValue(self.customColorChooser.getValue());
-                                                self._dealStoreColors();
+                                                var color = self.customColorChooser.getValue();
+                                                // farbtastic选择器没有透明和自动选项，点击保存不应该设置透明
+                                                if (BI.isNotEmptyString(color)) {
+                                                    self.setValue(color);
+                                                    self._dealStoreColors();
+                                                }
                                                 self.more.hideView();
                                                 self.fireEvent(BI.ColorChooserPopup.EVENT_CHANGE, arguments);
                                                 break;