Browse Source

Merge pull request #585 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'd05465b500b07d9ad44d6bd8c1c7e264825c4f75':
  update
  update
  BI-18810 树节点的半选-->全选
es6
windy 6 years ago
parent
commit
21860aa886
  1. 55
      dist/base.css
  2. 13
      dist/base.js
  3. 119
      dist/bundle.css
  4. 28
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 40
      dist/bundle.min.js
  7. 4
      dist/case.js
  8. 4
      dist/core.css
  9. 2
      dist/core.js
  10. 4
      dist/core_without_normalize.css
  11. 119
      dist/fineui.css
  12. 28
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 40
      dist/fineui.min.js
  15. 43
      dist/resource.css
  16. 2
      dist/utils.js
  17. 4
      dist/utils.min.js
  18. 17
      dist/widget.css
  19. 9
      dist/widget.js
  20. 43
      public/css/background.css
  21. 3
      src/base/foundation/message.js
  22. 5
      src/base/tree/asynctree.js
  23. 5
      src/base/tree/treeview.js
  24. 4
      src/case/colorchooser/colorchooser.trigger.js
  25. 2
      src/core/alias.js
  26. 55
      src/css/base/colorchooser/colorpicker/editor.css
  27. 4
      src/css/core/utils/common.css
  28. 43
      src/css/resource/background.css
  29. 17
      src/css/widget/multistringlist/multistringlist.css
  30. 4
      src/less/core/utils/common.less
  31. 42
      src/less/resource/background.less
  32. 6
      src/less/widget/multistringlist/multistringlist.insert.less
  33. 3
      src/less/widget/multistringlist/multistringlist.less
  34. 9
      src/widget/editor/editor.search.js
  35. 43
      ui/css/background.css

55
dist/base.css vendored

@ -306,31 +306,62 @@
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -341,11 +372,23 @@
border-radius: 2px;
}
.bi-color-picker-editor.disabled .auto-color-normal-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;

13
dist/base.js vendored

@ -1798,6 +1798,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function onCheck (event, treeId, treeNode) {
@ -2199,6 +2204,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function beforeExpand (treeId, treeNode) {
@ -5186,6 +5196,9 @@ BI.Msg = function () {
// height: 50,
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
},
width: 60

119
dist/bundle.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
.bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark {
@ -2236,31 +2236,62 @@ textarea {
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -2271,11 +2302,23 @@ textarea {
border-radius: 2px;
}
.bi-color-picker-editor.disabled .auto-color-normal-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -3513,6 +3556,23 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 8px;
border-radius: 8px;
}
.bi-multi-select-insert-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #3685f2;
}
@ -4061,31 +4121,62 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.loading-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/loading.gif');
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_disable.png');
_background: none;

28
dist/bundle.js vendored

@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
@ -37068,6 +37070,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function onCheck (event, treeId, treeNode) {
@ -37469,6 +37476,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function beforeExpand (treeId, treeNode) {
@ -40456,6 +40468,9 @@ BI.Msg = function () {
// height: 50,
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
},
width: 60
@ -51262,7 +51277,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "bi-card color-chooser-trigger-content"
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({
@ -51284,7 +51299,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3
}, {
el: down,
right: 1,
right: -1,
bottom: 1
}]
});
@ -63164,13 +63179,8 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
items: [
{
el: {
type: "bi.center_adapt",
cls: "search-font",
items: [{
el: {
type: "bi.icon"
}
}]
type: "bi.icon_label",
cls: "search-font"
},
width: 24
},

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

40
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -2653,7 +2653,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "bi-card color-chooser-trigger-content"
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({
@ -2675,7 +2675,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3
}, {
el: down,
right: 1,
right: -1,
bottom: 1
}]
});

4
dist/core.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
.bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark {

2
dist/core.js vendored

@ -25567,6 +25567,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
@ -25578,6 +25579,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});

4
dist/core_without_normalize.css vendored

