Browse Source

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

es6
windy 6 years ago
parent
commit
69cbbbf2da
  1. 8
      dist/_fineui.min.js
  2. 5
      dist/base.js
  3. 5
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 5
      dist/fineui.js
  6. 13
      dist/fineui.min.js
  7. 5
      src/base/formula/formulaeditor.js

8
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/base.js vendored

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

5
dist/bundle.js vendored

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

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored

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

13
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
src/base/formula/formulaeditor.js

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

Loading…
Cancel
Save