Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

dist/base.js

@@ -14644,8 +14644,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
     /**
      * 添加字段
      * @param fieldId
+     * @param force, 判断是否强制不标红
      */
-    insertField: function (fieldId) {
+    insertField: function (fieldId, force) {
         var value = fieldId;
         var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
         var from = this.editor.getCursor();
@@ -14656,7 +14657,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + showName + "\u200b");
         var to = this.editor.getCursor();
         var className = "fieldName";
-        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/))) {
+        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/)) && !force) {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});

dist/bundle.js

@@ -50415,8 +50415,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
     /**
      * 添加字段
      * @param fieldId
+     * @param force, 判断是否强制不标红
      */
-    insertField: function (fieldId) {
+    insertField: function (fieldId, force) {
         var value = fieldId;
         var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
         var from = this.editor.getCursor();
@@ -50427,7 +50428,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + showName + "\u200b");
         var to = this.editor.getCursor();
         var className = "fieldName";
-        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/))) {
+        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/)) && !force) {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});

dist/fineui.js

@@ -50664,8 +50664,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
     /**
      * 添加字段
      * @param fieldId
+     * @param force, 判断是否强制不标红
      */
-    insertField: function (fieldId) {
+    insertField: function (fieldId, force) {
         var value = fieldId;
         var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
         var from = this.editor.getCursor();
@@ -50676,7 +50677,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + showName + "\u200b");
         var to = this.editor.getCursor();
         var className = "fieldName";
-        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/))) {
+        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/)) && !force) {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});

src/base/formula/formulaeditor.js

@@ -121,8 +121,9 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
     /**
      * 添加字段
      * @param fieldId
+     * @param force, 判断是否强制不标红
      */
-    insertField: function (fieldId) {
+    insertField: function (fieldId, force) {
         var value = fieldId;
         var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
         var from = this.editor.getCursor();
@@ -133,7 +134,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
         this.editor.replaceSelection("\u200b" + showName + "\u200b");
         var to = this.editor.getCursor();
         var className = "fieldName";
-        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/))) {
+        if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/)) && !force) {
             className = "error-field";
         }
         this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});