From 83ac5daeca888026de02a5ea441c9cf3f99d0757 Mon Sep 17 00:00:00 2001
From: Tangjinxia <1119518763@qq.com>
Date: Fri, 16 Apr 2021 16:48:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-7499=20refactor:=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../button/listitem/blankicontextitem.ts      | 20 +++++++++++++++++++
 .../colorchooser/colorchooser.popup.hex.ts    | 13 ++++++++++++
 typescript/index.ts                           |  6 ++++++
 3 files changed, 39 insertions(+)
 create mode 100644 typescript/base/single/button/listitem/blankicontextitem.ts
 create mode 100644 typescript/case/colorchooser/colorchooser.popup.hex.ts

diff --git a/typescript/base/single/button/listitem/blankicontextitem.ts b/typescript/base/single/button/listitem/blankicontextitem.ts
new file mode 100644
index 000000000..9f56ef513
--- /dev/null
+++ b/typescript/base/single/button/listitem/blankicontextitem.ts
@@ -0,0 +1,20 @@
+import { BasicButton } from "../button.basic";
+
+export declare class BlankIconTextItem extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    doClick(): void;
+
+    setValue(): void;
+
+    getValue(): string;
+
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+
+    doHighLight(...args: any[]): void;
+
+    unHighLight(...args: any[]): void;
+}
diff --git a/typescript/case/colorchooser/colorchooser.popup.hex.ts b/typescript/case/colorchooser/colorchooser.popup.hex.ts
new file mode 100644
index 000000000..20211bf0a
--- /dev/null
+++ b/typescript/case/colorchooser/colorchooser.popup.hex.ts
@@ -0,0 +1,13 @@
+import { Widget } from '../../core/widget';
+
+export declare class HexColorChooserPopup extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALUE_CHANGE: string;
+
+    setStoreColors(v: string): void;
+
+    setValue(v: string): void;
+
+    getValue(): string;
+}
diff --git a/typescript/index.ts b/typescript/index.ts
index 454beb3f8..3afa9c0cc 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -156,6 +156,8 @@ import { History, Router } from "./router/router";
 import { DateTimeCombo } from './widget/datetime/datetime.combo';
 import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizontal";
 import { AdaptiveLayout } from "./core/wrapper/layout/layout.adaptive";
+import { HexColorChooserPopup } from './case/colorchooser/colorchooser.popup.hex';
+import { BlankIconTextItem } from './base/single/button/listitem/blankicontextitem';
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -318,6 +320,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DateTimeCombo: typeof DateTimeCombo;
     FloatHorizontalLayout: typeof FloatHorizontalLayout;
     AdaptiveLayout: typeof AdaptiveLayout;
+    HexColorChooserPopup: typeof HexColorChooserPopup;
+    BlankIconTextItem: typeof BlankIconTextItem;
 }
 
 export default {
@@ -482,4 +486,6 @@ export {
     DateTimeCombo,
     FloatHorizontalLayout,
     AdaptiveLayout,
+    HexColorChooserPopup,
+    BlankIconTextItem,
 };

From 736af3ce68769b2f971f621a50ba57efb915faf5 Mon Sep 17 00:00:00 2001
From: Tangjinxia <1119518763@qq.com>
Date: Fri, 16 Apr 2021 17:15:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BI-81668=20fix:=E8=A1=A5=E5=85=85=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=A4=9A=E9=80=89=E4=B8=8E=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E9=AB=98=E5=BA=A6=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/singleselect/singleselect.insert.combo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js
index 819859d10..b2d86d913 100644
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@@ -29,7 +29,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.single_select_trigger",
-            height: o.height,
+            height: o.height - 2,
             allowNoSelect: o.allowNoSelect,
             allowEdit: o.allowEdit,
             // adapter: this.popup,