解决冲突

dist/base.css

@@ -1211,7 +1211,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 40px 40px 40px 40px;
   -moz-border-radius: 40px 40px 40px 40px;
   border-radius: 40px 40px 40px 40px;
-  background-color: #d4dadd;
+  background-color: #d0d4da;
 }
 .bi-switch:active,
 .bi-switch.active {
@@ -1222,6 +1222,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -moz-border-radius: 9px 9px 9px 9px;
   border-radius: 9px 9px 9px 9px;
 }
+.bi-switch.disabled {
+  background-color: #F2F4F7;
+}
+.bi-switch.disabled:active {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-switch {
+  background-color: #606479;
+}
+.bi-theme-dark .bi-switch:active,
+.bi-theme-dark .bi-switch.active {
+  background-color: #3685f2;
+}
+.bi-theme-dark .bi-switch.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-switch.disabled:active {
+  background-color: #2F3149;
+}
 
 .bi-multifile-editor .multifile-editor {
   text-align: right;

dist/bundle.css

@@ -3165,7 +3165,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 40px 40px 40px 40px;
   -moz-border-radius: 40px 40px 40px 40px;
   border-radius: 40px 40px 40px 40px;
-  background-color: #d4dadd;
+  background-color: #d0d4da;
 }
 .bi-switch:active,
 .bi-switch.active {
@@ -3176,6 +3176,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -moz-border-radius: 9px 9px 9px 9px;
   border-radius: 9px 9px 9px 9px;
 }
+.bi-switch.disabled {
+  background-color: #F2F4F7;
+}
+.bi-switch.disabled:active {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-switch {
+  background-color: #606479;
+}
+.bi-theme-dark .bi-switch:active,
+.bi-theme-dark .bi-switch.active {
+  background-color: #3685f2;
+}
+.bi-theme-dark .bi-switch.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-switch.disabled:active {
+  background-color: #2F3149;
+}
 
 .bi-multifile-editor .multifile-editor {
   text-align: right;

dist/fineui.css

@@ -3165,7 +3165,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -webkit-border-radius: 40px 40px 40px 40px;
   -moz-border-radius: 40px 40px 40px 40px;
   border-radius: 40px 40px 40px 40px;
-  background-color: #d4dadd;
+  background-color: #d0d4da;
 }
 .bi-switch:active,
 .bi-switch.active {
@@ -3176,6 +3176,25 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   -moz-border-radius: 9px 9px 9px 9px;
   border-radius: 9px 9px 9px 9px;
 }
+.bi-switch.disabled {
+  background-color: #F2F4F7;
+}
+.bi-switch.disabled:active {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-switch {
+  background-color: #606479;
+}
+.bi-theme-dark .bi-switch:active,
+.bi-theme-dark .bi-switch.active {
+  background-color: #3685f2;
+}
+.bi-theme-dark .bi-switch.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-switch.disabled:active {
+  background-color: #2F3149;
+}
 
 .bi-multifile-editor .multifile-editor {
   text-align: right;

src/less/base/single/button/switch.less

@@ -2,11 +2,32 @@
 
 .bi-switch{
   .border-radius(40px 40px 40px 40px);
-  background-color: @background-color-dark;
+  background-color: @color-bi-background-dark-gray;
   &:active, &.active {
     background-color: @color-bi-background-highlight;
   }
   & .circle-button{
     .border-radius(9px 9px 9px 9px);
   }
+  &.disabled {
+    background-color: @color-bi-background-disabled;
+    &:active {
+      background-color: @color-bi-background-disabled;
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-switch{
+    background-color: @color-bi-background-dark-gray-theme-dark;
+    &:active, &.active {
+      background-color: @color-bi-background-highlight;
+    }
+    &.disabled {
+      background-color: @color-bi-background-disabled-theme-dark;
+      &:active {
+        background-color: @color-bi-background-disabled-theme-dark;
+      }
+    }
+  }
 }

src/widget/dynamicdate/dynamicdate.trigger.js

@@ -162,7 +162,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
     },
 
     _setInnerValue: function (date) {
-        var dateStr = BI.print(date, "%Y-%x-%e");
+        var dateStr = BI.print(date, "%Y-%X-%e");
         this.editor.setState(dateStr);
         this.editor.setValue(dateStr);
     },

src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@@ -165,7 +165,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
     },
 
     _setInnerValue: function (date) {
-        var dateStr = BI.print(date, "%Y-%x-%e %H:%M:%S");
+        var dateStr = BI.print(date, "%Y-%X-%e %H:%M:%S");
         this.editor.setState(dateStr);
         this.editor.setValue(dateStr);
     },