Merge pull request #246 in ~GUY/fineui from ~WINDY/fineui:BI4.1 to BI4.1

* commit 'cbc97ef00ed422334e966b8328774ef2ad2bb948':
  插入空字符后的处理

bi/base.js

@@ -14541,8 +14541,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
                 switch (i.marker.className) {
                     case "fieldName":
                         var fieldNameLength = i.to - i.from;
-                        var fieldId = fieldMap[value.substr(i.from + num, fieldNameLength)];
+                        var start = i.from + num + 1;
-                        value = value.substr(0, i.from + num) + "$\{" + fieldMap[value.substr(i.from + num, fieldNameLength)] + "\}" + value.substr(i.to + num, value.length);
+                        var end = fieldNameLength - 2;
+                        var fieldId = fieldMap[value.substr(start, end)];
+                        value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
                         num += fieldId.length - fieldNameLength + 3;
                         break;
                 }

dist/base.js

@@ -14541,8 +14541,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
                 switch (i.marker.className) {
                     case "fieldName":
                         var fieldNameLength = i.to - i.from;
-                        var fieldId = fieldMap[value.substr(i.from + num, fieldNameLength)];
+                        var start = i.from + num + 1;
-                        value = value.substr(0, i.from + num) + "$\{" + fieldMap[value.substr(i.from + num, fieldNameLength)] + "\}" + value.substr(i.to + num, value.length);
+                        var end = fieldNameLength - 2;
+                        var fieldId = fieldMap[value.substr(start, end)];
+                        value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
                         num += fieldId.length - fieldNameLength + 3;
                         break;
                 }

dist/bundle.js

@@ -40409,8 +40409,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
                 switch (i.marker.className) {
                     case "fieldName":
                         var fieldNameLength = i.to - i.from;
-                        var fieldId = fieldMap[value.substr(i.from + num, fieldNameLength)];
+                        var start = i.from + num + 1;
-                        value = value.substr(0, i.from + num) + "$\{" + fieldMap[value.substr(i.from + num, fieldNameLength)] + "\}" + value.substr(i.to + num, value.length);
+                        var end = fieldNameLength - 2;
+                        var fieldId = fieldMap[value.substr(start, end)];
+                        value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
                         num += fieldId.length - fieldNameLength + 3;
                         break;
                 }

src/base/formula/formulaeditor.js

@@ -205,8 +205,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
                 switch (i.marker.className) {
                     case "fieldName":
                         var fieldNameLength = i.to - i.from;
-                        var fieldId = fieldMap[value.substr(i.from + num, fieldNameLength)];
+                        var start = i.from + num + 1;
-                        value = value.substr(0, i.from + num) + "$\{" + fieldMap[value.substr(i.from + num, fieldNameLength)] + "\}" + value.substr(i.to + num, value.length);
+                        var end = fieldNameLength - 2;
+                        var fieldId = fieldMap[value.substr(start, end)];
+                        value = value.substr(0, i.from + num) + "$\{" + fieldId + "\}" + value.substr(i.to + num, value.length);
                         num += fieldId.length - fieldNameLength + 3;
                         break;
                 }