From 625342689b49670174ae504fcf36e60f38764e55 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 18 Aug 2021 13:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E9=80=89=E6=8B=A9=E5=99=A8popup=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../colorpicker/editor.colorpicker.hex.js     | 121 +++++++++---------
 1 file changed, 63 insertions(+), 58 deletions(-)

diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
index f20cc58a3..274bfd186 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
@@ -120,67 +120,72 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
                             lgap: 10,
                         }]
                     }, {
-                        type: "bi.vertical_adapt",
-                        rgap: 5,
-                        items: [{
-                            el: {
-                                type: "bi.layout",
-                                cls: "color-picker-editor-display bi-card bi-border",
-                                height: 16,
-                                width: 16,
-                                ref: function (_ref) {
-                                    self.colorShow = _ref;
-                                }
-                            },
-                            width: 16
-                        }, {
-                            type: "bi.label",
-                            text: "#",
-                            width: 10
-                        }, {
-                            type: "bi.small_text_editor",
-                            ref: function (_ref) {
-                                self.hexEditor = _ref;
-                            },
-                            cls: "color-picker-editor-input",
-                            validationChecker: this._hexChecker,
-                            allowBlank: true,
-                            errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"),
-                            width: c.HEX_WIDTH,
-                            height: 20,
-                            listeners: [{
-                                eventName: "EVENT_CHANGE",
-                                action: function () {
-                                    self._checkHexEditor();
-                                    if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) {
-                                        self.colorShow.element.css("background-color", self.getValue());
-                                        self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
+                        el: {
+                            type: "bi.vertical_adapt",
+                            columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
+
+                            rgap: 5,
+                            items: [{
+                                el: {
+                                    type: "bi.layout",
+                                    cls: "color-picker-editor-display bi-card bi-border",
+                                    height: 16,
+                                    width: 16,
+                                    ref: function (_ref) {
+                                        self.colorShow = _ref;
                                     }
+                                },
+                                width: 16
+                            }, {
+                                type: "bi.label",
+                                text: "#",
+                                width: 10
+                            }, {
+                                type: "bi.small_text_editor",
+                                ref: function (_ref) {
+                                    self.hexEditor = _ref;
+                                },
+                                cls: "color-picker-editor-input",
+                                validationChecker: this._hexChecker,
+                                allowBlank: true,
+                                errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"),
+                                width: c.HEX_WIDTH,
+                                height: 20,
+                                listeners: [{
+                                    eventName: "EVENT_CHANGE",
+                                    action: function () {
+                                        self._checkHexEditor();
+                                        if (checker(self.storeValue.r) && checker(self.storeValue.g) && checker(self.storeValue.b)) {
+                                            self.colorShow.element.css("background-color", self.getValue());
+                                            self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
+                                        }
 
-                                }
+                                    }
+                                }]
+                            }, RGB[0], {
+                                el: BI.extend(Ws[0], {
+                                    ref: function (_ref) {
+                                        self.R = _ref
+                                    }
+                                }),
+                                width: c.RGB_WIDTH
+                            }, RGB[1], {
+                                el: BI.extend(Ws[1], {
+                                    ref: function (_ref) {
+                                        self.G = _ref
+                                    }
+                                }),
+                                width: c.RGB_WIDTH
+                            }, RGB[2], {
+                                el: BI.extend(Ws[2], {
+                                    ref: function (_ref) {
+                                        self.B = _ref
+                                    }
+                                }),
+                                rgap: -5,
+                                width: c.RGB_WIDTH
                             }]
-                        }, RGB[0], {
-                            el: BI.extend(Ws[0], {
-                                ref: function (_ref) {
-                                    self.R = _ref
-                                }
-                            }),
-                            width: c.RGB_WIDTH
-                        }, RGB[1], {
-                            el: BI.extend(Ws[1], {
-                                ref: function (_ref) {
-                                    self.G = _ref
-                                }
-                            }),
-                            width: c.RGB_WIDTH
-                        }, RGB[2], {
-                            el: BI.extend(Ws[2], {
-                                ref: function (_ref) {
-                                    self.B = _ref
-                                }
-                            }),
-                            width: c.RGB_WIDTH
-                        }]
+                        }
                     }]
                 },
                 left: 0,