caoww
/
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.js
#	dist/fineui.js
#	dist/fineui.min.js
es6
DESKTOP-49I29QK\zsmj 7 years ago
parent
372ffe31ef a29a5e53df
commit
37f4e8dad4
18 changed files with 97 additions and 89 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. 20
      dist/_fineui.min.js
  2. 10
      dist/base.js
  3. 4
      dist/bundle.css
  4. 10
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 70
      dist/bundle.min.js
  7. 4
      dist/fineui.css
  8. 10
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 24
      dist/fineui.min.js
  11. 4
      dist/resource.css
  12. 4
      public/css/background.css
  13. 4
      src/base/formula/formulaeditor.js
  14. 2
      src/base/single/button/buttons/button.js
  15. 4
      src/base/table/table.resizable.js
  16. 4
      src/css/resource/background.css
  17. 4
      src/less/resource/background.less
  18. 4
      ui/css/background.css

20
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/base.js vendored
Unescape View File

@ -14651,13 +14651,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});
@ -16743,6 +16743,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
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"});
}
@ -33992,7 +33994,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);
@ -34000,7 +34002,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();

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

10
dist/bundle.js vendored
Unescape View File

@ -50422,13 +50422,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});
@ -52514,6 +52514,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
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"});
}
@ -69763,7 +69765,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);
@ -69771,7 +69773,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();

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

70
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

10
dist/fineui.js vendored
Unescape View File

@ -50671,13 +50671,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});
@ -52763,6 +52763,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
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"});
}
@ -70012,7 +70014,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);
@ -70020,7 +70022,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();

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

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();

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