Merge pull request #33 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '5bd33c98871fb62a0f1c5a59108f37423a23a0e6': formula combo
7 years ago · ea0b637af5
3 changed files with 3 additions and 3 deletions
--- a/bi/case.js
+++ b/bi/case.js
@ -4023,7 +4023,7 @@ BI.FormulaComboTrigger = BI.inherit(BI.Widget, {
            var str = item.match(fieldRegx);
            if (BI.isNotEmptyArray(str)) {
                var id = str[0].substring(2, item.length - 1);
-                var item = BI.find(self.options.items, function (i, item) {
+                var item = BI.find(BI.flatten(self.options.items), function (i, item) {
                    return id === item.value;
                });
                formulaString = formulaString + item.text;
--- a/docs/case.js
+++ b/docs/case.js
@ -4023,7 +4023,7 @@ BI.FormulaComboTrigger = BI.inherit(BI.Widget, {
            var str = item.match(fieldRegx);
            if (BI.isNotEmptyArray(str)) {
                var id = str[0].substring(2, item.length - 1);
-                var item = BI.find(self.options.items, function (i, item) {
+                var item = BI.find(BI.flatten(self.options.items), function (i, item) {
                    return id === item.value;
                });
                formulaString = formulaString + item.text;
--- a/src/case/combo/formulacombo/trigger.formulacombo.js
+++ b/src/case/combo/formulacombo/trigger.formulacombo.js
@ -36,7 +36,7 @@ BI.FormulaComboTrigger = BI.inherit(BI.Widget, {
            var str = item.match(fieldRegx);
            if (BI.isNotEmptyArray(str)) {
                var id = str[0].substring(2, item.length - 1);
-                var item = BI.find(self.options.items, function (i, item) {
+                var item = BI.find(BI.flatten(self.options.items), function (i, item) {
                    return id === item.value;
                });
                formulaString = formulaString + item.text;