fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #486 in VISUAL/fineui from ~TELLER/fineui:bugfix/bugfix to master 

* commit '7969684f66a06f26a3f0ca9e9805dbb938d43f93':
  BI-23990
es6
guy 6 years ago
parent
062456750e 7969684f66
commit
5362ac1558
8 changed files with 34 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      dist/_fineui.min.js
  2. 5
      dist/base.js
  3. 9
      dist/bundle.js
  4. 10
      dist/bundle.min.js
  5. 9
      dist/fineui.js
  6. 13
      dist/fineui.min.js
  7. 4
      dist/widget.js
  8. 5
      src/base/formula/formulaeditor.js

8
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/base.js vendored
Unescape View File

@ -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});

9
dist/bundle.js vendored
Unescape View File

@ -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});
@ -90331,7 +90332,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }
@ -95074,7 +95075,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }

10
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/fineui.js vendored
Unescape View File

@ -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});
@ -90580,7 +90581,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }
@ -95323,7 +95324,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }

13
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -2644,7 +2644,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }
@ -7387,7 +7387,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
}], }],
cls: "bi-down-list-spliter-container cursor-pointer", cls: "bi-down-list-spliter-container cursor-pointer",
lgap: 10, lgap: 10,
rgap: 10 rgap: 0
}); });
result.push(spliter_container); result.push(spliter_container);
} }

5
src/base/formula/formulaeditor.js
Unescape View File

@ -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});

Write Preview
Loading…
Cancel
Save