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

Merge remote-tracking branch 'origin/master' into webpack-3.0 

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.css
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.css
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.css
#	dist/fineui.min.js
#	dist/utils.min.js
es6
iapyang 5 years ago
parent
49ec69c63c b9bdf190f4
commit
4d9ea4b550
23 changed files with 107 additions and 35 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. 1
      changelog.md
  2. 10
      dist/2.0/fineui.css
  3. 9
      dist/2.0/fineui.ie.js
  4. 9
      dist/2.0/fineui.js
  5. 5
      dist/base.css
  6. 10
      dist/bundle.css
  7. 9
      dist/bundle.ie.js
  8. 9
      dist/bundle.js
  9. 5
      dist/core.js
  10. 10
      dist/fineui.css
  11. 9
      dist/fineui.ie.js
  12. 9
      dist/fineui.js
  13. 9
      dist/fineui_without_jquery_polyfill.js
  14. 5
      dist/resource.css
  15. 4
      dist/widget.js
  16. 4
      public/css/background.css
  17. 2
      src/component/treevaluechooser/abstract.treevaluechooser.js
  18. 2
      src/component/valuechooser/abstract.valuechooser.js
  19. 5
      src/core/shortcut.js
  20. 4
      src/css/base/colorchooser/colorpicker/editor.css
  21. 4
      src/css/resource/background.css
  22. 4
      src/less/resource/background.less
  23. 4
      ui/css/background.css

1
changelog.md
Unescape View File

@ -3,6 +3,7 @@
- 修改了下拉树展开图标模糊的问题
- 修复了下拉树搜索高亮字符与正常字符间存在间距的问题
- 复选下拉系列的计数器从trigger中拆分, 作为独立的部分
- 增加BI.createElement方法
2.0(2019-09)
- [视觉]popover弹出框增加圆角

10
dist/2.0/fineui.css vendored
Unescape View File

@ -2273,7 +2273,10 @@ textarea {
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {
@ -4959,7 +4962,10 @@ textarea::-webkit-scrollbar-corner {
.ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {

9
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -87357,7 +87362,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -88742,7 +88747,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

9
dist/2.0/fineui.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -87761,7 +87766,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -89146,7 +89151,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

5
dist/base.css vendored
Unescape View File

@ -63,7 +63,10 @@
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {

10
dist/bundle.css vendored
Unescape View File

@ -2273,7 +2273,10 @@ textarea {
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {
@ -4959,7 +4962,10 @@ textarea::-webkit-scrollbar-corner {
.ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {

9
dist/bundle.ie.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -87357,7 +87362,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -88742,7 +88747,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

9
dist/bundle.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -87761,7 +87766,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -89146,7 +89151,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

5
dist/core.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2

10
dist/fineui.css vendored
Unescape View File

@ -2273,7 +2273,10 @@ textarea {
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {
@ -4959,7 +4962,10 @@ textarea::-webkit-scrollbar-corner {
.ztree.hack li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {

9
dist/fineui.ie.js vendored
Unescape View File

@ -12493,6 +12493,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -87602,7 +87607,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -88987,7 +88992,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

9
dist/fineui.js vendored
Unescape View File

@ -12493,6 +12493,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -88006,7 +88011,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -89391,7 +89396,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

9
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -12248,6 +12248,11 @@ if (!_global.BI) {
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();!(function () {
/*
CryptoJS v3.1.2
@ -70298,7 +70303,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -71683,7 +71688,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

5
dist/resource.css vendored
Unescape View File

@ -133,7 +133,10 @@ textarea::-webkit-scrollbar-corner {
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree.hack li ul.line {

4
dist/widget.js vendored
Unescape View File

@ -25511,7 +25511,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}
@ -26896,7 +26896,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

4
public/css/background.css
Unescape View File

@ -42,8 +42,8 @@
.ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;

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

@ -16,7 +16,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
var text = v;
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

2
src/component/valuechooser/abstract.valuechooser.js
Unescape View File

@ -25,7 +25,7 @@ BI.AbstractValueChooser = BI.inherit(BI.Widget, {
if (BI.isNotNull(this.items)) {
BI.some(this.items, function (i, item) {
// 把value都换成字符串
if (item.value + "" === v) {
if (item.value === v || item.value + "" === v) {
text = item.text;
return true;
}

5
src/core/shortcut.js
Unescape View File

@ -69,4 +69,9 @@
throw new Error("无法根据item创建组件");
};
BI.createElement = function () {
var widget = BI.createWidget.apply(this, arguments);
return widget.element;
};
})();

4
src/css/base/colorchooser/colorpicker/editor.css
Unescape View File

@ -42,8 +42,8 @@
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;

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

@ -42,8 +42,8 @@
.ztree.hack li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;

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

@ -61,7 +61,9 @@
.bi-theme-dark {
.ztree li ul.line {
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);
&:before {
border-left: 1px dashed #606479;
}
}
.ztree.hack li ul.line {
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);

4
ui/css/background.css
Unescape View File

@ -42,8 +42,8 @@
.ztree.hack li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.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 1px 0;
.bi-theme-dark .ztree li ul.line:before {
border-left: 1px dashed #606479;
}
.bi-theme-dark .ztree.hack li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;

Write Preview
Loading…
Cancel
Save