diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_2.png b/dist/images/1x/icon/dark/tree_solid_collapse_2.png
index 1a12e9300..d9c33bada 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_collapse_2.png and b/dist/images/1x/icon/dark/tree_solid_collapse_2.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_3.png b/dist/images/1x/icon/dark/tree_solid_collapse_3.png
index 55970ae4f..a73232ffb 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_collapse_3.png and b/dist/images/1x/icon/dark/tree_solid_collapse_3.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_4.png b/dist/images/1x/icon/dark/tree_solid_collapse_4.png
index ca9934373..aeb12dd5a 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_collapse_4.png and b/dist/images/1x/icon/dark/tree_solid_collapse_4.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_5.png b/dist/images/1x/icon/dark/tree_solid_collapse_5.png
index 399b591c1..ea1e4a8d6 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_collapse_5.png and b/dist/images/1x/icon/dark/tree_solid_collapse_5.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_expand_2.png b/dist/images/1x/icon/dark/tree_solid_expand_2.png
index 97853cceb..fa29e6eb1 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_expand_2.png and b/dist/images/1x/icon/dark/tree_solid_expand_2.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_expand_3.png b/dist/images/1x/icon/dark/tree_solid_expand_3.png
index 962e23207..9513a4b82 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_expand_3.png and b/dist/images/1x/icon/dark/tree_solid_expand_3.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_expand_4.png b/dist/images/1x/icon/dark/tree_solid_expand_4.png
index af4d70c2c..6be667d7d 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_expand_4.png and b/dist/images/1x/icon/dark/tree_solid_expand_4.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_expand_5.png b/dist/images/1x/icon/dark/tree_solid_expand_5.png
index 2bece8ca7..66648d619 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_expand_5.png and b/dist/images/1x/icon/dark/tree_solid_expand_5.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png
index 14180a680..a64ab7e49 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png and b/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png
index a90c243dc..e43e151e7 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png and b/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png
index b5c3f8016..a7b4e4bf0 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png and b/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png differ
diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png
index 9f4d0b0f7..20d66af62 100644
Binary files a/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png and b/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png differ
diff --git a/dist/images/1x/icon/tree_solid_collapse_1.png b/dist/images/1x/icon/tree_solid_collapse_1.png
index 06e6d581d..a5e5dcf9c 100644
Binary files a/dist/images/1x/icon/tree_solid_collapse_1.png and b/dist/images/1x/icon/tree_solid_collapse_1.png differ
diff --git a/dist/images/1x/icon/tree_solid_collapse_2.png b/dist/images/1x/icon/tree_solid_collapse_2.png
index e14b70839..2acf7e7c4 100644
Binary files a/dist/images/1x/icon/tree_solid_collapse_2.png and b/dist/images/1x/icon/tree_solid_collapse_2.png differ
diff --git a/dist/images/1x/icon/tree_solid_collapse_3.png b/dist/images/1x/icon/tree_solid_collapse_3.png
index 1040b0b1d..5bd6fbe19 100644
Binary files a/dist/images/1x/icon/tree_solid_collapse_3.png and b/dist/images/1x/icon/tree_solid_collapse_3.png differ
diff --git a/dist/images/1x/icon/tree_solid_collapse_4.png b/dist/images/1x/icon/tree_solid_collapse_4.png
index f6155d017..b445df5d9 100644
Binary files a/dist/images/1x/icon/tree_solid_collapse_4.png and b/dist/images/1x/icon/tree_solid_collapse_4.png differ
diff --git a/dist/images/1x/icon/tree_solid_collapse_5.png b/dist/images/1x/icon/tree_solid_collapse_5.png
index 5d5f9c1a0..f69e7dfb7 100644
Binary files a/dist/images/1x/icon/tree_solid_collapse_5.png and b/dist/images/1x/icon/tree_solid_collapse_5.png differ
diff --git a/dist/images/1x/icon/tree_solid_expand_1.png b/dist/images/1x/icon/tree_solid_expand_1.png
index 3511c173d..0b28d5e7e 100644
Binary files a/dist/images/1x/icon/tree_solid_expand_1.png and b/dist/images/1x/icon/tree_solid_expand_1.png differ
diff --git a/dist/images/1x/icon/tree_solid_expand_2.png b/dist/images/1x/icon/tree_solid_expand_2.png
index ce166506f..e418819a2 100644
Binary files a/dist/images/1x/icon/tree_solid_expand_2.png and b/dist/images/1x/icon/tree_solid_expand_2.png differ
diff --git a/dist/images/1x/icon/tree_solid_expand_3.png b/dist/images/1x/icon/tree_solid_expand_3.png
index d12f28a4f..6759ade95 100644
Binary files a/dist/images/1x/icon/tree_solid_expand_3.png and b/dist/images/1x/icon/tree_solid_expand_3.png differ
diff --git a/dist/images/1x/icon/tree_solid_expand_4.png b/dist/images/1x/icon/tree_solid_expand_4.png
index 749e30ea0..b8357157d 100644
Binary files a/dist/images/1x/icon/tree_solid_expand_4.png and b/dist/images/1x/icon/tree_solid_expand_4.png differ
diff --git a/dist/images/1x/icon/tree_solid_expand_5.png b/dist/images/1x/icon/tree_solid_expand_5.png
index c4404c793..a4ed55589 100644
Binary files a/dist/images/1x/icon/tree_solid_expand_5.png and b/dist/images/1x/icon/tree_solid_expand_5.png differ
diff --git a/dist/images/1x/icon/tree_solid_vertical_line_1.png b/dist/images/1x/icon/tree_solid_vertical_line_1.png
index a6144fe08..b80a5808f 100644
Binary files a/dist/images/1x/icon/tree_solid_vertical_line_1.png and b/dist/images/1x/icon/tree_solid_vertical_line_1.png differ
diff --git a/dist/images/1x/icon/tree_solid_vertical_line_2.png b/dist/images/1x/icon/tree_solid_vertical_line_2.png
index 9e8cb49fd..894cfd153 100644
Binary files a/dist/images/1x/icon/tree_solid_vertical_line_2.png and b/dist/images/1x/icon/tree_solid_vertical_line_2.png differ
diff --git a/dist/images/1x/icon/tree_solid_vertical_line_3.png b/dist/images/1x/icon/tree_solid_vertical_line_3.png
index f2fa32311..8a6914b63 100644
Binary files a/dist/images/1x/icon/tree_solid_vertical_line_3.png and b/dist/images/1x/icon/tree_solid_vertical_line_3.png differ
diff --git a/dist/images/1x/icon/tree_solid_vertical_line_4.png b/dist/images/1x/icon/tree_solid_vertical_line_4.png
index 90249bf97..28d18d2a9 100644
Binary files a/dist/images/1x/icon/tree_solid_vertical_line_4.png and b/dist/images/1x/icon/tree_solid_vertical_line_4.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_2.png b/dist/images/2x/icon/dark/tree_solid_collapse_2.png
index f6ffd6044..a111825f4 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_collapse_2.png and b/dist/images/2x/icon/dark/tree_solid_collapse_2.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_3.png b/dist/images/2x/icon/dark/tree_solid_collapse_3.png
index 1147dcaf0..c16ac4fc3 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_collapse_3.png and b/dist/images/2x/icon/dark/tree_solid_collapse_3.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_4.png b/dist/images/2x/icon/dark/tree_solid_collapse_4.png
index 47a70f457..f8b7f8ef2 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_collapse_4.png and b/dist/images/2x/icon/dark/tree_solid_collapse_4.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_5.png b/dist/images/2x/icon/dark/tree_solid_collapse_5.png
index 46718d2ca..5620b0886 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_collapse_5.png and b/dist/images/2x/icon/dark/tree_solid_collapse_5.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_expand_2.png b/dist/images/2x/icon/dark/tree_solid_expand_2.png
index 0ed147f1b..5951e659f 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_expand_2.png and b/dist/images/2x/icon/dark/tree_solid_expand_2.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_expand_3.png b/dist/images/2x/icon/dark/tree_solid_expand_3.png
index e0ad4f8dc..de68cf779 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_expand_3.png and b/dist/images/2x/icon/dark/tree_solid_expand_3.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_expand_4.png b/dist/images/2x/icon/dark/tree_solid_expand_4.png
index f49d17b23..dee6827fb 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_expand_4.png and b/dist/images/2x/icon/dark/tree_solid_expand_4.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_expand_5.png b/dist/images/2x/icon/dark/tree_solid_expand_5.png
index d05e40f72..6b6a559f9 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_expand_5.png and b/dist/images/2x/icon/dark/tree_solid_expand_5.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png
index efcb7d9c8..2c674dfd9 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png and b/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png
index 5313fd5c6..ab5584b5f 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png and b/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png
index bc37a5fe3..adf63d3d5 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png and b/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png differ
diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png
index 88c2171a4..17c39572d 100644
Binary files a/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png and b/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png differ
diff --git a/dist/images/2x/icon/tree_solid_collapse_2.png b/dist/images/2x/icon/tree_solid_collapse_2.png
index 6810aa794..b0be8e5c0 100644
Binary files a/dist/images/2x/icon/tree_solid_collapse_2.png and b/dist/images/2x/icon/tree_solid_collapse_2.png differ
diff --git a/dist/images/2x/icon/tree_solid_collapse_3.png b/dist/images/2x/icon/tree_solid_collapse_3.png
index e699f574d..b592b6a14 100644
Binary files a/dist/images/2x/icon/tree_solid_collapse_3.png and b/dist/images/2x/icon/tree_solid_collapse_3.png differ
diff --git a/dist/images/2x/icon/tree_solid_collapse_4.png b/dist/images/2x/icon/tree_solid_collapse_4.png
index 42ea2dc6c..f9b67b9cd 100644
Binary files a/dist/images/2x/icon/tree_solid_collapse_4.png and b/dist/images/2x/icon/tree_solid_collapse_4.png differ
diff --git a/dist/images/2x/icon/tree_solid_collapse_5.png b/dist/images/2x/icon/tree_solid_collapse_5.png
index 82d1f105d..55e059d6f 100644
Binary files a/dist/images/2x/icon/tree_solid_collapse_5.png and b/dist/images/2x/icon/tree_solid_collapse_5.png differ
diff --git a/dist/images/2x/icon/tree_solid_expand_2.png b/dist/images/2x/icon/tree_solid_expand_2.png
index 108a5fbc4..2a94194d1 100644
Binary files a/dist/images/2x/icon/tree_solid_expand_2.png and b/dist/images/2x/icon/tree_solid_expand_2.png differ
diff --git a/dist/images/2x/icon/tree_solid_expand_3.png b/dist/images/2x/icon/tree_solid_expand_3.png
index 16b9459fd..2300dad28 100644
Binary files a/dist/images/2x/icon/tree_solid_expand_3.png and b/dist/images/2x/icon/tree_solid_expand_3.png differ
diff --git a/dist/images/2x/icon/tree_solid_expand_4.png b/dist/images/2x/icon/tree_solid_expand_4.png
index 08fae67cd..7eb88716c 100644
Binary files a/dist/images/2x/icon/tree_solid_expand_4.png and b/dist/images/2x/icon/tree_solid_expand_4.png differ
diff --git a/dist/images/2x/icon/tree_solid_expand_5.png b/dist/images/2x/icon/tree_solid_expand_5.png
index e83999029..7ae297dd6 100644
Binary files a/dist/images/2x/icon/tree_solid_expand_5.png and b/dist/images/2x/icon/tree_solid_expand_5.png differ
diff --git a/dist/images/2x/icon/tree_solid_vertical_line_1.png b/dist/images/2x/icon/tree_solid_vertical_line_1.png
index 2c674dfd9..2b1a23d9b 100644
Binary files a/dist/images/2x/icon/tree_solid_vertical_line_1.png and b/dist/images/2x/icon/tree_solid_vertical_line_1.png differ
diff --git a/dist/images/2x/icon/tree_solid_vertical_line_2.png b/dist/images/2x/icon/tree_solid_vertical_line_2.png
index 353cc64eb..429f958ac 100644
Binary files a/dist/images/2x/icon/tree_solid_vertical_line_2.png and b/dist/images/2x/icon/tree_solid_vertical_line_2.png differ
diff --git a/dist/images/2x/icon/tree_solid_vertical_line_3.png b/dist/images/2x/icon/tree_solid_vertical_line_3.png
index f4c373db9..a44f13db0 100644
Binary files a/dist/images/2x/icon/tree_solid_vertical_line_3.png and b/dist/images/2x/icon/tree_solid_vertical_line_3.png differ
diff --git a/dist/images/2x/icon/tree_solid_vertical_line_4.png b/dist/images/2x/icon/tree_solid_vertical_line_4.png
index a9eaa98bd..7de47eeed 100644
Binary files a/dist/images/2x/icon/tree_solid_vertical_line_4.png and b/dist/images/2x/icon/tree_solid_vertical_line_4.png differ
diff --git a/package.json b/package.json
index 76ee8c63d..8c71ea218 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20220118174212",
+ "version": "2.0.20220119145223",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",
diff --git a/src/less/base/combo/combo.textvalue.icon.less b/src/less/base/combo/combo.textvalue.icon.less
index 6951dcebb..79fef76ed 100644
--- a/src/less/base/combo/combo.textvalue.icon.less
+++ b/src/less/base/combo/combo.textvalue.icon.less
@@ -7,7 +7,7 @@
color: @color-bi-text-error-hover-text-value-icon-combo;
}
}
- &>.bi-border, &>.bi-border-bottom {
+ &.bi-border, &.bi-border-bottom {
border-color: @border-color-negative;
}
}
diff --git a/src/less/base/combo/combo.textvalue.less b/src/less/base/combo/combo.textvalue.less
index f1e703030..dbf76aaa0 100644
--- a/src/less/base/combo/combo.textvalue.less
+++ b/src/less/base/combo/combo.textvalue.less
@@ -7,7 +7,7 @@
color: @color-bi-text-error-hover-text-value-combo;
}
}
- &>.bi-border, &>.bi-border-bottom {
+ &.bi-border, &.bi-border-bottom {
border-color: @border-color-negative;
}
}
diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less
index da3f019a6..371e39eec 100644
--- a/src/less/base/tree/tree.expander.less
+++ b/src/less/base/tree/tree.expander.less
@@ -12,3 +12,8 @@
left: 15px;
}
+.bi-theme-dark {
+ .bi-tree-expander-popup.line.solid:before {
+ border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark;
+ }
+}
diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 1f8e6e30d..eb20d2818 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -62,7 +62,7 @@
}
.ztree.solid li ul.line {
&:before {
- border-left: 1px solid @border-color-dark-gray-line;
+ border-left: 1px solid @border-color-dark-gray-line-theme-dark;
}
}
}
diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less
index 4029ba820..9575a2ae1 100644
--- a/src/less/lib/theme.less
+++ b/src/less/lib/theme.less
@@ -197,6 +197,7 @@
// tree
@color-bi-text-display-tree: @color-bi-text-gray;
@color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line;
+@color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark;
// popup
@color-bi-background-list-view-shadow: @color-bi-background-black;
@color-bi-border-list-view-toolbar: @color-bi-border-line;
diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js
index aa68dcd10..e74c16edf 100644
--- a/src/widget/editor/editor.text.js
+++ b/src/widget/editor/editor.text.js
@@ -80,6 +80,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
this.editor.on(BI.Editor.EVENT_VALID, function () {
+ self.element.removeClass("error");
self.fireEvent(BI.TextEditor.EVENT_VALID);
});
this.editor.on(BI.Editor.EVENT_CONFIRM, function () {
@@ -101,6 +102,7 @@ BI.TextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.TextEditor.EVENT_STOP);
});
this.editor.on(BI.Editor.EVENT_ERROR, function () {
+ self.element.addClass("error");
self.fireEvent(BI.TextEditor.EVENT_ERROR, arguments);
});
this.editor.on(BI.Editor.EVENT_ENTER, function () {