Merge pull request #269 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'a45d2bb9d5bec05f70862d5c61e200c8815c2341':
  warning与negative

bi/widget.css

@@ -0,0 +1,374 @@
+.bi-arrangement .arrangement-helper {
+  background: #3f8ce8;
+  z-index: 1000000000;
+}
+.bi-arrangement .arrangement-block {
+  z-index: 1000000000;
+}
+.bi-arrangement .arrangement-drop-container {
+  z-index: 1000000000;
+}
+.bi-arrangement .arrangement-drop-container .arrangement-drop-region {
+  overflow: hidden;
+}
+.bi-arrangement .arrangement-drop-container .drop-devider {
+  z-index: 1000000001;
+  background: #3f8ce8;
+}
+.bi-arrangement .arrangement-drop-container .top-left,
+.bi-arrangement .arrangement-drop-container .top-right,
+.bi-arrangement .arrangement-drop-container .bottom-left,
+.bi-arrangement .arrangement-drop-container .bottom-right,
+.bi-arrangement .arrangement-drop-container .top-left-second,
+.bi-arrangement .arrangement-drop-container .top-right-second,
+.bi-arrangement .arrangement-drop-container .bottom-left-second,
+.bi-arrangement .arrangement-drop-container .bottom-right-second,
+.bi-arrangement .arrangement-drop-container .top-center,
+.bi-arrangement .arrangement-drop-container .bottom-center,
+.bi-arrangement .arrangement-drop-container .left-center,
+.bi-arrangement .arrangement-drop-container .right-center,
+.bi-arrangement .arrangement-drop-container .top-center-second,
+.bi-arrangement .arrangement-drop-container .bottom-center-second,
+.bi-arrangement .arrangement-drop-container .left-center-second,
+.bi-arrangement .arrangement-drop-container .right-center-second {
+  z-index: 1000000001;
+  background: #3f8ce8;
+}
+.bi-arrangement-droppable {
+  z-index: 100000;
+}
+.bi-date-trigger {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-down-list-popup .list-group-item-text {
+  max-width: 203px;
+}
+.bi-down-list-popup .bi-down-list-item .list-item-text {
+  max-width: 203px;
+}
+.bi-excel-table > div.bottom-right > div > div > table {
+  border-right: 1px solid #d4dadd;
+}
+.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
+  border-right: 1px solid #525466;
+}
+.bi-excel-table-header-cell {
+  font-weight: bold;
+}
+.bi-file-manager-nav-button .file-manager-nav-button-text {
+  max-width: 200px;
+}
+.bi-file-manager-nav-button .file-manager-nav-button-text.active {
+  background-color: #eff1f4;
+  color: #999999;
+}
+.bi-file-manager-nav-button .file-manager-nav-button-triangle {
+  z-index: 1;
+}
+.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active {
+  background-color: #191b2b;
+  color: #999999;
+}
+.bi-interactive-arrangement .interactive-arrangement-dragtag-line {
+  z-index: 1000000000;
+  background-color: #faaa39;
+}
+.bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
+  z-index: 1000000000;
+}
+.bi-interval-slider {
+  min-height: 70px;
+}
+.bi-interval-slider-label {
+  min-height: 50px;
+}
+.bi-month-trigger {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-multidate-combo {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-multidate-popup .multidate-popup-label {
+  color: #3685f2;
+  font-size: 14px;
+}
+.bi-multidate-popup .multidate-popup-item:active,
+.bi-multidate-popup .multidate-popup-item.active {
+  background-color: #3685f2;
+  color: #ffffff;
+  -webkit-border-radius: 2px 2px 0 0;
+  -moz-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+}
+.bi-multidate-popup .multidate-popup-button {
+  color: #3685f2;
+  font-size: 14px;
+}
+.bi-multidate-segment .bi-multidate-editor {
+  font-size: 14px;
+}
+.bi-multi-select-check-pane .multi-select-check-selected {
+  text-decoration: underline;
+}
+.bi-multi-select-combo .multi-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-multi-select-trigger {
+  -webkit-border-radius: 2px 2px 2px 2px;
+  -moz-border-radius: 2px 2px 2px 2px;
+  border-radius: 2px 2px 2px 2px;
+}
+.bi-multi-select-search-pane .multi-select-toolbar {
+  color: #ff4949;
+}
+.bi-multi-select-check-selected-button {
+  z-index: 1;
+}
+.bi-multi-tree-check-pane .multi-tree-check-selected {
+  color: #3685f2;
+}
+.bi-multi-tree-combo .multi-select-trigger-icon-button {
+  font-size: 16px;
+}
+.bi-multi-tree-popup .popup-view-tree {
+  min-height: 170px;
+}
+.bi-multi-tree-check-selected-button .trigger-check-selected {
+  color: #3685f2;
+  z-index: 1;
+}
+.bi-number-editor {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-number-interval .number-interval-small-editor {
+  -moz-border-radius-topleft: 2px;
+  -webkit-border-top-left-radius: 2px;
+  -moz-border-radius-bottomleft: 2px;
+  -webkit-border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+.bi-number-interval .number-interval-big-editor {
+  -moz-border-radius-topright: 2px;
+  -webkit-border-top-right-radius: 2px;
+  -moz-border-radius-bottomright: 2px;
+  -webkit-border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.bi-number-interval .number-interval-big-combo {
+  -moz-border-radius-topleft: 2px;
+  -webkit-border-top-left-radius: 2px;
+  -moz-border-radius-bottomleft: 2px;
+  -webkit-border-bottom-left-radius: 2px;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+.bi-number-interval .number-interval-big-combo .bi-icon-combo-trigger .icon-combo-trigger-icon {
+  font-size: 14px;
+}
+.bi-number-interval .number-interval-small-combo {
+  -moz-border-radius-topright: 2px;
+  -webkit-border-top-right-radius: 2px;
+  -moz-border-radius-bottomright: 2px;
+  -webkit-border-bottom-right-radius: 2px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.bi-number-interval .number-interval-small-combo .bi-icon-combo-trigger .icon-combo-trigger-icon {
+  font-size: 14px;
+}
+.bi-number-interval.number-error .bi-input {
+  color: #ff4949 !important;
+}
+.bi-page-table-cell {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}
+.bi-path-chooser .path-chooser-radio {
+  z-index: 1;
+}
+.bi-path-region .path-region-label {
+  z-index: 1;
+}
+.bi-preview-table-cell {
+  min-height: 25px;
+  min-width: 80px;
+  max-width: 220px;
+}
+.bi-preview-table {
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  -o-user-select: text;
+  user-select: text;
+}
+.bi-preview-table > div > table > thead > tr.odd,
+.bi-preview-table > div > div > div > table > thead > tr.odd {
+  background-color: #eff1f4;
+}
+.bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
+.bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
+  background-color: #191b2b;
+}
+.bi-preview-table-header-cell {
+  font-weight: bold;
+  min-height: 25px;
+  min-width: 80px;
+  max-width: 220px;
+}
+.bi-quarter-trigger {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-relation-view-region .relation-view-region-container {
+  z-index: 1;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-relation-view-region .relation-view-region-container.other-package {
+  border-style: dashed;
+}
+.bi-sequence-table-dynamic-number .sequence-table-title-cell {
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-sequence-table-dynamic-number .sequence-table-number-cell {
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-sequence-table-list-number .sequence-table-title-cell {
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-sequence-table-list-number .sequence-table-number-cell {
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-sequence-table-tree-number .sequence-table-title-cell {
+  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-sequence-table-tree-number .sequence-table-number-cell {
+  -webkit-box-sizing: border-box;
+  /*Safari3.2+*/
+  -moz-box-sizing: border-box;
+  /*Firefox3.5+*/
+  -ms-box-sizing: border-box;
+  /*IE8*/
+  box-sizing: border-box;
+  /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
+}
+.bi-single-slider-label {
+  min-height: 50px;
+}
+.bi-single-slider-normal {
+  min-height: 30px;
+}
+.bi-single-slider {
+  min-height: 50px;
+}
+.bi-single-slider-button .slider-button {
+  cursor: ew-resize;
+  -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  border-radius: 7px;
+}
+.bi-slider-track .gray-track {
+  background-color: rgba(153, 153, 153, 0.3);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d999999,endColorstr=#4d999999);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-slider-track .blue-track {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.bi-param-time-interval.time-error .bi-input {
+  color: #ff4949;
+}
+.bi-param-time-interval.time-error .sign-editor-text {
+  color: #ff4949;
+}
+.bi-year-popup .year-popup-navigation {
+  line-height: 30px;
+}
+.bi-year-popup .year-popup-navigation > .center-element {
+  border-left: 1px solid #d4dadd;
+}
+.bi-year-popup .year-popup-navigation > .first-element {
+  border-left: none;
+}
+.bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
+  border-left: 1px solid #525466;
+}
+.bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
+  border-left: none;
+}
+.bi-year-trigger {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}

dist/base.css

@@ -783,7 +783,7 @@ body .bi-button.button-warning.clear,
 #body .bi-button.button-warning.clear,
 body .bi-button.button-warning.clear .b-font:before,
 #body .bi-button.button-warning.clear .b-font:before {
-  color: #faaa39;
+  color: #ff4949;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
@@ -912,7 +912,7 @@ body .bi-button.button-ignore.disabled.clear:active,
   display: inline-block;
 }
 .bi-code-editor .error-param {
-  color: #faaa39;
+  color: #ff4949;
   padding: 0 5px;
   margin: 1px 1px;
   display: inline-block;
@@ -965,7 +965,7 @@ body .bi-button.button-ignore.disabled.clear:active,
 .bi-input.bi-input-error,
 .bi-textarea.bi-input-error {
   border: none;
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }
 .bi-label {
   text-overflow: ellipsis;
@@ -997,8 +997,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-tip {
   position: fixed !important;
@@ -1014,8 +1014,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   color: #5cb75d;
 }
 .bi-toast.toast-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-tooltip {
   max-width: 250px;
@@ -1030,8 +1030,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   color: #1a1a1a;
 }
 .bi-tooltip.tooltip-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
   border: 1px solid #f4cbcb;
 }
 .bi-sql-editor .cm-s-default span[class*="#"] {

dist/base.js

@@ -20752,6 +20752,7 @@ BI.Trigger = BI.inherit(BI.Single, {
             //   });
             //   label.setTitle(data.description, {
             //     container: "body"
+            
             //   });
             // }
           };

dist/bundle.css

@@ -419,13 +419,13 @@ i {
   border-bottom: 1px solid #525466;
 }
 .bi-keyword-red-mark {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-input {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-textarea {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-high-light {
   color: #3685f2;
@@ -2378,7 +2378,7 @@ body .bi-button.button-warning.clear,
 #body .bi-button.button-warning.clear,
 body .bi-button.button-warning.clear .b-font:before,
 #body .bi-button.button-warning.clear .b-font:before {
-  color: #faaa39;
+  color: #ff4949;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,
@@ -2507,7 +2507,7 @@ body .bi-button.button-ignore.disabled.clear:active,
   display: inline-block;
 }
 .bi-code-editor .error-param {
-  color: #faaa39;
+  color: #ff4949;
   padding: 0 5px;
   margin: 1px 1px;
   display: inline-block;
@@ -2560,7 +2560,7 @@ body .bi-button.button-ignore.disabled.clear:active,
 .bi-input.bi-input-error,
 .bi-textarea.bi-input-error {
   border: none;
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }
 .bi-label {
   text-overflow: ellipsis;
@@ -2592,8 +2592,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-tip {
   position: fixed !important;
@@ -2609,8 +2609,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   color: #5cb75d;
 }
 .bi-toast.toast-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-tooltip {
   max-width: 250px;
@@ -2625,8 +2625,8 @@ body .bi-button.button-ignore.disabled.clear:active,
   color: #1a1a1a;
 }
 .bi-tooltip.tooltip-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
   border: 1px solid #f4cbcb;
 }
 .bi-sql-editor .cm-s-default span[class*="#"] {
@@ -3261,7 +3261,7 @@ ul.ztree.zTreeDragUL {
 }
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
-  background-color: #ff4949;
+  background-color: #faaa39;
 }
 .bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
   z-index: 1000000000;
@@ -3316,7 +3316,7 @@ ul.ztree.zTreeDragUL {
   border-radius: 2px 2px 2px 2px;
 }
 .bi-multi-select-search-pane .multi-select-toolbar {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-multi-select-check-selected-button {
   z-index: 1;
@@ -3378,7 +3378,7 @@ ul.ztree.zTreeDragUL {
   font-size: 14px;
 }
 .bi-number-interval.number-error .bi-input {
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }
 .bi-page-table-cell {
   -webkit-user-select: text;
@@ -3535,10 +3535,10 @@ ul.ztree.zTreeDragUL {
   border-radius: 3px;
 }
 .bi-param-time-interval.time-error .bi-input {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-param-time-interval.time-error .sign-editor-text {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-year-popup .year-popup-navigation {
   line-height: 30px;

dist/bundle.js

@@ -46564,6 +46564,7 @@ BI.Trigger = BI.inherit(BI.Single, {
             //   });
             //   label.setTitle(data.description, {
             //     container: "body"
+            
             //   });
             // }
           };

dist/core.css

@@ -419,13 +419,13 @@ i {
   border-bottom: 1px solid #525466;
 }
 .bi-keyword-red-mark {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-input {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-textarea {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-high-light {
   color: #3685f2;

dist/core_without_normalize.css

@@ -136,13 +136,13 @@
   border-bottom: 1px solid #525466;
 }
 .bi-keyword-red-mark {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-input {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-textarea {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-high-light {
   color: #3685f2;

dist/resource.css

@@ -398,7 +398,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 .search-close-h-font:hover .b-font:before,
 .search-close-h-font.hover .b-font:before {
   content: "\e600";
-  color: #faaa39;
+  color: #ff4949;
 }
 .search-close-h-font.disabled .b-font:before {
   content: "\e600";
@@ -971,11 +971,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .drag-tag-font .b-font:before {
   content: "\e600";
-  color: #ff4949;
+  color: #faaa39;
 }
 .drag-tag-font.disabled .b-font:before {
   content: "\e600";
-  color: #ff4949;
+  color: #faaa39;
 }
 .less-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/widget.css

@@ -73,7 +73,7 @@
 }
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
-  background-color: #ff4949;
+  background-color: #faaa39;
 }
 .bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
   z-index: 1000000000;
@@ -128,7 +128,7 @@
   border-radius: 2px 2px 2px 2px;
 }
 .bi-multi-select-search-pane .multi-select-toolbar {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-multi-select-check-selected-button {
   z-index: 1;
@@ -190,7 +190,7 @@
   font-size: 14px;
 }
 .bi-number-interval.number-error .bi-input {
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }
 .bi-page-table-cell {
   -webkit-user-select: text;
@@ -347,10 +347,10 @@
   border-radius: 3px;
 }
 .bi-param-time-interval.time-error .bi-input {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-param-time-interval.time-error .sign-editor-text {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-year-popup .year-popup-navigation {
   line-height: 30px;

src/base/sql/codemirrior/sql-hint.js

@@ -300,6 +300,7 @@
             //   });
             //   label.setTitle(data.description, {
             //     container: "body"
+            
             //   });
             // }
           };

src/css/base/single/button/button.css

@@ -101,7 +101,7 @@ body .bi-button.button-warning.clear,
 #body .bi-button.button-warning.clear,
 body .bi-button.button-warning.clear .b-font:before,
 #body .bi-button.button-warning.clear .b-font:before {
-  color: #faaa39;
+  color: #ff4949;
 }
 body .bi-button.button-common.disabled,
 #body .bi-button.button-common.disabled,

src/css/base/single/editor/editor.code.css

@@ -9,7 +9,7 @@
   display: inline-block;
 }
 .bi-code-editor .error-param {
-  color: #faaa39;
+  color: #ff4949;
   padding: 0 5px;
   margin: 1px 1px;
   display: inline-block;

src/css/base/single/input/input.css

@@ -15,5 +15,5 @@
 .bi-input.bi-input-error,
 .bi-textarea.bi-input-error {
   border: none;
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }

src/css/base/single/tip/tip.bubble.css

@@ -5,6 +5,6 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }

src/css/base/single/tip/tip.toast.css

@@ -9,6 +9,6 @@
   color: #5cb75d;
 }
 .bi-toast.toast-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
 }

src/css/base/single/tip/tip.tooltip.css

@@ -11,7 +11,7 @@
   color: #1a1a1a;
 }
 .bi-tooltip.tooltip-warning {
-  background: #fddddd;
+  background: #ff4949;
-  color: #faaa39;
+  color: #ff4949;
   border: 1px solid #f4cbcb;
 }

src/css/core/utils/common.css

@@ -136,13 +136,13 @@
   border-bottom: 1px solid #525466;
 }
 .bi-keyword-red-mark {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-input {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-keyword-red-mark .bi-textarea {
-  color: #ff4949;
+  color: #faaa39;
 }
 .bi-high-light {
   color: #3685f2;

src/css/resource/font.css

@@ -69,7 +69,7 @@
 .search-close-h-font:hover .b-font:before,
 .search-close-h-font.hover .b-font:before {
   content: "\e600";
-  color: #faaa39;
+  color: #ff4949;
 }
 .search-close-h-font.disabled .b-font:before {
   content: "\e600";
@@ -642,11 +642,11 @@
 }
 .drag-tag-font .b-font:before {
   content: "\e600";
-  color: #ff4949;
+  color: #faaa39;
 }
 .drag-tag-font.disabled .b-font:before {
   content: "\e600";
-  color: #ff4949;
+  color: #faaa39;
 }
 .less-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

src/css/widget/interactivearrangement/interactivearrangement.css

@@ -1,6 +1,6 @@
 .bi-interactive-arrangement .interactive-arrangement-dragtag-line {
   z-index: 1000000000;
-  background-color: #ff4949;
+  background-color: #faaa39;
 }
 .bi-interactive-arrangement .interactive-arrangement-dragtag-icon {
   z-index: 1000000000;

src/css/widget/multiselect/search/multiselect.search.pane.css

@@ -1,3 +1,3 @@
 .bi-multi-select-search-pane .multi-select-toolbar {
-  color: #faaa39;
+  color: #ff4949;
 }

src/css/widget/numberinterval/numberinterval.css

@@ -37,5 +37,5 @@
   font-size: 14px;
 }
 .bi-number-interval.number-error .bi-input {
-  color: #faaa39 !important;
+  color: #ff4949 !important;
 }

src/css/widget/timeinterval/timeinterval.css

@@ -1,6 +1,6 @@
 .bi-param-time-interval.time-error .bi-input {
-  color: #faaa39;
+  color: #ff4949;
 }
 .bi-param-time-interval.time-error .sign-editor-text {
-  color: #faaa39;
+  color: #ff4949;
 }

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

@@ -63,12 +63,12 @@ body .bi-button, #body .bi-button {
       &, & .b-font:before {
         color: @color-bi-text;
       }
-      background-color: @color-bi-background-delete;
+      background-color: @color-bi-background-failure;
-      border-color: @color-bi-border-delete;
+      border-color: @color-bi-border-failure;
     }
     &.clear {
       &, & .b-font:before {
-        color: @color-bi-text-warning;
+        color: @color-bi-text-failure;
       }
       background-color: transparent;
       border-width: 0;

src/less/base/single/editor/editor.code.less

@@ -10,7 +10,7 @@
     display: inline-block;
   }
   & .error-param {
-    color: @color-bi-text-warning;
+    color: @color-bi-text-failure;
     padding: 0 5px;
     margin: 1px 1px;
     display: inline-block;

src/less/base/single/input/input.less

@@ -14,6 +14,6 @@
 
   &.bi-input-error{
     border: none;
-    color:@color-bi-text-warning !important;
+    color:@color-bi-text-failure !important;
   }
 }

src/less/base/single/tip/tip.bubble.less

@@ -5,6 +5,6 @@
   & .bubble-text{
     .border-radius(2px);
     background: @color-bi-tip-warning-background;
-    color: @color-bi-text-warning;
+    color: @color-bi-text-failure;
   }
 }

src/less/base/single/tip/tip.toast.less

@@ -9,6 +9,6 @@
   }
   &.toast-warning{
     background: @color-bi-tip-warning-background;
-    color: @color-bi-text-warning;
+    color: @color-bi-text-failure;
   }
 }

src/less/base/single/tip/tip.tooltip.less

@@ -11,7 +11,7 @@
   }
   &.tooltip-warning{
     background: @color-bi-tip-warning-background;
-    color: @color-bi-text-warning;
+    color: @color-bi-text-failure;
     border: 1px solid @color-bi-tooltip-warning-border;
   }
 }

src/less/lib/colors.less

@@ -23,11 +23,11 @@
 //成功字体颜色
 @color-bi-text-success: @font-color-success;
 //失败字体颜色
-@color-bi-text-warning: @font-color-warning;
+@color-bi-text-failure: @font-color-negative;
 //基本提亮颜色
 @color-bi-text-highlight: @font-color-highlight;
 //标红色
-@color-bi-text-redmark: @font-color-redmark;
+@color-bi-text-redmark: @font-color-warning;
 
 //普通背景
 @color-bi-background-normal: @background-color-normal;
@@ -48,8 +48,6 @@
 @color-bi-background-success: @background-color-dark-success;
 //失败背景色
 @color-bi-background-failure: @background-color-negative;
-//删除背景色
-@color-bi-background-delete: @background-color-negative;
 //警示背景色
 @color-bi-background-warning: @background-color-warning;
 //背景提亮色
@@ -59,8 +57,6 @@
 @color-bi-border-black: @border-color-black;
 //默认边框色
 @color-bi-border-default: @border-color-default;
-//outline颜色
-@color-bi-border-outline: @border-color-outline;
 //边框线颜色
 @color-bi-border-line: @border-color-line;
 //深色系边框线色
@@ -71,15 +67,13 @@
 @color-bi-border-success: @border-color-success;
 //失败边框色
 @color-bi-border-failure: @border-color-negative;
-//删除边框色
-@color-bi-border-delete: @border-color-negative;
 //警示边框色
 @color-bi-border-warning: @border-color-warning;
 //边框提亮
 @color-bi-border-highlight: @border-color-highlight;
 
 //bubble、toast、tooltip通用
-@color-bi-tip-warning-background: @background-color-alert;
+@color-bi-tip-warning-background: @background-color-negative;
 
 //toast
 //成功背景

src/less/lib/constant.less

@@ -27,8 +27,7 @@
 @font-color-highlight: #3685f2;
 @font-color-success: #5cb75d;
 @font-color-warning: #faaa39;//
-@font-color-redmark: #ff4949;//
+@font-color-negative: #ff4949;//
-@font-color-orange: #fbb03b;//
 
 //background color
 @background-color-black: #1a1a1a;//
@@ -41,9 +40,8 @@
 @background-color-gray: #999999;
 @background-color-disabled: #cccccc;
 
-@background-color-alert: #fddddd;
-@background-color-warning: #faaa39;
 @background-color-negative: #ff4949;
+@background-color-warning: #faaa39;
 
 @background-color-dark-success: #58cc7d;
 @background-color-light-success: #e1f4e7;
@@ -54,7 +52,6 @@
 @border-color-black: #1a1a1a;
 @border-color-line: #d4dadd;
 @border-color-line-theme-dark: #525466;
-@border-color-outline: #3f8ce8;
 @border-color-highlight: #178cdf;
 
 @border-color-warning: #fbb03b;

src/less/resource/font.less

@@ -20,7 +20,7 @@
 .font-hover-active(close-ha-font, @font-cross);
 
 //搜索框中的带有hover后颜色变红的图标
-.font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-warning);
+.font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-failure);
 
 .font-hover(pre-page-h-font, @font-arrow-left);
 

src/less/widget/multiselect/search/multiselect.search.pane.less

@@ -3,6 +3,6 @@
 
 .bi-multi-select-search-pane{
   .multi-select-toolbar{
-    color: @color-bi-text-warning;
+    color: @color-bi-text-failure;
   }
 }

src/less/widget/numberinterval/numberinterval.less

@@ -26,6 +26,6 @@
   }
 
   &.number-error .bi-input {
-    color: @color-bi-text-warning !important;
+    color: @color-bi-text-failure !important;
   }
 }

src/less/widget/timeinterval/timeinterval.less

@@ -2,9 +2,9 @@
 
 .bi-param-time-interval{
   &.time-error .bi-input{
-    color:@color-bi-text-warning
+    color:@color-bi-text-failure
   }
   &.time-error .sign-editor-text{
-    color:@color-bi-text-warning
+    color:@color-bi-text-failure
   }
 }