From 35415d301df99732e458de21f039f4ba1e5378eb Mon Sep 17 00:00:00 2001 From: Treecat Date: Tue, 25 Apr 2023 12:18:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-94791=20fix:=E8=80=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=A7=E6=89=BF=E7=BB=93=E6=9E=84=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/5.inject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/core/5.inject.js b/packages/fineui/src/core/5.inject.js index a2f621ad6..dc3392106 100644 --- a/packages/fineui/src/core/5.inject.js +++ b/packages/fineui/src/core/5.inject.js @@ -405,7 +405,7 @@ export function shortcut(xtype, cls) { } // 兼容性 - if(!cls.superclass) { + if (!cls.hasOwnProperty("superclass")) { cls.superclass = Object.getPrototypeOf(cls.prototype); } From c5d87751ff266127d5a48e0d4f59c4522ab3f014 Mon Sep 17 00:00:00 2001 From: Treecat Date: Tue, 25 Apr 2023 14:18:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-94787=20fix:=E7=BA=A0=E6=AD=A3=20thi?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../treevaluechooser/abstract.treevaluechooser.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js index 73f5b4616..c0374b912 100644 --- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -963,13 +963,7 @@ export class AbstractTreeValueChooser extends Widget { buildCompleteTree(selectedValues) { const result = {}; - if (selectedValues !== null && !isEmpty(selectedValues)) { - fill([], this.tree.getRoot(), selectedValues, result); - } - - return result; - - function fill(parentValues, node, selected, r) { + const fill = (parentValues, node, selected, r) => { if (selected === null || isEmpty(selected)) { each(node.getChildren(), (i, child) => { const newParents = clone(parentValues); @@ -988,5 +982,11 @@ export class AbstractTreeValueChooser extends Widget { fill(newParents, node, selected[k], r[k]); }); } + + if (selectedValues !== null && !isEmpty(selectedValues)) { + fill([], this.tree.getRoot(), selectedValues, result); + } + + return result; } } From 88284129bd9f217d2e482c51825636aea2ea9965 Mon Sep 17 00:00:00 2001 From: Treecat Date: Tue, 25 Apr 2023 15:00:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BI-125433=20fix:=E4=BF=AE=E5=A4=8Dtextedito?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/base/single/editor/editor.textarea.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/fineui/src/base/single/editor/editor.textarea.js b/packages/fineui/src/base/single/editor/editor.textarea.js index 65076020f..4152af588 100644 --- a/packages/fineui/src/base/single/editor/editor.textarea.js +++ b/packages/fineui/src/base/single/editor/editor.textarea.js @@ -212,11 +212,12 @@ export class TextAreaEditor extends Single { _setErrorVisible(b) { const { adjustYOffset, adjustXOffset, offsetStyle } = this.options; - if (isFunction(this.options.errorText)) { - this.options.errorText = this.options.errorText(trim(this.getValue())); + let errorText = this.options.errorText; + if (isFunction(errorText)) { + errorText = errorText(trim(this.getValue())); } - if (!this.disabledError && isKey(this.options.errorText)) { - Bubbles[b ? "show" : "hide"](this.getName(), this.options.errorText, this, { + if (!this.disabledError && isKey(errorText)) { + Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, { adjustYOffset, adjustXOffset, offsetStyle,