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

* commit '55bee11ef154342e7f73033e149709b73d45da4a': 无JIRA任务颜色改一改间距设一设 update 无JIRA任务字体改一下
6 years ago · 1647ac9a82
34 changed files with 381 additions and 122 deletions
--- a/dist/base.js
+++ b/dist/base.js
@ -10767,7 +10767,8 @@ BI.shortcut("bi.toast", BI.Toast);/**
 */
 BI.Tooltip = BI.inherit(BI.Tip, {
    _const: {
-        hgap: 10
+        hgap: 5,
+        vgap: 3
    },

    _defaultConfig: function () {
@ -10821,8 +10822,9 @@ BI.Tooltip = BI.inherit(BI.Tip, {
                textAlign: "left",
                whiteSpace: "normal",
                text: o.text,
-                textHeight: 20,
-                hgap: this._const.hgap
+                textHeight: 16,
+                hgap: this._const.hgap,
+                vgap: this._const.vgap
            });
        }
    },
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -360,23 +360,23 @@ textarea {
 }
 .bi-header-background {
  background-color: #F2F4F7;
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-input {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-textarea {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-theme-dark .bi-header-background {
  background-color: #2F3149;
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-input {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-textarea {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-card {
  background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
 .bi-theme-dark .bi-border {
  border: 1px solid #2F3149;
 }
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-arial {
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
 .bi-border-radius {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
@ -3714,7 +3732,8 @@ ul.ztree.zTreeDragUL {
  left: -8px;
 }
 .bi-slider-track .gray-track {
-  background-color: #F2F4F7;
+  background-color: rgba(61, 77, 102, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
  border-radius: 3px;
@ -3730,6 +3749,19 @@ ul.ztree.zTreeDragUL {
  -moz-border-radius: 3px;
  border-radius: 3px;
 }
+.bi-theme-dark .bi-slider-track .gray-track {
+  background-color: rgba(214, 224, 220, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1ad6e0dc,endColorstr=#1ad6e0dc);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-theme-dark .bi-slider-track .disabled-blue-track {
+  background-color: #606479;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 .bi-date-interval.time-error .bi-input {
  color: #ff4949;
 }
@ -3793,7 +3825,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -46042,7 +46042,8 @@ BI.shortcut("bi.toast", BI.Toast);/**
 */
 BI.Tooltip = BI.inherit(BI.Tip, {
    _const: {
-        hgap: 10
+        hgap: 5,
+        vgap: 3
    },

    _defaultConfig: function () {
@ -46096,8 +46097,9 @@ BI.Tooltip = BI.inherit(BI.Tip, {
                textAlign: "left",
                whiteSpace: "normal",
                text: o.text,
-                textHeight: 20,
-                hgap: this._const.hgap
+                textHeight: 16,
+                hgap: this._const.hgap,
+                vgap: this._const.vgap
            });
        }
    },
@ -55529,7 +55531,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, {
        });
        return BI.createWidget({
            type: "bi.htape",
-            cls: "popup-panel-title bi-header-background bi-border",
+            cls: "popup-panel-title bi-header-background",
            height: 25,
            items: [{
                el: {
@ -58072,7 +58074,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
            },
            {
-                el: this.text
+                el: this.text,
+                lgap: BI.isEmptyString(o.iconCls) ? 5 : 0
            }, {
                el: this.trigerButton,
                width: o.triggerWidth || o.height
@ -58089,14 +58092,17 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var o = this.options;
        this.icon.setIcon(iconCls);
        var iconItem = this.wrapper.attr("items")[0];
+        var textItem = this.wrapper.attr("items")[1];
        if(BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
            if(iconItem.width !== 0) {
                iconItem.width = 0;
+                textItem.lgap = 5;
                this.wrapper.resize();
            }
        }else{
            if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
                iconItem.width = (o.iconWrapperWidth || o.height);
+                textItem.lgap = 0;
                this.wrapper.resize();
            }
        }
@ -61274,7 +61280,7 @@ BI.extend(BI.DynamicDateCard, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
        height: 22
    },

@ -67898,6 +67904,11 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
        this.button_group = BI.createWidget({
            type: "bi.select_list",
            logic: opts.logic,
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            el: BI.extend({
                onLoaded: opts.onLoaded,
                el: {
@ -68692,6 +68703,11 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
        this.storeValue = BI.deepClone(opts.value);
        this.button_group = BI.createWidget({
            type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            element: this,
            logic: {
                dynamic: false
@ -77146,7 +77162,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
@ -77326,7 +77342,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -6897,7 +6897,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, {
        });
        return BI.createWidget({
            type: "bi.htape",
-            cls: "popup-panel-title bi-header-background bi-border",
+            cls: "popup-panel-title bi-header-background",
            height: 25,
            items: [{
                el: {
@ -9440,7 +9440,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
            },
            {
-                el: this.text
+                el: this.text,
+                lgap: BI.isEmptyString(o.iconCls) ? 5 : 0
            }, {
                el: this.trigerButton,
                width: o.triggerWidth || o.height
@ -9457,14 +9458,17 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var o = this.options;
        this.icon.setIcon(iconCls);
        var iconItem = this.wrapper.attr("items")[0];
+        var textItem = this.wrapper.attr("items")[1];
        if(BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
            if(iconItem.width !== 0) {
                iconItem.width = 0;
+                textItem.lgap = 5;
                this.wrapper.resize();
            }
        }else{
            if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
                iconItem.width = (o.iconWrapperWidth || o.height);
+                textItem.lgap = 0;
                this.wrapper.resize();
            }
        }
--- a/dist/core.css
+++ b/dist/core.css
@ -360,23 +360,23 @@ textarea {
 }
 .bi-header-background {
  background-color: #F2F4F7;
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-input {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-textarea {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-theme-dark .bi-header-background {
  background-color: #2F3149;
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-input {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-textarea {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-card {
  background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
 .bi-theme-dark .bi-border {
  border: 1px solid #2F3149;
 }
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-arial {
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
 .bi-border-radius {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -79,23 +79,23 @@ textarea {
 }
 .bi-header-background {
  background-color: #F2F4F7;
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-input {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-textarea {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-theme-dark .bi-header-background {
  background-color: #2F3149;
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-input {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-textarea {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-card {
  background-color: #ffffff;
@ -156,6 +156,24 @@ textarea {
 .bi-theme-dark .bi-border {
  border: 1px solid #2F3149;
 }
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-arial {
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
 .bi-border-radius {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -360,23 +360,23 @@ textarea {
 }
 .bi-header-background {
  background-color: #F2F4F7;
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-input {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-textarea {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-theme-dark .bi-header-background {
  background-color: #2F3149;
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-input {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-textarea {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-card {
  background-color: #ffffff;
@ -437,6 +437,24 @@ textarea {
 .bi-theme-dark .bi-border {
  border: 1px solid #2F3149;
 }
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-arial {
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
 .bi-border-radius {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
@ -3714,7 +3732,8 @@ ul.ztree.zTreeDragUL {
  left: -8px;
 }
 .bi-slider-track .gray-track {
-  background-color: #F2F4F7;
+  background-color: rgba(61, 77, 102, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
  border-radius: 3px;
@ -3730,6 +3749,19 @@ ul.ztree.zTreeDragUL {
  -moz-border-radius: 3px;
  border-radius: 3px;
 }
+.bi-theme-dark .bi-slider-track .gray-track {
+  background-color: rgba(214, 224, 220, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1ad6e0dc,endColorstr=#1ad6e0dc);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-theme-dark .bi-slider-track .disabled-blue-track {
+  background-color: #606479;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 .bi-date-interval.time-error .bi-input {
  color: #ff4949;
 }
@ -3793,7 +3825,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -46263,7 +46263,8 @@ BI.shortcut("bi.toast", BI.Toast);/**
 */
 BI.Tooltip = BI.inherit(BI.Tip, {
    _const: {
-        hgap: 10
+        hgap: 5,
+        vgap: 3
    },

    _defaultConfig: function () {
@ -46317,8 +46318,9 @@ BI.Tooltip = BI.inherit(BI.Tip, {
                textAlign: "left",
                whiteSpace: "normal",
                text: o.text,
-                textHeight: 20,
-                hgap: this._const.hgap
+                textHeight: 16,
+                hgap: this._const.hgap,
+                vgap: this._const.vgap
            });
        }
    },
@ -55750,7 +55752,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, {
        });
        return BI.createWidget({
            type: "bi.htape",
-            cls: "popup-panel-title bi-header-background bi-border",
+            cls: "popup-panel-title bi-header-background",
            height: 25,
            items: [{
                el: {
@ -58293,7 +58295,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
            },
            {
-                el: this.text
+                el: this.text,
+                lgap: BI.isEmptyString(o.iconCls) ? 5 : 0
            }, {
                el: this.trigerButton,
                width: o.triggerWidth || o.height
@ -58310,14 +58313,17 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var o = this.options;
        this.icon.setIcon(iconCls);
        var iconItem = this.wrapper.attr("items")[0];
+        var textItem = this.wrapper.attr("items")[1];
        if(BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
            if(iconItem.width !== 0) {
                iconItem.width = 0;
+                textItem.lgap = 5;
                this.wrapper.resize();
            }
        }else{
            if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
                iconItem.width = (o.iconWrapperWidth || o.height);
+                textItem.lgap = 0;
                this.wrapper.resize();
            }
        }
@ -61495,7 +61501,7 @@ BI.extend(BI.DynamicDateCard, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
        height: 22
    },

@ -68119,6 +68125,11 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
        this.button_group = BI.createWidget({
            type: "bi.select_list",
            logic: opts.logic,
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            el: BI.extend({
                onLoaded: opts.onLoaded,
                el: {
@ -68913,6 +68924,11 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
        this.storeValue = BI.deepClone(opts.value);
        this.button_group = BI.createWidget({
            type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            element: this,
            logic: {
                dynamic: false
@ -77367,7 +77383,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
@ -77547,7 +77563,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/resource.css
+++ b/dist/resource.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/widget.css
+++ b/dist/widget.css
@ -226,7 +226,8 @@
  left: -8px;
 }
 .bi-slider-track .gray-track {
-  background-color: #F2F4F7;
+  background-color: rgba(61, 77, 102, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
  border-radius: 3px;
@ -242,6 +243,19 @@
  -moz-border-radius: 3px;
  border-radius: 3px;
 }
+.bi-theme-dark .bi-slider-track .gray-track {
+  background-color: rgba(214, 224, 220, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1ad6e0dc,endColorstr=#1ad6e0dc);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-theme-dark .bi-slider-track .disabled-blue-track {
+  background-color: #606479;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
 .bi-date-interval.time-error .bi-input {
  color: #ff4949;
 }
--- a/dist/widget.js
+++ b/dist/widget.js
@ -2864,7 +2864,7 @@ BI.extend(BI.DynamicDateCard, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
        height: 22
    },

@ -9488,6 +9488,11 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
        this.button_group = BI.createWidget({
            type: "bi.select_list",
            logic: opts.logic,
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            el: BI.extend({
                onLoaded: opts.onLoaded,
                el: {
@ -10282,6 +10287,11 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
        this.storeValue = BI.deepClone(opts.value);
        this.button_group = BI.createWidget({
            type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            element: this,
            logic: {
                dynamic: false
@ -18736,7 +18746,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
@ -18916,7 +18926,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
--- a/public/css/app.css
+++ b/public/css/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/src/base/single/tip/tip.tooltip.js
+++ b/src/base/single/tip/tip.tooltip.js
@ -7,7 +7,8 @@
 */
 BI.Tooltip = BI.inherit(BI.Tip, {
    _const: {
-        hgap: 10
+        hgap: 5,
+        vgap: 3
    },

    _defaultConfig: function () {
@ -61,8 +62,9 @@ BI.Tooltip = BI.inherit(BI.Tip, {
                textAlign: "left",
                whiteSpace: "normal",
                text: o.text,
-                textHeight: 20,
-                hgap: this._const.hgap
+                textHeight: 16,
+                hgap: this._const.hgap,
+                vgap: this._const.vgap
            });
        }
    },
--- a/src/case/layer/layer.panel.js
+++ b/src/case/layer/layer.panel.js
@ -32,7 +32,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, {
        });
        return BI.createWidget({
            type: "bi.htape",
-            cls: "popup-panel-title bi-header-background bi-border",
+            cls: "popup-panel-title bi-header-background",
            height: 25,
            items: [{
                el: {
--- a/src/case/trigger/trigger.icon.text.js
+++ b/src/case/trigger/trigger.icon.text.js
@ -56,7 +56,8 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                width: BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height)
            },
            {
-                el: this.text
+                el: this.text,
+                lgap: BI.isEmptyString(o.iconCls) ? 5 : 0
            }, {
                el: this.trigerButton,
                width: o.triggerWidth || o.height
@ -73,14 +74,17 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
        var o = this.options;
        this.icon.setIcon(iconCls);
        var iconItem = this.wrapper.attr("items")[0];
+        var textItem = this.wrapper.attr("items")[1];
        if(BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
            if(iconItem.width !== 0) {
                iconItem.width = 0;
+                textItem.lgap = 5;
                this.wrapper.resize();
            }
        }else{
            if(iconItem.width !== (o.iconWrapperWidth || o.height)) {
                iconItem.width = (o.iconWrapperWidth || o.height);
+                textItem.lgap = 0;
                this.wrapper.resize();
            }
        }
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -79,23 +79,23 @@ textarea {
 }
 .bi-header-background {
  background-color: #F2F4F7;
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-input {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-header-background .bi-textarea {
-  color: #3d4d66;
+  color: #647185;
 }
 .bi-theme-dark .bi-header-background {
  background-color: #2F3149;
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-input {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-theme-dark .bi-header-background .bi-textarea {
-  color: #d6e0dc;
+  color: #afb7c6;
 }
 .bi-card {
  background-color: #ffffff;
@ -156,6 +156,24 @@ textarea {
 .bi-theme-dark .bi-border {
  border: 1px solid #2F3149;
 }
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-arial {
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
 .bi-border-radius {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
--- a/src/css/resource/app.css
+++ b/src/css/resource/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/src/css/widget/singleslider/track/widget.css
+++ b/src/css/widget/singleslider/track/widget.css
@ -1,5 +1,6 @@
 .bi-slider-track .gray-track {
-  background-color: #F2F4F7;
+  background-color: rgba(61, 77, 102, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1a3d4d66,endColorstr=#1a3d4d66);
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
  border-radius: 3px;
@ -15,3 +16,16 @@
  -moz-border-radius: 3px;
  border-radius: 3px;
 }
+.bi-theme-dark .bi-slider-track .gray-track {
+  background-color: rgba(214, 224, 220, 0.1);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#1ad6e0dc,endColorstr=#1ad6e0dc);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-theme-dark .bi-slider-track .disabled-blue-track {
+  background-color: #606479;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -97,24 +97,24 @@ textarea {

 .bi-header-background {
  background-color: @color-bi-background-light-gray;
-  color: @color-bi-text-normal;
+  color: @color-bi-text-light-gray;
  & .bi-input {
-    color: @color-bi-text-normal;
+    color: @color-bi-text-light-gray;
  }
  & .bi-textarea {
-    color: @color-bi-text-normal;
+    color: @color-bi-text-light-gray;
  }
 }

 .bi-theme-dark {
  .bi-header-background {
    background-color: @color-bi-background-light-gray-theme-dark;
-    color: @color-bi-text-normal-theme-dark;
+    color: @color-bi-text-light-gray-theme-dark;
    & .bi-input {
-      color: @color-bi-text-normal-theme-dark;
+      color: @color-bi-text-light-gray-theme-dark;
    }
    & .bi-textarea {
-      color: @color-bi-text-normal-theme-dark;
+      color: @color-bi-text-light-gray-theme-dark;
    }
  }
 }
@ -199,6 +199,31 @@ textarea {
  }
 }

+// 字体
+.bi-font-helvetica-neue {
+  font-family: "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+
+.bi-font-arial{
+  font-family: Arial, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+
+.bi-font-PingFang {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Hiragino Sans GB", "Microsoft YaHei", Heiti, serif;
+}
+
+.bi-font-hiragino-sans {
+  font-family: "Hiragino Sans GB", "Helvetica Neue", Arial, "PingFang SC", "Microsoft YaHei", Heiti, serif;
+}
+
+.bi-font-microsoft-yaHei {
+  font-family: "Microsoft YaHei", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", Heiti, serif;
+}
+
+.bi-font-heiti {
+  font-family: Heiti, "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", serif;
+}
+
 .bi-border-radius {
  .border-radius(2px);
 }
--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@ -14,6 +14,8 @@
@color-bi-text-gray: @font-color-gray;
 //浅灰色字体
@color-bi-text-light-gray: @font-color-light-gray;
+//深色浅灰色字体
+@color-bi-text-light-gray-theme-dark: @font-color-light-gray-theme-dark;
 //白色字体颜色
@color-bi-text: @font-color-white;
 //灰化字体颜色
@ -44,8 +46,14 @@
@color-bi-background-default-theme-dark: @background-color-default-theme-dark;
 //黑色背景
@color-bi-background-black: @background-color-black;
+//浅黑色背景
+@color-bi-background-light-black: @background-color-light-black;
+//深色系浅黑色背景
+@color-bi-background-light-black-theme-dark: @background-color-light-black-theme-dark;
 //深灰色背景
@color-bi-background-dark-gray: @background-color-dark-gray;
+//深色系深灰色背景
+@color-bi-background-dark-gray-theme-dark: @background-color-dark-gray-theme-dark;
 //灰色背景(浅)
@color-bi-background-light-gray: @background-color-light-gray;
 //深色主题灰色背景
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@ -47,6 +47,8 @@

 //background color
@background-color-black: #232E40;//
+@background-color-light-black: #3d4d66;
+@background-color-light-black-theme-dark: #d6e0dc;//
@background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640;//
@background-color-normal: #f7f8fa;//
@ -60,6 +62,7 @@
@background-color-light-gray: #F2F4F7;
@background-color-light-gray-theme-dark: #2F3149;
@background-color-dark-gray: #d0d4da;
+@background-color-dark-gray-theme-dark: #606479;
@background-color-disabled: #F2F4F7;
@background-color-disabled-theme-dark: #2F3149;
@background-color-yellow: #ffc101;//
--- a/src/less/resource/app.less
+++ b/src/less/resource/app.less
@ -16,7 +16,7 @@ body {
  background-repeat: repeat;
  .user-select-disable();
  color: @color-bi-text-normal;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;
--- a/src/less/widget/singleslider/track/widget.track.less
+++ b/src/less/widget/singleslider/track/widget.track.less
@ -2,14 +2,27 @@

 .bi-slider-track {
  & .gray-track {
-    background-color: @color-bi-background-light-gray;
+    .background-color(@color-bi-background-light-black, 10%);
    .border-radius(3px);
  }
  & .blue-track {
    .border-radius(3px);
  }
  & .disabled-blue-track {
-    background-color: @background-color-dark-gray;
+    background-color: @color-bi-background-dark-gray;
    .border-radius(3px);
  }
+}
+
+.bi-theme-dark {
+  .bi-slider-track {
+    & .gray-track {
+      .background-color(@color-bi-background-light-black-theme-dark, 10%);
+      .border-radius(3px);
+    }
+    & .disabled-blue-track {
+      background-color: @color-bi-background-dark-gray-theme-dark;
+      .border-radius(3px);
+    }
+  }
 }
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@ -9,7 +9,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow",
+        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
        height: 22
    },

--- a/src/widget/multiselect/multiselect.loader.js
+++ b/src/widget/multiselect/multiselect.loader.js
@ -33,6 +33,11 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
        this.button_group = BI.createWidget({
            type: "bi.select_list",
            logic: opts.logic,
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            el: BI.extend({
                onLoaded: opts.onLoaded,
                el: {
--- a/src/widget/multiselect/search/multiselect.search.loader.js
+++ b/src/widget/multiselect/search/multiselect.search.loader.js
@ -23,6 +23,11 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
        this.storeValue = BI.deepClone(opts.value);
        this.button_group = BI.createWidget({
            type: "bi.select_list",
+            toolbar: {
+                type: "bi.multi_select_bar",
+                cls: "bi-list-item-active",
+                iconWrapperWidth: 36
+            },
            element: this,
            logic: {
                dynamic: false
--- a/src/widget/timeinterval/dateinterval.js
+++ b/src/widget/timeinterval/dateinterval.js
@ -33,7 +33,7 @@ BI.DateInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
--- a/src/widget/timeinterval/timeinterval.js
+++ b/src/widget/timeinterval/timeinterval.js
@ -33,7 +33,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
        BI.createWidget({
            element: self,
            type: "bi.center",
-            hgap: 15,
+            hgap: 10,
            height: this.constants.height,
            items: [{
                type: "bi.absolute",
--- a/ui/css/app.css
+++ b/ui/css/app.css
@ -18,7 +18,7 @@ body {
  -o-user-select: none;
  user-select: none;
  color: #3d4d66;
-  font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3";
+  font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", Heiti;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-decoration: none;