From e247b3935a527aa775460c43989f2229b0236d1d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 21 Aug 2019 14:46:19 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-20334=20fix:=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E6=90=9C=E7=B4=A2loading=E4=B8=8D?= =?UTF-8?q?=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 11 +++++++++-- dist/2.0/fineui.js | 11 +++++++++-- dist/bundle.ie.js | 11 +++++++++-- dist/bundle.js | 11 +++++++++-- dist/fineui.ie.js | 11 +++++++++-- dist/fineui.js | 11 +++++++++-- dist/fineui_without_jquery_polyfill.js | 11 +++++++++-- dist/widget.js | 11 +++++++++-- .../multilayersingletree.trigger.js | 11 +++++++++-- 9 files changed, 81 insertions(+), 18 deletions(-) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 739d9a875..7ef01aa85 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -70081,7 +70081,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70162,7 +70162,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 881449d9c..3c46a8656 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -70485,7 +70485,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70566,7 +70566,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 739d9a875..7ef01aa85 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -70081,7 +70081,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70162,7 +70162,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/bundle.js b/dist/bundle.js index 881449d9c..3c46a8656 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -70485,7 +70485,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70566,7 +70566,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index fcdd3c76c..6127b5dd1 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -70326,7 +70326,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70407,7 +70407,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/fineui.js b/dist/fineui.js index 152691c13..68b0dc99d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -70730,7 +70730,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -70811,7 +70811,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index a870a6580..83709a7d0 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -53032,7 +53032,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -53113,7 +53113,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/dist/widget.js b/dist/widget.js index c4961c180..37aece130 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -8146,7 +8146,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -8227,7 +8227,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () { diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index 2e4d2b09a..192a87f36 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -61,7 +61,7 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, popup: { type: "bi.multilayer_single_tree_popup", - itemsCreator: function (op, callback) { + itemsCreator: o.itemsCreator === BI.emptyFn ? BI.emptyFn : function (op, callback) { op.keyword = self.editor.getValue(); o.itemsCreator(op, callback); }, @@ -142,7 +142,14 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { _digest: function (v) { var o = this.options; - return o.valueFormatter(v) || o.text; + if(o.itemsCreator === BI.emptyFn) { + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : o.text; + } + return o.valueFormatter(v); + }, stopEditing: function () {