Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui 

# Conflicts:
#	dist/_fineui.min.js
#	dist/base.js
#	dist/bundle.js
#	dist/bundle.min.css
#	dist/bundle.min.js
#	dist/fineui.js
#	dist/fineui.min.css
#	dist/fineui.min.js
es6
MrErHu 6 years ago
parent
7502956bd7 c97ea9b743
commit
50b4718c43
12 changed files with 25448 additions and 25440 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/bundle.css
  2. 4
      dist/fineui.css
  3. 4
      dist/resource.css
  4. 3
      dist/widget.js
  5. 4
      public/css/background.css
  6. 4
      src/base/formula/formulaeditor.js
  7. 2
      src/base/single/button/buttons/button.js
  8. 4
      src/base/table/table.resizable.js
  9. 3
      src/component/treevaluechooser/abstract.treevaluechooser.js
  10. 4
      src/css/resource/background.css
  11. 4
      src/less/resource/background.less
  12. 4
      ui/css/background.css

4
dist/bundle.css vendored
Unescape View File

@ -4312,12 +4312,12 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.ztree li ul.line {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

4
dist/fineui.css vendored
Unescape View File

@ -4312,12 +4312,12 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

4
dist/resource.css vendored
Unescape View File

@ -100,12 +100,12 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.ztree li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

3
dist/widget.js vendored
Unescape View File

@ -25154,6 +25154,9 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AbstractTree
_isMatch: function (parentValues, value, keyword) {
var node = this._getTreeNode(parentValues, value);
if (!node) {
return false;
}
var find = BI.Func.getSearchResult([node.text || node.value], keyword);
return find.find.length > 0 || find.match.length > 0;
},

4
public/css/background.css
Unescape View File

@ -29,12 +29,12 @@
_background: none;
}
.ztree li ul.line {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

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

@ -128,13 +128,13 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
var fieldFormattedName = this.options.paramFormatter(fieldId) || "undefined";
var from = this.editor.getCursor();
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
var showName = fieldFormattedName.replaceAll(/^<!.*!>$/, function (str) {
var showName = fieldFormattedName.replaceAll("^<!.*!>$", function (str) {
return str.substring(2, str.length - 2);
});
this.editor.replaceSelection("\u200b" + showName + "\u200b");
var to = this.editor.getCursor();
var className = "fieldName";
if (BI.isNotNull(fieldFormattedName.match(/^<!.*!>$/)) && !force) {
if (BI.isNotNull(fieldFormattedName.match("^<!.*!>$")) && !force) {
className = "error-field";
}
this.editor.markText(from, to, {className: className, atomic: true, startStyle: "start", endStyle: "end", value: value});

2
src/base/single/button/buttons/button.js
Unescape View File

@ -43,6 +43,8 @@
var o = this.options, self = this;
if (BI.isNumber(o.height) && !o.clear && !o.block) {
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 {
this.element.css({lineHeight: (o.height - 2) + "px"});
}

4
src/base/table/table.resizable.js
Unescape View File

@ -114,7 +114,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
if (mouseMoveTracker.isDragging()) {
start = true;
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._setRegionResizerHandlerPosition(size - 3, 0);
@ -122,7 +122,7 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
}, function () {
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);
if (o.isResizeAdapt === true) {
var freezeColumnSize = self._getFreezeColumnSize();

3
src/component/treevaluechooser/abstract.treevaluechooser.js
Unescape View File

@ -627,6 +627,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
_isMatch: function (parentValues, value, keyword) {
var node = this._getTreeNode(parentValues, value);
if (!node) {
return false;
}
var find = BI.Func.getSearchResult([node.text || node.value], keyword);
return find.find.length > 0 || find.match.length > 0;
},

4
src/css/resource/background.css
Unescape View File

@ -29,12 +29,12 @@
_background: none;
}
.ztree li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

4
src/less/resource/background.less
Unescape View File

@ -29,12 +29,12 @@
}
.ztree li ul.line {
.imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y);
.imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y);
}
.bi-theme-dark {
.ztree li ul.line {
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y);
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);
}
}

4
ui/css/background.css
Unescape View File

@ -29,12 +29,12 @@
_background: none;
}
.ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png');
_background: none;
}
.bi-theme-dark .ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png');
_background: none;
}

Write Preview
Loading…
Cancel
Save