Merge branch 'master' into bugfix/bugfix

dist/base.css

@@ -306,31 +306,62 @@
   _background: none;
 }
 .loading-background {
-  background: url('images/1x/icon/loading.gif') no-repeat center center;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;

dist/base.js

@@ -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

dist/bundle.css

@@ -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;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;
+  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/1x/icon/loading.gif');
+  _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;

dist/bundle.js

@@ -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",
+                        type: "bi.icon_label",
-                        cls: "search-font",
+                        cls: "search-font"
-                        items: [{
-                            el: {
-                                type: "bi.icon"
-                            }
-                        }]
                     },
                     width: 24
                 },

dist/case.js

@@ -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
             }]
         });

dist/core.css

@@ -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 {

dist/core.js

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

dist/core_without_normalize.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 {

dist/fineui.css

@@ -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;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;
+  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/1x/icon/loading.gif');
+  _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;

dist/fineui.js

@@ -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",
+                        type: "bi.icon_label",
-                        cls: "search-font",
+                        cls: "search-font"
-                        items: [{
-                            el: {
-                                type: "bi.icon"
-                            }
-                        }]
                     },
                     width: 24
                 },

dist/resource.css

@@ -353,31 +353,62 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .loading-background {
-  background: url('images/1x/icon/loading.gif') no-repeat center center;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;

dist/utils.js

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

dist/widget.css

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

dist/widget.js

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

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;
+  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/1x/icon/loading.gif');
+  _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;

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

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) {

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) {

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

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

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;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;

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 {

src/css/resource/background.css

@@ -282,31 +282,62 @@
   _background: none;
 }
 .loading-background {
-  background: url('images/1x/icon/loading.gif') no-repeat center center;
+  background: url('images/2x/icon/loading.gif') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/loading.gif');
+  _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;

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

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

src/less/resource/background.less

@@ -256,25 +256,55 @@
 }
 
 .loading-background {
-  .imagePath(@icon-loading);
+  .image2xPath(@icon-loading);
 }
 
 .auto-color-background {
+  .image2xPath(@background-auto-color);
+}
+
+.auto-color-normal-background {
+  .image2xPath(@background-auto-color-normal);
+}
+
+.auto-color-normal-disabled-background {
+  .image2xPath(@background-auto-color-normal-disabled);
+}
+
+.trans-color-background {
+  .image2xPath(@background-trans-color);
+}
+
+.trans-color-disabled-background {
+  .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);
+  }
 }

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)
+  }
+}

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

src/widget/editor/editor.search.js

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

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;
+  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/1x/icon/loading.gif');
+  _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;