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, 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; } } 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); }