Browse Source

BI-26037

es6
MrErHu 7 years ago
parent
commit
b2e88c48cb
  1. 50
      dist/_fineui.min.js
  2. 10
      dist/base.js
  3. 13
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 20
      dist/bundle.min.js
  6. 13
      dist/fineui.js
  7. 2
      dist/fineui.min.css
  8. 54
      dist/fineui.min.js

50
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/base.js vendored

@ -14651,13 +14651,13 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var fieldFormattedName = this.options.paramFormatter(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) {
return str.substring(2, str.length - 2); return str.substring(2, str.length - 2);
}); });
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(/^<!.*!>$/)) && !force) { 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});
@ -16743,6 +16743,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
var o = this.options, self = this; var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) { if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"}); this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else if (o.clear || o.block) {
this.element.css({lineHeight: o.height + "px"});
} else { } else {
this.element.css({lineHeight: (o.height - 2) + "px"}); this.element.css({lineHeight: (o.height - 2) + "px"});
} }
@ -33998,7 +34000,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
if (mouseMoveTracker.isDragging()) { if (mouseMoveTracker.isDragging()) {
start = true; start = true;
offset += deltaX; offset += deltaX;
size = BI.clamp(defaultSize + offset, 10, o.width - 15); size = BI.clamp(defaultSize + offset, 30, o.width - 40);
self.regionResizerHandler.element.addClass("dragging"); self.regionResizerHandler.element.addClass("dragging");
self._setRegionResizerHandlerPosition(size - 3, 0); self._setRegionResizerHandlerPosition(size - 3, 0);
@ -34006,7 +34008,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
}, function () { }, function () {
if (start === true) { if (start === true) {
o.regionColumnSize[0] = BI.clamp(size, 10, o.width - 15); o.regionColumnSize[0] = BI.clamp(size, 30, o.width - 40);
self.table.setRegionColumnSize(o.regionColumnSize); self.table.setRegionColumnSize(o.regionColumnSize);
if (o.isResizeAdapt === true) { if (o.isResizeAdapt === true) {
var freezeColumnSize = self._getFreezeColumnSize(); var freezeColumnSize = self._getFreezeColumnSize();

13
dist/bundle.js vendored

@ -50422,13 +50422,13 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var fieldFormattedName = this.options.paramFormatter(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) {
return str.substring(2, str.length - 2); return str.substring(2, str.length - 2);
}); });
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(/^<!.*!>$/)) && !force) { 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});
@ -52514,6 +52514,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
var o = this.options, self = this; var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) { if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"}); this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else if (o.clear || o.block) {
this.element.css({lineHeight: o.height + "px"});
} else { } else {
this.element.css({lineHeight: (o.height - 2) + "px"}); this.element.css({lineHeight: (o.height - 2) + "px"});
} }
@ -69769,7 +69771,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
if (mouseMoveTracker.isDragging()) { if (mouseMoveTracker.isDragging()) {
start = true; start = true;
offset += deltaX; offset += deltaX;
size = BI.clamp(defaultSize + offset, 10, o.width - 15); size = BI.clamp(defaultSize + offset, 30, o.width - 40);
self.regionResizerHandler.element.addClass("dragging"); self.regionResizerHandler.element.addClass("dragging");
self._setRegionResizerHandlerPosition(size - 3, 0); self._setRegionResizerHandlerPosition(size - 3, 0);
@ -69777,7 +69779,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
}, function () { }, function () {
if (start === true) { if (start === true) {
o.regionColumnSize[0] = BI.clamp(size, 10, o.width - 15); o.regionColumnSize[0] = BI.clamp(size, 30, o.width - 40);
self.table.setRegionColumnSize(o.regionColumnSize); self.table.setRegionColumnSize(o.regionColumnSize);
if (o.isResizeAdapt === true) { if (o.isResizeAdapt === true) {
var freezeColumnSize = self._getFreezeColumnSize(); var freezeColumnSize = self._getFreezeColumnSize();
@ -112857,6 +112859,9 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AbstractTree
_isMatch: function (parentValues, value, keyword) { _isMatch: function (parentValues, value, keyword) {
var node = this._getTreeNode(parentValues, value); var node = this._getTreeNode(parentValues, value);
if (!node) {
return false;
}
var find = BI.Func.getSearchResult([node.text || node.value], keyword); var find = BI.Func.getSearchResult([node.text || node.value], keyword);
return find.find.length > 0 || find.match.length > 0; return find.find.length > 0 || find.match.length > 0;
}, },

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

20
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

13
dist/fineui.js vendored

@ -50671,13 +50671,13 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var fieldFormattedName = this.options.paramFormatter(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) {
return str.substring(2, str.length - 2); return str.substring(2, str.length - 2);
}); });
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(/^<!.*!>$/)) && !force) { 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});
@ -52763,6 +52763,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
var o = this.options, self = this; var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) { if (BI.isNumber(o.height) && !o.clear && !o.block) {
this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"}); this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
} else if (o.clear || o.block) {
this.element.css({lineHeight: o.height + "px"});
} else { } else {
this.element.css({lineHeight: (o.height - 2) + "px"}); this.element.css({lineHeight: (o.height - 2) + "px"});
} }
@ -70018,7 +70020,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
if (mouseMoveTracker.isDragging()) { if (mouseMoveTracker.isDragging()) {
start = true; start = true;
offset += deltaX; offset += deltaX;
size = BI.clamp(defaultSize + offset, 10, o.width - 15); size = BI.clamp(defaultSize + offset, 30, o.width - 40);
self.regionResizerHandler.element.addClass("dragging"); self.regionResizerHandler.element.addClass("dragging");
self._setRegionResizerHandlerPosition(size - 3, 0); self._setRegionResizerHandlerPosition(size - 3, 0);
@ -70026,7 +70028,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
}, function () { }, function () {
if (start === true) { if (start === true) {
o.regionColumnSize[0] = BI.clamp(size, 10, o.width - 15); o.regionColumnSize[0] = BI.clamp(size, 30, o.width - 40);
self.table.setRegionColumnSize(o.regionColumnSize); self.table.setRegionColumnSize(o.regionColumnSize);
if (o.isResizeAdapt === true) { if (o.isResizeAdapt === true) {
var freezeColumnSize = self._getFreezeColumnSize(); var freezeColumnSize = self._getFreezeColumnSize();
@ -113106,6 +113108,9 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AbstractTree
_isMatch: function (parentValues, value, keyword) { _isMatch: function (parentValues, value, keyword) {
var node = this._getTreeNode(parentValues, value); var node = this._getTreeNode(parentValues, value);
if (!node) {
return false;
}
var find = BI.Func.getSearchResult([node.text || node.value], keyword); var find = BI.Func.getSearchResult([node.text || node.value], keyword);
return find.find.length > 0 || find.match.length > 0; return find.find.length > 0 || find.match.length > 0;
}, },

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

54
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save