@ -200,10 +200,10 @@ textarea {
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
.bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark {

119
dist/fineui.css vendored

@ -481,10 +481,10 @@ textarea {
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
.bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark {
@ -2236,31 +2236,62 @@ textarea {
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -2271,11 +2302,23 @@ textarea {
border-radius: 2px;
}
.bi-color-picker-editor.disabled .auto-color-normal-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -3513,6 +3556,23 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 8px;
border-radius: 8px;
}
.bi-multi-select-insert-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #3685f2;
}
@ -4061,31 +4121,62 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.loading-background {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/loading.gif');
background: url('resources?path=/com/fr/web/ui/images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png');
_background: none;

28
dist/fineui.js vendored

@ -25788,6 +25788,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
@ -25799,6 +25800,7 @@ BI.ShowAction = BI.inherit(BI.Action, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});
@ -37289,6 +37291,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function onCheck (event, treeId, treeNode) {
@ -37690,6 +37697,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function beforeExpand (treeId, treeNode) {
@ -40677,6 +40689,9 @@ BI.Msg = function () {
// height: 50,
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
},
width: 60
@ -51483,7 +51498,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "bi-card color-chooser-trigger-content"
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({
@ -51505,7 +51520,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3
}, {
el: down,
right: 1,
right: -1,
bottom: 1
}]
});
@ -63385,13 +63400,8 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
items: [
{
el: {
type: "bi.center_adapt",
cls: "search-font",
items: [{
el: {
type: "bi.icon"
}
}]
type: "bi.icon_label",
cls: "search-font"
},
width: 24
},

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

40
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

43
dist/resource.css vendored

@ -353,31 +353,62 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;

2
dist/utils.js vendored

@ -13138,6 +13138,7 @@ _.extend(BI.OB.prototype, {
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
@ -13149,6 +13150,7 @@ _.extend(BI.OB.prototype, {
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

17
dist/widget.css vendored

@ -75,6 +75,23 @@
-moz-border-radius: 8px;
border-radius: 8px;
}
.bi-multi-select-insert-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-tree-check-pane .multi-tree-check-selected {
color: #3685f2;
}

9
dist/widget.js vendored

@ -4778,13 +4778,8 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
items: [
{
el: {
type: "bi.center_adapt",
cls: "search-font",
items: [{
el: {
type: "bi.icon"
}
}]
type: "bi.icon_label",
cls: "search-font"
},
width: 24
},

43
public/css/background.css

@ -282,31 +282,62 @@
_background: none;
}
.loading-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/loading.gif');
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_disable.png');
_background: none;

3
src/base/foundation/message.js

@ -127,6 +127,9 @@ BI.Msg = function () {
// height: 50,
handler: function () {
close();
if (BI.isFunction(callback)) {
callback.apply(null, [false]);
}
}
},
width: 60

5
src/base/tree/asynctree.js

@ -76,6 +76,11 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function beforeExpand (treeId, treeNode) {

5
src/base/tree/treeview.js

@ -192,6 +192,11 @@ BI.TreeView = BI.inherit(BI.Pane, {
node.halfCheck = false;
});
}
var status = treeNode.getCheckStatus();
// 当前点击节点的状态是半选,且为true_part, 则将其改为false_part,使得点击半选后切换到的是全选
if(status.half === true && status.checked === true) {
treeNode.checked = false;
}
}
function onCheck (event, treeId, treeNode) {

4
src/case/colorchooser/colorchooser.trigger.js

@ -19,7 +19,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({
type: "bi.layout",
cls: "bi-card color-chooser-trigger-content"
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
});
var down = BI.createWidget({
@ -41,7 +41,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3
}, {
el: down,
right: 1,
right: -1,
bottom: 1
}]
});

2
src/core/alias.js

@ -577,6 +577,7 @@
BI.encodeURIComponent = function (url) {
BI.specialCharsMap = BI.specialCharsMap || {};
url = url || "";
url = url.replaceAll(BI.keys(BI.specialCharsMap || []).join("|"), function (str) {
return BI.specialCharsMap[str] || str;
});
@ -588,6 +589,7 @@
BI.each(BI.specialCharsMap, function (initialChar, encodeChar) {
reserveSpecialCharsMap[encodeChar] = initialChar;
});
url = url || "";
url = url.replaceAll(BI.keys(reserveSpecialCharsMap || []).join("|"), function (str) {
return reserveSpecialCharsMap[str] || str;
});

55
src/css/base/colorchooser/colorpicker/editor.css

@ -282,31 +282,62 @@
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;
@ -317,11 +348,23 @@
border-radius: 2px;
}
.bi-color-picker-editor.disabled .auto-color-normal-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.bi-color-picker-editor.disabled .trans-color-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;

4
src/css/core/utils/common.css

@ -200,10 +200,10 @@ textarea {
.bi-theme-dark .bi-split-top {
border-top: 1px solid #2F3149;
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid #f2f4f7;
}
.bi-theme-dark .bi-border-bottom {
.bi-theme-dark .bi-split-bottom {
border-bottom: 1px solid #2F3149;
}
.bi-keyword-red-mark {

43
src/css/resource/background.css

@ -282,31 +282,62 @@
_background: none;
}
.loading-background {
background: url('images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
background: url('images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_disable.png');
_background: none;

17
src/css/widget/multistringlist/multistringlist.css

@ -0,0 +1,17 @@
.bi-multi-select-insert-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-bottomright: 0px;
-webkit-border-bottom-right-radius: 0px;
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}

4
src/less/core/utils/common.less

@ -262,12 +262,12 @@ textarea {
}
}
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid @border-color-light-line;
}
.bi-theme-dark {
.bi-border-bottom {
.bi-split-bottom {
border-bottom: 1px solid @border-color-light-line-theme-dark;
}
}

42
src/less/resource/background.less

@ -256,25 +256,55 @@
}
.loading-background {
.imagePath(@icon-loading);
.image2xPath(@icon-loading);
}
.auto-color-background {
.imagePath(@background-auto-color);
.image2xPath(@background-auto-color);
}
.auto-color-normal-background {
.imagePath(@background-auto-color-normal);
.image2xPath(@background-auto-color-normal);
}
.auto-color-normal-disabled-background {
.imagePath(@background-auto-color-normal-disabled);
.image2xPath(@background-auto-color-normal-disabled);
}
.trans-color-background {
.imagePath(@background-trans-color);
.image2xPath(@background-trans-color);
}
.trans-color-disabled-background {
.imagePath(@background-trans-color-disabled);
.image2xPath(@background-trans-color-disabled);
}
.auto-color-background {
&.hack{
.imagePath(@background-auto-color);
}
}
.auto-color-normal-background {
&.hack{
.imagePath(@background-auto-color-normal);
}
}
.auto-color-normal-disabled-background {
&.hack{
.imagePath(@background-auto-color-normal-disabled);
}
}
.trans-color-background {
&.hack{
.imagePath(@background-trans-color);
}
}
.trans-color-disabled-background {
&.hack{
.imagePath(@background-trans-color-disabled);
}
}

6
src/less/widget/multistringlist/multistringlist.insert.less

@ -0,0 +1,6 @@
@import "../../index";
.bi-multi-select-insert-list{
& .bi-search-editor{
.border-corner-bottom-radius(0px, 0px)
}
}

3
src/less/widget/multistringlist/multistringlist.less

@ -1,5 +1,6 @@
@import "../../index";
.bi-multi-select-list{
& .popup-multi-select-list{
& .bi-search-editor{
.border-corner-bottom-radius(0px, 0px)
}
}

9
src/widget/editor/editor.search.js

@ -43,13 +43,8 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
items: [
{
el: {
type: "bi.center_adapt",
cls: "search-font",
items: [{
el: {
type: "bi.icon"
}
}]
type: "bi.icon_label",
cls: "search-font"
},
width: 24
},

43
ui/css/background.css

@ -282,31 +282,62 @@
_background: none;
}
.loading-background {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/loading.gif');
background: url('resources?path=/com/fr/web/ui/images/2x/icon/loading.gif') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/icon/loading.gif');
background-size: contain;
_background: none;
}
.auto-color-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color.png');
background-size: contain;
_background: none;
}
.auto-color-normal-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal.png');
background-size: contain;
_background: none;
}
.auto-color-normal-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/auto_color_normal_disable.png');
background-size: contain;
_background: none;
}
.trans-color-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/trans_normal.png');
background-size: contain;
_background: none;
}
.trans-color-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/2x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/2x/background/trans_disable.png');
background-size: contain;
_background: none;
}
.auto-color-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color.png');
_background: none;
}
.auto-color-normal-background {
.auto-color-normal-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
_background: none;
}
.auto-color-normal-disabled-background {
.auto-color-normal-disabled-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
.trans-color-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png');
_background: none;
}
.trans-color-disabled-background {
.trans-color-disabled-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png');
_background: none;

Loading…
Cancel
Save