Browse Source

update

master
iapyang 6 years ago
parent
commit
ebf713cc43
  1. 4
      dist/base.css
  2. 7
      dist/base.js
  3. 4
      dist/bundle.css
  4. 7
      dist/bundle.js
  5. 14
      dist/bundle.min.js
  6. 4
      dist/fineui.css
  7. 7
      dist/fineui.js
  8. 7
      dist/fineui.min.js
  9. 7
      src/base/formula/formulaeditor.js
  10. 4
      src/css/base/formula/formulaeditor.css
  11. 4
      src/less/base/formula/formulaeditor.less

4
dist/base.css vendored

@ -701,10 +701,10 @@ li.CodeMirror-hint-active {
color: white; color: white;
} }
.bi-formula-editor .error-field { .bi-formula-editor .error-field {
color: #ff4949; display: inline-block;
padding: 0 5px; padding: 0 5px;
margin: 1px 1px; margin: 1px 1px;
display: inline-block; color: #ff4949;
} }
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;

7
dist/base.js vendored

@ -14643,12 +14643,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
/** /**
* 添加字段 * 添加字段
* @param fieldName
* @param fieldId * @param fieldId
*/ */
insertField: function (fieldName, fieldId) { insertField: function (fieldId) {
var value = this.options.fieldTextValueMap[fieldName] || fieldId; var value = fieldId;
var fieldFormattedName = this.options.paramFormatter(fieldName) || "undefined"; var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) { var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {

4
dist/bundle.css vendored

@ -2457,10 +2457,10 @@ li.CodeMirror-hint-active {
color: white; color: white;
} }
.bi-formula-editor .error-field { .bi-formula-editor .error-field {
color: #ff4949; display: inline-block;
padding: 0 5px; padding: 0 5px;
margin: 1px 1px; margin: 1px 1px;
display: inline-block; color: #ff4949;
} }
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;

7
dist/bundle.js vendored

@ -50414,12 +50414,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
/** /**
* 添加字段 * 添加字段
* @param fieldName
* @param fieldId * @param fieldId
*/ */
insertField: function (fieldName, fieldId) { insertField: function (fieldId) {
var value = this.options.fieldTextValueMap[fieldName] || fieldId; var value = fieldId;
var fieldFormattedName = this.options.paramFormatter(fieldName) || "undefined"; var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) { var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {

14
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.css vendored

@ -2457,10 +2457,10 @@ li.CodeMirror-hint-active {
color: white; color: white;
} }
.bi-formula-editor .error-field { .bi-formula-editor .error-field {
color: #ff4949; display: inline-block;
padding: 0 5px; padding: 0 5px;
margin: 1px 1px; margin: 1px 1px;
display: inline-block; color: #ff4949;
} }
.bi-message-title { .bi-message-title {
font-size: 14px; font-size: 14px;

7
dist/fineui.js vendored

@ -50663,12 +50663,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
/** /**
* 添加字段 * 添加字段
* @param fieldName
* @param fieldId * @param fieldId
*/ */
insertField: function (fieldName, fieldId) { insertField: function (fieldId) {
var value = this.options.fieldTextValueMap[fieldName] || fieldId; var value = fieldId;
var fieldFormattedName = this.options.paramFormatter(fieldName) || "undefined"; var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) { var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {

7
dist/fineui.min.js vendored

@ -174,12 +174,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
/** /**
* 添加字段 * 添加字段
* @param fieldName
* @param fieldId * @param fieldId
*/ */
insertField: function (fieldName, fieldId) { insertField: function (fieldId) {
var value = this.options.fieldTextValueMap[fieldName] || fieldId; var value = fieldId;
var fieldFormattedName = this.options.paramFormatter(fieldName) || "undefined"; var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) { var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {

7
src/base/formula/formulaeditor.js

@ -120,12 +120,11 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
/** /**
* 添加字段 * 添加字段
* @param fieldName
* @param fieldId * @param fieldId
*/ */
insertField: function (fieldName, fieldId) { insertField: function (fieldId) {
var value = this.options.fieldTextValueMap[fieldName] || fieldId; var value = fieldId;
var fieldFormattedName = this.options.paramFormatter(fieldName, fieldId) || "undefined"; var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor(); var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) { var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {

4
src/css/base/formula/formulaeditor.css

@ -1,6 +1,6 @@
.bi-formula-editor .error-field { .bi-formula-editor .error-field {
color: #ff4949; display: inline-block;
padding: 0 5px; padding: 0 5px;
margin: 1px 1px; margin: 1px 1px;
display: inline-block; color: #ff4949;
} }

4
src/less/base/formula/formulaeditor.less

@ -2,9 +2,9 @@
.bi-formula-editor { .bi-formula-editor {
& .error-field { & .error-field {
color: @color-bi-text-failure; display: inline-block;
padding: 0 5px; padding: 0 5px;
margin: 1px 1px; margin: 1px 1px;
display: inline-block; color: @color-bi-text-failure;
} }
} }

Loading…
Cancel
Save