From f5c47f8802e418d3eca6b9c16cd54da06fb2a59e Mon Sep 17 00:00:00 2001 From: freddy Date: Mon, 28 Feb 2022 16:36:54 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-60473=20fix:=E5=AE=9E=E7=8E=B0=E4=B8=8Bs?= =?UTF-8?q?etWaterMark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/searcher.js | 4 ++++ src/case/editor/editor.state.js | 2 ++ src/case/editor/editor.state.simple.js | 3 +++ src/component/treevaluechooser/combo.listtreevaluechooser.js | 4 ++++ .../treevaluechooser/combo.treevaluechooser.insert.js | 4 ++++ src/component/treevaluechooser/combo.treevaluechooser.js | 4 ++++ src/widget/multilayerselecttree/multilayerselecttree.combo.js | 4 ++++ .../multilayerselecttree/multilayerselecttree.trigger.js | 4 ++++ src/widget/multilayersingletree/multilayersingletree.combo.js | 4 ++++ .../multilayersingletree/multilayersingletree.trigger.js | 4 ++++ src/widget/multiselect/multiselect.trigger.js | 4 ++++ src/widget/multiselect/trigger/editor.multiselect.js | 4 ++++ src/widget/multitree/multi.tree.combo.js | 4 ++++ src/widget/multitree/multi.tree.insert.combo.js | 4 ++++ src/widget/multitree/multi.tree.list.combo.js | 4 ++++ src/widget/multitree/trigger/searcher.list.multi.tree.js | 4 ++++ src/widget/multitree/trigger/searcher.multi.tree.js | 4 ++++ .../component/treevaluechooser/combo.listtreevaluechooser.ts | 2 ++ .../treevaluechooser/combo.treevaluechooser.insert.ts | 2 ++ .../component/treevaluechooser/combo.treevaluechooser.ts | 2 ++ typescript/widget/multitree/multi.tree.combo.ts | 2 ++ typescript/widget/multitree/multi.tree.insert.combo.ts | 2 ++ typescript/widget/multitree/multi.tree.list.combo.ts | 2 ++ 23 files changed, 77 insertions(+) diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js index e7d16c53e..c4fd29025 100644 --- a/src/base/combination/searcher.js +++ b/src/base/combination/searcher.js @@ -315,6 +315,10 @@ BI.Searcher = BI.inherit(BI.Widget, { blur: function () { this.editor.blur(); + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); } }); BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js index d1e11b20a..7b388da4a 100644 --- a/src/case/editor/editor.state.js +++ b/src/case/editor/editor.state.js @@ -156,6 +156,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { setWaterMark: function (v) { this.options.watermark = v; + this.options.defaultText = v; + this.setState(BI.isNull(this.stateValue) || this.stateValue === "" ? v : this.stateValue); this.editor.setWaterMark(v); }, diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js index 81b815441..e2c010990 100644 --- a/src/case/editor/editor.state.simple.js +++ b/src/case/editor/editor.state.simple.js @@ -143,6 +143,8 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { setWaterMark: function (v) { this.options.watermark = v; + this.options.text = v; + this.setState(this.stateValue); this.editor.setWaterMark(v); }, @@ -232,6 +234,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { setState: function (v) { var o = this.options; BI.SimpleStateEditor.superclass.setValue.apply(this, arguments); + this.stateValue = v; if (BI.isNumber(v)) { if (v === BI.Selection.All) { this._setText(BI.i18nText("BI-Already_Selected")); diff --git a/src/component/treevaluechooser/combo.listtreevaluechooser.js b/src/component/treevaluechooser/combo.listtreevaluechooser.js index e6bebe3d6..fb6b3dfa8 100644 --- a/src/component/treevaluechooser/combo.listtreevaluechooser.js +++ b/src/component/treevaluechooser/combo.listtreevaluechooser.js @@ -110,6 +110,10 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser, blur: function () { this.combo.blur(); + }, + + setWaterMark: function (v) { + this.combo.setWaterMark(v); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.insert.js b/src/component/treevaluechooser/combo.treevaluechooser.insert.js index d506dfe8b..ec60a0a4a 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.insert.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.insert.js @@ -109,6 +109,10 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { blur: function () { this.combo.blur(); + }, + + setWaterMark: function (v) { + this.combo.setWaterMark(v); } }); diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 2b6e25282..4eec5d7c4 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -113,6 +113,10 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { blur: function () { this.combo.blur(); + }, + + setWaterMark: function (v) { + this.combo.setWaterMark(v); } }); diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index 40621f02c..6365ef484 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -250,6 +250,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { showView: function () { this.combo.showView(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 2fd1c96ec..4b66b58f7 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -245,6 +245,10 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { blur: function () { this.searcher.blur(); + }, + + setWaterMark: function (v) { + this.searcher.setWaterMark(v); } }); diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index df855e227..779e645bf 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -251,6 +251,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { showView: function () { this.combo.showView(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index 0812c8029..75a515129 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -247,6 +247,10 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { blur: function () { this.searcher.blur(); + }, + + setWaterMark: function (v) { + this.searcher.setWaterMark(v); } }); BI.MultiLayerSingleTreeTrigger.EVENT_FOCUS = "EVENT_FOCUS"; diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index d829fa740..7406bd5ba 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -144,6 +144,10 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { blur: function () { this.searcher.blur(); + }, + + setWaterMark: function (v) { + this.searcher.setWaterMark(v); } }); diff --git a/src/widget/multiselect/trigger/editor.multiselect.js b/src/widget/multiselect/trigger/editor.multiselect.js index 4541ddbe7..29ee8489b 100644 --- a/src/widget/multiselect/trigger/editor.multiselect.js +++ b/src/widget/multiselect/trigger/editor.multiselect.js @@ -93,6 +93,10 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { populate: function (items) { + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); } }); diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 908b7002f..40fc91a14 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -352,6 +352,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { blur: function () { this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 532f76fe8..76f9c0b5c 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -368,6 +368,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { blur: function () { this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index 21b27687c..198eb53fc 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -386,6 +386,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { blur: function () { this.trigger.blur(); + }, + + setWaterMark: function (v) { + this.trigger.setWaterMark(v); } }); diff --git a/src/widget/multitree/trigger/searcher.list.multi.tree.js b/src/widget/multitree/trigger/searcher.list.multi.tree.js index 1661b9575..555d1b783 100644 --- a/src/widget/multitree/trigger/searcher.list.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.list.multi.tree.js @@ -172,6 +172,10 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, { blur: function () { this.editor.blur(); + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); } }); diff --git a/src/widget/multitree/trigger/searcher.multi.tree.js b/src/widget/multitree/trigger/searcher.multi.tree.js index ffece8cb9..35d59f200 100644 --- a/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.multi.tree.js @@ -192,6 +192,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, { blur: function () { this.editor.blur(); + }, + + setWaterMark: function (v) { + this.editor.setWaterMark(v); } }); diff --git a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts index 6709fd8e3..6a10e929b 100644 --- a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts @@ -27,4 +27,6 @@ export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeVal focus(): void; blur(): void; + + setWaterMark(v: string): void; } diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts index 971f44022..bb448e0b5 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts @@ -26,4 +26,6 @@ export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChoose focus(): void; blur(): void; + + setWaterMark(v: string): void; } diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.ts index 859480ce6..a21a8dea1 100644 --- a/typescript/component/treevaluechooser/combo.treevaluechooser.ts +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.ts @@ -28,4 +28,6 @@ export declare class TreeValueChooserCombo extends AbstractTreeValueChooser { focus(): void; blur(): void; + + setWaterMark(v: string): void; } diff --git a/typescript/widget/multitree/multi.tree.combo.ts b/typescript/widget/multitree/multi.tree.combo.ts index e96ed9808..3fe60ebed 100644 --- a/typescript/widget/multitree/multi.tree.combo.ts +++ b/typescript/widget/multitree/multi.tree.combo.ts @@ -19,4 +19,6 @@ export declare class MultiTreeCombo extends Single { focus(): void; blur(): void; + + setWaterMark(v: string): void; } diff --git a/typescript/widget/multitree/multi.tree.insert.combo.ts b/typescript/widget/multitree/multi.tree.insert.combo.ts index 55f2bbdf6..b7b8e6eac 100644 --- a/typescript/widget/multitree/multi.tree.insert.combo.ts +++ b/typescript/widget/multitree/multi.tree.insert.combo.ts @@ -27,4 +27,6 @@ export declare class MultiTreeInsertCombo extends Single { focus(): void; blur(): void; + + setWaterMark(v: string): void; } diff --git a/typescript/widget/multitree/multi.tree.list.combo.ts b/typescript/widget/multitree/multi.tree.list.combo.ts index 202b8b9b0..f3b09ad64 100644 --- a/typescript/widget/multitree/multi.tree.list.combo.ts +++ b/typescript/widget/multitree/multi.tree.list.combo.ts @@ -26,4 +26,6 @@ export declare class MultiTreeListCombo extends Single { focus(): void; blur(): void; + + setWaterMark(v: string): void; }