无JIRA任务 颜色改一改间距设一设

dist/bundle.css

@@ -3732,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;
@@ -3748,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;
 }

dist/bundle.js

@@ -58074,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
@@ -58091,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();
             }
         }
@@ -67900,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: {
@@ -68694,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

dist/case.js

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

dist/fineui.css

@@ -3732,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;
@@ -3748,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;
 }

dist/fineui.js

@@ -58295,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
@@ -58312,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();
             }
         }
@@ -68121,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: {
@@ -68915,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

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

dist/widget.js

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

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

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

src/less/lib/colors.less

@@ -46,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;
 //深色主题灰色背景

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

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

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

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