From f81feff31ec48681c71a3248134359e1ec68b654 Mon Sep 17 00:00:00 2001
From: windy <taiyangstorm@gmail.com>
Date: Tue, 18 Oct 2022 17:08:03 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=8D=95?=
=?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E5=80=BC0=E9=80=89=E4=B8=ADtrigger?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/widget/singleselect/trigger/searcher.singleselect.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/widget/singleselect/trigger/searcher.singleselect.js b/src/widget/singleselect/trigger/searcher.singleselect.js
index a5674b8f1..3ba7c78e4 100644
--- a/src/widget/singleselect/trigger/searcher.singleselect.js
+++ b/src/widget/singleselect/trigger/searcher.singleselect.js
@@ -128,7 +128,7 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
if (BI.isUndefined(v)) {
this.editor.setState(BI.Selection.None);
} else {
- v = v || "";
+ v = BI.isNull(v) ? "" : v;
this.editor.setState(o.valueFormatter(v + "") || (v + ""));
}
},
From accde7ee707d0ee1b8ed1bf3f4125a94a2b83005 Mon Sep 17 00:00:00 2001
From: windy <taiyangstorm@gmail.com>
Date: Thu, 27 Oct 2022 17:15:11 +0800
Subject: [PATCH 2/7] =?UTF-8?q?BI-116192=20=E5=8A=A8=E6=80=81=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E4=B8=8D=E5=8F=AF=E8=A7=81=E7=8A=B6=E6=80=81=E4=B8=8B?=
=?UTF-8?q?resize=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/core/platform/web/detectElementResize.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/platform/web/detectElementResize.js b/src/core/platform/web/detectElementResize.js
index 357e938a7..3183a57c4 100644
--- a/src/core/platform/web/detectElementResize.js
+++ b/src/core/platform/web/detectElementResize.js
@@ -553,7 +553,7 @@ var ResizeObserver = window.ResizeObserver || ResizeObserverPolyfill.ResizeObser
if (!element.__resizeObserver__) {
var resizeObserver = new ResizeObserver(function () {
element.__resizeListeners__.forEach(function (listener) {
- listener();
+ BI.$(element).is(":visible") && listener();
});
});
resizeObserver.observe(element);
From 19053e204d025700437d4b14b9c45f5c34f2717d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 28 Oct 2022 14:35:12 +0800
Subject: [PATCH 3/7] auto upgrade version to 2.0.20221028143506
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 012eb232f..9c559b39c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20221027174605",
+ "version": "2.0.20221028143506",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",
From f873cb43c286d0c24080583e2e7839de5f99f07d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 28 Oct 2022 14:56:02 +0800
Subject: [PATCH 4/7] auto upgrade version to 2.0.20221028145548
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9c559b39c..4ba289f11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20221028143506",
+ "version": "2.0.20221028145548",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",
From 868c0d1a4087bc3dd675e1d490324b2175964264 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 28 Oct 2022 18:38:53 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0instruction?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/base/single/instruction/instruction.js | 75 ++++++++++++++++++++++
src/less/base/single/instruction.less | 31 +++++++++
src/less/base/single/tip/tip.bubble.less | 10 +--
3 files changed, 112 insertions(+), 4 deletions(-)
create mode 100644 src/base/single/instruction/instruction.js
create mode 100644 src/less/base/single/instruction.less
diff --git a/src/base/single/instruction/instruction.js b/src/base/single/instruction/instruction.js
new file mode 100644
index 000000000..f5db6bb09
--- /dev/null
+++ b/src/base/single/instruction/instruction.js
@@ -0,0 +1,75 @@
+BI.Instruction = BI.inherit(BI.Widget, {
+ _defaultConfig: function () {
+ var conf = BI.Link.superclass._defaultConfig.apply(this, arguments);
+ return BI.extend(conf, {
+ baseCls: (conf.baseCls || "") + " bi-instruction",
+ height: 20,
+ level: "error",
+ textAlign: "left",
+ whiteSpace: "nowrap"
+ });
+ },
+
+ render: function () {
+ var self = this, o = this.options;
+
+ return {
+ type: "bi.label",
+ ref: function (_ref) {
+ self.text = _ref;
+ },
+ cls: "instruction-" + o.level,
+ textAlign: o.textAlign,
+ whiteSpace: o.whiteSpace,
+ textHeight: o.height,
+ height: o.height,
+ hgap: o.hgap,
+ rgap: o.rgap,
+ lgap: o.lgap,
+ vgap: o.vgap,
+ text: o.text,
+ keyword: o.keyword,
+ value: o.value,
+ py: o.py
+ };
+ },
+
+ doRedMark: function () {
+ this.text.doRedMark.apply(this.text, arguments);
+ },
+
+ unRedMark: function () {
+ this.text.unRedMark.apply(this.text, arguments);
+ },
+
+ doHighLight: function () {
+ this.text.doHighLight.apply(this.text, arguments);
+ },
+
+ unHighLight: function () {
+ this.text.unHighLight.apply(this.text, arguments);
+ },
+
+ setText: function (v) {
+ this.options.text = v;
+ this.text.setText(v);
+ },
+
+ getText: function () {
+ return this.options.text;
+ },
+
+ setStyle: function (css) {
+ this.text.setStyle(css);
+ },
+
+ setValue: function (v) {
+ this.text.setValue(v);
+ },
+
+ getValue: function () {
+ this.text.getValue();
+ }
+});
+
+BI.shortcut("bi.instruction", BI.Instruction);
diff --git a/src/less/base/single/instruction.less b/src/less/base/single/instruction.less
new file mode 100644
index 000000000..51b9b0af4
--- /dev/null
+++ b/src/less/base/single/instruction.less
@@ -0,0 +1,31 @@
+@import "../../index.less";
+
+.bi-instruction {
+ .border-radius(2px);
+
+ &.instruction-error{
+ background: @color-bi-background-bubble-error;
+ color: @color-bi-text-failure;
+ }
+
+ &.instruction-common{
+ background: @color-bi-background-bubble-normal;
+ color: @color-bi-text-highlight;
+ }
+
+ &.instruction-success{
+ background: @color-bi-background-bubble-success;
+ color: @color-bi-text-success;
+ }
+
+ &.instruction-warning{
+ background: @color-bi-background-bubble-warning;
+ color: @color-bi-text-redmark;
+ }
+}
+
+.bi-theme-dark {
+ .bi-instruction.instruction-error {
+ background: @color-bi-background-bubble-error-theme-dark;
+ }
+}
diff --git a/src/less/base/single/tip/tip.bubble.less b/src/less/base/single/tip/tip.bubble.less
index e18e3ffc9..eb151aec4 100644
--- a/src/less/base/single/tip/tip.bubble.less
+++ b/src/less/base/single/tip/tip.bubble.less
@@ -9,10 +9,6 @@
color: @color-bi-text-failure;
}
- .bi-theme-dark &.bubble-error {
- background: @color-bi-background-bubble-error-theme-dark;
- }
-
&.bubble-common{
background: @color-bi-background-bubble-normal;
color: @color-bi-text-highlight;
@@ -28,3 +24,9 @@
color: @color-bi-text-redmark;
}
}
+
+.bi-theme-dark {
+ .bi-bubble.bubble-error {
+ background: @color-bi-background-bubble-error-theme-dark;
+ }
+}
From bf472bb8cb6fec3470ad3228c89fbad3b3bfea9a Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 28 Oct 2022 18:48:47 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0instruction?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/base/single/instruction/instruction.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/base/single/instruction/instruction.js b/src/base/single/instruction/instruction.js
index f5db6bb09..71a61a6f3 100644
--- a/src/base/single/instruction/instruction.js
+++ b/src/base/single/instruction/instruction.js
@@ -6,7 +6,8 @@ BI.Instruction = BI.inherit(BI.Widget, {
height: 20,
level: "error",
textAlign: "left",
- whiteSpace: "nowrap"
+ whiteSpace: "nowrap",
+ hgap: 5
});
},
From 79a96d9f65e05d8269540ea2145a5124b1b8787d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 28 Oct 2022 19:16:22 +0800
Subject: [PATCH 7/7] auto upgrade version to 2.0.20221028191610
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 4ba289f11..b8425b4ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20221028145548",
+ "version": "2.0.20221028191610",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",