BI-26782

7 years ago · 5ba016328c
8 changed files with 290808 additions and 290758 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/dist/base.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
--- a/src/base/formula/formulaeditor.js
+++ b/src/base/formula/formulaeditor.js
@ -202,7 +202,12 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
        return this.editor.getValue(true, function (line) {
            var rawText = line.text, value = line.text, num = 0;
            value.text = rawText;
-            _.forEach(line.markedSpans, function (i, ms) {
+            var markedSpans = _.clone(line.markedSpans);
+            markedSpans.sort(function (a, b) {
+                return a.from > b.from;
+            });
+
+            _.forEach(markedSpans, function (i, ms) {

                switch (i.marker.className) {
                    case "fieldName":
@ -223,7 +228,12 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
        var v = this.editor.getValue("\n", function (line) {
            var rawText = line.text, value = line.text, num = 0;
            value.text = rawText;
-            _.forEach(line.markedSpans, function (i, ms) {
+            var markedSpans = _.clone(line.markedSpans);
+            markedSpans.sort(function (a, b) {
+                return a.from > b.from;
+            });
+
+            _.forEach(markedSpans, function (i, ms) {
                switch (i.marker.className) {
                    case "fieldName":
                    case "error-field":