From 320f74ce969e28da1d510c3f16a85c4c005cf31c Mon Sep 17 00:00:00 2001 From: iapyang Date: Fri, 18 Jun 2021 18:17:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0getSearcher=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilayerselecttree/multilayerselecttree.combo.js | 9 ++++++++- .../treevaluechooser/combo.listtreevaluechooser.ts | 3 ++- .../treevaluechooser/combo.treevaluechooser.insert.ts | 2 +- .../component/treevaluechooser/combo.treevaluechooser.ts | 2 +- .../multilayerselecttree/multilayerselecttree.combo.ts | 3 +++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index e72d71009..823378647 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -199,11 +199,14 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { }, _getSyncConfig: function () { - var o = this.options; + var o = this.options, self = this; var baseConfig = this._getBaseConfig(); return BI.extend(baseConfig, o.allowEdit ? this._getSearchConfig() : { el: { type: "bi.single_tree_trigger", + ref: function(_ref) { + self.textTrigger = _ref; + }, text: o.text, height: o.height, items: o.items, @@ -226,6 +229,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { return this.combo.getValue(); }, + getSearcher: function () { + return this.trigger ? this.trigger.getSearcher() : this.textTrigger; + }, + populate: function (items) { this.combo.populate(items); } diff --git a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts index 7b4b98b08..3f6aedcd8 100644 --- a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts @@ -1,4 +1,5 @@ -import { Trigger } from "typescript/base/single/trigger/trigger"; + +import { Trigger } from "../../base/single/trigger/trigger"; import { AbstractListTreeValueChooser } from "./abstract.treevaluechooser.list"; export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeValueChooser { diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts index e95e4baeb..d555153ea 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts @@ -1,4 +1,4 @@ -import { Trigger } from "typescript/base/single/trigger/trigger"; +import { Trigger } from "../../base/single/trigger/trigger"; import { AbstractTreeValueChooser } from "./abstract.treevaluechooser"; export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChooser { diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.ts index 565063b58..b9566ac41 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.ts @@ -1,4 +1,4 @@ -import { Trigger } from "typescript/base/single/trigger/trigger"; +import { Trigger } from "../../base/single/trigger/trigger"; import { AbstractTreeValueChooser } from "./abstract.treevaluechooser"; export declare class TreeValueChooserCombo extends AbstractTreeValueChooser { diff --git a/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts b/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts index 3dded7a47..e84195729 100644 --- a/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts +++ b/typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts @@ -1,3 +1,4 @@ +import { Trigger } from "../../base/single/trigger/trigger"; import { Widget } from "../../core/widget"; export declare class MultiLayerSelectTreeCombo extends Widget { @@ -13,4 +14,6 @@ export declare class MultiLayerSelectTreeCombo extends Widget { getValue(): string[]; populate(items: T[]): void; + + getSearcher(): Trigger; }