diff --git a/bi/base.css b/bi/base.css index 1f5e0a7a8..f423941b2 100644 --- a/bi/base.css +++ b/bi/base.css @@ -1,27 +1,7 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-chooser-popup .color-chooser-popup-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-color-chooser-popup .color-chooser-popup-more { - background: #f4f4f4; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title { - background: #191a2c; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more { - background: #191a2c; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-color-chooser-trigger { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -32,27 +12,16 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-button { - background-color: #eaeaea; -} .bi-color-picker-button .color-picker-button-mask { border: 1px solid #1a1a1a; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker > .center-element { - border-left: 1px solid #ffffff; - border-top: 1px solid #ffffff; +.bi-theme-dark .bi-color-picker-button .color-picker-button-mask { + border: 1px solid #ffffff; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-editor .color-picker-editor-label { - color: #808080; -} .bi-color-picker-editor .color-picker-editor-display { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -63,24 +32,18 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-bubble-combo .bubble-combo-triangle-left { width: 0; height: 0; border-top: 6px solid transparent; - border-left: 6px solid #009de3; + border-left: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-right { width: 0; height: 0; border-top: 6px solid transparent; - border-right: 6px solid #009de3; + border-right: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-top { @@ -88,14 +51,14 @@ height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-top: 6px solid #009de3; + border-top: 6px solid #3f8ce8; } .bi-bubble-combo .bubble-combo-triangle-bottom { width: 0; height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #009de3; + border-bottom: 6px solid #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -106,7 +69,7 @@ box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); } .bi-bubble-popup-view .bubble-popup-line { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -127,9 +90,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ /*************BI.SearchEditor******************/ -.bi-search-editor { - border: 1px solid #d4dadd; -} .bi-search-editor .close-font { font-size: 20px; } @@ -164,28 +124,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-sign-style-editor .sign-style-editor-text { - max-width: 100%; - font-size: 12px; -} -.bi-sign-style-editor .sign-style-editor-tip { - max-width: 100%; - font-size: 12px; - color: #808080; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-text-editor { - border: 1px solid #d4dadd; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ /* BASICS */ .CodeMirror { /* Set height, width, borders, and global font properties here */ @@ -193,7 +131,12 @@ cursor: text; width: 100%; height: 100%; - color: black; + color: #1a1a1a; + background-color: #ffffff; +} +.bi-theme-dark .CodeMirror { + color: #ffffff; + background-color: #242640; } /* PADDING */ .CodeMirror-lines { @@ -230,7 +173,10 @@ } /* CURSOR */ .CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; + border-left: 1px solid #1a1a1a; +} +.bi-theme-dark .CodeMirror div.CodeMirror-cursor { + border-left: 1px solid #ffffff; } /* Shown when moving in bi-directional text */ .CodeMirror div.CodeMirror-secondarycursor { @@ -369,9 +315,9 @@ } .cm-s-default span[class*="fieldName"] { color: white; - padding: 1px ; + padding: 1px; margin: 1px 0px; - background: #009de3; + background: #3f8ce8; } .cm-s-default span[class*="start"] { -webkit-border-radius: 3px 0px 0px 3px; @@ -391,7 +337,7 @@ border-radius: 3px; } .cm-s-default span[class*="#"] { - color: #009de3; + color: #3f8ce8; } .cm-s-default .cm-error { color: #f00; @@ -421,7 +367,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket { .CodeMirror { position: relative; overflow: hidden; - background: white; } .CodeMirror-scroll { overflow: scroll !important; @@ -660,15 +605,9 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-message-title { - background-color: #f4f4f4; - color: #808080; font-size: 16px; cursor: pointer; } -.bi-theme-dark .bi-message-title { - background-color: #191a2c; - color: #b2b2b2; -} .bi-message-text { font-size: 16px; -webkit-user-select: text; @@ -679,14 +618,8 @@ li.CodeMirror-hint-active { user-select: text; } .bi-message-content { - background-color: #ffffff; - color: #808080; font-size: 16px; } -.bi-theme-dark .bi-message-content { - background-color: #202237; - color: #b2b2b2; -} .bi-message-close { font-size: 25px; } @@ -700,38 +633,13 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-popup-panel .popup-panel-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-theme-dark .bi-popup-panel .popup-panel-title { - background: #191a2c; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-searcher-view { - background: #ffffff; -} -.bi-searcher-view .searcher-view-spliter { - background: #d4dadd; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-panel { - border: 1px solid #a3d6e8; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-panel .panel-title { - background-color: #d8f2fd; - border-bottom: 1px solid #a3d6e8; -} .bi-panel .panel-title .panel-title-text { cursor: text; - color: #808080; font-size: 14px; } /****添加计算宽度的--运算符直接需要space****/ @@ -747,15 +655,10 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-pager .page-item { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-pager .page-item.active { - background: #009de3; - color: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -768,17 +671,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-segment-button:active, -.bi-segment-button.active { - color: #ffffff; - background: #009de3; -} -.bi-segment-button.disabled, -.bi-segment-button.disabled:hover, -.bi-segment-button.disabled:active { - color: #1a1a1a; - background: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -786,13 +678,8 @@ li.CodeMirror-hint-active { overflow: hidden; overflow-x: hidden; overflow-y: hidden; - background: #ffffff; - border-right: 1px solid #d4dadd; - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; } .bi-segment > .first-element { - border-left: 1px solid #d4dadd; -webkit-border-radius: 6px 0px 0px 6px; -moz-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; @@ -805,18 +692,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-loading-bar .loading-text { - color: #808080; -} -.bi-loading-bar .loading-text:hover, -.bi-loading-bar .loading-text.hover { - color: #009de3; -} -.bi-loading-bar .loading-text.disabled, -.bi-loading-bar .loading-text.disabled:hover, -.bi-loading-bar .loading-text.disabled:active { - color: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -824,8 +699,8 @@ li.CodeMirror-hint-active { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #009de3; - background-color: #009de3; + border: 1px solid #178cdf; + background-color: #3f8ce8; text-align: center; vertical-align: middle; cursor: pointer; @@ -893,10 +768,10 @@ li.CodeMirror-hint-active { } .bi-button.button-ignore.disabled, .bi-button.button-ignore.disabled .b-font { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-button.button-ignore.disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-success .bi-button-mask, @@ -918,7 +793,7 @@ li.CodeMirror-hint-active { /**** custom color(自定义颜色,用于特定场景) ****/ .bi-single-select-icon-text-item:active .b-font:before, .bi-single-select-icon-text-item.active .b-font:before { - color: #009de3; + color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -959,15 +834,9 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-state-editor .state-editor-infinite-text { - color: #cccccc; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-simple-state-editor .state-editor-infinite-text { - color: #cccccc; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -982,9 +851,6 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1093,24 +959,18 @@ li.CodeMirror-hint-active { /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-collection-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-collection-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-collection-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-collection-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-collection-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1130,24 +990,24 @@ li.CodeMirror-hint-active { border-top: none; } .bi-table > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-table > div > div > table, .bi-table > div > div > div > table { @@ -1171,35 +1031,35 @@ li.CodeMirror-hint-active { .bi-table > div > div > div > table > tbody > tr > td, .bi-table > div > div > table > thead > tr > td, .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #eaeaea; - border-left: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-table > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-right: 1px solid #525466; + border-bottom: 1px solid #525466; } .bi-theme-dark .bi-table > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > table > thead > tr > td, .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #24273e; - border-left: 1px solid #24273e; + border-top: 1px solid #525466; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1213,24 +1073,18 @@ li.CodeMirror-hint-active { /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-grid-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-grid-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-grid-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-grid-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-grid-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1243,12 +1097,13 @@ li.CodeMirror-hint-active { transition-duration: 250ms; transition-timing-function: ease; user-select: none; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); border-radius: 5px; } .bi-theme-dark .scrollbar-layout-main { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } .scrollbar-layout-main-vertical { bottom: 0; @@ -1266,11 +1121,12 @@ li.CodeMirror-hint-active { height: 10px; left: 0; transition-property: background-color; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); } .bi-theme-dark .scrollbar-layout-main-horizontal { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } /* Touching the scroll-track directly makes the scroll-track bolder */ .scrollbar-layout-main-horizontal.public-scrollbar-main-active, @@ -1323,20 +1179,24 @@ li.CodeMirror-hint-active { */ /* Touching the scroll-track directly makes the scroll-track bolder */ .public-scrollbar-face:after { - background-color: #e2e2e2; + background-color: rgba(102, 102, 102, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C666666,endColorstr=#4C666666); } .bi-theme-dark .public-scrollbar-face:after { - background-color: #7d7d7d; + background-color: rgba(204, 204, 204, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4Ccccccc,endColorstr=#4Ccccccc); } .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { - background-color: #7d7d7d; + background-color: rgba(102, 102, 102, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2666666,endColorstr=#B2666666); } .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-faceActive:after { - background-color: #e2e2e2; + background-color: rgba(204, 204, 204, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2cccccc,endColorstr=#B2cccccc); } .horizontal-scrollbar { bottom: 0; @@ -1351,7 +1211,7 @@ li.CodeMirror-hint-active { } .bi-resizable-table-cell .resizable-table-cell-resizer-container:hover .resizable-table-cell-resizer-knob, .bi-resizable-table-cell .resizable-table-cell-resizer-container.dragging .resizable-table-cell-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1359,7 +1219,7 @@ li.CodeMirror-hint-active { .bi-resizable-table .resizable-table-resizer { cursor: ew-resize; z-index: 1; - background-color: #009de3; + background-color: #3f8ce8; } .bi-resizable-table .resizable-table-region-resizer { cursor: ew-resize; @@ -1367,7 +1227,7 @@ li.CodeMirror-hint-active { } .bi-resizable-table .resizable-table-region-resizer:hover .resizable-table-region-resizer-knob, .bi-resizable-table .resizable-table-region-resizer.dragging .resizable-table-region-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1378,12 +1238,6 @@ li.CodeMirror-hint-active { .bi-branch-tree .bi-branch-tree-view { min-width: 300px; } -.bi-click-branch-tree { - border: 1px solid #d4dadd; -} -.bi-click-branch-tree .bi-empty-view { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1391,13 +1245,13 @@ li.CodeMirror-hint-active { color: #808080; } .bi-display-tree .ztree li span.button.switch.center_open { - background-image: url("icon/tree-vertical-line-3.png"); + background-image: url("/icon/tree-vertical-line-3.png"); } .bi-display-tree .ztree li span.button.switch.roots_open { - background-image: url("icon/tree-vertical-line-2.png"); + background-image: url("/icon/tree-vertical-line-2.png"); } .bi-display-tree .ztree li span.button.switch.bottom_open { - background-image: url("icon/tree-vertical-line-4.png"); + background-image: url("/icon/tree-vertical-line-4.png"); } .bi-display-tree .ztree li a, .bi-display-tree .ztree li span { @@ -1417,15 +1271,11 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-trigger .bi-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-editor-trigger { - border: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1433,7 +1283,6 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -1442,7 +1291,6 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-small-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -1450,14 +1298,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-float-box { - background-color: #ffffff; - color: #1a1a1a; -} -.bi-theme-dark .bi-float-box { - background-color: #202237; - color: #b2b2b2; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1470,25 +1310,23 @@ li.CodeMirror-hint-active { cursor: default; } .bi-list-view .list-view-outer { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - color: #1a1a1a; - background: #ffffff; } .bi-list-view .list-view-toolbar { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-list-view .list-view-toolbar > .center-element { - border-left: 1px solid #eaeaea; + border-left: 1px solid #d4dadd; } .bi-list-view .list-view-toolbar > .first-element { border-left: none; } -.bi-theme-dark .bi-list-view .list-view-outer { - color: #b2b2b2; - background: #202237; +.bi-theme-dark .bi-list-view .list-view-toolbar > .center-element { + border-left: 1px solid #525466; +} +.bi-theme-dark .bi-list-view .list-view-toolbar > .first-element { + border-left: none; } diff --git a/bi/base.js b/bi/base.js index 3eb95a678..aea1b5f03 100644 --- a/bi/base.js +++ b/bi/base.js @@ -496,11 +496,15 @@ BI.Text = BI.inherit(BI.Single, { type: "bi.layout", cls: "bi-text" }); - this.text.element.appendTo(this.element); + BI.createWidget({ + type: "bi.default", + element: this, + items: [this.text] + }); if (BI.isKey(o.text)) { - this.text.element.text(o.text); + this.setText(o.text); } else if (BI.isKey(o.value)) { - this.text.element.text(o.value); + this.setText(o.value); } if (o.hgap + o.lgap > 0) { this.text.element.css({ @@ -562,7 +566,7 @@ BI.Text = BI.inherit(BI.Single, { setValue: function (text) { BI.Text.superclass.setValue.apply(this, arguments); if (!this.isReadOnly()) { - this.text.element.text(text); + this.setText(text); } }, @@ -573,7 +577,7 @@ BI.Text = BI.inherit(BI.Single, { setText: function (text) { BI.Text.superclass.setText.apply(this, arguments); this.options.text = text; - this.text.element.text(text); + this.text.element.html(BI.escape(text).replaceAll(" ", " ")); } }); @@ -1114,7 +1118,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { deleted.push(i); } }); - BI.remove(this.buttons, deleted); + BI.removeAt(this.buttons, deleted); this.layouts.removeItemAt(deleted); }, @@ -2950,9 +2954,9 @@ BI.Combo = BI.inherit(BI.Widget, { }, _hideIf: function (e) { - if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { - return; - } + // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { + // return; + // } if (this.element.find(e.target).length > 0) { return; } @@ -14478,12 +14482,12 @@ $.extend(BI, { items: [ { type: 'bi.border', - cls: 'bi-message-content', + cls: 'bi-message-content bi-card', items: { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { @@ -14850,7 +14854,7 @@ BI.shortcut('bi.grid_view', BI.Grid);/** BI.FloatBox = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FloatBox.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-float-box", + baseCls: "bi-float-box bi-card", width: 600, height: 500 }) @@ -14889,7 +14893,7 @@ BI.FloatBox = BI.inherit(BI.Widget, { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { @@ -15044,12 +15048,7 @@ BI.PopupView = BI.inherit(BI.Widget, { "max-width": o.maxWidth + "px" }).bind({"click": fn}); - //FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错：未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题 - try { - this.element.bind("mousewheel", fn); - } catch (e) { - this.element.bind("mousewheel", fn); - } + this.element.bind("mousewheel", fn); o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn}); o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop}); @@ -15077,7 +15076,7 @@ BI.PopupView = BI.inherit(BI.Widget, { hgap: o.hgap, items: BI.LogicFactory.createLogicItemsByDirection(o.direction, BI.extend({ - cls: "list-view-outer" + cls: "list-view-outer bi-card bi-border" }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar) }))) @@ -15121,7 +15120,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(o.buttons, { once: false, @@ -15179,7 +15178,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { _defaultConfig: function () { var conf = BI.SearcherView.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-searcher-view", + baseCls: (conf.baseCls || "") + " bi-searcher-view bi-card", tipText: BI.i18nText("BI-No_Select"), chooseType: BI.Selection.Single, @@ -15239,7 +15238,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { items: [{ type: "bi.layout", height: 1, - cls: "searcher-view-spliter" + cls: "searcher-view-spliter bi-background" }] }); this.searcher = BI.createWidget(o.searcher, { @@ -15636,7 +15635,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { _defaultConfig: function() { var conf = BI.LoadingBar.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-loading-bar', + baseCls : (conf.baseCls ||"")+' bi-loading-bar bi-tips', height: 30, handler: BI.emptyFn }) @@ -15646,7 +15645,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { var self = this; this.loaded = BI.createWidget({ type: "bi.text_button", - cls: "loading-text", + cls: "loading-text bi-list-item-simple", text: this.consts.loadedText, width: 120, handler: this.options.handler @@ -17843,7 +17842,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { tagName: "textarea", width: "100%", height: "100%", - cls: "textarea-editor-content display-block" + cls: "textarea-editor-content display-block bi-card" }); this.content.element.css({"resize": "none"}); BI.createWidget({ @@ -28237,7 +28236,7 @@ BI.shortcut("bi.table_cell", BI.TableCell);/** BI.CollectionTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.CollectionTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-collection-table-cell", + baseCls: "bi-collection-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _left: 0, @@ -28966,7 +28965,7 @@ BI.shortcut('bi.quick_collection_table', BI.QuickCollectionTable);/** BI.GridTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.GridTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-grid-table-cell", + baseCls: "bi-grid-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _rowIndex: 0, @@ -30824,13 +30823,14 @@ BI.Table = BI.inherit(BI.Widget, { .addClass(c === rows.length - 1 ? "last-col" : ""); var w = BI.createWidget(map[r][c], { type: "bi.table_cell", - root: true, textAlign: "left", width: BI.isNumeric(width) ? width : "", height: BI.isNumeric(height) ? height : "", _row: r, _col: c + start }); + self.addWidget(w.getName(), w); + w._mount(); w.element.css("position", "relative"); td.append(w.element); tr.append(td); diff --git a/bi/case.js b/bi/case.js index 546c49b20..12dde9b59 100644 --- a/bi/case.js +++ b/bi/case.js @@ -2509,7 +2509,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.absolute", - cls: "color-chooser-popup-title", + cls: "bi-background bi-border-bottom", items: [{ el: this.colorEditor, left: 0, @@ -2588,7 +2588,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-card", height: 30 }) }, @@ -2645,7 +2645,7 @@ BI.ColorPickerButton = BI.inherit(BI.BasicButton, { _defaultConfig: function () { var conf = BI.ColorPickerButton.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-picker-button" + baseCls: (conf.baseCls || "") + " bi-color-picker-button bi-background bi-border-top bi-border-left" }) }, @@ -2902,7 +2902,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { var self = this, o = this.options; this.colorShow = BI.createWidget({ type: "bi.layout", - cls: "color-picker-editor-display", + cls: "color-picker-editor-display bi-card", height: 20 }); var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { @@ -4315,7 +4315,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; this.trigger = BI.createWidget(o.el, { type: "bi.text_icon_item", - cls: "bi-select-text-trigger pull-down-font", + cls: "bi-select-text-trigger bi-border pull-down-font", text: o.text, readonly: true, textLgap: 5, @@ -5231,7 +5231,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-search-editor", + baseCls: "bi-search-editor bi-border", height: 30, errorText: "", watermark: BI.i18nText("BI-Basic_Search"), @@ -6108,265 +6108,6 @@ BI.SignEditor.EVENT_SPACE = "EVENT_SPACE"; BI.SignEditor.EVENT_EMPTY = "EVENT_EMPTY"; BI.shortcut("bi.sign_editor", BI.SignEditor);/** - * sign标签分两段，可以自定义样式 - * @class BI.SignStyleEditor - * @extends BI.Single - */ -BI.SignStyleEditor = BI.inherit(BI.Single, { - - constants: { - tipTextGap: 4 - }, - - _defaultConfig: function () { - var conf = BI.SignStyleEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-sign-style-editor", - text: "", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - mouseOut: false, - allowBlank: false, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.SignStyleEditor.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.text = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-text", - textAlign: "left", - height: o.height, - hgap: 4, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.tipText = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-tip", - textAlign: "right", - rgap: 4, - height: o.height, - text: o.text, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.text.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.tipText.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.wrap = BI.createWidget({ - type: "bi.htape", - element: this, - items: [this.text, this.tipText] - }); - - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_FOCUS); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_BLUR); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CHANGE); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.SignStyleEditor.EVENT_KEY_DOWN); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_VALID); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self._showHint(); - self._checkText(); - self._resizeLayout(); - self.fireEvent(BI.SignStyleEditor.EVENT_CONFIRM); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_START); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_PAUSE); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_STOP); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_SPACE); - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ERROR); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ENTER); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_RESTRICT); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_EMPTY); - }); - BI.createWidget({ - type: "bi.vertical", - scrolly: false, - element: this, - items: [this.editor] - }); - this._showHint(); - this._checkText(); - - BI.nextTick(function () { - var tipTextSize = self.text.element.getStyle("font-size"); - self.tipTextSize = tipTextSize.substring(0, tipTextSize.length - 2); - self._resizeLayout(); - }); - }, - - _checkText: function () { - var o = this.options; - if (this.editor.getValue() === "") { - this.text.setValue(o.watermark || ""); - this.text.element.addClass("bi-water-mark"); - } else { - this.text.setValue(this.editor.getValue()); - this.tipText.setValue("(" + o.text + ")"); - this.text.element.removeClass("bi-water-mark"); - } - this.setTitle(this.text.getValue() + this.tipText.getValue()); - }, - - _showInput: function () { - this.editor.setVisible(true); - this.text.setVisible(false); - this.tipText.setVisible(false); - }, - - _showHint: function () { - this.editor.setVisible(false); - this.text.setVisible(true); - this.tipText.setVisible(true); - }, - - _resizeLayout: function () { - this.wrap.attr("items")[0].width = BI.DOM.getTextSizeWidth(this.text.getValue(), this.tipTextSize) + 2 * this.constants.tipTextGap; - this.wrap.resize(); - }, - - focus: function () { - this._showInput(); - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - this._showHint(); - this._checkText(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - setValue: function (k) { - BI.SignStyleEditor.superclass.setValue.apply(this, arguments); - this.editor.setValue(k); - this._checkText(); - this._resizeLayout(); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - return this.options.text; - }, - - setState: function (v) { - var o = this.options; - o.text = v; - this._showHint(); - this.tipText.setValue("(" + v + ")"); - this._checkText(); - } -}); -BI.SignStyleEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.SignStyleEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.SignStyleEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.SignStyleEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.SignStyleEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; -BI.SignStyleEditor.EVENT_CLICK_LABEL = "EVENT_CLICK_LABEL"; - -BI.SignStyleEditor.EVENT_START = "EVENT_START"; -BI.SignStyleEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.SignStyleEditor.EVENT_STOP = "EVENT_STOP"; -BI.SignStyleEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.SignStyleEditor.EVENT_VALID = "EVENT_VALID"; -BI.SignStyleEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.SignStyleEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.SignStyleEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.SignStyleEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.SignStyleEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.sign_style_editor", BI.SignStyleEditor);/** * guy * 记录状态的输入框 * @class BI.StateEditor @@ -6415,7 +6156,7 @@ BI.StateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), @@ -6695,7 +6436,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), @@ -6915,7 +6656,7 @@ BI.TextEditor = BI.inherit(BI.Single, { _defaultConfig: function () { var conf = BI.TextEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - extraCls: "bi-text-editor", + extraCls: "bi-text-editor bi-border", hgap: 4, vgap: 2, lgap: 0, @@ -7247,7 +6988,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(text, { type: "bi.text_button", @@ -7308,7 +7049,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, { }); return BI.createWidget({ type: "bi.htape", - cls: "popup-panel-title", + cls: "popup-panel-title bi-background bi-border", height: 25, items: [{ el: { @@ -7509,7 +7250,7 @@ BI.shortcut("bi.list_pane", BI.ListPane);/** BI.Panel = BI.inherit(BI.Widget,{ _defaultConfig : function(){ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ - baseCls: "bi-panel", + baseCls: "bi-panel bi-border", title:"", titleButtons:[], el:{}, @@ -7560,7 +7301,7 @@ BI.Panel = BI.inherit(BI.Widget,{ return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title", + cls: "panel-title bi-tips bi-border-bottom bi-background", height: 30, items: { left: [this.text], @@ -8884,7 +8625,7 @@ BI.DetailPager = BI.inherit(BI.Widget, { type: "bi.button_group", element: this, items: BI.createItems(view, { - cls: "page-item", + cls: "page-item bi-border bi-list-item-active", height: 23, hgap: 10 }), @@ -9005,7 +8746,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, { _defaultConfig: function() { var conf = BI.SegmentButton.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-segment-button', + baseCls : (conf.baseCls ||"")+' bi-segment-button bi-list-item-active', shadow: true, readonly: true, hgap: 10 @@ -9063,10 +8804,15 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup = BI.createWidget({ element: this, type: "bi.button_group", - items: BI.createItems(o.items, { - type: "bi.segment_button", - height: o.height - 2, - whiteSpace: o.whiteSpace + items: BI.map(o.items, function (i, item) { + return BI.extend({ + type: "bi.segment_button", + height: o.height - 2, + whiteSpace: o.whiteSpace + }, item, { + cls: (i === 0 ? "bi-border-left " : "") + + (item.cls || "") + " bi-border-top bi-border-right bi-border-bottom" + }); }), layout: [ { @@ -11388,7 +11134,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-editor-trigger", + baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border", height: 30, validationChecker: BI.emptyFn, quitChecker: BI.emptyFn, @@ -11555,7 +11301,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-select-text-trigger", + baseCls: "bi-select-text-trigger bi-border", height: 24 }); }, @@ -11608,7 +11354,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SmallSelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-small-select-text-trigger", + baseCls: "bi-small-select-text-trigger bi-border", height: 20 }); }, diff --git a/bi/core.css b/bi/core.css index 0f1f664ff..5044d7d89 100644 --- a/bi/core.css +++ b/bi/core.css @@ -2905,10 +2905,16 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .base-disabled { cursor: default !important; - color: #c4c6c6 !important; + color: #cccccc !important; } .base-disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .base-disabled { + color: #666666 !important; +} +.bi-theme-dark .base-disabled .b-font:before { + color: #666666 !important; } .base-invalid { cursor: default !important; @@ -2925,116 +2931,219 @@ .clearfix:after { clear: both; } +.bi-background { + background-color: #eff1f4; + color: #666666; +} +.bi-theme-dark .bi-background { + background-color: #191b2b; + color: #cccccc; +} +.bi-card { + background-color: #ffffff; + color: #666666; +} +.bi-theme-dark .bi-card { + background-color: #242640; + color: #cccccc; +} +.bi-disabled { + color: #cccccc; +} +.bi-theme-dark .bi-disabled { + color: #666666; +} +.bi-tips { + color: #999999; +} +.bi-border { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border { + border: 1px solid #525466; +} +.bi-border-left { + border-left: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-left { + border-left: 1px solid #525466; +} +.bi-border-right { + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-right { + border-right: 1px solid #525466; +} +.bi-border-top { + border-top: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-top { + border-top: 1px solid #525466; +} +.bi-border-bottom { + border-bottom: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-bottom { + border-bottom: 1px solid #525466; +} .bi-keyword-red-mark { color: #f07d0a; } .bi-high-light { - color: #009de3; + color: #3f8ce8; } .bi-water-mark { color: #cccccc; cursor: text; } -.bi-tips { - color: #c4c6c6; +.bi-theme-dark .bi-water-mark { + color: #666666; } .bi-resizer { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); + background: #1a1a1a; + opacity: 0.2; + filter: alpha(opacity=20); z-index: 1000000000; } +.bi-theme-dark .bi-resizer { + background: #ffffff; +} .bi-z-index-mask { background-color: #1a1a1a; opacity: 0.5; filter: alpha(opacity=50); } +.bi-theme-dark .bi-z-index-mask { + background-color: #ffffff; +} .bi-list-item:hover, .bi-list-item.hover { - background-color: #f4f4f4; + background-color: #eff1f4; + color: #1a1a1a; } .bi-list-item.disabled, .bi-list-item.disabled:hover, .bi-list-item.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { - background-color: #04070d; + background-color: #191b2b; color: #ffffff; } +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-list-item-simple:hover, +.bi-list-item-simple.hover { + color: #1a1a1a; +} +.bi-list-item-simple.disabled, +.bi-list-item-simple.disabled:hover, +.bi-list-item-simple.disabled:active { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-simple:hover, +.bi-theme-dark .bi-list-item-simple.hover { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-simple.disabled, +.bi-theme-dark .bi-list-item-simple.disabled:hover, +.bi-theme-dark .bi-list-item-simple.disabled:active { + color: #666666 !important; +} +.bi-list-item-effect:hover { + color: #1a1a1a; +} .bi-list-item-effect.active, .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-effect:hover { + color: #ffffff; } .bi-theme-dark .bi-list-item-effect.active, .bi-theme-dark .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-theme-dark .bi-list-item-effect.disabled, .bi-theme-dark .bi-list-item-effect.disabled:hover, .bi-theme-dark .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-hover.disabled, .bi-theme-dark .bi-list-item-hover.disabled:hover, .bi-theme-dark .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-active:hover, .bi-list-item-active.hover { - background-color: #f4f4f4; + color: #1a1a1a; + background-color: #eff1f4; } .bi-list-item-active.active, .bi-list-item-active:active { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-active.disabled, .bi-list-item-active.disabled:hover, .bi-list-item-active.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { - background-color: #04070d; + background-color: #191b2b; color: #ffffff; } .bi-theme-dark .bi-list-item-active.active, .bi-theme-dark .bi-list-item-active:active { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-select:hover, .bi-list-item-select.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-select:active, .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-list-item-select:active .bi-high-light, .bi-list-item-select.active .bi-high-light { @@ -3043,28 +3152,39 @@ .bi-list-item-select.disabled, .bi-list-item-select.disabled:hover, .bi-list-item-select.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-list-item-select.disabled .bi-high-light, .bi-list-item-select.disabled:hover .bi-high-light, .bi-list-item-select.disabled:active .bi-high-light { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #eff1f4; } .bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-theme-dark .bi-list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select.active .bi-high-light { color: #ffffff; } +.bi-theme-dark .bi-list-item-select.disabled, +.bi-theme-dark .bi-list-item-select.disabled:hover, +.bi-theme-dark .bi-list-item-select.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-select.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { + color: #666666 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; @@ -3141,10 +3261,6 @@ .horizon-left { text-align: left; } -.div-horizon-center { - margin-left: auto; - margin-right: auto; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -3499,8 +3615,8 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-theme-dark { - background-color: #191a2c; - color: #b2b2b2; + background-color: #191b2b; + color: #cccccc; } .bi-theme-dark .bi-input { color: #ffffff; diff --git a/bi/core.js b/bi/core.js index fdac19401..0a23cd165 100644 --- a/bi/core.js +++ b/bi/core.js @@ -2666,6 +2666,13 @@ if (!window.BI) { } }, + parseSafeInt: function (value) { + var MAX_SAFE_INTEGER = 9007199254740991; + return value + ? this.clamp(this.parseInt(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER) + : (value === 0 ? value : 0); + }, + parseFloat: function (number) { try { return parseFloat(number); @@ -4426,27 +4433,14 @@ BI.Widget = BI.inherit(BI.OB, { } this.beforeMounted && this.beforeMounted(); this._isMounted = true; - this._mountChildren(); + this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { widget._mount && widget._mount(); }); this.mounted && this.mounted(); }, - _mountChildren: function () { - var self = this; - var frag = document.createDocumentFragment(); - var hasChild = false; - BI.each(this._children, function (i, widget) { - if (widget.element !== self.element) { - frag.appendChild(widget.element[0]); - hasChild = true; - } - }); - if (hasChild === true) { - this.element.append(frag); - } - }, + _mountChildren: null, _unMount: function () { BI.each(this._children, function (i, widget) { @@ -8289,11 +8283,14 @@ BI.ScalingCellSizeAndPositionManager.prototype = { element.__resizeTriggers__ = !element.removeChild(element.__resizeTriggers__); } } - } + }; BI.ResizeDetector = { addResizeListener: function (widget, fn) { addResizeListener(widget.element[0], fn); + return function () { + removeResizeListener(widget.element[0], fn); + } }, removeResizeListener: function (widget, fn) { removeResizeListener(widget.element[0], fn); @@ -11110,6 +11107,21 @@ BI.Layout = BI.inherit(BI.Widget, { } }, + _mountChildren: function () { + var self = this; + var frag = document.createDocumentFragment(); + var hasChild = false; + BI.each(this._children, function (i, widget) { + if (widget.element !== self.element) { + frag.appendChild(widget.element[0]); + hasChild = true; + } + }); + if (hasChild === true) { + this.element.append(frag); + } + }, + _getChildName: function (index) { return index + ""; }, @@ -17034,7 +17046,7 @@ $(function () { } var rgb = this.rgb2json(this.hex2rgb(hex)); var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114); - if (grayLevel < 192) { + if (grayLevel < 140) { return true; } return false; @@ -17043,7 +17055,7 @@ $(function () { //获取对比颜色 getContrastColor: function (color) { if (this.isDarkColor(color)) { - return "#b2b2b2"; + return "#ffffff"; } return "#1a1a1a"; }, diff --git a/bi/widget.css b/bi/widget.css index 30c4bdc6c..df905928d 100644 --- a/bi/widget.css +++ b/bi/widget.css @@ -1,17 +1,11 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-arrangement-block { - background: #e85050; - opacity: 0.8; - filter: alpha(opacity=80); -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement .arrangement-helper { - border: 1px solid #d4dadd; - background: #009de3; + background: #3f8ce8; z-index: 1000000000; } .bi-arrangement .arrangement-block { @@ -25,7 +19,7 @@ } .bi-arrangement .arrangement-drop-container .drop-devider { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } .bi-arrangement .arrangement-drop-container .top-left, .bi-arrangement .arrangement-drop-container .top-right, @@ -44,7 +38,7 @@ .bi-arrangement .arrangement-drop-container .left-center-second, .bi-arrangement .arrangement-drop-container .right-center-second { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -131,7 +125,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-date-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -139,9 +132,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .bi-down-list-spliter { - border-top: 1px solid #eaeaea; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -155,14 +145,16 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table { + border-right: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table-header-cell { font-weight: bold; - background-color: #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -170,15 +162,9 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-file-item { - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-folder-item { - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -187,35 +173,30 @@ background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #f4f4f4; - color: #808080; + 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 { + background: #242640; +} +.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { + background-color: #191b2b; + color: #999999; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-nav { - border-left: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-fine-tuning-number-editor { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-fine-tuning-number-editor .top-button { - border-left: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} -.bi-fine-tuning-number-editor .bottom-button { - border-top: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -228,26 +209,20 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-image-button-size .image-button-size-button-group { font-size: 12px; - color: #1a1a1a; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-upload-image .upload-image-text-button-label { font-size: 14px; - color: #c4c6c6; + color: #999999; } .bi-upload-image .upload-image-icon-button { z-index: 1; font-size: 16px; - background-color: #ffffff; } .bi-upload-image .upload-image-delete-label { font-size: 14px; - color: #1a1a1a; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -269,7 +244,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-month-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -277,40 +251,26 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-check-pane { - background-color: #f4f4f4; -} .bi-multi-select-check-pane .multi-select-check-selected { - color: #009de3; + color: #3f8ce8; text-decoration: underline; } -.bi-theme-dark .bi-multi-select-check-pane { - background-color: #191a2c; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-display-list .display-list-item { - color: #808080; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-popup-view .multi-select-no-toolbar { - color: #c4c6c6; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px 2px 2px 2px; -moz-border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px; @@ -318,9 +278,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-search-pane { - background: #ffffff; -} .bi-multi-select-search-pane .multi-select-toolbar { color: #e85050; } @@ -328,70 +285,25 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-check-selected-button { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } -.bi-theme-dark .bi-multi-select-check-selected-button { - background-color: #191a2c; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-string-list .popup-multi-string-list { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-check-pane { - background-color: #f4f4f4; -} -.bi-multi-tree-check-pane .multi-tree-continue-select { - background-color: #f4f4f4; -} .bi-multi-tree-check-pane .multi-tree-check-selected { - color: #009de3; + color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-display { - background-color: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ @@ -403,58 +315,20 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-search-pane { - background: #ffffff; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-check-selected-button .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-tree-list-popup { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-numerical-interval .numerical-interval-small-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -463,9 +337,6 @@ border-bottom-left-radius: 2px; } .bi-numerical-interval .numerical-interval-big-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; @@ -474,7 +345,6 @@ border-bottom-right-radius: 2px; } .bi-numerical-interval .numerical-interval-big-combo { - border: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -486,7 +356,6 @@ font-size: 14px; } .bi-numerical-interval .numerical-interval-small-combo { - border: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; @@ -503,15 +372,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-numerical-interval-popup .numerical-interval-popup-item.hover, -.bi-numerical-interval-popup .numerical-interval-popup-item:hover { - background-color: #f4f4f4; -} -.bi-numerical-interval-popup .numerical-interval-popup-item.active, -.bi-numerical-interval-popup .numerical-interval-popup-item:active { - background-color: #f4f4f4; - color: #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -535,17 +395,8 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-path-region { - background: #eaeaea; -} .bi-path-region .path-region-label { z-index: 1; - background: #ffffff; - border: 1px solid #ffffff; -} -.bi-path-region .path-region-label.active { - background: #009de3; - color: #ffffff; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -560,7 +411,11 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eaeaea; + 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; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -581,7 +436,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-quarter-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -589,26 +443,17 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-relation-view-item.active { - color: #ffffff; - background-color: #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-relation-view-region .relation-view-region-container { - background: #ffffff; - border: 1px solid #d4dadd; 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: 1px dashed #d4dadd; -} -.bi-relation-view-region .relation-view-region-container .relation-view-region-title { - border-bottom: 1px solid #d4dadd; + border-style: dashed; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -625,7 +470,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-dynamic-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -636,9 +480,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -655,7 +496,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-list-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -666,9 +506,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -688,7 +525,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-tree-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -699,38 +535,10 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-singletree-combo .singletree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.bi-singletree-combo .bi-singletree-popup .singletree-toolbar { - color: #c4c6c6; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-web-page .web-page-button { - z-index: 1; - font-size: 14px; - background-color: #ffffff; -} -.bi-web-page .web-page-text-button-label { - font-size: 16px; - color: #c4c6c6; -} -.bi-web-page .web-page-delete-label { - font-size: 14px; - color: #1a1a1a; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -738,21 +546,25 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-popup .year-popup-navigation { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #eaeaea; + 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; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/bi/widget.js b/bi/widget.js index 99ffd64b5..bfce10a76 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -35,7 +35,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -251,7 +251,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, styleGetter: numbers[key].isSummary === true ? function () { return o.summaryCellStyleGetter(true); @@ -921,7 +921,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block" + baseCls: "bi-arrangement-block bi-resizer" }); }, @@ -3206,7 +3206,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { type: "bi.layout", width: 18, height: 18, - cls: "arrangement-helper" + cls: "arrangement-helper bi-border" }); BI.createWidget({ type: "bi.absolute", @@ -4876,7 +4876,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge _defaultConfig: function () { return BI.extend(BI.DateTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-date-trigger", + extraCls: "bi-date-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25 @@ -6017,7 +6017,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { items: [{ el: { type: "bi.layout", - cls: "bi-down-list-spliter cursor-pointer", + cls: "bi-down-list-spliter bi-border-top cursor-pointer", height: 0 } @@ -6137,7 +6137,7 @@ BI.ExcelTableHeaderCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ExcelTableHeaderCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-excel-table-header-cell", + baseCls: "bi-excel-table-header-cell bi-background", text: "" }); }, @@ -6564,7 +6564,7 @@ BI.FileManagerFileItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFileItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-file-item bi-list-item", + baseCls: "bi-file-manager-file-item bi-list-item bi-border-bottom", height: 30 }) }, @@ -6631,7 +6631,7 @@ BI.FileManagerFolderItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFolderItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-folder-item bi-list-item", + baseCls: "bi-file-manager-folder-item bi-list-item bi-border-bottom", height: 30 }) }, @@ -6855,7 +6855,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, { var self = this, o = this.options, c = this._const; this.button = BI.createWidget({ type: "bi.text_button", - cls: "file-manager-nav-button-text", + cls: "file-manager-nav-button-text bi-card", once: true, selected: o.selected, text: o.text, @@ -6931,7 +6931,7 @@ BI.FileManagerNav = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FileManagerNav.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-nav", + baseCls: "bi-file-manager-nav bi-border-left", height: 40, items: [] }) @@ -7033,7 +7033,7 @@ BI.shortcut("bi.file_manager_nav", BI.FileManagerNav);/** BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FineTuningNumberEditor.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-fine-tuning-number-editor", + baseCls: "bi-fine-tuning-number-editor bi-border", value: -1 }) }, @@ -7055,7 +7055,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.topBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-pre-page-h-font top-button" + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(1); @@ -7063,7 +7063,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.bottomBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-next-page-h-font bottom-button" + cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(-1); @@ -7121,6 +7121,70 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** + * Created by GameJian on 2016/1/28. + */ +BI.ImageButtonHref = BI.inherit(BI.Single, { + + _defaultConfig: function () { + return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-image-button-href", + title: BI.i18nText("BI-Add_Href") + }) + }, + + _init: function () { + BI.ImageButtonHref.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.trigger = BI.createWidget({ + type: "bi.icon_button", + cls: "img-href-font", + title: o.title, + height: 24, + width: 24 + }); + + this.input = BI.createWidget({ + type: "bi.clear_editor", + watermark: BI.i18nText("BI-Input_Href"), + width: 255, + height: 30 + }); + this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { + self.combo.hideView(); + }); + + this.combo = BI.createWidget({ + type: "bi.combo", + element: this, + direction: "bottom,left", + adjustYOffset: 3, + el: this.trigger, + popup: { + el: this.input, + stopPropagation: false, + minWidth: 255 + } + }); + + this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { + self.input.focus() + }); + + this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { + self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) + }) + }, + + getValue: function () { + return this.input.getValue(); + }, + + setValue: function (url) { + this.input.setValue(url) + } +}); +BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; +BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * @@ -7869,7 +7933,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-month-trigger", + extraCls: "bi-month-trigger bi-border", height: 25 }); }, @@ -9320,7 +9384,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-check-pane", + baseCls: "bi-multi-select-check-pane bi-background", items: [], itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, @@ -9473,7 +9537,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: 'bi.icon_text_item', - cls: 'cursor-default check-font display-list-item', + cls: 'cursor-default check-font display-list-item bi-tips', once: true, invalid: true, selected: true, @@ -9658,7 +9722,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); @@ -10126,7 +10190,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-trigger", + baseCls: "bi-multi-select-trigger bi-border", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, searcher: {}, @@ -10433,7 +10497,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-search-pane", + baseCls: "bi-multi-select-search-pane bi-card", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, keywordGetter: BI.emptyFn @@ -10779,13 +10843,18 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { }, setState: function (ob) { + var o = this.options; ob || (ob = {}); ob.value || (ob.value = []); if (ob.type === BI.Selection.All) { - this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + if (BI.size(ob.assist) === 1) { + this.editor.setState(o.valueFormatter(ob.assist[0] + "") || ob.assist[0] + ""); + } else { + this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + } } else { if (BI.size(ob.value) === 1) { - this.editor.setState(ob.value[0] + ""); + this.editor.setState(o.valueFormatter(ob.value[0] + "" || ob.value[0] + "")); } else { this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.None); } @@ -10940,7 +11009,7 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.popup = BI.createWidget({ type: "bi.multi_select_loader", - cls: "popup-multi-string-list", + cls: "popup-multi-string-list bi-border-left bi-border-right bi-border-bottom", itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, onLoaded: o.onLoaded, @@ -11247,7 +11316,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-check-pane", + baseCls: "bi-multi-tree-check-pane bi-background", onClickContinueSelect: BI.emptyFn }); }, @@ -11542,7 +11611,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); @@ -11708,7 +11777,7 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-search-pane", + baseCls: "bi-multi-tree-search-pane bi-card", itemsCreator: BI.emptyFn, keywordGetter: BI.emptyFn }); @@ -12153,7 +12222,7 @@ BI.shortcut('bi.multi_tree_list', BI.MultiTreeList);/** BI.MultiStringListPopup=BI.inherit(BI.Widget,{ _defaultConfig:function () { return BI.extend(BI.MultiStringListPopup.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-tree-list-popup", + baseCls: "bi-tree-list-popup bi-border-left bi-border-right bi-border-bottom", itemsCreator: BI.emptyFn }); }, @@ -12244,7 +12313,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-small-editor" + cls: "numerical-interval-small-editor bi-border-top bi-border-bottom bi-border-left" }); this.smallTip = BI.createWidget({ @@ -12281,7 +12350,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-big-editor" + cls: "numerical-interval-big-editor bi-border-top bi-border-bottom bi-border-right" }); this.bigTip = BI.createWidget({ @@ -12317,7 +12386,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { //}); this.smallCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-small-combo", + cls: "numerical-interval-small-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", @@ -12336,7 +12405,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } this.bigCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-big-combo", + cls: "numerical-interval-big-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", @@ -13532,7 +13601,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.PathRegion.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-path-region", + baseCls: "bi-path-region bi-background", width: 80, title: "" }) @@ -13569,7 +13638,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { if (BI.isKey(value)) { var label = BI.createWidget({ type: "bi.label", - cls: "path-region-label", + cls: "path-region-label bi-card bi-border bi-list-item-active", text: text, value: value, title: text || value, @@ -14069,7 +14138,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-quarter-trigger", + extraCls: "bi-quarter-trigger bi-border", height: 25 }); }, @@ -14167,7 +14236,7 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.RelationViewItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-item", + baseCls: "bi-relation-view-item bi-list-item-active", height: 25, hoverIn: BI.emptyFn, hoverOut: BI.emptyFn @@ -14538,7 +14607,7 @@ BI.shortcut('bi.relation_view', BI.RelationView);/** BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-region-container", + baseCls: "bi-relation-view-region-container bi-card bi-border", width: 150 }); }, @@ -14689,10 +14758,10 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { element: this, items: [{ type: "bi.vertical", - cls: "relation-view-region-container " + (o.belongPackage ? "" : "other-package"), + cls: "relation-view-region-container bi-card bi-border " + (o.belongPackage ? "" : "other-package"), items: [{ type: "bi.vertical_adapt", - cls: "relation-view-region-title", + cls: "relation-view-region-title bi-border", items: [this.preview, this.title] }, this.button_group] }], @@ -15737,7 +15806,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -15804,7 +15873,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, height: o.rowSize, text: this.start + i, @@ -16460,159 +16529,6 @@ BI.SwitchTree.SelectType = { }; BI.shortcut('bi.switch_tree', BI.SwitchTree); /** - * web组件 - * Created by GameJian on 2016/3/1. - */ -BI.WebPage = BI.inherit(BI.Widget, { - _defaultConfig: function () { - return BI.extend(BI.WebPage.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-web-page" - }) - }, - - _init: function () { - BI.WebPage.superclass._init.apply(this, arguments); - var self = this, o = this.options; - - this.iframe = BI.createWidget({ - type: "bi.iframe" - }); - - this.label = BI.createWidget({ - type: "bi.label", - cls: "web-page-text-button-label", - whiteSpace: "normal", - text: BI.i18nText("BI-Not_Add_Url") - }); - - this.del = BI.createWidget({ - type: "bi.bubble_combo", - el: { - type: "bi.icon_button", - cls: "web-page-button img-shutdown-font", - title: BI.i18nText("BI-Basic_Delete"), - height: 24, - width: 24 - }, - popup: { - type: "bi.bubble_bar_popup_view", - buttons: [{ - value: BI.i18nText(BI.i18nText("BI-Basic_Sure")), - handler: function () { - self.fireEvent(BI.WebPage.EVENT_DESTROY) - } - }, { - value: BI.i18nText("BI-Basic_Cancel"), - level: "ignore", - handler: function () { - self.del.hideView(); - } - }], - el: { - type: "bi.vertical_adapt", - items: [{ - type: "bi.label", - text: BI.i18nText("BI-Sure_Delete_Current_Component"), - cls: "web-page-delete-label", - textAlign: "left", - width: 300 - }], - width: 300, - height: 100, - hgap: 20 - }, - maxHeight: 140, - minWidth: 340 - }, - invisible: true, - stopPropagation: true - }); - - - this.href = BI.createWidget({ - type: "bi.image_button_href", - cls: "web-page-button" - }); - - this.href.on(BI.ImageButtonHref.EVENT_CHANGE, function () { - var url = this.getValue(); - self.setValue(this.getValue()); - self._checkUrl(url); - self.fireEvent(BI.WebPage.EVENT_VALUE_CHANGE); - }); - - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{ - el: this.iframe - }, { - el: this.del, - right: 4, - top: 8 - }, { - el: this.href, - right: 36, - top: 8 - }, { - el: this.label, - top: 32, - left: 0, - bottom: 0, - right: 0 - }] - }); - - this.setToolbarVisible(false); - this._showLabel(); - }, - - _checkUrl: function(url){ - BI.Bubbles.hide(this.getName()); - if(BI.isEmptyString(url)){ - BI.Bubbles.show(this.getName(), BI.i18nText("BI-Click_To_Add_Hyperlink"), this.href, { - offsetStyle: "left" - }); - } - }, - - _hideLabel: function () { - this.label.invisible() - }, - - isSelected: function () { - return this.href.isSelected(); - }, - - _showLabel: function () { - this.label.visible() - }, - - setToolbarVisible: function (v) { - this.href.setVisible(v); - this.del.setVisible(v); - }, - - getValue: function () { - return this.href.getValue() - }, - - setValue: function (url) { - var self = this; - if (BI.isNotEmptyString(url)) { - self._hideLabel(); - } else { - this.setToolbarVisible(true); - this.href.showView(); - } - this.href.setValue(url); - this.iframe.setSrc(BI.Func.formatAddress(url)) - } -}); - -BI.WebPage.EVENT_DESTROY = "EVENT_DESTROY"; -BI.WebPage.EVENT_VALUE_CHANGE = "EVENT_VALUE_CHANGE"; -BI.shortcut("bi.web_page", BI.WebPage);/** * 年份下拉框 * * Created by GUY on 2015/8/28. @@ -16769,7 +16685,7 @@ BI.YearPopup = BI.inherit(BI.Widget, { dynamic: true }, tab: { - cls: "year-popup-navigation", + cls: "year-popup-navigation bi-border-top", height: 25, items: [backBtn, preBtn] }, @@ -16827,7 +16743,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.YearTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-year-trigger", + extraCls: "bi-year-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25 diff --git a/demo/css/face.css b/demo/css/face.css index 80e5f22e7..310c89450 100644 --- a/demo/css/face.css +++ b/demo/css/face.css @@ -1,12 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-face .face-config { - border-right: 1px solid #d4dadd; -} .demo-face .face-config .config-label { font-size: 14px; } -.demo-face .face-config .config-item { - border-bottom: 1px solid #d4dadd; -} diff --git a/demo/css/main.css b/demo/css/main.css index e816d3d95..a7c674685 100644 --- a/demo/css/main.css +++ b/demo/css/main.css @@ -43,8 +43,8 @@ background-color: #178cdf; } body { - background-color: #f3f3f3; + background-color: #eff1f4; } body.bi-theme-dark { - background-color: #191A2C; + background-color: #191B2B; } diff --git a/demo/css/preview.css b/demo/css/preview.css index 1b98b455e..2f6491e13 100644 --- a/demo/css/preview.css +++ b/demo/css/preview.css @@ -1,12 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-preview .preview-title { - border-bottom: 1px solid #d4dadd; -} -.demo-preview .preview-card { - background-color: #ffffff; -} -.bi-theme-dark .demo-preview .preview-card { - background-color: #202237; -} diff --git a/demo/css/west.css b/demo/css/west.css index 80a1d026b..2f6491e13 100644 --- a/demo/css/west.css +++ b/demo/css/west.css @@ -1,10 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-west { - background-color: #ffffff; - border-right: 1px solid #eaeaea; -} -.bi-theme-dark .demo-west { - background-color: #202237; -} diff --git a/demo/js/face.js b/demo/js/face.js index 400a88047..63afbcd0a 100644 --- a/demo/js/face.js +++ b/demo/js/face.js @@ -39,7 +39,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("背景色："), this._createColorPicker(function () { self.backgroundColor = this; @@ -53,7 +53,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("字体颜色："), this._createColorPicker(function () { self.fontColor = this; @@ -63,11 +63,53 @@ Demo.Face = BI.inherit(BI.Widget, { } }, + _createActiveFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("激活状态字体颜色："), this._createColorPicker(function () { + self.activeFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createSelectFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("选中状态字体颜色："), this._createColorPicker(function () { + self.selectFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createGrayFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("灰色字体颜色(用于Card2)："), this._createColorPicker(function () { + self.grayFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + _createDisableFontConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("灰化字体颜色："), this._createColorPicker(function () { self.disabledFontColor = this; @@ -85,25 +127,34 @@ Demo.Face = BI.inherit(BI.Widget, { } }, - _createCardBackgroundConfig: function () { + _createCard1BackgroundConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, - items: [this._createLabel("Card背景颜色："), this._createColorPicker(function () { + items: [this._createLabel("Card1背景颜色："), this._createColorPicker(function () { self.cardBackgroundColor = this; }, function () { self._runGlobalStyle(); })] } }, + _createCard2BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("Card2背景颜色：无颜色")] + } + }, _createHoverBackgroundColor: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("悬浮状态背景颜色："), this._createColorPicker(function () { self.hoverBackgroundColor = this; @@ -117,7 +168,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("激活状态背景颜色："), this._createColorPicker(function () { self.activeBackgroundColor = this; @@ -127,25 +178,163 @@ Demo.Face = BI.inherit(BI.Widget, { } }, + _createSelectBackgroundColor: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("选中状态背景颜色："), this._createColorPicker(function () { + self.selectBackgroundColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createSlitColor: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("分割线颜色(只对左边的表格有效)："), this._createColorPicker(function () { + self.slitColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + _createBaseConfig: function () { return { type: "bi.vertical", items: [this._createLabel("--通用配色--"), this._createBackgroundConfig(), this._createFontConfig(), + this._createActiveFontConfig(), + this._createSelectFontConfig(), + this._createGrayFontConfig(), this._createDisableFontConfig(), - this._createCardBackgroundConfig(), + this._createCard1BackgroundConfig(), + this._createCard2BackgroundConfig(), this._createHoverBackgroundColor(), - this._createActiveBackgroundColor() + this._createActiveBackgroundColor(), + this._createSelectBackgroundColor(), + this._createSlitColor() ] } }, + + _createButton1BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色1："), this._createColorPicker(function () { + self.button1BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + cls: "config-button1", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton2BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色2："), this._createColorPicker(function () { + self.button2BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "success", + cls: "config-button2", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton3BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色3："), this._createColorPicker(function () { + self.button3BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "warning", + cls: "config-button3", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton4BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色4："), this._createColorPicker(function () { + self.button4BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "ignore", + cls: "config-button4", + text: "测试按钮" + }] + } + }] + } + }, + _createScrollBackgroundConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("滚动条底色："), this._createColorPicker(function () { self.scrollBackgroundColor = this; @@ -159,7 +348,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("滚动条thumb颜色："), this._createColorPicker(function () { self.scrollThumbColor = this; @@ -173,7 +362,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("下拉框背景颜色："), this._createColorPicker(function () { self.popupBackgroundColor = this; @@ -278,7 +467,7 @@ Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("弹出层蒙版颜色："), this._createColorPicker(function () { self.maskBackgroundColor = this; @@ -304,6 +493,10 @@ Demo.Face = BI.inherit(BI.Widget, { return { type: "bi.vertical", items: [this._createLabel("--一般配色--"), + this._createButton1BackgroundConfig(), + this._createButton2BackgroundConfig(), + this._createButton3BackgroundConfig(), + this._createButton4BackgroundConfig(), this._createScrollBackgroundConfig(), this._createScrollThumbConfig(), this._createPopupBackgroundConfig(), @@ -320,14 +513,14 @@ Demo.Face = BI.inherit(BI.Widget, { column: 0, row: 0, el: { - type: "demo.preview", - cls: "face-config" + type: "demo.preview" } }, { column: 1, row: 0, el: { type: "bi.vertical", + cls: "face-config bi-border-left", items: [this._createBaseConfig(), this._createCommonConfig()] } @@ -350,24 +543,36 @@ Demo.Face = BI.inherit(BI.Widget, { _runGlobalStyle: function () { var backgroundColor = this.backgroundColor.getValue(); var fontColor = this.fontColor.getValue(); + var activeFontColor = this.activeFontColor.getValue(); + var selectFontColor = this.selectFontColor.getValue(); + var grayFontColor = this.grayFontColor.getValue(); var disabledFontColor = this.disabledFontColor.getValue(); var cardBackgroundColor = this.cardBackgroundColor.getValue(); var hoverBackgroundColor = this.hoverBackgroundColor.getValue(); var activeBackgroundColor = this.activeBackgroundColor.getValue(); + var selectBackgroundColor = this.selectBackgroundColor.getValue(); + var slitColor = this.slitColor.getValue(); + var button1BackgroundColor = this.button1BackgroundColor.getValue(); + var button2BackgroundColor = this.button2BackgroundColor.getValue(); + var button3BackgroundColor = this.button3BackgroundColor.getValue(); + var button4BackgroundColor = this.button4BackgroundColor.getValue(); var scrollBackgroundColor = this.scrollBackgroundColor.getValue(); var scrollThumbColor = this.scrollThumbColor.getValue(); var popupBackgroundColor = this.popupBackgroundColor.getValue(); var maskBackgroundColor = this.maskBackgroundColor.getValue(); - $("#wrapper").css({ - backgroundColor: backgroundColor, - color: fontColor - }); - $(".demo-west,.preview-card").css({ - backgroundColor: cardBackgroundColor - }); this._setStyle({ + ".bi-background": { + "background-color": backgroundColor + "!important", + "color": fontColor + "!important" + }, + ".bi-card": { + "background-color": cardBackgroundColor + "!important" + }, + ".bi-tips": { + "color": grayFontColor + "!important" + }, "div::-webkit-scrollbar,.scrollbar-layout-main": { "background-color": scrollBackgroundColor + "!important" }, @@ -387,10 +592,40 @@ Demo.Face = BI.inherit(BI.Widget, { "background-color": maskBackgroundColor + "!important" }, ".bi-list-item:hover,.bi-list-item-hover:hover,.bi-list-item-active:hover,.bi-list-item-select:hover,.bi-list-item-effect:hover": { - "background-color": hoverBackgroundColor + "background-color": hoverBackgroundColor + "!important" }, ".bi-list-item-active:active,.bi-list-item-select:active,.bi-list-item-effect:active": { - "background-color": activeBackgroundColor + "background-color": activeBackgroundColor + "!important", + "color": activeFontColor + "!important" + }, + ".bi-list-item-active.active,.bi-list-item-select.active,.bi-list-item-effect.active": { + "background-color": selectBackgroundColor + "!important", + "color": selectFontColor + "!important" + }, + ".bi-button": { + "background-color": button1BackgroundColor, + "border-color": button1BackgroundColor + }, + ".bi-button.button-success": { + "background-color": button2BackgroundColor, + "border-color": button2BackgroundColor + }, + ".bi-button.button-warning": { + "background-color": button3BackgroundColor, + "border-color": button3BackgroundColor + }, + ".bi-button.button-ignore": { + "background-color": button4BackgroundColor + }, + ".bi-collection-table-cell": { + "border-right-color": slitColor, + "border-bottom-color": slitColor + }, + ".bi-collection-table-cell.first-col": { + "border-left-color": slitColor + }, + ".bi-collection-table-cell.first-row": { + "border-top-color": slitColor } }) }, @@ -398,15 +633,24 @@ Demo.Face = BI.inherit(BI.Widget, { mounted: function () { this.backgroundColor.setValue(""); this.fontColor.setValue(""); + this.activeFontColor.setValue(""); + this.selectFontColor.setValue(""); + this.grayFontColor.setValue(""); this.disabledFontColor.setValue(""); this.cardBackgroundColor.setValue(""); this.hoverBackgroundColor.setValue(""); this.activeBackgroundColor.setValue(""); + this.selectBackgroundColor.setValue(""); + this.button1BackgroundColor.setValue(""); + this.button2BackgroundColor.setValue(""); + this.button3BackgroundColor.setValue(""); + this.button4BackgroundColor.setValue(""); this.scrollBackgroundColor.setValue(""); this.scrollThumbColor.setValue(""); this.popupBackgroundColor.setValue(""); this.maskBackgroundColor.setValue(""); + this.slitColor.setValue(""); this._runGlobalStyle(); } }); diff --git a/demo/js/main.js b/demo/js/main.js index c049e8acb..b906ada39 100644 --- a/demo/js/main.js +++ b/demo/js/main.js @@ -1,6 +1,6 @@ Demo.Main = BI.inherit(BI.Widget, { props: { - baseCls: "demo-main" + baseCls: "demo-main bi-background" }, render: function () { var center; diff --git a/demo/js/preview.js b/demo/js/preview.js index 3758eb3dd..d1772e5ad 100644 --- a/demo/js/preview.js +++ b/demo/js/preview.js @@ -27,47 +27,73 @@ Demo.Preview = BI.inherit(BI.Widget, { } } return { - type: "bi.center", + type: "bi.absolute", cls: "preview-background", - hgap: 100, - vgap: 100, items: [{ - type: "bi.vtape", - cls: "preview-card", - items: [{ - el: { + el: { + type: "bi.left", + cls: "preview-header bi-tips", + height: 40, + items: [{ type: "bi.label", - cls: "preview-title", height: 40, - text: "统计组件", + text: "Card2", hgap: 10, textAlign: "left" - }, - height: 40 - }, { - type: "bi.center_adapt", - scrollable: true, + }, { + type: "bi.icon_text_item", + cls: "filter-font", + text: "测试图标", + width: 100, + height: 40 + }] + }, + left: 60, + right: 60, + top: 60 + }, { + el: { + type: "bi.vtape", + cls: "preview-card bi-card", items: [{ - type: "bi.resizable_table", el: { - type: "bi.collection_table" - }, - width: 500, - height: 400, - isResizeAdapt: true, - isNeedResize: true, - isNeedMerge: true, - mergeCols: [0, 1], - mergeRule: function (col1, col2) { - return BI.isEqual(col1, col2); + type: "bi.label", + cls: "preview-title bi-border-bottom", + height: 40, + text: "Card1", + hgap: 10, + textAlign: "left" }, - isNeedFreeze: true, - freezeCols: [0, 1], - columnSize: columnSize, - items: items, - header: header + height: 40 + }, { + type: "bi.center_adapt", + scrollable: true, + items: [{ + type: "bi.resizable_table", + el: { + type: "bi.collection_table" + }, + width: 500, + height: 400, + isResizeAdapt: true, + isNeedResize: true, + isNeedMerge: true, + mergeCols: [0, 1], + mergeRule: function (col1, col2) { + return BI.isEqual(col1, col2); + }, + isNeedFreeze: true, + freezeCols: [0, 1], + columnSize: columnSize, + items: items, + header: header + }] }] - }] + }, + left: 60, + right: 60, + top: 160, + bottom: 60 }] } }, diff --git a/demo/js/west.js b/demo/js/west.js index 6ebd1a989..4864f999b 100644 --- a/demo/js/west.js +++ b/demo/js/west.js @@ -1,6 +1,6 @@ Demo.West = BI.inherit(BI.Widget, { props: { - baseCls: "demo-west" + baseCls: "demo-west bi-border-right bi-card" }, render: function () { var self = this; diff --git a/demo/less/face.less b/demo/less/face.less index d6375bac4..6c0577491 100644 --- a/demo/less/face.less +++ b/demo/less/face.less @@ -2,12 +2,10 @@ .demo-face { .face-config { - border-right: 1px solid @color-bi-border-normal; .config-label { font-size: 14px; } .config-item { - border-bottom: 1px solid @color-bi-border-normal; } } } \ No newline at end of file diff --git a/demo/less/preview.less b/demo/less/preview.less index 9aab4861b..50f9e79dc 100644 --- a/demo/less/preview.less +++ b/demo/less/preview.less @@ -1,18 +1,4 @@ @import "index"; .demo-preview { - .preview-title { - border-bottom: 1px solid @color-bi-border-normal; - } - .preview-card { - background-color: @color-bi-background-default; - } -} - -.bi-theme-dark { - .demo-preview { - .preview-card { - background-color: @color-bi-background-default-theme-dark; - } - } } \ No newline at end of file diff --git a/demo/less/west.less b/demo/less/west.less index 90f750203..a3ed9a55e 100644 --- a/demo/less/west.less +++ b/demo/less/west.less @@ -1,12 +1,4 @@ @import "index"; .demo-west { - background-color: @color-bi-background-default; - border-right: 1px solid @color-bi-border-line; } - -.bi-theme-dark { - .demo-west { - background-color: @color-bi-background-default-theme-dark; - } -} \ No newline at end of file diff --git a/docs/base.css b/docs/base.css index 1f5e0a7a8..f423941b2 100644 --- a/docs/base.css +++ b/docs/base.css @@ -1,27 +1,7 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-chooser-popup .color-chooser-popup-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-color-chooser-popup .color-chooser-popup-more { - background: #f4f4f4; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title { - background: #191a2c; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more { - background: #191a2c; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-color-chooser-trigger { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -32,27 +12,16 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-button { - background-color: #eaeaea; -} .bi-color-picker-button .color-picker-button-mask { border: 1px solid #1a1a1a; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker > .center-element { - border-left: 1px solid #ffffff; - border-top: 1px solid #ffffff; +.bi-theme-dark .bi-color-picker-button .color-picker-button-mask { + border: 1px solid #ffffff; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-editor .color-picker-editor-label { - color: #808080; -} .bi-color-picker-editor .color-picker-editor-display { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -63,24 +32,18 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-bubble-combo .bubble-combo-triangle-left { width: 0; height: 0; border-top: 6px solid transparent; - border-left: 6px solid #009de3; + border-left: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-right { width: 0; height: 0; border-top: 6px solid transparent; - border-right: 6px solid #009de3; + border-right: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-top { @@ -88,14 +51,14 @@ height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-top: 6px solid #009de3; + border-top: 6px solid #3f8ce8; } .bi-bubble-combo .bubble-combo-triangle-bottom { width: 0; height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #009de3; + border-bottom: 6px solid #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -106,7 +69,7 @@ box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); } .bi-bubble-popup-view .bubble-popup-line { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -127,9 +90,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ /*************BI.SearchEditor******************/ -.bi-search-editor { - border: 1px solid #d4dadd; -} .bi-search-editor .close-font { font-size: 20px; } @@ -164,28 +124,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-sign-style-editor .sign-style-editor-text { - max-width: 100%; - font-size: 12px; -} -.bi-sign-style-editor .sign-style-editor-tip { - max-width: 100%; - font-size: 12px; - color: #808080; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-text-editor { - border: 1px solid #d4dadd; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ /* BASICS */ .CodeMirror { /* Set height, width, borders, and global font properties here */ @@ -193,7 +131,12 @@ cursor: text; width: 100%; height: 100%; - color: black; + color: #1a1a1a; + background-color: #ffffff; +} +.bi-theme-dark .CodeMirror { + color: #ffffff; + background-color: #242640; } /* PADDING */ .CodeMirror-lines { @@ -230,7 +173,10 @@ } /* CURSOR */ .CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; + border-left: 1px solid #1a1a1a; +} +.bi-theme-dark .CodeMirror div.CodeMirror-cursor { + border-left: 1px solid #ffffff; } /* Shown when moving in bi-directional text */ .CodeMirror div.CodeMirror-secondarycursor { @@ -369,9 +315,9 @@ } .cm-s-default span[class*="fieldName"] { color: white; - padding: 1px ; + padding: 1px; margin: 1px 0px; - background: #009de3; + background: #3f8ce8; } .cm-s-default span[class*="start"] { -webkit-border-radius: 3px 0px 0px 3px; @@ -391,7 +337,7 @@ border-radius: 3px; } .cm-s-default span[class*="#"] { - color: #009de3; + color: #3f8ce8; } .cm-s-default .cm-error { color: #f00; @@ -421,7 +367,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket { .CodeMirror { position: relative; overflow: hidden; - background: white; } .CodeMirror-scroll { overflow: scroll !important; @@ -660,15 +605,9 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-message-title { - background-color: #f4f4f4; - color: #808080; font-size: 16px; cursor: pointer; } -.bi-theme-dark .bi-message-title { - background-color: #191a2c; - color: #b2b2b2; -} .bi-message-text { font-size: 16px; -webkit-user-select: text; @@ -679,14 +618,8 @@ li.CodeMirror-hint-active { user-select: text; } .bi-message-content { - background-color: #ffffff; - color: #808080; font-size: 16px; } -.bi-theme-dark .bi-message-content { - background-color: #202237; - color: #b2b2b2; -} .bi-message-close { font-size: 25px; } @@ -700,38 +633,13 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-popup-panel .popup-panel-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-theme-dark .bi-popup-panel .popup-panel-title { - background: #191a2c; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-searcher-view { - background: #ffffff; -} -.bi-searcher-view .searcher-view-spliter { - background: #d4dadd; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-panel { - border: 1px solid #a3d6e8; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-panel .panel-title { - background-color: #d8f2fd; - border-bottom: 1px solid #a3d6e8; -} .bi-panel .panel-title .panel-title-text { cursor: text; - color: #808080; font-size: 14px; } /****添加计算宽度的--运算符直接需要space****/ @@ -747,15 +655,10 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-pager .page-item { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-pager .page-item.active { - background: #009de3; - color: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -768,17 +671,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-segment-button:active, -.bi-segment-button.active { - color: #ffffff; - background: #009de3; -} -.bi-segment-button.disabled, -.bi-segment-button.disabled:hover, -.bi-segment-button.disabled:active { - color: #1a1a1a; - background: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -786,13 +678,8 @@ li.CodeMirror-hint-active { overflow: hidden; overflow-x: hidden; overflow-y: hidden; - background: #ffffff; - border-right: 1px solid #d4dadd; - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; } .bi-segment > .first-element { - border-left: 1px solid #d4dadd; -webkit-border-radius: 6px 0px 0px 6px; -moz-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; @@ -805,18 +692,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-loading-bar .loading-text { - color: #808080; -} -.bi-loading-bar .loading-text:hover, -.bi-loading-bar .loading-text.hover { - color: #009de3; -} -.bi-loading-bar .loading-text.disabled, -.bi-loading-bar .loading-text.disabled:hover, -.bi-loading-bar .loading-text.disabled:active { - color: #ffffff; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -824,8 +699,8 @@ li.CodeMirror-hint-active { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #009de3; - background-color: #009de3; + border: 1px solid #178cdf; + background-color: #3f8ce8; text-align: center; vertical-align: middle; cursor: pointer; @@ -893,10 +768,10 @@ li.CodeMirror-hint-active { } .bi-button.button-ignore.disabled, .bi-button.button-ignore.disabled .b-font { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-button.button-ignore.disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-success .bi-button-mask, @@ -918,7 +793,7 @@ li.CodeMirror-hint-active { /**** custom color(自定义颜色,用于特定场景) ****/ .bi-single-select-icon-text-item:active .b-font:before, .bi-single-select-icon-text-item.active .b-font:before { - color: #009de3; + color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -959,15 +834,9 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-state-editor .state-editor-infinite-text { - color: #cccccc; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-simple-state-editor .state-editor-infinite-text { - color: #cccccc; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -982,9 +851,6 @@ li.CodeMirror-hint-active { .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1093,24 +959,18 @@ li.CodeMirror-hint-active { /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-collection-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-collection-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-collection-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-collection-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-collection-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1130,24 +990,24 @@ li.CodeMirror-hint-active { border-top: none; } .bi-table > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-table > div > div > table, .bi-table > div > div > div > table { @@ -1171,35 +1031,35 @@ li.CodeMirror-hint-active { .bi-table > div > div > div > table > tbody > tr > td, .bi-table > div > div > table > thead > tr > td, .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #eaeaea; - border-left: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-table > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-right: 1px solid #525466; + border-bottom: 1px solid #525466; } .bi-theme-dark .bi-table > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > table > thead > tr > td, .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #24273e; - border-left: 1px solid #24273e; + border-top: 1px solid #525466; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1213,24 +1073,18 @@ li.CodeMirror-hint-active { /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-grid-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-grid-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-grid-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-grid-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-grid-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1243,12 +1097,13 @@ li.CodeMirror-hint-active { transition-duration: 250ms; transition-timing-function: ease; user-select: none; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); border-radius: 5px; } .bi-theme-dark .scrollbar-layout-main { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } .scrollbar-layout-main-vertical { bottom: 0; @@ -1266,11 +1121,12 @@ li.CodeMirror-hint-active { height: 10px; left: 0; transition-property: background-color; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); } .bi-theme-dark .scrollbar-layout-main-horizontal { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } /* Touching the scroll-track directly makes the scroll-track bolder */ .scrollbar-layout-main-horizontal.public-scrollbar-main-active, @@ -1323,20 +1179,24 @@ li.CodeMirror-hint-active { */ /* Touching the scroll-track directly makes the scroll-track bolder */ .public-scrollbar-face:after { - background-color: #e2e2e2; + background-color: rgba(102, 102, 102, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C666666,endColorstr=#4C666666); } .bi-theme-dark .public-scrollbar-face:after { - background-color: #7d7d7d; + background-color: rgba(204, 204, 204, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4Ccccccc,endColorstr=#4Ccccccc); } .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { - background-color: #7d7d7d; + background-color: rgba(102, 102, 102, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2666666,endColorstr=#B2666666); } .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-faceActive:after { - background-color: #e2e2e2; + background-color: rgba(204, 204, 204, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2cccccc,endColorstr=#B2cccccc); } .horizontal-scrollbar { bottom: 0; @@ -1351,7 +1211,7 @@ li.CodeMirror-hint-active { } .bi-resizable-table-cell .resizable-table-cell-resizer-container:hover .resizable-table-cell-resizer-knob, .bi-resizable-table-cell .resizable-table-cell-resizer-container.dragging .resizable-table-cell-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1359,7 +1219,7 @@ li.CodeMirror-hint-active { .bi-resizable-table .resizable-table-resizer { cursor: ew-resize; z-index: 1; - background-color: #009de3; + background-color: #3f8ce8; } .bi-resizable-table .resizable-table-region-resizer { cursor: ew-resize; @@ -1367,7 +1227,7 @@ li.CodeMirror-hint-active { } .bi-resizable-table .resizable-table-region-resizer:hover .resizable-table-region-resizer-knob, .bi-resizable-table .resizable-table-region-resizer.dragging .resizable-table-region-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -1378,12 +1238,6 @@ li.CodeMirror-hint-active { .bi-branch-tree .bi-branch-tree-view { min-width: 300px; } -.bi-click-branch-tree { - border: 1px solid #d4dadd; -} -.bi-click-branch-tree .bi-empty-view { - background: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1391,13 +1245,13 @@ li.CodeMirror-hint-active { color: #808080; } .bi-display-tree .ztree li span.button.switch.center_open { - background-image: url("icon/tree-vertical-line-3.png"); + background-image: url("/icon/tree-vertical-line-3.png"); } .bi-display-tree .ztree li span.button.switch.roots_open { - background-image: url("icon/tree-vertical-line-2.png"); + background-image: url("/icon/tree-vertical-line-2.png"); } .bi-display-tree .ztree li span.button.switch.bottom_open { - background-image: url("icon/tree-vertical-line-4.png"); + background-image: url("/icon/tree-vertical-line-4.png"); } .bi-display-tree .ztree li a, .bi-display-tree .ztree li span { @@ -1417,15 +1271,11 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-trigger .bi-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-editor-trigger { - border: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1433,7 +1283,6 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -1442,7 +1291,6 @@ li.CodeMirror-hint-active { /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-small-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -1450,14 +1298,6 @@ li.CodeMirror-hint-active { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-float-box { - background-color: #ffffff; - color: #1a1a1a; -} -.bi-theme-dark .bi-float-box { - background-color: #202237; - color: #b2b2b2; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -1470,25 +1310,23 @@ li.CodeMirror-hint-active { cursor: default; } .bi-list-view .list-view-outer { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - color: #1a1a1a; - background: #ffffff; } .bi-list-view .list-view-toolbar { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-list-view .list-view-toolbar > .center-element { - border-left: 1px solid #eaeaea; + border-left: 1px solid #d4dadd; } .bi-list-view .list-view-toolbar > .first-element { border-left: none; } -.bi-theme-dark .bi-list-view .list-view-outer { - color: #b2b2b2; - background: #202237; +.bi-theme-dark .bi-list-view .list-view-toolbar > .center-element { + border-left: 1px solid #525466; +} +.bi-theme-dark .bi-list-view .list-view-toolbar > .first-element { + border-left: none; } diff --git a/docs/base.js b/docs/base.js index 3eb95a678..aea1b5f03 100644 --- a/docs/base.js +++ b/docs/base.js @@ -496,11 +496,15 @@ BI.Text = BI.inherit(BI.Single, { type: "bi.layout", cls: "bi-text" }); - this.text.element.appendTo(this.element); + BI.createWidget({ + type: "bi.default", + element: this, + items: [this.text] + }); if (BI.isKey(o.text)) { - this.text.element.text(o.text); + this.setText(o.text); } else if (BI.isKey(o.value)) { - this.text.element.text(o.value); + this.setText(o.value); } if (o.hgap + o.lgap > 0) { this.text.element.css({ @@ -562,7 +566,7 @@ BI.Text = BI.inherit(BI.Single, { setValue: function (text) { BI.Text.superclass.setValue.apply(this, arguments); if (!this.isReadOnly()) { - this.text.element.text(text); + this.setText(text); } }, @@ -573,7 +577,7 @@ BI.Text = BI.inherit(BI.Single, { setText: function (text) { BI.Text.superclass.setText.apply(this, arguments); this.options.text = text; - this.text.element.text(text); + this.text.element.html(BI.escape(text).replaceAll(" ", " ")); } }); @@ -1114,7 +1118,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { deleted.push(i); } }); - BI.remove(this.buttons, deleted); + BI.removeAt(this.buttons, deleted); this.layouts.removeItemAt(deleted); }, @@ -2950,9 +2954,9 @@ BI.Combo = BI.inherit(BI.Widget, { }, _hideIf: function (e) { - if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { - return; - } + // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { + // return; + // } if (this.element.find(e.target).length > 0) { return; } @@ -14478,12 +14482,12 @@ $.extend(BI, { items: [ { type: 'bi.border', - cls: 'bi-message-content', + cls: 'bi-message-content bi-card', items: { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { @@ -14850,7 +14854,7 @@ BI.shortcut('bi.grid_view', BI.Grid);/** BI.FloatBox = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FloatBox.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-float-box", + baseCls: "bi-float-box bi-card", width: 600, height: 500 }) @@ -14889,7 +14893,7 @@ BI.FloatBox = BI.inherit(BI.Widget, { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { @@ -15044,12 +15048,7 @@ BI.PopupView = BI.inherit(BI.Widget, { "max-width": o.maxWidth + "px" }).bind({"click": fn}); - //FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错：未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题 - try { - this.element.bind("mousewheel", fn); - } catch (e) { - this.element.bind("mousewheel", fn); - } + this.element.bind("mousewheel", fn); o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn}); o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop}); @@ -15077,7 +15076,7 @@ BI.PopupView = BI.inherit(BI.Widget, { hgap: o.hgap, items: BI.LogicFactory.createLogicItemsByDirection(o.direction, BI.extend({ - cls: "list-view-outer" + cls: "list-view-outer bi-card bi-border" }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar) }))) @@ -15121,7 +15120,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(o.buttons, { once: false, @@ -15179,7 +15178,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { _defaultConfig: function () { var conf = BI.SearcherView.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-searcher-view", + baseCls: (conf.baseCls || "") + " bi-searcher-view bi-card", tipText: BI.i18nText("BI-No_Select"), chooseType: BI.Selection.Single, @@ -15239,7 +15238,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { items: [{ type: "bi.layout", height: 1, - cls: "searcher-view-spliter" + cls: "searcher-view-spliter bi-background" }] }); this.searcher = BI.createWidget(o.searcher, { @@ -15636,7 +15635,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { _defaultConfig: function() { var conf = BI.LoadingBar.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-loading-bar', + baseCls : (conf.baseCls ||"")+' bi-loading-bar bi-tips', height: 30, handler: BI.emptyFn }) @@ -15646,7 +15645,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { var self = this; this.loaded = BI.createWidget({ type: "bi.text_button", - cls: "loading-text", + cls: "loading-text bi-list-item-simple", text: this.consts.loadedText, width: 120, handler: this.options.handler @@ -17843,7 +17842,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { tagName: "textarea", width: "100%", height: "100%", - cls: "textarea-editor-content display-block" + cls: "textarea-editor-content display-block bi-card" }); this.content.element.css({"resize": "none"}); BI.createWidget({ @@ -28237,7 +28236,7 @@ BI.shortcut("bi.table_cell", BI.TableCell);/** BI.CollectionTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.CollectionTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-collection-table-cell", + baseCls: "bi-collection-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _left: 0, @@ -28966,7 +28965,7 @@ BI.shortcut('bi.quick_collection_table', BI.QuickCollectionTable);/** BI.GridTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.GridTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-grid-table-cell", + baseCls: "bi-grid-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _rowIndex: 0, @@ -30824,13 +30823,14 @@ BI.Table = BI.inherit(BI.Widget, { .addClass(c === rows.length - 1 ? "last-col" : ""); var w = BI.createWidget(map[r][c], { type: "bi.table_cell", - root: true, textAlign: "left", width: BI.isNumeric(width) ? width : "", height: BI.isNumeric(height) ? height : "", _row: r, _col: c + start }); + self.addWidget(w.getName(), w); + w._mount(); w.element.css("position", "relative"); td.append(w.element); tr.append(td); diff --git a/docs/case.js b/docs/case.js index 546c49b20..12dde9b59 100644 --- a/docs/case.js +++ b/docs/case.js @@ -2509,7 +2509,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.absolute", - cls: "color-chooser-popup-title", + cls: "bi-background bi-border-bottom", items: [{ el: this.colorEditor, left: 0, @@ -2588,7 +2588,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-card", height: 30 }) }, @@ -2645,7 +2645,7 @@ BI.ColorPickerButton = BI.inherit(BI.BasicButton, { _defaultConfig: function () { var conf = BI.ColorPickerButton.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-picker-button" + baseCls: (conf.baseCls || "") + " bi-color-picker-button bi-background bi-border-top bi-border-left" }) }, @@ -2902,7 +2902,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { var self = this, o = this.options; this.colorShow = BI.createWidget({ type: "bi.layout", - cls: "color-picker-editor-display", + cls: "color-picker-editor-display bi-card", height: 20 }); var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { @@ -4315,7 +4315,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; this.trigger = BI.createWidget(o.el, { type: "bi.text_icon_item", - cls: "bi-select-text-trigger pull-down-font", + cls: "bi-select-text-trigger bi-border pull-down-font", text: o.text, readonly: true, textLgap: 5, @@ -5231,7 +5231,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-search-editor", + baseCls: "bi-search-editor bi-border", height: 30, errorText: "", watermark: BI.i18nText("BI-Basic_Search"), @@ -6108,265 +6108,6 @@ BI.SignEditor.EVENT_SPACE = "EVENT_SPACE"; BI.SignEditor.EVENT_EMPTY = "EVENT_EMPTY"; BI.shortcut("bi.sign_editor", BI.SignEditor);/** - * sign标签分两段，可以自定义样式 - * @class BI.SignStyleEditor - * @extends BI.Single - */ -BI.SignStyleEditor = BI.inherit(BI.Single, { - - constants: { - tipTextGap: 4 - }, - - _defaultConfig: function () { - var conf = BI.SignStyleEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-sign-style-editor", - text: "", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - mouseOut: false, - allowBlank: false, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.SignStyleEditor.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.text = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-text", - textAlign: "left", - height: o.height, - hgap: 4, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.tipText = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-tip", - textAlign: "right", - rgap: 4, - height: o.height, - text: o.text, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.text.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.tipText.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.wrap = BI.createWidget({ - type: "bi.htape", - element: this, - items: [this.text, this.tipText] - }); - - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_FOCUS); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_BLUR); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CHANGE); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.SignStyleEditor.EVENT_KEY_DOWN); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_VALID); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self._showHint(); - self._checkText(); - self._resizeLayout(); - self.fireEvent(BI.SignStyleEditor.EVENT_CONFIRM); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_START); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_PAUSE); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_STOP); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_SPACE); - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ERROR); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ENTER); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_RESTRICT); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_EMPTY); - }); - BI.createWidget({ - type: "bi.vertical", - scrolly: false, - element: this, - items: [this.editor] - }); - this._showHint(); - this._checkText(); - - BI.nextTick(function () { - var tipTextSize = self.text.element.getStyle("font-size"); - self.tipTextSize = tipTextSize.substring(0, tipTextSize.length - 2); - self._resizeLayout(); - }); - }, - - _checkText: function () { - var o = this.options; - if (this.editor.getValue() === "") { - this.text.setValue(o.watermark || ""); - this.text.element.addClass("bi-water-mark"); - } else { - this.text.setValue(this.editor.getValue()); - this.tipText.setValue("(" + o.text + ")"); - this.text.element.removeClass("bi-water-mark"); - } - this.setTitle(this.text.getValue() + this.tipText.getValue()); - }, - - _showInput: function () { - this.editor.setVisible(true); - this.text.setVisible(false); - this.tipText.setVisible(false); - }, - - _showHint: function () { - this.editor.setVisible(false); - this.text.setVisible(true); - this.tipText.setVisible(true); - }, - - _resizeLayout: function () { - this.wrap.attr("items")[0].width = BI.DOM.getTextSizeWidth(this.text.getValue(), this.tipTextSize) + 2 * this.constants.tipTextGap; - this.wrap.resize(); - }, - - focus: function () { - this._showInput(); - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - this._showHint(); - this._checkText(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - setValue: function (k) { - BI.SignStyleEditor.superclass.setValue.apply(this, arguments); - this.editor.setValue(k); - this._checkText(); - this._resizeLayout(); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - return this.options.text; - }, - - setState: function (v) { - var o = this.options; - o.text = v; - this._showHint(); - this.tipText.setValue("(" + v + ")"); - this._checkText(); - } -}); -BI.SignStyleEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.SignStyleEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.SignStyleEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.SignStyleEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.SignStyleEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; -BI.SignStyleEditor.EVENT_CLICK_LABEL = "EVENT_CLICK_LABEL"; - -BI.SignStyleEditor.EVENT_START = "EVENT_START"; -BI.SignStyleEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.SignStyleEditor.EVENT_STOP = "EVENT_STOP"; -BI.SignStyleEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.SignStyleEditor.EVENT_VALID = "EVENT_VALID"; -BI.SignStyleEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.SignStyleEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.SignStyleEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.SignStyleEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.SignStyleEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.sign_style_editor", BI.SignStyleEditor);/** * guy * 记录状态的输入框 * @class BI.StateEditor @@ -6415,7 +6156,7 @@ BI.StateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), @@ -6695,7 +6436,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), @@ -6915,7 +6656,7 @@ BI.TextEditor = BI.inherit(BI.Single, { _defaultConfig: function () { var conf = BI.TextEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - extraCls: "bi-text-editor", + extraCls: "bi-text-editor bi-border", hgap: 4, vgap: 2, lgap: 0, @@ -7247,7 +6988,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(text, { type: "bi.text_button", @@ -7308,7 +7049,7 @@ BI.PopupPanel = BI.inherit(BI.MultiPopupView, { }); return BI.createWidget({ type: "bi.htape", - cls: "popup-panel-title", + cls: "popup-panel-title bi-background bi-border", height: 25, items: [{ el: { @@ -7509,7 +7250,7 @@ BI.shortcut("bi.list_pane", BI.ListPane);/** BI.Panel = BI.inherit(BI.Widget,{ _defaultConfig : function(){ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ - baseCls: "bi-panel", + baseCls: "bi-panel bi-border", title:"", titleButtons:[], el:{}, @@ -7560,7 +7301,7 @@ BI.Panel = BI.inherit(BI.Widget,{ return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title", + cls: "panel-title bi-tips bi-border-bottom bi-background", height: 30, items: { left: [this.text], @@ -8884,7 +8625,7 @@ BI.DetailPager = BI.inherit(BI.Widget, { type: "bi.button_group", element: this, items: BI.createItems(view, { - cls: "page-item", + cls: "page-item bi-border bi-list-item-active", height: 23, hgap: 10 }), @@ -9005,7 +8746,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, { _defaultConfig: function() { var conf = BI.SegmentButton.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-segment-button', + baseCls : (conf.baseCls ||"")+' bi-segment-button bi-list-item-active', shadow: true, readonly: true, hgap: 10 @@ -9063,10 +8804,15 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup = BI.createWidget({ element: this, type: "bi.button_group", - items: BI.createItems(o.items, { - type: "bi.segment_button", - height: o.height - 2, - whiteSpace: o.whiteSpace + items: BI.map(o.items, function (i, item) { + return BI.extend({ + type: "bi.segment_button", + height: o.height - 2, + whiteSpace: o.whiteSpace + }, item, { + cls: (i === 0 ? "bi-border-left " : "") + + (item.cls || "") + " bi-border-top bi-border-right bi-border-bottom" + }); }), layout: [ { @@ -11388,7 +11134,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-editor-trigger", + baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border", height: 30, validationChecker: BI.emptyFn, quitChecker: BI.emptyFn, @@ -11555,7 +11301,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-select-text-trigger", + baseCls: "bi-select-text-trigger bi-border", height: 24 }); }, @@ -11608,7 +11354,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SmallSelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-small-select-text-trigger", + baseCls: "bi-small-select-text-trigger bi-border", height: 20 }); }, diff --git a/docs/core.css b/docs/core.css index 0f1f664ff..5044d7d89 100644 --- a/docs/core.css +++ b/docs/core.css @@ -2905,10 +2905,16 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .base-disabled { cursor: default !important; - color: #c4c6c6 !important; + color: #cccccc !important; } .base-disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .base-disabled { + color: #666666 !important; +} +.bi-theme-dark .base-disabled .b-font:before { + color: #666666 !important; } .base-invalid { cursor: default !important; @@ -2925,116 +2931,219 @@ .clearfix:after { clear: both; } +.bi-background { + background-color: #eff1f4; + color: #666666; +} +.bi-theme-dark .bi-background { + background-color: #191b2b; + color: #cccccc; +} +.bi-card { + background-color: #ffffff; + color: #666666; +} +.bi-theme-dark .bi-card { + background-color: #242640; + color: #cccccc; +} +.bi-disabled { + color: #cccccc; +} +.bi-theme-dark .bi-disabled { + color: #666666; +} +.bi-tips { + color: #999999; +} +.bi-border { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border { + border: 1px solid #525466; +} +.bi-border-left { + border-left: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-left { + border-left: 1px solid #525466; +} +.bi-border-right { + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-right { + border-right: 1px solid #525466; +} +.bi-border-top { + border-top: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-top { + border-top: 1px solid #525466; +} +.bi-border-bottom { + border-bottom: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-bottom { + border-bottom: 1px solid #525466; +} .bi-keyword-red-mark { color: #f07d0a; } .bi-high-light { - color: #009de3; + color: #3f8ce8; } .bi-water-mark { color: #cccccc; cursor: text; } -.bi-tips { - color: #c4c6c6; +.bi-theme-dark .bi-water-mark { + color: #666666; } .bi-resizer { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); + background: #1a1a1a; + opacity: 0.2; + filter: alpha(opacity=20); z-index: 1000000000; } +.bi-theme-dark .bi-resizer { + background: #ffffff; +} .bi-z-index-mask { background-color: #1a1a1a; opacity: 0.5; filter: alpha(opacity=50); } +.bi-theme-dark .bi-z-index-mask { + background-color: #ffffff; +} .bi-list-item:hover, .bi-list-item.hover { - background-color: #f4f4f4; + background-color: #eff1f4; + color: #1a1a1a; } .bi-list-item.disabled, .bi-list-item.disabled:hover, .bi-list-item.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { - background-color: #04070d; + background-color: #191b2b; color: #ffffff; } +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-list-item-simple:hover, +.bi-list-item-simple.hover { + color: #1a1a1a; +} +.bi-list-item-simple.disabled, +.bi-list-item-simple.disabled:hover, +.bi-list-item-simple.disabled:active { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-simple:hover, +.bi-theme-dark .bi-list-item-simple.hover { + color: #ffffff; +} +.bi-theme-dark .bi-list-item-simple.disabled, +.bi-theme-dark .bi-list-item-simple.disabled:hover, +.bi-theme-dark .bi-list-item-simple.disabled:active { + color: #666666 !important; +} +.bi-list-item-effect:hover { + color: #1a1a1a; +} .bi-list-item-effect.active, .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-effect:hover { + color: #ffffff; } .bi-theme-dark .bi-list-item-effect.active, .bi-theme-dark .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-theme-dark .bi-list-item-effect.disabled, .bi-theme-dark .bi-list-item-effect.disabled:hover, .bi-theme-dark .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-hover.disabled, .bi-theme-dark .bi-list-item-hover.disabled:hover, .bi-theme-dark .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-active:hover, .bi-list-item-active.hover { - background-color: #f4f4f4; + color: #1a1a1a; + background-color: #eff1f4; } .bi-list-item-active.active, .bi-list-item-active:active { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-active.disabled, .bi-list-item-active.disabled:hover, .bi-list-item-active.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { - background-color: #04070d; + background-color: #191b2b; color: #ffffff; } .bi-theme-dark .bi-list-item-active.active, .bi-theme-dark .bi-list-item-active:active { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-select:hover, .bi-list-item-select.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-select:active, .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-list-item-select:active .bi-high-light, .bi-list-item-select.active .bi-high-light { @@ -3043,28 +3152,39 @@ .bi-list-item-select.disabled, .bi-list-item-select.disabled:hover, .bi-list-item-select.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-list-item-select.disabled .bi-high-light, .bi-list-item-select.disabled:hover .bi-high-light, .bi-list-item-select.disabled:active .bi-high-light { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #eff1f4; } .bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-theme-dark .bi-list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select.active .bi-high-light { color: #ffffff; } +.bi-theme-dark .bi-list-item-select.disabled, +.bi-theme-dark .bi-list-item-select.disabled:hover, +.bi-theme-dark .bi-list-item-select.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-select.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { + color: #666666 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; @@ -3141,10 +3261,6 @@ .horizon-left { text-align: left; } -.div-horizon-center { - margin-left: auto; - margin-right: auto; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -3499,8 +3615,8 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-theme-dark { - background-color: #191a2c; - color: #b2b2b2; + background-color: #191b2b; + color: #cccccc; } .bi-theme-dark .bi-input { color: #ffffff; diff --git a/docs/core.js b/docs/core.js index 58742196e..10dbadaf8 100644 --- a/docs/core.js +++ b/docs/core.js @@ -13808,6 +13808,13 @@ if (!window.BI) { } }, + parseSafeInt: function (value) { + var MAX_SAFE_INTEGER = 9007199254740991; + return value + ? this.clamp(this.parseInt(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER) + : (value === 0 ? value : 0); + }, + parseFloat: function (number) { try { return parseFloat(number); @@ -14421,27 +14428,14 @@ BI.Widget = BI.inherit(BI.OB, { } this.beforeMounted && this.beforeMounted(); this._isMounted = true; - this._mountChildren(); + this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { widget._mount && widget._mount(); }); this.mounted && this.mounted(); }, - _mountChildren: function () { - var self = this; - var frag = document.createDocumentFragment(); - var hasChild = false; - BI.each(this._children, function (i, widget) { - if (widget.element !== self.element) { - frag.appendChild(widget.element[0]); - hasChild = true; - } - }); - if (hasChild === true) { - this.element.append(frag); - } - }, + _mountChildren: null, _unMount: function () { BI.each(this._children, function (i, widget) { @@ -16861,11 +16855,14 @@ BI.ScalingCellSizeAndPositionManager.prototype = { element.__resizeTriggers__ = !element.removeChild(element.__resizeTriggers__); } } - } + }; BI.ResizeDetector = { addResizeListener: function (widget, fn) { addResizeListener(widget.element[0], fn); + return function () { + removeResizeListener(widget.element[0], fn); + } }, removeResizeListener: function (widget, fn) { removeResizeListener(widget.element[0], fn); @@ -19326,6 +19323,21 @@ BI.Layout = BI.inherit(BI.Widget, { } }, + _mountChildren: function () { + var self = this; + var frag = document.createDocumentFragment(); + var hasChild = false; + BI.each(this._children, function (i, widget) { + if (widget.element !== self.element) { + frag.appendChild(widget.element[0]); + hasChild = true; + } + }); + if (hasChild === true) { + this.element.append(frag); + } + }, + _getChildName: function (index) { return index + ""; }, @@ -22658,7 +22670,7 @@ $(function () { } var rgb = this.rgb2json(this.hex2rgb(hex)); var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114); - if (grayLevel < 192) { + if (grayLevel < 140) { return true; } return false; @@ -22667,7 +22679,7 @@ $(function () { //获取对比颜色 getContrastColor: function (color) { if (this.isDarkColor(color)) { - return "#b2b2b2"; + return "#ffffff"; } return "#1a1a1a"; }, diff --git a/docs/demo.css b/docs/demo.css index d60343c87..2c14653b2 100644 --- a/docs/demo.css +++ b/docs/demo.css @@ -1,15 +1,9 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-face .face-config { - border-right: 1px solid #d4dadd; -} .demo-face .face-config .config-label { font-size: 14px; } -.demo-face .face-config .config-item { - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -58,10 +52,10 @@ background-color: #178cdf; } body { - background-color: #f3f3f3; + background-color: #eff1f4; } body.bi-theme-dark { - background-color: #191A2C; + background-color: #191B2B; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -79,22 +73,6 @@ body.bi-theme-dark { /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-preview .preview-title { - border-bottom: 1px solid #d4dadd; -} -.demo-preview .preview-card { - background-color: #ffffff; -} -.bi-theme-dark .demo-preview .preview-card { - background-color: #202237; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.demo-west { - background-color: #ffffff; - border-right: 1px solid #eaeaea; -} -.bi-theme-dark .demo-west { - background-color: #202237; -} diff --git a/docs/demo.js b/docs/demo.js index 615e9e44d..b191d9538 100644 --- a/docs/demo.js +++ b/docs/demo.js @@ -4559,7 +4559,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("背景色："), this._createColorPicker(function () { self.backgroundColor = this; @@ -4573,7 +4573,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("字体颜色："), this._createColorPicker(function () { self.fontColor = this; @@ -4583,11 +4583,53 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { } }, + _createActiveFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("激活状态字体颜色："), this._createColorPicker(function () { + self.activeFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createSelectFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("选中状态字体颜色："), this._createColorPicker(function () { + self.selectFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createGrayFontConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("灰色字体颜色(用于Card2)："), this._createColorPicker(function () { + self.grayFontColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + _createDisableFontConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("灰化字体颜色："), this._createColorPicker(function () { self.disabledFontColor = this; @@ -4605,25 +4647,34 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { } }, - _createCardBackgroundConfig: function () { + _createCard1BackgroundConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, - items: [this._createLabel("Card背景颜色："), this._createColorPicker(function () { + items: [this._createLabel("Card1背景颜色："), this._createColorPicker(function () { self.cardBackgroundColor = this; }, function () { self._runGlobalStyle(); })] } }, + _createCard2BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("Card2背景颜色：无颜色")] + } + }, _createHoverBackgroundColor: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("悬浮状态背景颜色："), this._createColorPicker(function () { self.hoverBackgroundColor = this; @@ -4637,7 +4688,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("激活状态背景颜色："), this._createColorPicker(function () { self.activeBackgroundColor = this; @@ -4647,25 +4698,163 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { } }, + _createSelectBackgroundColor: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("选中状态背景颜色："), this._createColorPicker(function () { + self.selectBackgroundColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + + _createSlitColor: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("分割线颜色(只对左边的表格有效)："), this._createColorPicker(function () { + self.slitColor = this; + }, function () { + self._runGlobalStyle(); + })] + } + }, + _createBaseConfig: function () { return { type: "bi.vertical", items: [this._createLabel("--通用配色--"), this._createBackgroundConfig(), this._createFontConfig(), + this._createActiveFontConfig(), + this._createSelectFontConfig(), + this._createGrayFontConfig(), this._createDisableFontConfig(), - this._createCardBackgroundConfig(), + this._createCard1BackgroundConfig(), + this._createCard2BackgroundConfig(), this._createHoverBackgroundColor(), - this._createActiveBackgroundColor() + this._createActiveBackgroundColor(), + this._createSelectBackgroundColor(), + this._createSlitColor() ] } }, + + _createButton1BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色1："), this._createColorPicker(function () { + self.button1BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + cls: "config-button1", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton2BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色2："), this._createColorPicker(function () { + self.button2BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "success", + cls: "config-button2", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton3BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色3："), this._createColorPicker(function () { + self.button3BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "warning", + cls: "config-button3", + text: "测试按钮" + }] + } + }] + } + }, + + _createButton4BackgroundConfig: function () { + var self = this; + return { + type: "bi.htape", + cls: "config-item bi-border-bottom", + height: 40, + items: [this._createLabel("按钮背景色4："), this._createColorPicker(function () { + self.button4BackgroundColor = this; + }, function () { + self._runGlobalStyle(); + }), { + width: 100, + el: { + type: "bi.vertical_adapt", + height: 40, + items: [{ + type: "bi.button", + level: "ignore", + cls: "config-button4", + text: "测试按钮" + }] + } + }] + } + }, + _createScrollBackgroundConfig: function () { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("滚动条底色："), this._createColorPicker(function () { self.scrollBackgroundColor = this; @@ -4679,7 +4868,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("滚动条thumb颜色："), this._createColorPicker(function () { self.scrollThumbColor = this; @@ -4693,7 +4882,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("下拉框背景颜色："), this._createColorPicker(function () { self.popupBackgroundColor = this; @@ -4798,7 +4987,7 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { var self = this; return { type: "bi.htape", - cls: "config-item", + cls: "config-item bi-border-bottom", height: 40, items: [this._createLabel("弹出层蒙版颜色："), this._createColorPicker(function () { self.maskBackgroundColor = this; @@ -4824,6 +5013,10 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { return { type: "bi.vertical", items: [this._createLabel("--一般配色--"), + this._createButton1BackgroundConfig(), + this._createButton2BackgroundConfig(), + this._createButton3BackgroundConfig(), + this._createButton4BackgroundConfig(), this._createScrollBackgroundConfig(), this._createScrollThumbConfig(), this._createPopupBackgroundConfig(), @@ -4840,14 +5033,14 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { column: 0, row: 0, el: { - type: "demo.preview", - cls: "face-config" + type: "demo.preview" } }, { column: 1, row: 0, el: { type: "bi.vertical", + cls: "face-config bi-border-left", items: [this._createBaseConfig(), this._createCommonConfig()] } @@ -4870,24 +5063,36 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { _runGlobalStyle: function () { var backgroundColor = this.backgroundColor.getValue(); var fontColor = this.fontColor.getValue(); + var activeFontColor = this.activeFontColor.getValue(); + var selectFontColor = this.selectFontColor.getValue(); + var grayFontColor = this.grayFontColor.getValue(); var disabledFontColor = this.disabledFontColor.getValue(); var cardBackgroundColor = this.cardBackgroundColor.getValue(); var hoverBackgroundColor = this.hoverBackgroundColor.getValue(); var activeBackgroundColor = this.activeBackgroundColor.getValue(); + var selectBackgroundColor = this.selectBackgroundColor.getValue(); + var slitColor = this.slitColor.getValue(); + var button1BackgroundColor = this.button1BackgroundColor.getValue(); + var button2BackgroundColor = this.button2BackgroundColor.getValue(); + var button3BackgroundColor = this.button3BackgroundColor.getValue(); + var button4BackgroundColor = this.button4BackgroundColor.getValue(); var scrollBackgroundColor = this.scrollBackgroundColor.getValue(); var scrollThumbColor = this.scrollThumbColor.getValue(); var popupBackgroundColor = this.popupBackgroundColor.getValue(); var maskBackgroundColor = this.maskBackgroundColor.getValue(); - $("#wrapper").css({ - backgroundColor: backgroundColor, - color: fontColor - }); - $(".demo-west,.preview-card").css({ - backgroundColor: cardBackgroundColor - }); this._setStyle({ + ".bi-background": { + "background-color": backgroundColor + "!important", + "color": fontColor + "!important" + }, + ".bi-card": { + "background-color": cardBackgroundColor + "!important" + }, + ".bi-tips": { + "color": grayFontColor + "!important" + }, "div::-webkit-scrollbar,.scrollbar-layout-main": { "background-color": scrollBackgroundColor + "!important" }, @@ -4907,10 +5112,40 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { "background-color": maskBackgroundColor + "!important" }, ".bi-list-item:hover,.bi-list-item-hover:hover,.bi-list-item-active:hover,.bi-list-item-select:hover,.bi-list-item-effect:hover": { - "background-color": hoverBackgroundColor + "background-color": hoverBackgroundColor + "!important" }, ".bi-list-item-active:active,.bi-list-item-select:active,.bi-list-item-effect:active": { - "background-color": activeBackgroundColor + "background-color": activeBackgroundColor + "!important", + "color": activeFontColor + "!important" + }, + ".bi-list-item-active.active,.bi-list-item-select.active,.bi-list-item-effect.active": { + "background-color": selectBackgroundColor + "!important", + "color": selectFontColor + "!important" + }, + ".bi-button": { + "background-color": button1BackgroundColor, + "border-color": button1BackgroundColor + }, + ".bi-button.button-success": { + "background-color": button2BackgroundColor, + "border-color": button2BackgroundColor + }, + ".bi-button.button-warning": { + "background-color": button3BackgroundColor, + "border-color": button3BackgroundColor + }, + ".bi-button.button-ignore": { + "background-color": button4BackgroundColor + }, + ".bi-collection-table-cell": { + "border-right-color": slitColor, + "border-bottom-color": slitColor + }, + ".bi-collection-table-cell.first-col": { + "border-left-color": slitColor + }, + ".bi-collection-table-cell.first-row": { + "border-top-color": slitColor } }) }, @@ -4918,21 +5153,30 @@ BI.shortcut("demo.vtape", Demo.VtapeLayout);Demo.Face = BI.inherit(BI.Widget, { mounted: function () { this.backgroundColor.setValue(""); this.fontColor.setValue(""); + this.activeFontColor.setValue(""); + this.selectFontColor.setValue(""); + this.grayFontColor.setValue(""); this.disabledFontColor.setValue(""); this.cardBackgroundColor.setValue(""); this.hoverBackgroundColor.setValue(""); this.activeBackgroundColor.setValue(""); + this.selectBackgroundColor.setValue(""); + this.button1BackgroundColor.setValue(""); + this.button2BackgroundColor.setValue(""); + this.button3BackgroundColor.setValue(""); + this.button4BackgroundColor.setValue(""); this.scrollBackgroundColor.setValue(""); this.scrollThumbColor.setValue(""); this.popupBackgroundColor.setValue(""); this.maskBackgroundColor.setValue(""); + this.slitColor.setValue(""); this._runGlobalStyle(); } }); BI.shortcut("demo.face", Demo.Face);Demo.Main = BI.inherit(BI.Widget, { props: { - baseCls: "demo-main" + baseCls: "demo-main bi-background" }, render: function () { var center; @@ -5049,47 +5293,73 @@ BI.shortcut("demo.north", Demo.North);Demo.Preview = BI.inherit(BI.Widget, { } } return { - type: "bi.center", + type: "bi.absolute", cls: "preview-background", - hgap: 100, - vgap: 100, items: [{ - type: "bi.vtape", - cls: "preview-card", - items: [{ - el: { + el: { + type: "bi.left", + cls: "preview-header bi-tips", + height: 40, + items: [{ type: "bi.label", - cls: "preview-title", height: 40, - text: "统计组件", + text: "Card2", hgap: 10, textAlign: "left" - }, - height: 40 - }, { - type: "bi.center_adapt", - scrollable: true, + }, { + type: "bi.icon_text_item", + cls: "filter-font", + text: "测试图标", + width: 100, + height: 40 + }] + }, + left: 60, + right: 60, + top: 60 + }, { + el: { + type: "bi.vtape", + cls: "preview-card bi-card", items: [{ - type: "bi.resizable_table", el: { - type: "bi.collection_table" - }, - width: 500, - height: 400, - isResizeAdapt: true, - isNeedResize: true, - isNeedMerge: true, - mergeCols: [0, 1], - mergeRule: function (col1, col2) { - return BI.isEqual(col1, col2); + type: "bi.label", + cls: "preview-title bi-border-bottom", + height: 40, + text: "Card1", + hgap: 10, + textAlign: "left" }, - isNeedFreeze: true, - freezeCols: [0, 1], - columnSize: columnSize, - items: items, - header: header + height: 40 + }, { + type: "bi.center_adapt", + scrollable: true, + items: [{ + type: "bi.resizable_table", + el: { + type: "bi.collection_table" + }, + width: 500, + height: 400, + isResizeAdapt: true, + isNeedResize: true, + isNeedMerge: true, + mergeCols: [0, 1], + mergeRule: function (col1, col2) { + return BI.isEqual(col1, col2); + }, + isNeedFreeze: true, + freezeCols: [0, 1], + columnSize: columnSize, + items: items, + header: header + }] }] - }] + }, + left: 60, + right: 60, + top: 160, + bottom: 60 }] } }, @@ -5098,7 +5368,7 @@ BI.shortcut("demo.north", Demo.North);Demo.Preview = BI.inherit(BI.Widget, { }); BI.shortcut("demo.preview", Demo.Preview);Demo.West = BI.inherit(BI.Widget, { props: { - baseCls: "demo-west" + baseCls: "demo-west bi-border-right bi-card" }, render: function () { var self = this; diff --git a/docs/resource.css b/docs/resource.css index e0f9d5b7f..ef4dd0ada 100644 --- a/docs/resource.css +++ b/docs/resource.css @@ -41,7 +41,7 @@ body { -ms-user-select: none; -o-user-select: none; user-select: none; - color: #1a1a1a; + color: #666666; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -61,41 +61,10 @@ body { overflow-x: hidden; overflow-y: hidden; } -a { - outline: none; - text-decoration: none; -} -a:focus { - outline: 0; -} -input, -textarea { - margin: 0; - padding: 0; - outline: none; - border: 1px solid #cccccc; -} -ul, -ol { - margin: 0; - padding: 0; -} -ul { - list-style: disc; -} -li { - list-style-type: none; -} -i { - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); width: 6px; height: 6px; } @@ -104,12 +73,12 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: #e2e2e2; + background-color: rgba(102, 102, 102, 0.3); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(204, 204, 204, 0.05); width: 6px; height: 6px; } @@ -118,7 +87,7 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: #7d7d7d; + background-color: rgba(204, 204, 204, 0.3); } .base-line-conn-background { background: url('icon/tree-vertical-line-1.png') repeat-y 0 0; @@ -959,37 +928,37 @@ textarea::-webkit-scrollbar-thumb { /**维度/指标 下拉列表图标字体 ~begin~**/ .delete-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-font.native .b-font:before, .delete-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font:hover .b-font:before, .delete-h-font:focus .b-font:before, .delete-h-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font.native .b-font:before, .delete-h-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font:hover .b-font:before, .delete-ha-font:focus .b-font:before, .delete-ha-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font:active .b-font:before, .delete-ha-font.active .b-font:before { @@ -999,17 +968,17 @@ textarea::-webkit-scrollbar-thumb { .delete-ha-font.native .b-font:before, .delete-ha-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font:hover .b-font:before, .delete-e-font:focus .b-font:before, .delete-e-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font.active .b-font:before { content: "\e605"; @@ -1022,7 +991,7 @@ textarea::-webkit-scrollbar-thumb { .delete-e-font.native .b-font:before, .delete-e-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .dot-font .b-font:before { content: "\e606"; @@ -1041,7 +1010,7 @@ textarea::-webkit-scrollbar-thumb { .dot-h-font:focus .b-font:before, .dot-h-font.hover .b-font:before { content: "\e606"; - color: #1a1a1a; + color: inherit; } .dot-h-font.native .b-font:before, .dot-h-font.disabled .b-font:before { @@ -1084,7 +1053,7 @@ textarea::-webkit-scrollbar-thumb { } .dot-e-font:active .b-font:before { content: "\e606"; - color: #009de3; + color: #3f8ce8; } .dot-e-font.native .b-font:before, .dot-e-font.disabled .b-font:before { @@ -1093,37 +1062,37 @@ textarea::-webkit-scrollbar-thumb { } .pull-right-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-font.native .b-font:before, .pull-right-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font:focus .b-font:before, .pull-right-h-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font.native .b-font:before, .pull-right-h-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font:focus .b-font:before, .pull-right-ha-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { @@ -1133,17 +1102,17 @@ textarea::-webkit-scrollbar-thumb { .pull-right-ha-font.native .b-font:before, .pull-right-ha-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font:focus .b-font:before, .pull-right-e-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font.active .b-font:before { content: "\e607"; @@ -1156,16 +1125,16 @@ textarea::-webkit-scrollbar-thumb { .pull-right-e-font.native .b-font:before, .pull-right-e-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .copy-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-font.native .b-font:before, .copy-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-h-font .b-font:before { content: "\e610"; @@ -1175,7 +1144,7 @@ textarea::-webkit-scrollbar-thumb { .copy-h-font:focus .b-font:before, .copy-h-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-h-font.native .b-font:before, .copy-h-font.disabled .b-font:before { @@ -1184,13 +1153,13 @@ textarea::-webkit-scrollbar-thumb { } .copy-ha-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-ha-font:hover .b-font:before, .copy-ha-font:focus .b-font:before, .copy-ha-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-ha-font:active .b-font:before, .copy-ha-font.active .b-font:before { @@ -1200,17 +1169,17 @@ textarea::-webkit-scrollbar-thumb { .copy-ha-font.native .b-font:before, .copy-ha-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font:hover .b-font:before, .copy-e-font:focus .b-font:before, .copy-e-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font.active .b-font:before { content: "\e610"; @@ -1223,41 +1192,41 @@ textarea::-webkit-scrollbar-thumb { .copy-e-font.native .b-font:before, .copy-e-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .check-mark-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-font.native .b-font:before, .check-mark-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font:hover .b-font:before, .check-mark-h-font:focus .b-font:before, .check-mark-h-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font.native .b-font:before, .check-mark-h-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font:hover .b-font:before, .check-mark-ha-font:focus .b-font:before, .check-mark-ha-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font:active .b-font:before, .check-mark-ha-font.active .b-font:before { @@ -1267,17 +1236,17 @@ textarea::-webkit-scrollbar-thumb { .check-mark-ha-font.native .b-font:before, .check-mark-ha-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font:hover .b-font:before, .check-mark-e-font:focus .b-font:before, .check-mark-e-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font.active .b-font:before { content: "\e611"; @@ -1290,41 +1259,41 @@ textarea::-webkit-scrollbar-thumb { .check-mark-e-font.native .b-font:before, .check-mark-e-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .dimension-from-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-font.native .b-font:before, .dimension-from-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font:hover .b-font:before, .dimension-from-h-font:focus .b-font:before, .dimension-from-h-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font.native .b-font:before, .dimension-from-h-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font:hover .b-font:before, .dimension-from-ha-font:focus .b-font:before, .dimension-from-ha-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font:active .b-font:before, .dimension-from-ha-font.active .b-font:before { @@ -1334,17 +1303,17 @@ textarea::-webkit-scrollbar-thumb { .dimension-from-ha-font.native .b-font:before, .dimension-from-ha-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font:hover .b-font:before, .dimension-from-e-font:focus .b-font:before, .dimension-from-e-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font.active .b-font:before { content: "\e612"; @@ -1357,41 +1326,41 @@ textarea::-webkit-scrollbar-thumb { .dimension-from-e-font.native .b-font:before, .dimension-from-e-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .chart-type-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-font.native .b-font:before, .chart-type-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font:hover .b-font:before, .chart-type-h-font:focus .b-font:before, .chart-type-h-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font.native .b-font:before, .chart-type-h-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font:hover .b-font:before, .chart-type-ha-font:focus .b-font:before, .chart-type-ha-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font:active .b-font:before, .chart-type-ha-font.active .b-font:before { @@ -1401,17 +1370,17 @@ textarea::-webkit-scrollbar-thumb { .chart-type-ha-font.native .b-font:before, .chart-type-ha-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font:hover .b-font:before, .chart-type-e-font:focus .b-font:before, .chart-type-e-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font.active .b-font:before { content: "\e613"; @@ -1424,41 +1393,41 @@ textarea::-webkit-scrollbar-thumb { .chart-type-e-font.native .b-font:before, .chart-type-e-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .style-set-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-font.native .b-font:before, .style-set-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font:hover .b-font:before, .style-set-h-font:focus .b-font:before, .style-set-h-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font.native .b-font:before, .style-set-h-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font:hover .b-font:before, .style-set-ha-font:focus .b-font:before, .style-set-ha-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font:active .b-font:before, .style-set-ha-font.active .b-font:before { @@ -1468,17 +1437,17 @@ textarea::-webkit-scrollbar-thumb { .style-set-ha-font.native .b-font:before, .style-set-ha-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font:hover .b-font:before, .style-set-e-font:focus .b-font:before, .style-set-e-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font.active .b-font:before { content: "\e60c"; @@ -1491,7 +1460,7 @@ textarea::-webkit-scrollbar-thumb { .style-set-e-font.native .b-font:before, .style-set-e-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .hyper-link-font .b-font:before { content: "\e688"; @@ -1513,28 +1482,28 @@ textarea::-webkit-scrollbar-thumb { } .filter-h-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-h-font:hover .b-font:before, .filter-h-font:focus .b-font:before, .filter-h-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-h-font.native .b-font:before, .filter-h-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font:hover .b-font:before, .filter-ha-font:focus .b-font:before, .filter-ha-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font:active .b-font:before, .filter-ha-font.active .b-font:before { @@ -1544,17 +1513,17 @@ textarea::-webkit-scrollbar-thumb { .filter-ha-font.native .b-font:before, .filter-ha-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font:hover .b-font:before, .filter-e-font:focus .b-font:before, .filter-e-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font.active .b-font:before { content: "\e60f"; @@ -1567,16 +1536,16 @@ textarea::-webkit-scrollbar-thumb { .filter-e-font.native .b-font:before, .filter-e-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .classify-font .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .classify-font.native .b-font:before, .classify-font.disabled .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .series-font .b-font:before { content: "\e695"; @@ -1591,93 +1560,93 @@ textarea::-webkit-scrollbar-thumb { /** dashboard组件/控件 下拉列表图标字体 ~begin~**/ .link-to-widget-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-widget-h-font:hover .b-font:before, .link-to-widget-h-font:focus .b-font:before, .link-to-widget-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .link-to-widget-h-font.native .b-font:before, .link-to-widget-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-detail-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-detail-h-font:hover .b-font:before, .link-to-detail-h-font:focus .b-font:before, .link-to-detail-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .link-to-detail-h-font.native .b-font:before, .link-to-detail-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .detail-setting-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .detail-setting-h-font:hover .b-font:before, .detail-setting-h-font:focus .b-font:before, .detail-setting-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .detail-setting-h-font.native .b-font:before, .detail-setting-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .export-to-excel-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .export-to-excel-h-font:hover .b-font:before, .export-to-excel-h-font:focus .b-font:before, .export-to-excel-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .export-to-excel-h-font.native .b-font:before, .export-to-excel-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .widget-copy-h-font .b-font:before { content: "\e610"; - color: #808080; + color: #999999; } .widget-copy-h-font:hover .b-font:before, .widget-copy-h-font:focus .b-font:before, .widget-copy-h-font.hover .b-font:before { content: "\e610"; - color: #009de3; + color: #3f8ce8; } .widget-copy-h-font.native .b-font:before, .widget-copy-h-font.disabled .b-font:before { content: "\e610"; - color: #808080; + color: #999999; } .widget-delete-h-font .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .widget-delete-h-font:hover .b-font:before, .widget-delete-h-font:focus .b-font:before, .widget-delete-h-font.hover .b-font:before { content: "\e605"; - color: #009de3; + color: #3f8ce8; } .widget-delete-h-font.native .b-font:before, .widget-delete-h-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font:before { @@ -1700,83 +1669,83 @@ textarea::-webkit-scrollbar-thumb { } .row-pre-page-h-font .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-pre-page-h-font:hover .b-font:before, .row-pre-page-h-font:focus .b-font:before, .row-pre-page-h-font.hover .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-pre-page-h-font.native .b-font:before, .row-pre-page-h-font.disabled .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font:hover .b-font:before, .row-next-page-h-font:focus .b-font:before, .row-next-page-h-font.hover .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font.native .b-font:before, .row-next-page-h-font.disabled .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font:hover .b-font:before, .column-pre-page-h-font:focus .b-font:before, .column-pre-page-h-font.hover .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font.native .b-font:before, .column-pre-page-h-font.disabled .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font:hover .b-font:before, .column-next-page-h-font:focus .b-font:before, .column-next-page-h-font.hover .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font.native .b-font:before, .column-next-page-h-font.disabled .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .trigger-triangle-font .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .trigger-triangle-font:hover .b-font:before, .trigger-triangle-font:focus .b-font:before, .trigger-triangle-font.hover .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .trigger-triangle-font:active .b-font:before, .trigger-triangle-font.active .b-font:before { content: "\e66a"; - color: #009de3; + color: #3f8ce8; } .trigger-triangle-font.native .b-font:before, .trigger-triangle-font.disabled .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .widget-date-next-h-font .b-font:before { content: "\e62f"; @@ -2637,31 +2606,31 @@ textarea::-webkit-scrollbar-thumb { } .check-font .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .check-font.native .b-font:before, .check-font.disabled .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .move2group-add-font .b-font:before { content: "\e649"; - color: #009de3; + color: #3f8ce8; } .move2group-add-font.native .b-font:before, .move2group-add-font.disabled .b-font:before { content: "\e649"; - color: #009de3; + color: #3f8ce8; } .select-data-field-calc-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-calc-font:hover .b-font:before, .select-data-field-calc-font:focus .b-font:before, .select-data-field-calc-font.hover .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-calc-font:active .b-font:before, .select-data-field-calc-font.active .b-font:before { @@ -2671,17 +2640,17 @@ textarea::-webkit-scrollbar-thumb { .select-data-field-calc-font.native .b-font:before, .select-data-field-calc-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font:hover .b-font:before, .select-data-field-string-font:focus .b-font:before, .select-data-field-string-font.hover .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font:active .b-font:before, .select-data-field-string-font.active .b-font:before { @@ -2691,17 +2660,17 @@ textarea::-webkit-scrollbar-thumb { .select-data-field-string-font.native .b-font:before, .select-data-field-string-font.disabled .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font:hover .b-font:before, .select-data-field-number-font:focus .b-font:before, .select-data-field-number-font.hover .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font:active .b-font:before, .select-data-field-number-font.active .b-font:before { @@ -2711,17 +2680,17 @@ textarea::-webkit-scrollbar-thumb { .select-data-field-number-font.native .b-font:before, .select-data-field-number-font.disabled .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font:hover .b-font:before, .select-data-field-date-font:focus .b-font:before, .select-data-field-date-font.hover .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font:active .b-font:before, .select-data-field-date-font.active .b-font:before { @@ -2731,7 +2700,7 @@ textarea::-webkit-scrollbar-thumb { .select-data-field-date-font.native .b-font:before, .select-data-field-date-font.disabled .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-group-font .b-font:before { content: "\e642"; @@ -2762,23 +2731,23 @@ textarea::-webkit-scrollbar-thumb { } .select-data-preview-font .b-font:before { content: "\e65f"; - color: #808080; + color: #999999; } .select-data-preview-font:hover .b-font:before, .select-data-preview-font:focus .b-font:before, .select-data-preview-font.hover .b-font:before { content: "\e65f"; - color: #009de3; + color: #3f8ce8; } .select-data-preview-font:active .b-font:before, .select-data-preview-font.active .b-font:before { content: "\e65f"; - color: #009de3; + color: #3f8ce8; } .select-data-preview-font.native .b-font:before, .select-data-preview-font.disabled .b-font:before { content: "\e65f"; - color: #808080; + color: #999999; } .detail-dimension-set-font .b-font:before { content: "\e678"; @@ -2812,63 +2781,63 @@ textarea::-webkit-scrollbar-thumb { } .select-group-field-string-font .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font:hover .b-font:before, .select-group-field-string-font:focus .b-font:before, .select-group-field-string-font.hover .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font:active .b-font:before, .select-group-field-string-font.active .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font.native .b-font:before, .select-group-field-string-font.disabled .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font:hover .b-font:before, .select-group-field-number-font:focus .b-font:before, .select-group-field-number-font.hover .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font:active .b-font:before, .select-group-field-number-font.active .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font.native .b-font:before, .select-group-field-number-font.disabled .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font:hover .b-font:before, .select-group-field-date-font:focus .b-font:before, .select-group-field-date-font.hover .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font:active .b-font:before, .select-group-field-date-font.active .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font.native .b-font:before, .select-group-field-date-font.disabled .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .dashboard-widget-combo-detail-set-font .b-font:before { content: "\e634"; @@ -2905,120 +2874,120 @@ textarea::-webkit-scrollbar-thumb { } .text-bold-font .b-font:before { content: "\e64d"; - color: #1a1a1a; + color: inherit; } .text-bold-font.native .b-font:before, .text-bold-font.disabled .b-font:before { content: "\e64d"; - color: #1a1a1a; + color: inherit; } .text-italic-font .b-font:before { content: "\e656"; - color: #1a1a1a; + color: inherit; } .text-italic-font.native .b-font:before, .text-italic-font.disabled .b-font:before { content: "\e656"; - color: #1a1a1a; + color: inherit; } .text-underline-font .b-font:before { content: "\e650"; - color: #1a1a1a; + color: inherit; } .text-underline-font.native .b-font:before, .text-underline-font.disabled .b-font:before { content: "\e650"; - color: #1a1a1a; + color: inherit; } .text-color-font .b-font:before { content: "\e69c"; - color: #1a1a1a; + color: inherit; } .text-color-font.native .b-font:before, .text-color-font.disabled .b-font:before { content: "\e69c"; - color: #1a1a1a; + color: inherit; } .text-background-font .b-font:before { content: "\e696"; - color: #1a1a1a; + color: inherit; } .text-background-font.native .b-font:before, .text-background-font.disabled .b-font:before { content: "\e696"; - color: #1a1a1a; + color: inherit; } .text-color-underline-font .b-font:before { content: "\e69d"; - color: ""; + color: inherit; } .text-color-underline-font.native .b-font:before, .text-color-underline-font.disabled .b-font:before { content: "\e69d"; - color: ""; + color: inherit; } .text-align-left-font .b-font:before { content: "\e654"; - color: #1a1a1a; + color: inherit; } .text-align-left-font.native .b-font:before, .text-align-left-font.disabled .b-font:before { content: "\e654"; - color: #1a1a1a; + color: inherit; } .text-align-center-font .b-font:before { content: "\e64f"; - color: #1a1a1a; + color: inherit; } .text-align-center-font.native .b-font:before, .text-align-center-font.disabled .b-font:before { content: "\e64f"; - color: #1a1a1a; + color: inherit; } .text-align-right-font .b-font:before { content: "\e651"; - color: #1a1a1a; + color: inherit; } .text-align-right-font.native .b-font:before, .text-align-right-font.disabled .b-font:before { content: "\e651"; - color: #1a1a1a; + color: inherit; } .img-upload-font .b-font:before { content: "\e6ba"; - color: #009de3; + color: #3f8ce8; } .img-upload-font.native .b-font:before, .img-upload-font.disabled .b-font:before { content: "\e6ba"; - color: #009de3; + color: #3f8ce8; } .img-size-font .b-font:before { content: "\e68b"; - color: #009de3; + color: #3f8ce8; } .img-size-font.native .b-font:before, .img-size-font.disabled .b-font:before { content: "\e68b"; - color: #009de3; + color: #3f8ce8; } .img-href-font .b-font:before { content: "\e688"; - color: #009de3; + color: #3f8ce8; } .img-href-font.native .b-font:before, .img-href-font.disabled .b-font:before { content: "\e688"; - color: #009de3; + color: #3f8ce8; } .img-shutdown-font .b-font:before { content: "\e689"; - color: #009de3; + color: #3f8ce8; } .img-shutdown-font.native .b-font:before, .img-shutdown-font.disabled .b-font:before { content: "\e689"; - color: #009de3; + color: #3f8ce8; } .move-font .b-font:before { content: "\e65e"; @@ -3058,12 +3027,12 @@ textarea::-webkit-scrollbar-thumb { } .folder-font .b-font:before { content: "\e65c"; - color: #009de3; + color: #3f8ce8; } .folder-font.native .b-font:before, .folder-font.disabled .b-font:before { content: "\e65c"; - color: #009de3; + color: #3f8ce8; } .letter-font .b-font:before { content: "\e659"; @@ -3116,12 +3085,12 @@ textarea::-webkit-scrollbar-thumb { } .delete-template-font .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .delete-template-font.native .b-font:before, .delete-template-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .real-time-font .b-font:before { content: "\e6af"; @@ -3134,13 +3103,13 @@ textarea::-webkit-scrollbar-thumb { } .data-source-table-font .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .data-source-table-font:hover .b-font:before, .data-source-table-font:focus .b-font:before, .data-source-table-font.hover .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .data-source-table-font:active .b-font:before, .data-source-table-font.active .b-font:before { @@ -3150,17 +3119,17 @@ textarea::-webkit-scrollbar-thumb { .data-source-table-font.native .b-font:before, .data-source-table-font.disabled .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .etl-table-font .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .etl-table-font:hover .b-font:before, .etl-table-font:focus .b-font:before, .etl-table-font.hover .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .etl-table-font:active .b-font:before, .etl-table-font.active .b-font:before { @@ -3170,17 +3139,17 @@ textarea::-webkit-scrollbar-thumb { .etl-table-font.native .b-font:before, .etl-table-font.disabled .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .excel-table-font .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .excel-table-font:hover .b-font:before, .excel-table-font:focus .b-font:before, .excel-table-font.hover .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .excel-table-font:active .b-font:before, .excel-table-font.active .b-font:before { @@ -3190,17 +3159,17 @@ textarea::-webkit-scrollbar-thumb { .excel-table-font.native .b-font:before, .excel-table-font.disabled .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .sql-table-font .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .sql-table-font:hover .b-font:before, .sql-table-font:focus .b-font:before, .sql-table-font.hover .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .sql-table-font:active .b-font:before, .sql-table-font.active .b-font:before { @@ -3210,7 +3179,7 @@ textarea::-webkit-scrollbar-thumb { .sql-table-font.native .b-font:before, .sql-table-font.disabled .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .refresh-table-font .b-font:before { content: "\e683"; @@ -3223,12 +3192,12 @@ textarea::-webkit-scrollbar-thumb { } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #009de3; + color: #3f8ce8; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #009de3; + color: #3f8ce8; } .tables-tile-view-font .b-font:before { content: "\e685"; @@ -3292,7 +3261,7 @@ textarea::-webkit-scrollbar-thumb { .data-link-check-font:active .b-font:before, .data-link-check-font.active .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .data-link-check-font.native .b-font:before, .data-link-check-font.disabled .b-font:before { @@ -3406,108 +3375,108 @@ textarea::-webkit-scrollbar-thumb { } .table-no-sort-no-filter-font .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-no-filter-font:hover .b-font:before, .table-no-sort-no-filter-font:focus .b-font:before, .table-no-sort-no-filter-font.hover .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-no-filter-font.native .b-font:before, .table-no-sort-no-filter-font.disabled .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-filter-font .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-no-sort-filter-font:hover .b-font:before, .table-no-sort-filter-font:focus .b-font:before, .table-no-sort-filter-font.hover .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-no-sort-filter-font.native .b-font:before, .table-no-sort-filter-font.disabled .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-descending-filter-font .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-descending-filter-font:hover .b-font:before, .table-descending-filter-font:focus .b-font:before, .table-descending-filter-font.hover .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-descending-filter-font.native .b-font:before, .table-descending-filter-font.disabled .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-ascending-filter-font .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-ascending-filter-font:hover .b-font:before, .table-ascending-filter-font:focus .b-font:before, .table-ascending-filter-font.hover .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-ascending-filter-font.native .b-font:before, .table-ascending-filter-font.disabled .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-descending-no-filter-font .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-descending-no-filter-font:hover .b-font:before, .table-descending-no-filter-font:focus .b-font:before, .table-descending-no-filter-font.hover .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-descending-no-filter-font.native .b-font:before, .table-descending-no-filter-font.disabled .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-ascending-no-filter-font .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-ascending-no-filter-font:hover .b-font:before, .table-ascending-no-filter-font:focus .b-font:before, .table-ascending-no-filter-font.hover .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-ascending-no-filter-font.native .b-font:before, .table-ascending-no-filter-font.disabled .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-no-sort-font .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .table-no-sort-font:hover .b-font:before, .table-no-sort-font:focus .b-font:before, .table-no-sort-font.hover .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .table-no-sort-font.native .b-font:before, .table-no-sort-font.disabled .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .primary-key-font .b-font:before { content: "\e67d;"; @@ -3566,30 +3535,30 @@ textarea::-webkit-scrollbar-thumb { } .calculate-function-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: #666666; } .calculate-function-font.native .b-font:before, .calculate-function-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: #666666; } .path-set-doubt .b-font:before { content: "\e69a"; - color: #009de3; + color: #3f8ce8; } .path-set-doubt.native .b-font:before, .path-set-doubt.disabled .b-font:before { content: "\e69a"; - color: #009de3; + color: #3f8ce8; } .rename-report-font .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .rename-report-font.native .b-font:before, .rename-report-font.disabled .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .remove-report-font .b-font:before { content: "\e605"; @@ -3602,66 +3571,66 @@ textarea::-webkit-scrollbar-thumb { } .excel-upload-tip-font .b-font:before { content: "\e69e"; - color: #009de3; + color: #3f8ce8; } .excel-upload-tip-font.native .b-font:before, .excel-upload-tip-font.disabled .b-font:before { content: "\e69e"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-string-font .b-font:before { content: "\e622"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-string-font.native .b-font:before, .excel-field-type-string-font.disabled .b-font:before { content: "\e622"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-number-font .b-font:before { content: "\e61f"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-number-font.native .b-font:before, .excel-field-type-number-font.disabled .b-font:before { content: "\e61f"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-date-font .b-font:before { content: "\e61b"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-date-font.native .b-font:before, .excel-field-type-date-font.disabled .b-font:before { content: "\e61b"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-pull-down-font .b-font:before { content: "\e608"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-pull-down-font.native .b-font:before, .excel-field-type-pull-down-font.disabled .b-font:before { content: "\e608"; - color: #009de3; + color: #3f8ce8; } .data-link-set-font .b-font:before { content: "\e678"; - color: #009de3; + color: #3f8ce8; } .data-link-set-font.native .b-font:before, .data-link-set-font.disabled .b-font:before { content: "\e678"; - color: #009de3; + color: #3f8ce8; } .data-link-test-font .b-font:before { content: "\e686"; - color: #009de3; + color: #3f8ce8; } .data-link-test-font.native .b-font:before, .data-link-test-font.disabled .b-font:before { content: "\e686"; - color: #009de3; + color: #3f8ce8; } .data-link-copy-font .b-font:before { content: "\e610"; @@ -3746,66 +3715,66 @@ textarea::-webkit-scrollbar-thumb { } .calculate-target-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .calculate-target-font.native .b-font:before, .calculate-target-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .task-list-font .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .task-list-font.native .b-font:before, .task-list-font.disabled .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .widget-combo-detail-font .b-font:before { content: "\e697"; - color: #009de3; + color: #3f8ce8; } .widget-combo-detail-font.native .b-font:before, .widget-combo-detail-font.disabled .b-font:before { content: "\e697"; - color: #009de3; + color: #3f8ce8; } .widget-combo-pull-down-font .b-font:before { content: "\e6ab"; - color: #009de3; + color: #3f8ce8; } .widget-combo-pull-down-font.native .b-font:before, .widget-combo-pull-down-font.disabled .b-font:before { content: "\e6ab"; - color: #009de3; + color: #3f8ce8; } .widget-tools-filter-font .b-font:before { content: "\e60f"; - color: #009de3; + color: #3f8ce8; } .widget-tools-filter-font.native .b-font:before, .widget-tools-filter-font.disabled .b-font:before { content: "\e60f"; - color: #009de3; + color: #3f8ce8; } .widget-tools-clear-font .b-font:before { content: "\e63d"; - color: #009de3; + color: #3f8ce8; } .widget-tools-clear-font.native .b-font:before, .widget-tools-clear-font.disabled .b-font:before { content: "\e63d"; - color: #009de3; + color: #3f8ce8; } .widget-tools-export-excel-font .b-font:before { content: "\e635"; - color: #009de3; + color: #3f8ce8; } .widget-tools-export-excel-font.native .b-font:before, .widget-tools-export-excel-font.disabled .b-font:before { content: "\e635"; - color: #009de3; + color: #3f8ce8; } .widget-combo-expand-font .b-font:before { content: "\e697"; @@ -3941,21 +3910,21 @@ textarea::-webkit-scrollbar-thumb { } .chart-drill-up .b-font:before { content: "\e6ad"; - color: ""; + color: inherit; } .chart-drill-up.native .b-font:before, .chart-drill-up.disabled .b-font:before { content: "\e6ad"; - color: ""; + color: inherit; } .chart-drill-down .b-font:before { content: "\e608"; - color: ""; + color: inherit; } .chart-drill-down.native .b-font:before, .chart-drill-down.disabled .b-font:before { content: "\e608"; - color: ""; + color: inherit; } .report-filter-open-font .b-font:before { content: "\e648"; @@ -3977,21 +3946,21 @@ textarea::-webkit-scrollbar-thumb { } .report-apply-hangout-normal-font .b-font:before { content: "\e66d"; - color: #808080; + color: #999999; } .report-apply-hangout-normal-font.native .b-font:before, .report-apply-hangout-normal-font.disabled .b-font:before { content: "\e66d"; - color: #808080; + color: #999999; } .report-apply-hangout-ing-font .b-font:before { content: "\e66d"; - color: #009de3; + color: #3f8ce8; } .report-apply-hangout-ing-font.native .b-font:before, .report-apply-hangout-ing-font.disabled .b-font:before { content: "\e66d"; - color: #009de3; + color: #3f8ce8; } .report-hangout-font .b-font:before { content: "\e64b"; @@ -4004,21 +3973,21 @@ textarea::-webkit-scrollbar-thumb { } .report-cancel-hangout-font .b-font:before { content: "\e64b"; - color: #808080; + color: #999999; } .report-cancel-hangout-font.native .b-font:before, .report-cancel-hangout-font.disabled .b-font:before { content: "\e64b"; - color: #808080; + color: #999999; } .report-hangout-ing-mark-font .b-font:before { content: "\e64b"; - color: #009de3; + color: #3f8ce8; } .report-hangout-ing-mark-font.native .b-font:before, .report-hangout-ing-mark-font.disabled .b-font:before { content: "\e64b"; - color: #009de3; + color: #3f8ce8; } .delete-font-package .b-font:before { content: "\e605"; @@ -4040,30 +4009,30 @@ textarea::-webkit-scrollbar-thumb { } .rename-font-package .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .rename-font-package.native .b-font:before, .rename-font-package.disabled .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .package-selected-font .b-font:before { content: "\e6b3"; - color: #178cdf; + color: #3f8ce8; } .package-selected-font.native .b-font:before, .package-selected-font.disabled .b-font:before { content: "\e6b3"; - color: #178cdf; + color: #3f8ce8; } .package-not-selected-font .b-font:before { content: "\e6b2"; - color: #178cdf; + color: #3f8ce8; } .package-not-selected-font.native .b-font:before, .package-not-selected-font.disabled .b-font:before { content: "\e6b2"; - color: #178cdf; + color: #3f8ce8; } .report-detail-info-font .b-font:before { content: "\e66e"; @@ -4085,12 +4054,12 @@ textarea::-webkit-scrollbar-thumb { } .report-cancel-share-font .b-font:before { content: "\e6b5"; - color: #009de3; + color: #3f8ce8; } .report-cancel-share-font.native .b-font:before, .report-cancel-share-font.disabled .b-font:before { content: "\e6b5"; - color: #009de3; + color: #3f8ce8; } .drill-push-up-font .b-font:before { content: "\e630"; @@ -6349,6 +6318,57 @@ textarea::-webkit-scrollbar-thumb { _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='icon/push_up.png'); _background: none; } +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} /** * Farbtastic Color Picker 1.2 * © 2008 Steven Wittens @@ -6404,6 +6424,35 @@ textarea::-webkit-scrollbar-thumb { overflow: hidden; background: url("third/farbtastic/marker.png") no-repeat; } +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-display-tree .ztree * { + color: #999999; +} +.bi-display-tree .ztree li span.button.switch.center_open { + background-image: url("/icon/tree-vertical-line-3.png"); +} +.bi-display-tree .ztree li span.button.switch.roots_open { + background-image: url("/icon/tree-vertical-line-2.png"); +} +.bi-display-tree .ztree li span.button.switch.bottom_open { + background-image: url("/icon/tree-vertical-line-4.png"); +} +.bi-display-tree .ztree li a, +.bi-display-tree .ztree li span { + cursor: default !important; +} +.bi-display-tree .ztree li a:hover { + text-decoration: none; +} +.bi-display-tree .ztree li a.curSelectedNode { + padding-top: 1px; + border: none; + background-color: inherit; + opacity: 1; + filter: alpha(opacity=100); +} /*------------------------------------- zTree Style diff --git a/docs/widget.css b/docs/widget.css index 30c4bdc6c..df905928d 100644 --- a/docs/widget.css +++ b/docs/widget.css @@ -1,17 +1,11 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-arrangement-block { - background: #e85050; - opacity: 0.8; - filter: alpha(opacity=80); -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement .arrangement-helper { - border: 1px solid #d4dadd; - background: #009de3; + background: #3f8ce8; z-index: 1000000000; } .bi-arrangement .arrangement-block { @@ -25,7 +19,7 @@ } .bi-arrangement .arrangement-drop-container .drop-devider { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } .bi-arrangement .arrangement-drop-container .top-left, .bi-arrangement .arrangement-drop-container .top-right, @@ -44,7 +38,7 @@ .bi-arrangement .arrangement-drop-container .left-center-second, .bi-arrangement .arrangement-drop-container .right-center-second { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -131,7 +125,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-date-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -139,9 +132,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .bi-down-list-spliter { - border-top: 1px solid #eaeaea; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -155,14 +145,16 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table { + border-right: 1px solid #525466; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table-header-cell { font-weight: bold; - background-color: #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -170,15 +162,9 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-file-item { - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-folder-item { - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -187,35 +173,30 @@ background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #f4f4f4; - color: #808080; + 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 { + background: #242640; +} +.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { + background-color: #191b2b; + color: #999999; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-nav { - border-left: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-fine-tuning-number-editor { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-fine-tuning-number-editor .top-button { - border-left: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} -.bi-fine-tuning-number-editor .bottom-button { - border-top: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -228,26 +209,20 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-image-button-size .image-button-size-button-group { font-size: 12px; - color: #1a1a1a; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ .bi-upload-image .upload-image-text-button-label { font-size: 14px; - color: #c4c6c6; + color: #999999; } .bi-upload-image .upload-image-icon-button { z-index: 1; font-size: 16px; - background-color: #ffffff; } .bi-upload-image .upload-image-delete-label { font-size: 14px; - color: #1a1a1a; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -269,7 +244,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-month-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -277,40 +251,26 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-check-pane { - background-color: #f4f4f4; -} .bi-multi-select-check-pane .multi-select-check-selected { - color: #009de3; + color: #3f8ce8; text-decoration: underline; } -.bi-theme-dark .bi-multi-select-check-pane { - background-color: #191a2c; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-display-list .display-list-item { - color: #808080; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-popup-view .multi-select-no-toolbar { - color: #c4c6c6; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px 2px 2px 2px; -moz-border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px; @@ -318,9 +278,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-search-pane { - background: #ffffff; -} .bi-multi-select-search-pane .multi-select-toolbar { color: #e85050; } @@ -328,70 +285,25 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-check-selected-button { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } -.bi-theme-dark .bi-multi-select-check-selected-button { - background-color: #191a2c; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-string-list .popup-multi-string-list { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-check-pane { - background-color: #f4f4f4; -} -.bi-multi-tree-check-pane .multi-tree-continue-select { - background-color: #f4f4f4; -} .bi-multi-tree-check-pane .multi-tree-check-selected { - color: #009de3; + color: #3f8ce8; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-display { - background-color: #f4f4f4; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } /****添加计算宽度的--运算符直接需要space****/ @@ -403,58 +315,20 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-search-pane { - background: #ffffff; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-check-selected-button .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-tree-list-popup { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-numerical-interval .numerical-interval-small-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -463,9 +337,6 @@ border-bottom-left-radius: 2px; } .bi-numerical-interval .numerical-interval-big-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; @@ -474,7 +345,6 @@ border-bottom-right-radius: 2px; } .bi-numerical-interval .numerical-interval-big-combo { - border: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -486,7 +356,6 @@ font-size: 14px; } .bi-numerical-interval .numerical-interval-small-combo { - border: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; @@ -503,15 +372,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-numerical-interval-popup .numerical-interval-popup-item.hover, -.bi-numerical-interval-popup .numerical-interval-popup-item:hover { - background-color: #f4f4f4; -} -.bi-numerical-interval-popup .numerical-interval-popup-item.active, -.bi-numerical-interval-popup .numerical-interval-popup-item:active { - background-color: #f4f4f4; - color: #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -535,17 +395,8 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-path-region { - background: #eaeaea; -} .bi-path-region .path-region-label { z-index: 1; - background: #ffffff; - border: 1px solid #ffffff; -} -.bi-path-region .path-region-label.active { - background: #009de3; - color: #ffffff; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -560,7 +411,11 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eaeaea; + 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; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -581,7 +436,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-quarter-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -589,26 +443,17 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-relation-view-item.active { - color: #ffffff; - background-color: #009de3; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-relation-view-region .relation-view-region-container { - background: #ffffff; - border: 1px solid #d4dadd; 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: 1px dashed #d4dadd; -} -.bi-relation-view-region .relation-view-region-container .relation-view-region-title { - border-bottom: 1px solid #d4dadd; + border-style: dashed; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -625,7 +470,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-dynamic-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -636,9 +480,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -655,7 +496,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-list-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -666,9 +506,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ @@ -688,7 +525,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-tree-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -699,38 +535,10 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-singletree-combo .singletree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.bi-singletree-combo .bi-singletree-popup .singletree-toolbar { - color: #c4c6c6; -} -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-web-page .web-page-button { - z-index: 1; - font-size: 14px; - background-color: #ffffff; -} -.bi-web-page .web-page-text-button-label { - font-size: 16px; - color: #c4c6c6; -} -.bi-web-page .web-page-delete-label { - font-size: 14px; - color: #1a1a1a; -} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ @@ -738,21 +546,25 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-popup .year-popup-navigation { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #eaeaea; + 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; +} /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/docs/widget.js b/docs/widget.js index 99ffd64b5..bfce10a76 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -35,7 +35,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -251,7 +251,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, styleGetter: numbers[key].isSummary === true ? function () { return o.summaryCellStyleGetter(true); @@ -921,7 +921,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block" + baseCls: "bi-arrangement-block bi-resizer" }); }, @@ -3206,7 +3206,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { type: "bi.layout", width: 18, height: 18, - cls: "arrangement-helper" + cls: "arrangement-helper bi-border" }); BI.createWidget({ type: "bi.absolute", @@ -4876,7 +4876,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge _defaultConfig: function () { return BI.extend(BI.DateTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-date-trigger", + extraCls: "bi-date-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25 @@ -6017,7 +6017,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { items: [{ el: { type: "bi.layout", - cls: "bi-down-list-spliter cursor-pointer", + cls: "bi-down-list-spliter bi-border-top cursor-pointer", height: 0 } @@ -6137,7 +6137,7 @@ BI.ExcelTableHeaderCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ExcelTableHeaderCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-excel-table-header-cell", + baseCls: "bi-excel-table-header-cell bi-background", text: "" }); }, @@ -6564,7 +6564,7 @@ BI.FileManagerFileItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFileItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-file-item bi-list-item", + baseCls: "bi-file-manager-file-item bi-list-item bi-border-bottom", height: 30 }) }, @@ -6631,7 +6631,7 @@ BI.FileManagerFolderItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFolderItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-folder-item bi-list-item", + baseCls: "bi-file-manager-folder-item bi-list-item bi-border-bottom", height: 30 }) }, @@ -6855,7 +6855,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, { var self = this, o = this.options, c = this._const; this.button = BI.createWidget({ type: "bi.text_button", - cls: "file-manager-nav-button-text", + cls: "file-manager-nav-button-text bi-card", once: true, selected: o.selected, text: o.text, @@ -6931,7 +6931,7 @@ BI.FileManagerNav = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FileManagerNav.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-nav", + baseCls: "bi-file-manager-nav bi-border-left", height: 40, items: [] }) @@ -7033,7 +7033,7 @@ BI.shortcut("bi.file_manager_nav", BI.FileManagerNav);/** BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FineTuningNumberEditor.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-fine-tuning-number-editor", + baseCls: "bi-fine-tuning-number-editor bi-border", value: -1 }) }, @@ -7055,7 +7055,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.topBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-pre-page-h-font top-button" + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(1); @@ -7063,7 +7063,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.bottomBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-next-page-h-font bottom-button" + cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(-1); @@ -7121,6 +7121,70 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); BI.FineTuningNumberEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.shortcut("bi.fine_tuning_number_editor", BI.FineTuningNumberEditor);/** + * Created by GameJian on 2016/1/28. + */ +BI.ImageButtonHref = BI.inherit(BI.Single, { + + _defaultConfig: function () { + return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-image-button-href", + title: BI.i18nText("BI-Add_Href") + }) + }, + + _init: function () { + BI.ImageButtonHref.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.trigger = BI.createWidget({ + type: "bi.icon_button", + cls: "img-href-font", + title: o.title, + height: 24, + width: 24 + }); + + this.input = BI.createWidget({ + type: "bi.clear_editor", + watermark: BI.i18nText("BI-Input_Href"), + width: 255, + height: 30 + }); + this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { + self.combo.hideView(); + }); + + this.combo = BI.createWidget({ + type: "bi.combo", + element: this, + direction: "bottom,left", + adjustYOffset: 3, + el: this.trigger, + popup: { + el: this.input, + stopPropagation: false, + minWidth: 255 + } + }); + + this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { + self.input.focus() + }); + + this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { + self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) + }) + }, + + getValue: function () { + return this.input.getValue(); + }, + + setValue: function (url) { + this.input.setValue(url) + } +}); +BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; +BI.shortcut("bi.image_button_href", BI.ImageButtonHref);/** * 交互行为布局 * * @@ -7869,7 +7933,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-month-trigger", + extraCls: "bi-month-trigger bi-border", height: 25 }); }, @@ -9320,7 +9384,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-check-pane", + baseCls: "bi-multi-select-check-pane bi-background", items: [], itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, @@ -9473,7 +9537,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: 'bi.icon_text_item', - cls: 'cursor-default check-font display-list-item', + cls: 'cursor-default check-font display-list-item bi-tips', once: true, invalid: true, selected: true, @@ -9658,7 +9722,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); @@ -10126,7 +10190,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-trigger", + baseCls: "bi-multi-select-trigger bi-border", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, searcher: {}, @@ -10433,7 +10497,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-search-pane", + baseCls: "bi-multi-select-search-pane bi-card", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, keywordGetter: BI.emptyFn @@ -10779,13 +10843,18 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { }, setState: function (ob) { + var o = this.options; ob || (ob = {}); ob.value || (ob.value = []); if (ob.type === BI.Selection.All) { - this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + if (BI.size(ob.assist) === 1) { + this.editor.setState(o.valueFormatter(ob.assist[0] + "") || ob.assist[0] + ""); + } else { + this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + } } else { if (BI.size(ob.value) === 1) { - this.editor.setState(ob.value[0] + ""); + this.editor.setState(o.valueFormatter(ob.value[0] + "" || ob.value[0] + "")); } else { this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.None); } @@ -10940,7 +11009,7 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.popup = BI.createWidget({ type: "bi.multi_select_loader", - cls: "popup-multi-string-list", + cls: "popup-multi-string-list bi-border-left bi-border-right bi-border-bottom", itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, onLoaded: o.onLoaded, @@ -11247,7 +11316,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-check-pane", + baseCls: "bi-multi-tree-check-pane bi-background", onClickContinueSelect: BI.emptyFn }); }, @@ -11542,7 +11611,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); @@ -11708,7 +11777,7 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-search-pane", + baseCls: "bi-multi-tree-search-pane bi-card", itemsCreator: BI.emptyFn, keywordGetter: BI.emptyFn }); @@ -12153,7 +12222,7 @@ BI.shortcut('bi.multi_tree_list', BI.MultiTreeList);/** BI.MultiStringListPopup=BI.inherit(BI.Widget,{ _defaultConfig:function () { return BI.extend(BI.MultiStringListPopup.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-tree-list-popup", + baseCls: "bi-tree-list-popup bi-border-left bi-border-right bi-border-bottom", itemsCreator: BI.emptyFn }); }, @@ -12244,7 +12313,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-small-editor" + cls: "numerical-interval-small-editor bi-border-top bi-border-bottom bi-border-left" }); this.smallTip = BI.createWidget({ @@ -12281,7 +12350,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-big-editor" + cls: "numerical-interval-big-editor bi-border-top bi-border-bottom bi-border-right" }); this.bigTip = BI.createWidget({ @@ -12317,7 +12386,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { //}); this.smallCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-small-combo", + cls: "numerical-interval-small-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", @@ -12336,7 +12405,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } this.bigCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-big-combo", + cls: "numerical-interval-big-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", @@ -13532,7 +13601,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.PathRegion.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-path-region", + baseCls: "bi-path-region bi-background", width: 80, title: "" }) @@ -13569,7 +13638,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { if (BI.isKey(value)) { var label = BI.createWidget({ type: "bi.label", - cls: "path-region-label", + cls: "path-region-label bi-card bi-border bi-list-item-active", text: text, value: value, title: text || value, @@ -14069,7 +14138,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-quarter-trigger", + extraCls: "bi-quarter-trigger bi-border", height: 25 }); }, @@ -14167,7 +14236,7 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.RelationViewItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-item", + baseCls: "bi-relation-view-item bi-list-item-active", height: 25, hoverIn: BI.emptyFn, hoverOut: BI.emptyFn @@ -14538,7 +14607,7 @@ BI.shortcut('bi.relation_view', BI.RelationView);/** BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-region-container", + baseCls: "bi-relation-view-region-container bi-card bi-border", width: 150 }); }, @@ -14689,10 +14758,10 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { element: this, items: [{ type: "bi.vertical", - cls: "relation-view-region-container " + (o.belongPackage ? "" : "other-package"), + cls: "relation-view-region-container bi-card bi-border " + (o.belongPackage ? "" : "other-package"), items: [{ type: "bi.vertical_adapt", - cls: "relation-view-region-title", + cls: "relation-view-region-title bi-border", items: [this.preview, this.title] }, this.button_group] }], @@ -15737,7 +15806,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -15804,7 +15873,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, height: o.rowSize, text: this.start + i, @@ -16460,159 +16529,6 @@ BI.SwitchTree.SelectType = { }; BI.shortcut('bi.switch_tree', BI.SwitchTree); /** - * web组件 - * Created by GameJian on 2016/3/1. - */ -BI.WebPage = BI.inherit(BI.Widget, { - _defaultConfig: function () { - return BI.extend(BI.WebPage.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-web-page" - }) - }, - - _init: function () { - BI.WebPage.superclass._init.apply(this, arguments); - var self = this, o = this.options; - - this.iframe = BI.createWidget({ - type: "bi.iframe" - }); - - this.label = BI.createWidget({ - type: "bi.label", - cls: "web-page-text-button-label", - whiteSpace: "normal", - text: BI.i18nText("BI-Not_Add_Url") - }); - - this.del = BI.createWidget({ - type: "bi.bubble_combo", - el: { - type: "bi.icon_button", - cls: "web-page-button img-shutdown-font", - title: BI.i18nText("BI-Basic_Delete"), - height: 24, - width: 24 - }, - popup: { - type: "bi.bubble_bar_popup_view", - buttons: [{ - value: BI.i18nText(BI.i18nText("BI-Basic_Sure")), - handler: function () { - self.fireEvent(BI.WebPage.EVENT_DESTROY) - } - }, { - value: BI.i18nText("BI-Basic_Cancel"), - level: "ignore", - handler: function () { - self.del.hideView(); - } - }], - el: { - type: "bi.vertical_adapt", - items: [{ - type: "bi.label", - text: BI.i18nText("BI-Sure_Delete_Current_Component"), - cls: "web-page-delete-label", - textAlign: "left", - width: 300 - }], - width: 300, - height: 100, - hgap: 20 - }, - maxHeight: 140, - minWidth: 340 - }, - invisible: true, - stopPropagation: true - }); - - - this.href = BI.createWidget({ - type: "bi.image_button_href", - cls: "web-page-button" - }); - - this.href.on(BI.ImageButtonHref.EVENT_CHANGE, function () { - var url = this.getValue(); - self.setValue(this.getValue()); - self._checkUrl(url); - self.fireEvent(BI.WebPage.EVENT_VALUE_CHANGE); - }); - - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{ - el: this.iframe - }, { - el: this.del, - right: 4, - top: 8 - }, { - el: this.href, - right: 36, - top: 8 - }, { - el: this.label, - top: 32, - left: 0, - bottom: 0, - right: 0 - }] - }); - - this.setToolbarVisible(false); - this._showLabel(); - }, - - _checkUrl: function(url){ - BI.Bubbles.hide(this.getName()); - if(BI.isEmptyString(url)){ - BI.Bubbles.show(this.getName(), BI.i18nText("BI-Click_To_Add_Hyperlink"), this.href, { - offsetStyle: "left" - }); - } - }, - - _hideLabel: function () { - this.label.invisible() - }, - - isSelected: function () { - return this.href.isSelected(); - }, - - _showLabel: function () { - this.label.visible() - }, - - setToolbarVisible: function (v) { - this.href.setVisible(v); - this.del.setVisible(v); - }, - - getValue: function () { - return this.href.getValue() - }, - - setValue: function (url) { - var self = this; - if (BI.isNotEmptyString(url)) { - self._hideLabel(); - } else { - this.setToolbarVisible(true); - this.href.showView(); - } - this.href.setValue(url); - this.iframe.setSrc(BI.Func.formatAddress(url)) - } -}); - -BI.WebPage.EVENT_DESTROY = "EVENT_DESTROY"; -BI.WebPage.EVENT_VALUE_CHANGE = "EVENT_VALUE_CHANGE"; -BI.shortcut("bi.web_page", BI.WebPage);/** * 年份下拉框 * * Created by GUY on 2015/8/28. @@ -16769,7 +16685,7 @@ BI.YearPopup = BI.inherit(BI.Widget, { dynamic: true }, tab: { - cls: "year-popup-navigation", + cls: "year-popup-navigation bi-border-top", height: 25, items: [backBtn, preBtn] }, @@ -16827,7 +16743,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.YearTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-year-trigger", + extraCls: "bi-year-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25 diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index b84f8a998..105339c08 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -181,9 +181,9 @@ BI.Combo = BI.inherit(BI.Widget, { }, _hideIf: function (e) { - if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { - return; - } + // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) { + // return; + // } if (this.element.find(e.target).length > 0) { return; } diff --git a/src/base/combination/group.button.js b/src/base/combination/group.button.js index 353f18cd0..d303feeeb 100644 --- a/src/base/combination/group.button.js +++ b/src/base/combination/group.button.js @@ -170,7 +170,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { deleted.push(i); } }); - BI.remove(this.buttons, deleted); + BI.removeAt(this.buttons, deleted); this.layouts.removeItemAt(deleted); }, diff --git a/src/base/foundation/bi.message.js b/src/base/foundation/bi.message.js index 569371d47..5ea5234f1 100644 --- a/src/base/foundation/bi.message.js +++ b/src/base/foundation/bi.message.js @@ -105,12 +105,12 @@ $.extend(BI, { items: [ { type: 'bi.border', - cls: 'bi-message-content', + cls: 'bi-message-content bi-card', items: { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { diff --git a/src/base/layer/layer.floatbox.js b/src/base/layer/layer.floatbox.js index fe42543a7..c015e76eb 100644 --- a/src/base/layer/layer.floatbox.js +++ b/src/base/layer/layer.floatbox.js @@ -6,7 +6,7 @@ BI.FloatBox = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FloatBox.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-float-box", + baseCls: "bi-float-box bi-card", width: 600, height: 500 }) @@ -45,7 +45,7 @@ BI.FloatBox = BI.inherit(BI.Widget, { 'north': { el: { type: 'bi.border', - cls: 'bi-message-title', + cls: 'bi-message-title bi-background', items: { center: { el: { diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index 9589237e4..626acf148 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -55,12 +55,7 @@ BI.PopupView = BI.inherit(BI.Widget, { "max-width": o.maxWidth + "px" }).bind({"click": fn}); - //FIXME IE8下 jquery.mousewheeel.js 第一次执行65行$elem["offsetParent"]()的时候报错：未指明的错误 但是第二次或者调试的时候展开一下$elem内容均能避免上述问题 - try { - this.element.bind("mousewheel", fn); - } catch (e) { - this.element.bind("mousewheel", fn); - } + this.element.bind("mousewheel", fn); o.stopPropagation && this.element.bind({"mousedown": fn, "mouseup": fn, "mouseover": fn}); o.stopEvent && this.element.bind({"mousedown": stop, "mouseup": stop, "mouseover": stop}); @@ -88,7 +83,7 @@ BI.PopupView = BI.inherit(BI.Widget, { hgap: o.hgap, items: BI.LogicFactory.createLogicItemsByDirection(o.direction, BI.extend({ - cls: "list-view-outer" + cls: "list-view-outer bi-card bi-border" }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar) }))) @@ -132,7 +127,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(o.buttons, { once: false, diff --git a/src/base/layer/layer.searcher.js b/src/base/layer/layer.searcher.js index 97392035b..09dc6ff54 100644 --- a/src/base/layer/layer.searcher.js +++ b/src/base/layer/layer.searcher.js @@ -10,7 +10,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { _defaultConfig: function () { var conf = BI.SearcherView.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-searcher-view", + baseCls: (conf.baseCls || "") + " bi-searcher-view bi-card", tipText: BI.i18nText("BI-No_Select"), chooseType: BI.Selection.Single, @@ -70,7 +70,7 @@ BI.SearcherView = BI.inherit(BI.Pane, { items: [{ type: "bi.layout", height: 1, - cls: "searcher-view-spliter" + cls: "searcher-view-spliter bi-background" }] }); this.searcher = BI.createWidget(o.searcher, { diff --git a/src/base/single/bar/bar.loading.js b/src/base/single/bar/bar.loading.js index 7f7d90f6d..78a07bc45 100644 --- a/src/base/single/bar/bar.loading.js +++ b/src/base/single/bar/bar.loading.js @@ -11,7 +11,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { _defaultConfig: function() { var conf = BI.LoadingBar.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-loading-bar', + baseCls : (conf.baseCls ||"")+' bi-loading-bar bi-tips', height: 30, handler: BI.emptyFn }) @@ -21,7 +21,7 @@ BI.LoadingBar = BI.inherit(BI.Single, { var self = this; this.loaded = BI.createWidget({ type: "bi.text_button", - cls: "loading-text", + cls: "loading-text bi-list-item-simple", text: this.consts.loadedText, width: 120, handler: this.options.handler diff --git a/src/base/single/editor/editor.textarea.js b/src/base/single/editor/editor.textarea.js index 1c0afb044..daa12f8a8 100644 --- a/src/base/single/editor/editor.textarea.js +++ b/src/base/single/editor/editor.textarea.js @@ -19,7 +19,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, { tagName: "textarea", width: "100%", height: "100%", - cls: "textarea-editor-content display-block" + cls: "textarea-editor-content display-block bi-card" }); this.content.element.css({"resize": "none"}); BI.createWidget({ diff --git a/src/base/single/text.js b/src/base/single/text.js index 8ac371d77..078195730 100644 --- a/src/base/single/text.js +++ b/src/base/single/text.js @@ -29,11 +29,15 @@ BI.Text = BI.inherit(BI.Single, { type: "bi.layout", cls: "bi-text" }); - this.text.element.appendTo(this.element); + BI.createWidget({ + type: "bi.default", + element: this, + items: [this.text] + }); if (BI.isKey(o.text)) { - this.text.element.text(o.text); + this.setText(o.text); } else if (BI.isKey(o.value)) { - this.text.element.text(o.value); + this.setText(o.value); } if (o.hgap + o.lgap > 0) { this.text.element.css({ @@ -95,7 +99,7 @@ BI.Text = BI.inherit(BI.Single, { setValue: function (text) { BI.Text.superclass.setValue.apply(this, arguments); if (!this.isReadOnly()) { - this.text.element.text(text); + this.setText(text); } }, @@ -106,7 +110,7 @@ BI.Text = BI.inherit(BI.Single, { setText: function (text) { BI.Text.superclass.setText.apply(this, arguments); this.options.text = text; - this.text.element.text(text); + this.text.element.html(BI.escape(text).replaceAll(" ", " ")); } }); diff --git a/src/base/table/table.collection.cell.js b/src/base/table/table.collection.cell.js index e0291c0a2..7a1ebae85 100644 --- a/src/base/table/table.collection.cell.js +++ b/src/base/table/table.collection.cell.js @@ -9,7 +9,7 @@ BI.CollectionTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.CollectionTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-collection-table-cell", + baseCls: "bi-collection-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _left: 0, diff --git a/src/base/table/table.grid.cell.js b/src/base/table/table.grid.cell.js index 777382d94..eaccd5a2b 100644 --- a/src/base/table/table.grid.cell.js +++ b/src/base/table/table.grid.cell.js @@ -9,7 +9,7 @@ BI.GridTableCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.GridTableCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-grid-table-cell", + baseCls: "bi-grid-table-cell bi-border-right bi-border-bottom", width: 0, height: 0, _rowIndex: 0, diff --git a/src/base/table/table.js b/src/base/table/table.js index 8652d0543..ed5530110 100644 --- a/src/base/table/table.js +++ b/src/base/table/table.js @@ -743,13 +743,14 @@ BI.Table = BI.inherit(BI.Widget, { .addClass(c === rows.length - 1 ? "last-col" : ""); var w = BI.createWidget(map[r][c], { type: "bi.table_cell", - root: true, textAlign: "left", width: BI.isNumeric(width) ? width : "", height: BI.isNumeric(height) ? height : "", _row: r, _col: c + start }); + self.addWidget(w.getName(), w); + w._mount(); w.element.css("position", "relative"); td.append(w.element); tr.append(td); diff --git a/src/case/colorchooser/colorchooser.popup.js b/src/case/colorchooser/colorchooser.popup.js index 4cfac3c29..b369bd38b 100644 --- a/src/case/colorchooser/colorchooser.popup.js +++ b/src/case/colorchooser/colorchooser.popup.js @@ -124,7 +124,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.absolute", - cls: "color-chooser-popup-title", + cls: "bi-background bi-border-bottom", items: [{ el: this.colorEditor, left: 0, diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js index 99d0e37ae..af4de6b9e 100644 --- a/src/case/colorchooser/colorchooser.trigger.js +++ b/src/case/colorchooser/colorchooser.trigger.js @@ -10,7 +10,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-card", height: 30 }) }, diff --git a/src/case/colorchooser/colorpicker/button/button.colorpicker.js b/src/case/colorchooser/colorpicker/button/button.colorpicker.js index cb54d2e65..047d750c7 100644 --- a/src/case/colorchooser/colorpicker/button/button.colorpicker.js +++ b/src/case/colorchooser/colorpicker/button/button.colorpicker.js @@ -10,7 +10,7 @@ BI.ColorPickerButton = BI.inherit(BI.BasicButton, { _defaultConfig: function () { var conf = BI.ColorPickerButton.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-picker-button" + baseCls: (conf.baseCls || "") + " bi-color-picker-button bi-background bi-border-top bi-border-left" }) }, diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.js b/src/case/colorchooser/colorpicker/editor.colorpicker.js index 52f8734a6..27c07f34b 100644 --- a/src/case/colorchooser/colorpicker/editor.colorpicker.js +++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js @@ -20,7 +20,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, { var self = this, o = this.options; this.colorShow = BI.createWidget({ type: "bi.layout", - cls: "color-picker-editor-display", + cls: "color-picker-editor-display bi-card", height: 20 }); var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { diff --git a/src/case/combo/staticcombo/combo.static.js b/src/case/combo/staticcombo/combo.static.js index 9363b9b6e..79cb28e0e 100644 --- a/src/case/combo/staticcombo/combo.static.js +++ b/src/case/combo/staticcombo/combo.static.js @@ -21,7 +21,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; this.trigger = BI.createWidget(o.el, { type: "bi.text_icon_item", - cls: "bi-select-text-trigger pull-down-font", + cls: "bi-select-text-trigger bi-border pull-down-font", text: o.text, readonly: true, textLgap: 5, diff --git a/src/case/editor/editor.search.js b/src/case/editor/editor.search.js index 3ecc7eed1..d952ece8b 100644 --- a/src/case/editor/editor.search.js +++ b/src/case/editor/editor.search.js @@ -5,7 +5,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: "bi-search-editor", + baseCls: "bi-search-editor bi-border", height: 30, errorText: "", watermark: BI.i18nText("BI-Basic_Search"), diff --git a/src/case/editor/editor.sign.style.js b/src/case/editor/editor.sign.style.js deleted file mode 100644 index 13c16cfaa..000000000 --- a/src/case/editor/editor.sign.style.js +++ /dev/null @@ -1,260 +0,0 @@ -/** - * sign标签分两段，可以自定义样式 - * @class BI.SignStyleEditor - * @extends BI.Single - */ -BI.SignStyleEditor = BI.inherit(BI.Single, { - - constants: { - tipTextGap: 4 - }, - - _defaultConfig: function () { - var conf = BI.SignStyleEditor.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-sign-style-editor", - text: "", - hgap: 4, - vgap: 2, - lgap: 0, - rgap: 0, - tgap: 0, - bgap: 0, - validationChecker: BI.emptyFn, - quitChecker: BI.emptyFn, - mouseOut: false, - allowBlank: false, - watermark: "", - errorText: "", - height: 30 - }) - }, - - _init: function () { - BI.SignStyleEditor.superclass._init.apply(this, arguments); - var self = this, o = this.options; - this.editor = BI.createWidget({ - type: "bi.editor", - height: o.height, - hgap: o.hgap, - vgap: o.vgap, - lgap: o.lgap, - rgap: o.rgap, - tgap: o.tgap, - bgap: o.bgap, - value: o.value, - validationChecker: o.validationChecker, - quitChecker: o.quitChecker, - mouseOut: o.mouseOut, - allowBlank: o.allowBlank, - watermark: o.watermark, - errorText: o.errorText - }); - this.text = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-text", - textAlign: "left", - height: o.height, - hgap: 4, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.tipText = BI.createWidget({ - type: "bi.text_button", - cls: "sign-style-editor-tip", - textAlign: "right", - rgap: 4, - height: o.height, - text: o.text, - handler: function () { - self._showInput(); - self.editor.focus(); - self.editor.selectAll(); - } - }); - - this.text.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.tipText.on(BI.TextButton.EVENT_CHANGE, function () { - BI.nextTick(function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK_LABEL) - }); - }); - - this.wrap = BI.createWidget({ - type: "bi.htape", - element: this, - items: [this.text, this.tipText] - }); - - this.editor.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - this.editor.on(BI.Editor.EVENT_FOCUS, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_FOCUS); - }); - this.editor.on(BI.Editor.EVENT_BLUR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_BLUR); - }); - this.editor.on(BI.Editor.EVENT_CLICK, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CLICK); - }); - this.editor.on(BI.Editor.EVENT_CHANGE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_CHANGE); - }); - this.editor.on(BI.Editor.EVENT_KEY_DOWN, function (v) { - self.fireEvent(BI.SignStyleEditor.EVENT_KEY_DOWN); - }); - - this.editor.on(BI.Editor.EVENT_VALID, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_VALID); - }); - this.editor.on(BI.Editor.EVENT_CONFIRM, function () { - self._showHint(); - self._checkText(); - self._resizeLayout(); - self.fireEvent(BI.SignStyleEditor.EVENT_CONFIRM); - }); - this.editor.on(BI.Editor.EVENT_START, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_START); - }); - this.editor.on(BI.Editor.EVENT_PAUSE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_PAUSE); - }); - this.editor.on(BI.Editor.EVENT_STOP, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_STOP); - }); - this.editor.on(BI.Editor.EVENT_SPACE, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_SPACE); - }); - this.editor.on(BI.Editor.EVENT_ERROR, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ERROR); - }); - this.editor.on(BI.Editor.EVENT_ENTER, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_ENTER); - }); - this.editor.on(BI.Editor.EVENT_RESTRICT, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_RESTRICT); - }); - this.editor.on(BI.Editor.EVENT_EMPTY, function () { - self.fireEvent(BI.SignStyleEditor.EVENT_EMPTY); - }); - BI.createWidget({ - type: "bi.vertical", - scrolly: false, - element: this, - items: [this.editor] - }); - this._showHint(); - this._checkText(); - - BI.nextTick(function () { - var tipTextSize = self.text.element.getStyle("font-size"); - self.tipTextSize = tipTextSize.substring(0, tipTextSize.length - 2); - self._resizeLayout(); - }); - }, - - _checkText: function () { - var o = this.options; - if (this.editor.getValue() === "") { - this.text.setValue(o.watermark || ""); - this.text.element.addClass("bi-water-mark"); - } else { - this.text.setValue(this.editor.getValue()); - this.tipText.setValue("(" + o.text + ")"); - this.text.element.removeClass("bi-water-mark"); - } - this.setTitle(this.text.getValue() + this.tipText.getValue()); - }, - - _showInput: function () { - this.editor.setVisible(true); - this.text.setVisible(false); - this.tipText.setVisible(false); - }, - - _showHint: function () { - this.editor.setVisible(false); - this.text.setVisible(true); - this.tipText.setVisible(true); - }, - - _resizeLayout: function () { - this.wrap.attr("items")[0].width = BI.DOM.getTextSizeWidth(this.text.getValue(), this.tipTextSize) + 2 * this.constants.tipTextGap; - this.wrap.resize(); - }, - - focus: function () { - this._showInput(); - this.editor.focus(); - }, - - blur: function () { - this.editor.blur(); - this._showHint(); - this._checkText(); - }, - - isValid: function () { - return this.editor.isValid(); - }, - - setErrorText: function (text) { - this.editor.setErrorText(text); - }, - - getErrorText: function () { - return this.editor.getErrorText(); - }, - - setValue: function (k) { - BI.SignStyleEditor.superclass.setValue.apply(this, arguments); - this.editor.setValue(k); - this._checkText(); - this._resizeLayout(); - }, - - getValue: function () { - return this.editor.getValue(); - }, - - getState: function () { - return this.options.text; - }, - - setState: function (v) { - var o = this.options; - o.text = v; - this._showHint(); - this.tipText.setValue("(" + v + ")"); - this._checkText(); - } -}); -BI.SignStyleEditor.EVENT_CHANGE = "EVENT_CHANGE"; -BI.SignStyleEditor.EVENT_FOCUS = "EVENT_FOCUS"; -BI.SignStyleEditor.EVENT_BLUR = "EVENT_BLUR"; -BI.SignStyleEditor.EVENT_CLICK = "EVENT_CLICK"; -BI.SignStyleEditor.EVENT_KEY_DOWN = "EVENT_KEY_DOWN"; -BI.SignStyleEditor.EVENT_CLICK_LABEL = "EVENT_CLICK_LABEL"; - -BI.SignStyleEditor.EVENT_START = "EVENT_START"; -BI.SignStyleEditor.EVENT_PAUSE = "EVENT_PAUSE"; -BI.SignStyleEditor.EVENT_STOP = "EVENT_STOP"; -BI.SignStyleEditor.EVENT_CONFIRM = "EVENT_CONFIRM"; -BI.SignStyleEditor.EVENT_VALID = "EVENT_VALID"; -BI.SignStyleEditor.EVENT_ERROR = "EVENT_ERROR"; -BI.SignStyleEditor.EVENT_ENTER = "EVENT_ENTER"; -BI.SignStyleEditor.EVENT_RESTRICT = "EVENT_RESTRICT"; -BI.SignStyleEditor.EVENT_SPACE = "EVENT_SPACE"; -BI.SignStyleEditor.EVENT_EMPTY = "EVENT_EMPTY"; - -BI.shortcut("bi.sign_style_editor", BI.SignStyleEditor); \ No newline at end of file diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js index ac4a580b1..fefe2bb1c 100644 --- a/src/case/editor/editor.state.js +++ b/src/case/editor/editor.state.js @@ -47,7 +47,7 @@ BI.StateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js index f8a918f2a..2996daa9e 100644 --- a/src/case/editor/editor.state.simple.js +++ b/src/case/editor/editor.state.simple.js @@ -47,7 +47,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Single, { }); this.text = BI.createWidget({ type: "bi.text_button", - cls: "state-editor-infinite-text", + cls: "state-editor-infinite-text bi-disabled", textAlign: "left", height: o.height, text: BI.i18nText("BI-Unrestricted"), diff --git a/src/case/editor/editor.text.js b/src/case/editor/editor.text.js index 6bca9d337..4d8abd7d3 100644 --- a/src/case/editor/editor.text.js +++ b/src/case/editor/editor.text.js @@ -7,7 +7,7 @@ BI.TextEditor = BI.inherit(BI.Single, { _defaultConfig: function () { var conf = BI.TextEditor.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - extraCls: "bi-text-editor", + extraCls: "bi-text-editor bi-border", hgap: 4, vgap: 2, lgap: 0, diff --git a/src/case/layer/layer.multiselect.js b/src/case/layer/layer.multipopup.js similarity index 94% rename from src/case/layer/layer.multiselect.js rename to src/case/layer/layer.multipopup.js index d1213f4f9..ed33f619e 100644 --- a/src/case/layer/layer.multiselect.js +++ b/src/case/layer/layer.multipopup.js @@ -34,7 +34,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", - cls: "list-view-toolbar", + cls: "list-view-toolbar bi-border-top", height: 30, items: BI.createItems(text, { type: "bi.text_button", diff --git a/src/case/layer/layer.panel.js b/src/case/layer/layer.panel.js index 0bd402b82..bc7aa8357 100644 --- 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", + cls: "popup-panel-title bi-background bi-border", height: 25, items: [{ el: { diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js index 2e25b4f21..5e0f75190 100644 --- a/src/case/layer/panel.js +++ b/src/case/layer/panel.js @@ -6,7 +6,7 @@ BI.Panel = BI.inherit(BI.Widget,{ _defaultConfig : function(){ return BI.extend(BI.Panel.superclass._defaultConfig.apply(this,arguments),{ - baseCls: "bi-panel", + baseCls: "bi-panel bi-border", title:"", titleButtons:[], el:{}, @@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget,{ return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title", + cls: "panel-title bi-tips bi-border-bottom bi-background", height: 30, items: { left: [this.text], diff --git a/src/case/pager/pager.js b/src/case/pager/pager.js index 7097d3ff2..15f460bf2 100644 --- a/src/case/pager/pager.js +++ b/src/case/pager/pager.js @@ -176,7 +176,7 @@ BI.DetailPager = BI.inherit(BI.Widget, { type: "bi.button_group", element: this, items: BI.createItems(view, { - cls: "page-item", + cls: "page-item bi-border bi-list-item-active", height: 23, hgap: 10 }), diff --git a/src/case/segment/button.segment.js b/src/case/segment/button.segment.js index 2e35fcaa5..95fb94ca0 100644 --- a/src/case/segment/button.segment.js +++ b/src/case/segment/button.segment.js @@ -10,7 +10,7 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, { _defaultConfig: function() { var conf = BI.SegmentButton.superclass._defaultConfig.apply(this, arguments); return BI.extend( conf, { - baseCls : (conf.baseCls ||"")+' bi-segment-button', + baseCls : (conf.baseCls ||"")+' bi-segment-button bi-list-item-active', shadow: true, readonly: true, hgap: 10 diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index 0979baaa0..3fc3fabea 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -19,10 +19,15 @@ BI.Segment = BI.inherit(BI.Widget, { this.buttonGroup = BI.createWidget({ element: this, type: "bi.button_group", - items: BI.createItems(o.items, { - type: "bi.segment_button", - height: o.height - 2, - whiteSpace: o.whiteSpace + items: BI.map(o.items, function (i, item) { + return BI.extend({ + type: "bi.segment_button", + height: o.height - 2, + whiteSpace: o.whiteSpace + }, item, { + cls: (i === 0 ? "bi-border-left " : "") + + (item.cls || "") + " bi-border-top bi-border-right bi-border-bottom" + }); }), layout: [ { diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js index 27eafb528..5427b331a 100644 --- a/src/case/trigger/trigger.editor.js +++ b/src/case/trigger/trigger.editor.js @@ -13,7 +13,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.EditorTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-editor-trigger", + baseCls: (conf.baseCls || "") + " bi-editor-trigger bi-border", height: 30, validationChecker: BI.emptyFn, quitChecker: BI.emptyFn, diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 0fb63d636..6f4c2f90b 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -9,7 +9,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-select-text-trigger", + baseCls: "bi-select-text-trigger bi-border", height: 24 }); }, diff --git a/src/case/trigger/trigger.text.select.small.js b/src/case/trigger/trigger.text.select.small.js index 891ca9a41..372831725 100644 --- a/src/case/trigger/trigger.text.select.small.js +++ b/src/case/trigger/trigger.text.select.small.js @@ -8,7 +8,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SmallSelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-small-select-text-trigger", + baseCls: "bi-small-select-text-trigger bi-border", height: 20 }); }, diff --git a/src/core/base.js b/src/core/base.js index 93da905a3..65b3916bc 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -771,6 +771,13 @@ if (!window.BI) { } }, + parseSafeInt: function (value) { + var MAX_SAFE_INTEGER = 9007199254740991; + return value + ? this.clamp(this.parseInt(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER) + : (value === 0 ? value : 0); + }, + parseFloat: function (number) { try { return parseFloat(number); diff --git a/src/core/func/function.js b/src/core/func/function.js index c8fdf37cd..3d5f4a8d1 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -129,7 +129,7 @@ $(function () { } var rgb = this.rgb2json(this.hex2rgb(hex)); var grayLevel = Math.round(rgb.r * 0.299 + rgb.g * 0.587 + rgb.b * 0.114); - if (grayLevel < 192) { + if (grayLevel < 140) { return true; } return false; @@ -138,7 +138,7 @@ $(function () { //获取对比颜色 getContrastColor: function (color) { if (this.isDarkColor(color)) { - return "#b2b2b2"; + return "#ffffff"; } return "#1a1a1a"; }, diff --git a/src/core/utils/detectElementResize.js b/src/core/utils/detectElementResize.js index 70b70df63..18a5a39d6 100644 --- a/src/core/utils/detectElementResize.js +++ b/src/core/utils/detectElementResize.js @@ -161,11 +161,14 @@ element.__resizeTriggers__ = !element.removeChild(element.__resizeTriggers__); } } - } + }; BI.ResizeDetector = { addResizeListener: function (widget, fn) { addResizeListener(widget.element[0], fn); + return function () { + removeResizeListener(widget.element[0], fn); + } }, removeResizeListener: function (widget, fn) { removeResizeListener(widget.element[0], fn); diff --git a/src/core/widget.js b/src/core/widget.js index fd56767db..2cd8c3b52 100644 --- a/src/core/widget.js +++ b/src/core/widget.js @@ -161,27 +161,14 @@ BI.Widget = BI.inherit(BI.OB, { } this.beforeMounted && this.beforeMounted(); this._isMounted = true; - this._mountChildren(); + this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { widget._mount && widget._mount(); }); this.mounted && this.mounted(); }, - _mountChildren: function () { - var self = this; - var frag = document.createDocumentFragment(); - var hasChild = false; - BI.each(this._children, function (i, widget) { - if (widget.element !== self.element) { - frag.appendChild(widget.element[0]); - hasChild = true; - } - }); - if (hasChild === true) { - this.element.append(frag); - } - }, + _mountChildren: null, _unMount: function () { BI.each(this._children, function (i, widget) { diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index cf23c3974..abca6b005 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -63,6 +63,21 @@ BI.Layout = BI.inherit(BI.Widget, { } }, + _mountChildren: function () { + var self = this; + var frag = document.createDocumentFragment(); + var hasChild = false; + BI.each(this._children, function (i, widget) { + if (widget.element !== self.element) { + frag.appendChild(widget.element[0]); + hasChild = true; + } + }); + if (hasChild === true) { + this.element.append(frag); + } + }, + _getChildName: function (index) { return index + ""; }, diff --git a/src/css/base/calendar/calendar.css b/src/css/base/calendar/calendar.css deleted file mode 100644 index 2f6491e13..000000000 --- a/src/css/base/calendar/calendar.css +++ /dev/null @@ -1,3 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/base/colorchooser/colorchooser.popup.css b/src/css/base/colorchooser/colorchooser.popup.css deleted file mode 100644 index 1ef4e321f..000000000 --- a/src/css/base/colorchooser/colorchooser.popup.css +++ /dev/null @@ -1,16 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-chooser-popup .color-chooser-popup-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-color-chooser-popup .color-chooser-popup-more { - background: #f4f4f4; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-title { - background: #191a2c; -} -.bi-theme-dark .bi-color-chooser-popup .color-chooser-popup-more { - background: #191a2c; -} diff --git a/src/css/base/colorchooser/colorchooser.trigger.css b/src/css/base/colorchooser/colorchooser.trigger.css index 65be3f196..e466f14dd 100644 --- a/src/css/base/colorchooser/colorchooser.trigger.css +++ b/src/css/base/colorchooser/colorchooser.trigger.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-color-chooser-trigger { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/base/colorchooser/colorpicker/button.colorpicker.css b/src/css/base/colorchooser/colorpicker/button.colorpicker.css index 6317de4f6..90758e051 100644 --- a/src/css/base/colorchooser/colorpicker/button.colorpicker.css +++ b/src/css/base/colorchooser/colorpicker/button.colorpicker.css @@ -1,9 +1,9 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-button { - background-color: #eaeaea; -} .bi-color-picker-button .color-picker-button-mask { border: 1px solid #1a1a1a; } +.bi-theme-dark .bi-color-picker-button .color-picker-button-mask { + border: 1px solid #ffffff; +} diff --git a/src/css/base/colorchooser/colorpicker/colorpicker.css b/src/css/base/colorchooser/colorpicker/colorpicker.css deleted file mode 100644 index 98fc55e0c..000000000 --- a/src/css/base/colorchooser/colorpicker/colorpicker.css +++ /dev/null @@ -1,7 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker > .center-element { - border-left: 1px solid #ffffff; - border-top: 1px solid #ffffff; -} diff --git a/src/css/base/colorchooser/colorpicker/editor.colorpicker.css b/src/css/base/colorchooser/colorpicker/editor.colorpicker.css index 62cdece56..535f9b56c 100644 --- a/src/css/base/colorchooser/colorpicker/editor.colorpicker.css +++ b/src/css/base/colorchooser/colorpicker/editor.colorpicker.css @@ -1,11 +1,7 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-color-picker-editor .color-picker-editor-label { - color: #808080; -} .bi-color-picker-editor .color-picker-editor-display { - background: #ffffff; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/base/combination/combo.css b/src/css/base/combination/combo.css deleted file mode 100644 index 2f6491e13..000000000 --- a/src/css/base/combination/combo.css +++ /dev/null @@ -1,3 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/base/combination/searcher.css b/src/css/base/combination/searcher.css deleted file mode 100644 index 2f6491e13..000000000 --- a/src/css/base/combination/searcher.css +++ /dev/null @@ -1,3 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/base/combo/combo.bubble.css b/src/css/base/combo/combo.bubble.css index 0c7ee8d0e..88aaf0f0e 100644 --- a/src/css/base/combo/combo.bubble.css +++ b/src/css/base/combo/combo.bubble.css @@ -5,14 +5,14 @@ width: 0; height: 0; border-top: 6px solid transparent; - border-left: 6px solid #009de3; + border-left: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-right { width: 0; height: 0; border-top: 6px solid transparent; - border-right: 6px solid #009de3; + border-right: 6px solid #3f8ce8; border-bottom: 6px solid transparent; } .bi-bubble-combo .bubble-combo-triangle-top { @@ -20,12 +20,12 @@ height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-top: 6px solid #009de3; + border-top: 6px solid #3f8ce8; } .bi-bubble-combo .bubble-combo-triangle-bottom { width: 0; height: 0; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #009de3; + border-bottom: 6px solid #3f8ce8; } diff --git a/src/css/base/combo/popup.bubble.css b/src/css/base/combo/popup.bubble.css index 2423ffe25..b3791009d 100644 --- a/src/css/base/combo/popup.bubble.css +++ b/src/css/base/combo/popup.bubble.css @@ -7,5 +7,5 @@ box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); } .bi-bubble-popup-view .bubble-popup-line { - background-color: #009de3; + background-color: #3f8ce8; } diff --git a/src/css/base/editor/editor.search.css b/src/css/base/editor/editor.search.css index 0070eff5a..1e97d6318 100644 --- a/src/css/base/editor/editor.search.css +++ b/src/css/base/editor/editor.search.css @@ -2,9 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ /*************BI.SearchEditor******************/ -.bi-search-editor { - border: 1px solid #d4dadd; -} .bi-search-editor .close-font { font-size: 20px; } diff --git a/src/css/base/editor/editor.sign.style.css b/src/css/base/editor/editor.sign.style.css deleted file mode 100644 index 63e9f258c..000000000 --- a/src/css/base/editor/editor.sign.style.css +++ /dev/null @@ -1,12 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-sign-style-editor .sign-style-editor-text { - max-width: 100%; - font-size: 12px; -} -.bi-sign-style-editor .sign-style-editor-tip { - max-width: 100%; - font-size: 12px; - color: #808080; -} diff --git a/src/css/base/editor/editor.text.css b/src/css/base/editor/editor.text.css deleted file mode 100644 index fd41d73a4..000000000 --- a/src/css/base/editor/editor.text.css +++ /dev/null @@ -1,6 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-text-editor { - border: 1px solid #d4dadd; -} diff --git a/src/css/base/editor/editor.text.small.css b/src/css/base/editor/editor.text.small.css deleted file mode 100644 index 18e55e5ff..000000000 --- a/src/css/base/editor/editor.text.small.css +++ /dev/null @@ -1,4 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -/*************BI.SearchEditor******************/ diff --git a/src/css/base/formula/codemirror.css b/src/css/base/formula/codemirror.css index ee5e2577a..7142bfbe8 100644 --- a/src/css/base/formula/codemirror.css +++ b/src/css/base/formula/codemirror.css @@ -8,7 +8,12 @@ cursor: text; width: 100%; height: 100%; - color: black; + color: #1a1a1a; + background-color: #ffffff; +} +.bi-theme-dark .CodeMirror { + color: #ffffff; + background-color: #242640; } /* PADDING */ .CodeMirror-lines { @@ -45,7 +50,10 @@ } /* CURSOR */ .CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; + border-left: 1px solid #1a1a1a; +} +.bi-theme-dark .CodeMirror div.CodeMirror-cursor { + border-left: 1px solid #ffffff; } /* Shown when moving in bi-directional text */ .CodeMirror div.CodeMirror-secondarycursor { @@ -184,9 +192,9 @@ } .cm-s-default span[class*="fieldName"] { color: white; - padding: 1px ; + padding: 1px; margin: 1px 0px; - background: #009de3; + background: #3f8ce8; } .cm-s-default span[class*="start"] { -webkit-border-radius: 3px 0px 0px 3px; @@ -206,7 +214,7 @@ border-radius: 3px; } .cm-s-default span[class*="#"] { - color: #009de3; + color: #3f8ce8; } .cm-s-default .cm-error { color: #f00; @@ -236,7 +244,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket { .CodeMirror { position: relative; overflow: hidden; - background: white; } .CodeMirror-scroll { overflow: scroll !important; diff --git a/src/css/base/foundation/bi.message.css b/src/css/base/foundation/bi.message.css index ae71ee605..38bbd163f 100644 --- a/src/css/base/foundation/bi.message.css +++ b/src/css/base/foundation/bi.message.css @@ -2,15 +2,9 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-message-title { - background-color: #f4f4f4; - color: #808080; font-size: 16px; cursor: pointer; } -.bi-theme-dark .bi-message-title { - background-color: #191a2c; - color: #b2b2b2; -} .bi-message-text { font-size: 16px; -webkit-user-select: text; @@ -21,14 +15,8 @@ user-select: text; } .bi-message-content { - background-color: #ffffff; - color: #808080; font-size: 16px; } -.bi-theme-dark .bi-message-content { - background-color: #202237; - color: #b2b2b2; -} .bi-message-close { font-size: 25px; } diff --git a/src/css/base/layer/layer.panel.css b/src/css/base/layer/layer.panel.css deleted file mode 100644 index 25faba555..000000000 --- a/src/css/base/layer/layer.panel.css +++ /dev/null @@ -1,10 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-popup-panel .popup-panel-title { - background: #f4f4f4; - border-bottom: 1px solid #d4dadd; -} -.bi-theme-dark .bi-popup-panel .popup-panel-title { - background: #191a2c; -} diff --git a/src/css/base/layer/layer.searcher.css b/src/css/base/layer/layer.searcher.css deleted file mode 100644 index 81fbf9869..000000000 --- a/src/css/base/layer/layer.searcher.css +++ /dev/null @@ -1,9 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-searcher-view { - background: #ffffff; -} -.bi-searcher-view .searcher-view-spliter { - background: #d4dadd; -} diff --git a/src/css/base/layer/panel.css b/src/css/base/layer/panel.css index cb1f06815..a1ef3cc42 100644 --- a/src/css/base/layer/panel.css +++ b/src/css/base/layer/panel.css @@ -2,17 +2,11 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-panel { - border: 1px solid #a3d6e8; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-panel .panel-title { - background-color: #d8f2fd; - border-bottom: 1px solid #a3d6e8; -} .bi-panel .panel-title .panel-title-text { cursor: text; - color: #808080; font-size: 14px; } diff --git a/src/css/base/pager/pager.css b/src/css/base/pager/pager.css index 47959284a..8db6b20c1 100644 --- a/src/css/base/pager/pager.css +++ b/src/css/base/pager/pager.css @@ -2,12 +2,7 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-pager .page-item { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-pager .page-item.active { - background: #009de3; - color: #ffffff; -} diff --git a/src/css/base/segment/button.segment.css b/src/css/base/segment/button.segment.css index 19e183d06..2f6491e13 100644 --- a/src/css/base/segment/button.segment.css +++ b/src/css/base/segment/button.segment.css @@ -1,14 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-segment-button:active, -.bi-segment-button.active { - color: #ffffff; - background: #009de3; -} -.bi-segment-button.disabled, -.bi-segment-button.disabled:hover, -.bi-segment-button.disabled:active { - color: #1a1a1a; - background: #ffffff; -} diff --git a/src/css/base/segment/segment.css b/src/css/base/segment/segment.css index 11ddb87d9..7de4338bc 100644 --- a/src/css/base/segment/segment.css +++ b/src/css/base/segment/segment.css @@ -5,13 +5,8 @@ overflow: hidden; overflow-x: hidden; overflow-y: hidden; - background: #ffffff; - border-right: 1px solid #d4dadd; - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; } .bi-segment > .first-element { - border-left: 1px solid #d4dadd; -webkit-border-radius: 6px 0px 0px 6px; -moz-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; diff --git a/src/css/base/single/bar/bar.css b/src/css/base/single/bar/bar.css index 1ed7ff839..2f6491e13 100644 --- a/src/css/base/single/bar/bar.css +++ b/src/css/base/single/bar/bar.css @@ -1,15 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-loading-bar .loading-text { - color: #808080; -} -.bi-loading-bar .loading-text:hover, -.bi-loading-bar .loading-text.hover { - color: #009de3; -} -.bi-loading-bar .loading-text.disabled, -.bi-loading-bar .loading-text.disabled:hover, -.bi-loading-bar .loading-text.disabled:active { - color: #ffffff; -} diff --git a/src/css/base/single/button/button.css b/src/css/base/single/button/button.css index 7f8ef980d..72c8297ee 100644 --- a/src/css/base/single/button/button.css +++ b/src/css/base/single/button/button.css @@ -5,8 +5,8 @@ -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - border: 1px solid #009de3; - background-color: #009de3; + border: 1px solid #178cdf; + background-color: #3f8ce8; text-align: center; vertical-align: middle; cursor: pointer; @@ -74,10 +74,10 @@ } .bi-button.button-ignore.disabled, .bi-button.button-ignore.disabled .b-font { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-button.button-ignore.disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-basic-button.button-common .bi-button-mask, .bi-basic-button.button-success .bi-button-mask, diff --git a/src/css/base/single/button/item.singleselect.icontext.css b/src/css/base/single/button/item.singleselect.icontext.css index eedc54956..f3adc7949 100644 --- a/src/css/base/single/button/item.singleselect.icontext.css +++ b/src/css/base/single/button/item.singleselect.icontext.css @@ -3,5 +3,5 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-single-select-icon-text-item:active .b-font:before, .bi-single-select-icon-text-item.active .b-font:before { - color: #009de3; + color: #3f8ce8; } diff --git a/src/css/base/single/editor/editor.state.css b/src/css/base/single/editor/editor.state.css index 0d3f1bb14..2f6491e13 100644 --- a/src/css/base/single/editor/editor.state.css +++ b/src/css/base/single/editor/editor.state.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-state-editor .state-editor-infinite-text { - color: #cccccc; -} diff --git a/src/css/base/single/editor/editor.state.simple.css b/src/css/base/single/editor/editor.state.simple.css index c2c892781..2f6491e13 100644 --- a/src/css/base/single/editor/editor.state.simple.css +++ b/src/css/base/single/editor/editor.state.simple.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-simple-state-editor .state-editor-infinite-text { - color: #cccccc; -} diff --git a/src/css/base/single/editor/editor.textarea.css b/src/css/base/single/editor/editor.textarea.css index 150d4a224..13e82616c 100644 --- a/src/css/base/single/editor/editor.textarea.css +++ b/src/css/base/single/editor/editor.textarea.css @@ -12,6 +12,3 @@ .bi-textarea-editor .textarea-editor-content { border: none; } -.bi-textarea-editor .textarea-editor-content.textarea-editor-focus { - border: 1px solid #009de3; -} diff --git a/src/css/base/table/table.collection.cell.css b/src/css/base/table/table.collection.cell.css index 5aa03eb6d..5cdf9ea68 100644 --- a/src/css/base/table/table.collection.cell.css +++ b/src/css/base/table/table.collection.cell.css @@ -10,22 +10,16 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-collection-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-collection-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-collection-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-collection-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-collection-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } diff --git a/src/css/base/table/table.css b/src/css/base/table/table.css index 9e699b202..00bf93078 100644 --- a/src/css/base/table/table.css +++ b/src/css/base/table/table.css @@ -8,24 +8,24 @@ border-top: none; } .bi-table > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; + border-bottom: 1px solid #d4dadd; + border-right: 1px solid #d4dadd; } .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; + border-bottom: 1px solid #d4dadd; } .bi-table > div > div > table, .bi-table > div > div > div > table { @@ -49,33 +49,33 @@ .bi-table > div > div > div > table > tbody > tr > td, .bi-table > div > div > table > thead > tr > td, .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #eaeaea; - border-left: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-table > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.top-right > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-left > div > div > table { - border-bottom: 1px solid #24273e; - border-right: 1px solid #24273e; + border-bottom: 1px solid #525466; + border-right: 1px solid #525466; } .bi-theme-dark .bi-table > div.bottom-right > div > div > table { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-right: 1px solid #525466; + border-bottom: 1px solid #525466; } .bi-theme-dark .bi-table > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > div > table > tbody > tr > td, .bi-theme-dark .bi-table > div > div > table > thead > tr > td, .bi-theme-dark .bi-table > div > div > div > table > thead > tr > td { - border-top: 1px solid #24273e; - border-left: 1px solid #24273e; + border-top: 1px solid #525466; + border-left: 1px solid #525466; } diff --git a/src/css/base/table/table.grid.cell.css b/src/css/base/table/table.grid.cell.css index 9370e6ca8..d4b8f6672 100644 --- a/src/css/base/table/table.grid.cell.css +++ b/src/css/base/table/table.grid.cell.css @@ -10,22 +10,16 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } .bi-grid-table-cell.first-row { - border-top: 1px solid #eaeaea; + border-top: 1px solid #d4dadd; } .bi-grid-table-cell.first-col { - border-left: 1px solid #eaeaea; -} -.bi-theme-dark .bi-grid-table-cell { - border-right: 1px solid #24273e; - border-bottom: 1px solid #24273e; + border-left: 1px solid #d4dadd; } .bi-theme-dark .bi-grid-table-cell.first-row { - border-top: 1px solid #24273e; + border-top: 1px solid #525466; } .bi-theme-dark .bi-grid-table-cell.first-col { - border-left: 1px solid #24273e; + border-left: 1px solid #525466; } diff --git a/src/css/base/table/table.grid.scrollbar.css b/src/css/base/table/table.grid.scrollbar.css index d6fdfce98..37efef0b5 100644 --- a/src/css/base/table/table.grid.scrollbar.css +++ b/src/css/base/table/table.grid.scrollbar.css @@ -9,12 +9,13 @@ transition-duration: 250ms; transition-timing-function: ease; user-select: none; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); border-radius: 5px; } .bi-theme-dark .scrollbar-layout-main { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } .scrollbar-layout-main-vertical { bottom: 0; @@ -32,11 +33,12 @@ height: 10px; left: 0; transition-property: background-color; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666); } .bi-theme-dark .scrollbar-layout-main-horizontal { - background-color: rgba(255, 255, 255, 0.1); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff); + background-color: rgba(204, 204, 204, 0.05); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc); } /* Touching the scroll-track directly makes the scroll-track bolder */ .scrollbar-layout-main-horizontal.public-scrollbar-main-active, @@ -89,20 +91,24 @@ */ /* Touching the scroll-track directly makes the scroll-track bolder */ .public-scrollbar-face:after { - background-color: #e2e2e2; + background-color: rgba(102, 102, 102, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C666666,endColorstr=#4C666666); } .bi-theme-dark .public-scrollbar-face:after { - background-color: #7d7d7d; + background-color: rgba(204, 204, 204, 0.3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4Ccccccc,endColorstr=#4Ccccccc); } .public-scrollbar-main:hover .public-scrollbar-face:after, .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { - background-color: #7d7d7d; + background-color: rgba(102, 102, 102, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2666666,endColorstr=#B2666666); } .bi-theme-dark .public-scrollbar-main:hover .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-main-active .public-scrollbar-face:after, .bi-theme-dark .public-scrollbar-faceActive:after { - background-color: #e2e2e2; + background-color: rgba(204, 204, 204, 0.7); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2cccccc,endColorstr=#B2cccccc); } .horizontal-scrollbar { bottom: 0; diff --git a/src/css/base/table/table.resizable.cell.css b/src/css/base/table/table.resizable.cell.css index 282106d65..d080f2994 100644 --- a/src/css/base/table/table.resizable.cell.css +++ b/src/css/base/table/table.resizable.cell.css @@ -7,5 +7,5 @@ } .bi-resizable-table-cell .resizable-table-cell-resizer-container:hover .resizable-table-cell-resizer-knob, .bi-resizable-table-cell .resizable-table-cell-resizer-container.dragging .resizable-table-cell-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } diff --git a/src/css/base/table/table.resizable.css b/src/css/base/table/table.resizable.css index 0495b2cd2..71921f5f6 100644 --- a/src/css/base/table/table.resizable.css +++ b/src/css/base/table/table.resizable.css @@ -4,7 +4,7 @@ .bi-resizable-table .resizable-table-resizer { cursor: ew-resize; z-index: 1; - background-color: #009de3; + background-color: #3f8ce8; } .bi-resizable-table .resizable-table-region-resizer { cursor: ew-resize; @@ -12,5 +12,5 @@ } .bi-resizable-table .resizable-table-region-resizer:hover .resizable-table-region-resizer-knob, .bi-resizable-table .resizable-table-region-resizer.dragging .resizable-table-region-resizer-knob { - background-color: #009de3; + background-color: #3f8ce8; } diff --git a/src/css/base/tree/branch.tree.css b/src/css/base/tree/branch.tree.css index 9d642a085..b23b28b83 100644 --- a/src/css/base/tree/branch.tree.css +++ b/src/css/base/tree/branch.tree.css @@ -4,9 +4,3 @@ .bi-branch-tree .bi-branch-tree-view { min-width: 300px; } -.bi-click-branch-tree { - border: 1px solid #d4dadd; -} -.bi-click-branch-tree .bi-empty-view { - background: #f4f4f4; -} diff --git a/src/css/base/tree/display.tree.css b/src/css/base/tree/display.tree.css index 4655bd027..6f1815af3 100644 --- a/src/css/base/tree/display.tree.css +++ b/src/css/base/tree/display.tree.css @@ -5,13 +5,13 @@ color: #808080; } .bi-display-tree .ztree li span.button.switch.center_open { - background-image: url("icon/tree-vertical-line-3.png"); + background-image: url("/icon/tree-vertical-line-3.png"); } .bi-display-tree .ztree li span.button.switch.roots_open { - background-image: url("icon/tree-vertical-line-2.png"); + background-image: url("/icon/tree-vertical-line-2.png"); } .bi-display-tree .ztree li span.button.switch.bottom_open { - background-image: url("icon/tree-vertical-line-4.png"); + background-image: url("/icon/tree-vertical-line-4.png"); } .bi-display-tree .ztree li a, .bi-display-tree .ztree li span { diff --git a/src/css/base/trigger/trigger.css b/src/css/base/trigger/trigger.css index 51cdd3fba..780b08de6 100644 --- a/src/css/base/trigger/trigger.css +++ b/src/css/base/trigger/trigger.css @@ -2,6 +2,5 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-trigger .bi-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } diff --git a/src/css/base/trigger/trigger.editor.css b/src/css/base/trigger/trigger.editor.css index 304d1984d..2f6491e13 100644 --- a/src/css/base/trigger/trigger.editor.css +++ b/src/css/base/trigger/trigger.editor.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-editor-trigger { - border: 1px solid #d4dadd; -} diff --git a/src/css/base/trigger/trigger.selecttext.css b/src/css/base/trigger/trigger.selecttext.css index cf54edd22..ac7ded09e 100644 --- a/src/css/base/trigger/trigger.selecttext.css +++ b/src/css/base/trigger/trigger.selecttext.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/base/trigger/trigger.selecttextsmall.css b/src/css/base/trigger/trigger.selecttextsmall.css index e22a3c0aa..009efb741 100644 --- a/src/css/base/trigger/trigger.selecttextsmall.css +++ b/src/css/base/trigger/trigger.selecttextsmall.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-small-select-text-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/base/view/floatboxview.css b/src/css/base/view/floatboxview.css index e10187191..2f6491e13 100644 --- a/src/css/base/view/floatboxview.css +++ b/src/css/base/view/floatboxview.css @@ -1,11 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-float-box { - background-color: #ffffff; - color: #1a1a1a; -} -.bi-theme-dark .bi-float-box { - background-color: #202237; - color: #b2b2b2; -} diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css index eebfefe89..c3a8693eb 100644 --- a/src/css/base/view/popupview.css +++ b/src/css/base/view/popupview.css @@ -10,25 +10,23 @@ cursor: default; } .bi-list-view .list-view-outer { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - color: #1a1a1a; - background: #ffffff; } .bi-list-view .list-view-toolbar { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-list-view .list-view-toolbar > .center-element { - border-left: 1px solid #eaeaea; + border-left: 1px solid #d4dadd; } .bi-list-view .list-view-toolbar > .first-element { border-left: none; } -.bi-theme-dark .bi-list-view .list-view-outer { - color: #b2b2b2; - background: #202237; +.bi-theme-dark .bi-list-view .list-view-toolbar > .center-element { + border-left: 1px solid #525466; +} +.bi-theme-dark .bi-list-view .list-view-toolbar > .first-element { + border-left: none; } diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 449cdf241..9798047f7 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -3,10 +3,16 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .base-disabled { cursor: default !important; - color: #c4c6c6 !important; + color: #cccccc !important; } .base-disabled .b-font:before { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .base-disabled { + color: #666666 !important; +} +.bi-theme-dark .base-disabled .b-font:before { + color: #666666 !important; } .base-invalid { cursor: default !important; @@ -23,116 +29,219 @@ .clearfix:after { clear: both; } +.bi-background { + background-color: #eff1f4; + color: #666666; +} +.bi-theme-dark .bi-background { + background-color: #191b2b; + color: #cccccc; +} +.bi-card { + background-color: #ffffff; + color: #666666; +} +.bi-theme-dark .bi-card { + background-color: #242640; + color: #cccccc; +} +.bi-disabled { + color: #cccccc; +} +.bi-theme-dark .bi-disabled { + color: #666666; +} +.bi-tips { + color: #999999; +} +.bi-border { + border: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border { + border: 1px solid #525466; +} +.bi-border-left { + border-left: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-left { + border-left: 1px solid #525466; +} +.bi-border-right { + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-right { + border-right: 1px solid #525466; +} +.bi-border-top { + border-top: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-top { + border-top: 1px solid #525466; +} +.bi-border-bottom { + border-bottom: 1px solid #d4dadd; +} +.bi-theme-dark .bi-border-bottom { + border-bottom: 1px solid #525466; +} .bi-keyword-red-mark { color: #f07d0a; } .bi-high-light { - color: #009de3; + color: #3f8ce8; } .bi-water-mark { color: #cccccc; cursor: text; } -.bi-tips { - color: #c4c6c6; +.bi-theme-dark .bi-water-mark { + color: #666666; } .bi-resizer { - background: #d8f3fe; - opacity: 0.8; - filter: alpha(opacity=80); + background: #1a1a1a; + opacity: 0.2; + filter: alpha(opacity=20); z-index: 1000000000; } +.bi-theme-dark .bi-resizer { + background: #ffffff; +} .bi-z-index-mask { background-color: #1a1a1a; opacity: 0.5; filter: alpha(opacity=50); } +.bi-theme-dark .bi-z-index-mask { + background-color: #ffffff; +} .bi-list-item:hover, .bi-list-item.hover { - background-color: #f4f4f4; + background-color: #eff1f4; + color: #1a1a1a; } .bi-list-item.disabled, .bi-list-item.disabled:hover, .bi-list-item.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item:hover, .bi-theme-dark .bi-list-item.hover { - background-color: #04070d; + background-color: #191b2b; + color: #ffffff; +} +.bi-theme-dark .bi-list-item.disabled, +.bi-theme-dark .bi-list-item.disabled:hover, +.bi-theme-dark .bi-list-item.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-list-item-simple:hover, +.bi-list-item-simple.hover { + color: #1a1a1a; +} +.bi-list-item-simple.disabled, +.bi-list-item-simple.disabled:hover, +.bi-list-item-simple.disabled:active { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-simple:hover, +.bi-theme-dark .bi-list-item-simple.hover { color: #ffffff; } +.bi-theme-dark .bi-list-item-simple.disabled, +.bi-theme-dark .bi-list-item-simple.disabled:hover, +.bi-theme-dark .bi-list-item-simple.disabled:active { + color: #666666 !important; +} +.bi-list-item-effect:hover { + color: #1a1a1a; +} .bi-list-item-effect.active, .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-list-item-effect.disabled, .bi-list-item-effect.disabled:hover, .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-effect:hover { + color: #ffffff; } .bi-theme-dark .bi-list-item-effect.active, .bi-theme-dark .bi-list-item-effect:active { - color: #009de3; + color: #3f8ce8; } .bi-theme-dark .bi-list-item-effect.disabled, .bi-theme-dark .bi-list-item-effect.disabled:hover, .bi-theme-dark .bi-list-item-effect.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-hover:hover, .bi-list-item-hover.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-hover.disabled, .bi-list-item-hover.disabled:hover, .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-theme-dark .bi-list-item-hover:hover, .bi-theme-dark .bi-list-item-hover.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-hover.disabled, .bi-theme-dark .bi-list-item-hover.disabled:hover, .bi-theme-dark .bi-list-item-hover.disabled:active { - color: #c4c6c6 !important; + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-active:hover, .bi-list-item-active.hover { - background-color: #f4f4f4; + color: #1a1a1a; + background-color: #eff1f4; } .bi-list-item-active.active, .bi-list-item-active:active { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-active.disabled, .bi-list-item-active.disabled:hover, .bi-list-item-active.disabled:active { background-color: transparent !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-active:hover, .bi-theme-dark .bi-list-item-active.hover { - background-color: #04070d; + background-color: #191b2b; color: #ffffff; } .bi-theme-dark .bi-list-item-active.active, .bi-theme-dark .bi-list-item-active:active { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; +} +.bi-theme-dark .bi-list-item-active.disabled, +.bi-theme-dark .bi-list-item-active.disabled:hover, +.bi-theme-dark .bi-list-item-active.disabled:active { + background-color: transparent !important; + color: #666666 !important; } .bi-list-item-select:hover, .bi-list-item-select.hover { - color: #009de3; - background-color: #f4f4f4; + color: #3f8ce8; + background-color: #eff1f4; } .bi-list-item-select:active, .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-list-item-select:active .bi-high-light, .bi-list-item-select.active .bi-high-light { @@ -141,25 +250,56 @@ .bi-list-item-select.disabled, .bi-list-item-select.disabled:hover, .bi-list-item-select.disabled:active { - color: #c4c6c6 !important; + color: #cccccc !important; background-color: transparent !important; } .bi-list-item-select.disabled .bi-high-light, .bi-list-item-select.disabled:hover .bi-high-light, .bi-list-item-select.disabled:active .bi-high-light { - color: #c4c6c6 !important; + color: #cccccc !important; } .bi-theme-dark .bi-list-item-select:hover, .bi-theme-dark .bi-list-item-select.hover { - color: #009de3; - background-color: #04070d; + color: #3f8ce8; + background-color: #191b2b; } .bi-theme-dark .bi-list-item-select:active, .bi-theme-dark .bi-list-item-select.active { color: #ffffff; - background-color: #009de3; + background-color: #3f8ce8; } .bi-theme-dark .bi-list-item-select:active .bi-high-light, .bi-theme-dark .bi-list-item-select.active .bi-high-light { color: #ffffff; } +.bi-theme-dark .bi-list-item-select.disabled, +.bi-theme-dark .bi-list-item-select.disabled:hover, +.bi-theme-dark .bi-list-item-select.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-select.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { + color: #666666 !important; +} +.bi-list-item-choose:active, +.bi-list-item-choose.active { + color: #ffffff; + background-color: #3f8ce8; +} +.bi-list-item-choose:active .bi-high-light, +.bi-list-item-choose.active .bi-high-light { + color: #ffffff; +} +.bi-list-item-choose.disabled, +.bi-list-item-choose.disabled:hover, +.bi-list-item-choose.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-choose.disabled .bi-high-light, +.bi-list-item-choose.disabled:hover .bi-high-light, +.bi-list-item-choose.disabled:active .bi-high-light { + color: #cccccc !important; +} diff --git a/src/css/core/utils/pos.css b/src/css/core/utils/pos.css index 76ae6c0fb..94f8e4148 100644 --- a/src/css/core/utils/pos.css +++ b/src/css/core/utils/pos.css @@ -22,7 +22,3 @@ .horizon-left { text-align: left; } -.div-horizon-center { - margin-left: auto; - margin-right: auto; -} diff --git a/src/css/lib/style.css b/src/css/lib/style.css deleted file mode 100644 index 6dfa999cc..000000000 --- a/src/css/lib/style.css +++ /dev/null @@ -1,2 +0,0 @@ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/reset.css b/src/css/reset.css deleted file mode 100644 index 0007ead9b..000000000 --- a/src/css/reset.css +++ /dev/null @@ -1,128 +0,0 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ -html, -body, -div, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -article, -aside, -canvas, -details, -embed, -figure, -figcaption, -footer, -header, -hgroup, -menu, -nav, -output, -ruby, -section, -summary, -time, -mark, -audio, -video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} -/* HTML5 display-role reset for older browsers */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -menu, -nav, -section { - display: block; -} -body { - line-height: 1; -} -ol, -ul { - list-style: none; -} -blockquote, -q { - quotes: none; -} -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} diff --git a/src/css/resource/app.css b/src/css/resource/app.css index f1b00ab8b..a4f143180 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -41,7 +41,7 @@ body { -ms-user-select: none; -o-user-select: none; user-select: none; - color: #1a1a1a; + color: #666666; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -61,41 +61,10 @@ body { overflow-x: hidden; overflow-y: hidden; } -a { - outline: none; - text-decoration: none; -} -a:focus { - outline: 0; -} -input, -textarea { - margin: 0; - padding: 0; - outline: none; - border: 1px solid #cccccc; -} -ul, -ol { - margin: 0; - padding: 0; -} -ul { - list-style: disc; -} -li { - list-style-type: none; -} -i { - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} div::-webkit-scrollbar, textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: #f4f4f4; + background-color: rgba(102, 102, 102, 0.05); width: 6px; height: 6px; } @@ -104,12 +73,12 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: #e2e2e2; + background-color: rgba(102, 102, 102, 0.3); } .bi-theme-dark div::-webkit-scrollbar, .bi-theme-dark textarea::-webkit-scrollbar { -webkit-appearance: none; - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(204, 204, 204, 0.05); width: 6px; height: 6px; } @@ -118,5 +87,5 @@ textarea::-webkit-scrollbar-thumb { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: #7d7d7d; + background-color: rgba(204, 204, 204, 0.3); } diff --git a/src/css/resource/font.css b/src/css/resource/font.css index a9cc42dd2..268aada16 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -314,37 +314,37 @@ /**维度/指标 下拉列表图标字体 ~begin~**/ .delete-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-font.native .b-font:before, .delete-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font:hover .b-font:before, .delete-h-font:focus .b-font:before, .delete-h-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-h-font.native .b-font:before, .delete-h-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font:hover .b-font:before, .delete-ha-font:focus .b-font:before, .delete-ha-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-ha-font:active .b-font:before, .delete-ha-font.active .b-font:before { @@ -354,17 +354,17 @@ .delete-ha-font.native .b-font:before, .delete-ha-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font:hover .b-font:before, .delete-e-font:focus .b-font:before, .delete-e-font.hover .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .delete-e-font.active .b-font:before { content: "\e605"; @@ -377,7 +377,7 @@ .delete-e-font.native .b-font:before, .delete-e-font.disabled .b-font:before { content: "\e605"; - color: #1a1a1a; + color: inherit; } .dot-font .b-font:before { content: "\e606"; @@ -396,7 +396,7 @@ .dot-h-font:focus .b-font:before, .dot-h-font.hover .b-font:before { content: "\e606"; - color: #1a1a1a; + color: inherit; } .dot-h-font.native .b-font:before, .dot-h-font.disabled .b-font:before { @@ -439,7 +439,7 @@ } .dot-e-font:active .b-font:before { content: "\e606"; - color: #009de3; + color: #3f8ce8; } .dot-e-font.native .b-font:before, .dot-e-font.disabled .b-font:before { @@ -448,37 +448,37 @@ } .pull-right-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-font.native .b-font:before, .pull-right-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font:hover .b-font:before, .pull-right-h-font:focus .b-font:before, .pull-right-h-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-h-font.native .b-font:before, .pull-right-h-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font:hover .b-font:before, .pull-right-ha-font:focus .b-font:before, .pull-right-ha-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-ha-font:active .b-font:before, .pull-right-ha-font.active .b-font:before { @@ -488,17 +488,17 @@ .pull-right-ha-font.native .b-font:before, .pull-right-ha-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font:hover .b-font:before, .pull-right-e-font:focus .b-font:before, .pull-right-e-font.hover .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .pull-right-e-font.active .b-font:before { content: "\e607"; @@ -511,16 +511,16 @@ .pull-right-e-font.native .b-font:before, .pull-right-e-font.disabled .b-font:before { content: "\e607"; - color: #1a1a1a; + color: inherit; } .copy-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-font.native .b-font:before, .copy-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-h-font .b-font:before { content: "\e610"; @@ -530,7 +530,7 @@ .copy-h-font:focus .b-font:before, .copy-h-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-h-font.native .b-font:before, .copy-h-font.disabled .b-font:before { @@ -539,13 +539,13 @@ } .copy-ha-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-ha-font:hover .b-font:before, .copy-ha-font:focus .b-font:before, .copy-ha-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-ha-font:active .b-font:before, .copy-ha-font.active .b-font:before { @@ -555,17 +555,17 @@ .copy-ha-font.native .b-font:before, .copy-ha-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font:hover .b-font:before, .copy-e-font:focus .b-font:before, .copy-e-font.hover .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .copy-e-font.active .b-font:before { content: "\e610"; @@ -578,41 +578,41 @@ .copy-e-font.native .b-font:before, .copy-e-font.disabled .b-font:before { content: "\e610"; - color: #1a1a1a; + color: inherit; } .check-mark-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-font.native .b-font:before, .check-mark-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font:hover .b-font:before, .check-mark-h-font:focus .b-font:before, .check-mark-h-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-h-font.native .b-font:before, .check-mark-h-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font:hover .b-font:before, .check-mark-ha-font:focus .b-font:before, .check-mark-ha-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-ha-font:active .b-font:before, .check-mark-ha-font.active .b-font:before { @@ -622,17 +622,17 @@ .check-mark-ha-font.native .b-font:before, .check-mark-ha-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font:hover .b-font:before, .check-mark-e-font:focus .b-font:before, .check-mark-e-font.hover .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .check-mark-e-font.active .b-font:before { content: "\e611"; @@ -645,41 +645,41 @@ .check-mark-e-font.native .b-font:before, .check-mark-e-font.disabled .b-font:before { content: "\e611"; - color: #1a1a1a; + color: inherit; } .dimension-from-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-font.native .b-font:before, .dimension-from-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font:hover .b-font:before, .dimension-from-h-font:focus .b-font:before, .dimension-from-h-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-h-font.native .b-font:before, .dimension-from-h-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font:hover .b-font:before, .dimension-from-ha-font:focus .b-font:before, .dimension-from-ha-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-ha-font:active .b-font:before, .dimension-from-ha-font.active .b-font:before { @@ -689,17 +689,17 @@ .dimension-from-ha-font.native .b-font:before, .dimension-from-ha-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font:hover .b-font:before, .dimension-from-e-font:focus .b-font:before, .dimension-from-e-font.hover .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .dimension-from-e-font.active .b-font:before { content: "\e612"; @@ -712,41 +712,41 @@ .dimension-from-e-font.native .b-font:before, .dimension-from-e-font.disabled .b-font:before { content: "\e612"; - color: #1a1a1a; + color: inherit; } .chart-type-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-font.native .b-font:before, .chart-type-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font:hover .b-font:before, .chart-type-h-font:focus .b-font:before, .chart-type-h-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-h-font.native .b-font:before, .chart-type-h-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font:hover .b-font:before, .chart-type-ha-font:focus .b-font:before, .chart-type-ha-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-ha-font:active .b-font:before, .chart-type-ha-font.active .b-font:before { @@ -756,17 +756,17 @@ .chart-type-ha-font.native .b-font:before, .chart-type-ha-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font:hover .b-font:before, .chart-type-e-font:focus .b-font:before, .chart-type-e-font.hover .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .chart-type-e-font.active .b-font:before { content: "\e613"; @@ -779,41 +779,41 @@ .chart-type-e-font.native .b-font:before, .chart-type-e-font.disabled .b-font:before { content: "\e613"; - color: #1a1a1a; + color: inherit; } .style-set-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-font.native .b-font:before, .style-set-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font:hover .b-font:before, .style-set-h-font:focus .b-font:before, .style-set-h-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-h-font.native .b-font:before, .style-set-h-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font:hover .b-font:before, .style-set-ha-font:focus .b-font:before, .style-set-ha-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-ha-font:active .b-font:before, .style-set-ha-font.active .b-font:before { @@ -823,17 +823,17 @@ .style-set-ha-font.native .b-font:before, .style-set-ha-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font:hover .b-font:before, .style-set-e-font:focus .b-font:before, .style-set-e-font.hover .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .style-set-e-font.active .b-font:before { content: "\e60c"; @@ -846,7 +846,7 @@ .style-set-e-font.native .b-font:before, .style-set-e-font.disabled .b-font:before { content: "\e60c"; - color: #1a1a1a; + color: inherit; } .hyper-link-font .b-font:before { content: "\e688"; @@ -868,28 +868,28 @@ } .filter-h-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-h-font:hover .b-font:before, .filter-h-font:focus .b-font:before, .filter-h-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-h-font.native .b-font:before, .filter-h-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font:hover .b-font:before, .filter-ha-font:focus .b-font:before, .filter-ha-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-ha-font:active .b-font:before, .filter-ha-font.active .b-font:before { @@ -899,17 +899,17 @@ .filter-ha-font.native .b-font:before, .filter-ha-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font:hover .b-font:before, .filter-e-font:focus .b-font:before, .filter-e-font.hover .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .filter-e-font.active .b-font:before { content: "\e60f"; @@ -922,16 +922,16 @@ .filter-e-font.native .b-font:before, .filter-e-font.disabled .b-font:before { content: "\e60f"; - color: #1a1a1a; + color: inherit; } .classify-font .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .classify-font.native .b-font:before, .classify-font.disabled .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .series-font .b-font:before { content: "\e695"; @@ -946,93 +946,93 @@ /** dashboard组件/控件 下拉列表图标字体 ~begin~**/ .link-to-widget-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-widget-h-font:hover .b-font:before, .link-to-widget-h-font:focus .b-font:before, .link-to-widget-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .link-to-widget-h-font.native .b-font:before, .link-to-widget-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-detail-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .link-to-detail-h-font:hover .b-font:before, .link-to-detail-h-font:focus .b-font:before, .link-to-detail-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .link-to-detail-h-font.native .b-font:before, .link-to-detail-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .detail-setting-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .detail-setting-h-font:hover .b-font:before, .detail-setting-h-font:focus .b-font:before, .detail-setting-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .detail-setting-h-font.native .b-font:before, .detail-setting-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .export-to-excel-h-font .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .export-to-excel-h-font:hover .b-font:before, .export-to-excel-h-font:focus .b-font:before, .export-to-excel-h-font.hover .b-font:before { content: "\e600"; - color: #009de3; + color: #3f8ce8; } .export-to-excel-h-font.native .b-font:before, .export-to-excel-h-font.disabled .b-font:before { content: "\e600"; - color: #808080; + color: #999999; } .widget-copy-h-font .b-font:before { content: "\e610"; - color: #808080; + color: #999999; } .widget-copy-h-font:hover .b-font:before, .widget-copy-h-font:focus .b-font:before, .widget-copy-h-font.hover .b-font:before { content: "\e610"; - color: #009de3; + color: #3f8ce8; } .widget-copy-h-font.native .b-font:before, .widget-copy-h-font.disabled .b-font:before { content: "\e610"; - color: #808080; + color: #999999; } .widget-delete-h-font .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .widget-delete-h-font:hover .b-font:before, .widget-delete-h-font:focus .b-font:before, .widget-delete-h-font.hover .b-font:before { content: "\e605"; - color: #009de3; + color: #3f8ce8; } .widget-delete-h-font.native .b-font:before, .widget-delete-h-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } /** dashboard组件/控件 下拉列表图标字体 ~end~**/ .tree-node-triangle-expand-font .b-font:before { @@ -1055,83 +1055,83 @@ } .row-pre-page-h-font .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-pre-page-h-font:hover .b-font:before, .row-pre-page-h-font:focus .b-font:before, .row-pre-page-h-font.hover .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-pre-page-h-font.native .b-font:before, .row-pre-page-h-font.disabled .b-font:before { content: "\e6be"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font:hover .b-font:before, .row-next-page-h-font:focus .b-font:before, .row-next-page-h-font.hover .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .row-next-page-h-font.native .b-font:before, .row-next-page-h-font.disabled .b-font:before { content: "\e6bd"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font:hover .b-font:before, .column-pre-page-h-font:focus .b-font:before, .column-pre-page-h-font.hover .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-pre-page-h-font.native .b-font:before, .column-pre-page-h-font.disabled .b-font:before { content: "\e6bc"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font:hover .b-font:before, .column-next-page-h-font:focus .b-font:before, .column-next-page-h-font.hover .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .column-next-page-h-font.native .b-font:before, .column-next-page-h-font.disabled .b-font:before { content: "\e6bb"; - color: #1a1a1a; + color: inherit; } .trigger-triangle-font .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .trigger-triangle-font:hover .b-font:before, .trigger-triangle-font:focus .b-font:before, .trigger-triangle-font.hover .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .trigger-triangle-font:active .b-font:before, .trigger-triangle-font.active .b-font:before { content: "\e66a"; - color: #009de3; + color: #3f8ce8; } .trigger-triangle-font.native .b-font:before, .trigger-triangle-font.disabled .b-font:before { content: "\e66a"; - color: #808080; + color: #999999; } .widget-date-next-h-font .b-font:before { content: "\e62f"; @@ -1992,31 +1992,31 @@ } .check-font .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .check-font.native .b-font:before, .check-font.disabled .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .move2group-add-font .b-font:before { content: "\e649"; - color: #009de3; + color: #3f8ce8; } .move2group-add-font.native .b-font:before, .move2group-add-font.disabled .b-font:before { content: "\e649"; - color: #009de3; + color: #3f8ce8; } .select-data-field-calc-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-calc-font:hover .b-font:before, .select-data-field-calc-font:focus .b-font:before, .select-data-field-calc-font.hover .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-calc-font:active .b-font:before, .select-data-field-calc-font.active .b-font:before { @@ -2026,17 +2026,17 @@ .select-data-field-calc-font.native .b-font:before, .select-data-field-calc-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font:hover .b-font:before, .select-data-field-string-font:focus .b-font:before, .select-data-field-string-font.hover .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-font:active .b-font:before, .select-data-field-string-font.active .b-font:before { @@ -2046,17 +2046,17 @@ .select-data-field-string-font.native .b-font:before, .select-data-field-string-font.disabled .b-font:before { content: "\e642"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font:hover .b-font:before, .select-data-field-number-font:focus .b-font:before, .select-data-field-number-font.hover .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-number-font:active .b-font:before, .select-data-field-number-font.active .b-font:before { @@ -2066,17 +2066,17 @@ .select-data-field-number-font.native .b-font:before, .select-data-field-number-font.disabled .b-font:before { content: "\e641"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font:hover .b-font:before, .select-data-field-date-font:focus .b-font:before, .select-data-field-date-font.hover .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-date-font:active .b-font:before, .select-data-field-date-font.active .b-font:before { @@ -2086,7 +2086,7 @@ .select-data-field-date-font.native .b-font:before, .select-data-field-date-font.disabled .b-font:before { content: "\e640"; - color: #1a1a1a; + color: inherit; } .select-data-field-string-group-font .b-font:before { content: "\e642"; @@ -2117,23 +2117,23 @@ } .select-data-preview-font .b-font:before { content: "\e65f"; - color: #808080; + color: #999999; } .select-data-preview-font:hover .b-font:before, .select-data-preview-font:focus .b-font:before, .select-data-preview-font.hover .b-font:before { content: "\e65f"; - color: #009de3; + color: #3f8ce8; } .select-data-preview-font:active .b-font:before, .select-data-preview-font.active .b-font:before { content: "\e65f"; - color: #009de3; + color: #3f8ce8; } .select-data-preview-font.native .b-font:before, .select-data-preview-font.disabled .b-font:before { content: "\e65f"; - color: #808080; + color: #999999; } .detail-dimension-set-font .b-font:before { content: "\e678"; @@ -2167,63 +2167,63 @@ } .select-group-field-string-font .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font:hover .b-font:before, .select-group-field-string-font:focus .b-font:before, .select-group-field-string-font.hover .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font:active .b-font:before, .select-group-field-string-font.active .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-string-font.native .b-font:before, .select-group-field-string-font.disabled .b-font:before { content: "\e642"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font:hover .b-font:before, .select-group-field-number-font:focus .b-font:before, .select-group-field-number-font.hover .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font:active .b-font:before, .select-group-field-number-font.active .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-number-font.native .b-font:before, .select-group-field-number-font.disabled .b-font:before { content: "\e641"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font:hover .b-font:before, .select-group-field-date-font:focus .b-font:before, .select-group-field-date-font.hover .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font:active .b-font:before, .select-group-field-date-font.active .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .select-group-field-date-font.native .b-font:before, .select-group-field-date-font.disabled .b-font:before { content: "\e640"; - color: #009de3; + color: #3f8ce8; } .dashboard-widget-combo-detail-set-font .b-font:before { content: "\e634"; @@ -2260,120 +2260,120 @@ } .text-bold-font .b-font:before { content: "\e64d"; - color: #1a1a1a; + color: inherit; } .text-bold-font.native .b-font:before, .text-bold-font.disabled .b-font:before { content: "\e64d"; - color: #1a1a1a; + color: inherit; } .text-italic-font .b-font:before { content: "\e656"; - color: #1a1a1a; + color: inherit; } .text-italic-font.native .b-font:before, .text-italic-font.disabled .b-font:before { content: "\e656"; - color: #1a1a1a; + color: inherit; } .text-underline-font .b-font:before { content: "\e650"; - color: #1a1a1a; + color: inherit; } .text-underline-font.native .b-font:before, .text-underline-font.disabled .b-font:before { content: "\e650"; - color: #1a1a1a; + color: inherit; } .text-color-font .b-font:before { content: "\e69c"; - color: #1a1a1a; + color: inherit; } .text-color-font.native .b-font:before, .text-color-font.disabled .b-font:before { content: "\e69c"; - color: #1a1a1a; + color: inherit; } .text-background-font .b-font:before { content: "\e696"; - color: #1a1a1a; + color: inherit; } .text-background-font.native .b-font:before, .text-background-font.disabled .b-font:before { content: "\e696"; - color: #1a1a1a; + color: inherit; } .text-color-underline-font .b-font:before { content: "\e69d"; - color: ""; + color: inherit; } .text-color-underline-font.native .b-font:before, .text-color-underline-font.disabled .b-font:before { content: "\e69d"; - color: ""; + color: inherit; } .text-align-left-font .b-font:before { content: "\e654"; - color: #1a1a1a; + color: inherit; } .text-align-left-font.native .b-font:before, .text-align-left-font.disabled .b-font:before { content: "\e654"; - color: #1a1a1a; + color: inherit; } .text-align-center-font .b-font:before { content: "\e64f"; - color: #1a1a1a; + color: inherit; } .text-align-center-font.native .b-font:before, .text-align-center-font.disabled .b-font:before { content: "\e64f"; - color: #1a1a1a; + color: inherit; } .text-align-right-font .b-font:before { content: "\e651"; - color: #1a1a1a; + color: inherit; } .text-align-right-font.native .b-font:before, .text-align-right-font.disabled .b-font:before { content: "\e651"; - color: #1a1a1a; + color: inherit; } .img-upload-font .b-font:before { content: "\e6ba"; - color: #009de3; + color: #3f8ce8; } .img-upload-font.native .b-font:before, .img-upload-font.disabled .b-font:before { content: "\e6ba"; - color: #009de3; + color: #3f8ce8; } .img-size-font .b-font:before { content: "\e68b"; - color: #009de3; + color: #3f8ce8; } .img-size-font.native .b-font:before, .img-size-font.disabled .b-font:before { content: "\e68b"; - color: #009de3; + color: #3f8ce8; } .img-href-font .b-font:before { content: "\e688"; - color: #009de3; + color: #3f8ce8; } .img-href-font.native .b-font:before, .img-href-font.disabled .b-font:before { content: "\e688"; - color: #009de3; + color: #3f8ce8; } .img-shutdown-font .b-font:before { content: "\e689"; - color: #009de3; + color: #3f8ce8; } .img-shutdown-font.native .b-font:before, .img-shutdown-font.disabled .b-font:before { content: "\e689"; - color: #009de3; + color: #3f8ce8; } .move-font .b-font:before { content: "\e65e"; @@ -2413,12 +2413,12 @@ } .folder-font .b-font:before { content: "\e65c"; - color: #009de3; + color: #3f8ce8; } .folder-font.native .b-font:before, .folder-font.disabled .b-font:before { content: "\e65c"; - color: #009de3; + color: #3f8ce8; } .letter-font .b-font:before { content: "\e659"; @@ -2471,12 +2471,12 @@ } .delete-template-font .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .delete-template-font.native .b-font:before, .delete-template-font.disabled .b-font:before { content: "\e605"; - color: #808080; + color: #999999; } .real-time-font .b-font:before { content: "\e6af"; @@ -2489,13 +2489,13 @@ } .data-source-table-font .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .data-source-table-font:hover .b-font:before, .data-source-table-font:focus .b-font:before, .data-source-table-font.hover .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .data-source-table-font:active .b-font:before, .data-source-table-font.active .b-font:before { @@ -2505,17 +2505,17 @@ .data-source-table-font.native .b-font:before, .data-source-table-font.disabled .b-font:before { content: "\e67b"; - color: #009de3; + color: #3f8ce8; } .etl-table-font .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .etl-table-font:hover .b-font:before, .etl-table-font:focus .b-font:before, .etl-table-font.hover .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .etl-table-font:active .b-font:before, .etl-table-font.active .b-font:before { @@ -2525,17 +2525,17 @@ .etl-table-font.native .b-font:before, .etl-table-font.disabled .b-font:before { content: "\e680"; - color: #009de3; + color: #3f8ce8; } .excel-table-font .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .excel-table-font:hover .b-font:before, .excel-table-font:focus .b-font:before, .excel-table-font.hover .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .excel-table-font:active .b-font:before, .excel-table-font.active .b-font:before { @@ -2545,17 +2545,17 @@ .excel-table-font.native .b-font:before, .excel-table-font.disabled .b-font:before { content: "\e682"; - color: #009de3; + color: #3f8ce8; } .sql-table-font .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .sql-table-font:hover .b-font:before, .sql-table-font:focus .b-font:before, .sql-table-font.hover .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .sql-table-font:active .b-font:before, .sql-table-font.active .b-font:before { @@ -2565,7 +2565,7 @@ .sql-table-font.native .b-font:before, .sql-table-font.disabled .b-font:before { content: "\e681"; - color: #009de3; + color: #3f8ce8; } .refresh-table-font .b-font:before { content: "\e683"; @@ -2578,12 +2578,12 @@ } .recover-chart-font-hightlight .b-font:before { content: "\e6b4"; - color: #009de3; + color: #3f8ce8; } .recover-chart-font-hightlight.native .b-font:before, .recover-chart-font-hightlight.disabled .b-font:before { content: "\e6b4"; - color: #009de3; + color: #3f8ce8; } .tables-tile-view-font .b-font:before { content: "\e685"; @@ -2647,7 +2647,7 @@ .data-link-check-font:active .b-font:before, .data-link-check-font.active .b-font:before { content: "\e611"; - color: #009de3; + color: #3f8ce8; } .data-link-check-font.native .b-font:before, .data-link-check-font.disabled .b-font:before { @@ -2761,108 +2761,108 @@ } .table-no-sort-no-filter-font .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-no-filter-font:hover .b-font:before, .table-no-sort-no-filter-font:focus .b-font:before, .table-no-sort-no-filter-font.hover .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-no-filter-font.native .b-font:before, .table-no-sort-no-filter-font.disabled .b-font:before { content: "\e66a"; - color: ""; + color: inherit; } .table-no-sort-filter-font .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-no-sort-filter-font:hover .b-font:before, .table-no-sort-filter-font:focus .b-font:before, .table-no-sort-filter-font.hover .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-no-sort-filter-font.native .b-font:before, .table-no-sort-filter-font.disabled .b-font:before { content: "\e66b"; - color: ""; + color: inherit; } .table-descending-filter-font .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-descending-filter-font:hover .b-font:before, .table-descending-filter-font:focus .b-font:before, .table-descending-filter-font.hover .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-descending-filter-font.native .b-font:before, .table-descending-filter-font.disabled .b-font:before { content: "\e667"; - color: ""; + color: inherit; } .table-ascending-filter-font .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-ascending-filter-font:hover .b-font:before, .table-ascending-filter-font:focus .b-font:before, .table-ascending-filter-font.hover .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-ascending-filter-font.native .b-font:before, .table-ascending-filter-font.disabled .b-font:before { content: "\e669"; - color: ""; + color: inherit; } .table-descending-no-filter-font .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-descending-no-filter-font:hover .b-font:before, .table-descending-no-filter-font:focus .b-font:before, .table-descending-no-filter-font.hover .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-descending-no-filter-font.native .b-font:before, .table-descending-no-filter-font.disabled .b-font:before { content: "\e666"; - color: ""; + color: inherit; } .table-ascending-no-filter-font .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-ascending-no-filter-font:hover .b-font:before, .table-ascending-no-filter-font:focus .b-font:before, .table-ascending-no-filter-font.hover .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-ascending-no-filter-font.native .b-font:before, .table-ascending-no-filter-font.disabled .b-font:before { content: "\e668"; - color: ""; + color: inherit; } .table-no-sort-font .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .table-no-sort-font:hover .b-font:before, .table-no-sort-font:focus .b-font:before, .table-no-sort-font.hover .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .table-no-sort-font.native .b-font:before, .table-no-sort-font.disabled .b-font:before { content: "\e66c"; - color: ""; + color: inherit; } .primary-key-font .b-font:before { content: "\e67d;"; @@ -2921,30 +2921,30 @@ } .calculate-function-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: #666666; } .calculate-function-font.native .b-font:before, .calculate-function-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: #666666; } .path-set-doubt .b-font:before { content: "\e69a"; - color: #009de3; + color: #3f8ce8; } .path-set-doubt.native .b-font:before, .path-set-doubt.disabled .b-font:before { content: "\e69a"; - color: #009de3; + color: #3f8ce8; } .rename-report-font .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .rename-report-font.native .b-font:before, .rename-report-font.disabled .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .remove-report-font .b-font:before { content: "\e605"; @@ -2957,66 +2957,66 @@ } .excel-upload-tip-font .b-font:before { content: "\e69e"; - color: #009de3; + color: #3f8ce8; } .excel-upload-tip-font.native .b-font:before, .excel-upload-tip-font.disabled .b-font:before { content: "\e69e"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-string-font .b-font:before { content: "\e622"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-string-font.native .b-font:before, .excel-field-type-string-font.disabled .b-font:before { content: "\e622"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-number-font .b-font:before { content: "\e61f"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-number-font.native .b-font:before, .excel-field-type-number-font.disabled .b-font:before { content: "\e61f"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-date-font .b-font:before { content: "\e61b"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-date-font.native .b-font:before, .excel-field-type-date-font.disabled .b-font:before { content: "\e61b"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-pull-down-font .b-font:before { content: "\e608"; - color: #009de3; + color: #3f8ce8; } .excel-field-type-pull-down-font.native .b-font:before, .excel-field-type-pull-down-font.disabled .b-font:before { content: "\e608"; - color: #009de3; + color: #3f8ce8; } .data-link-set-font .b-font:before { content: "\e678"; - color: #009de3; + color: #3f8ce8; } .data-link-set-font.native .b-font:before, .data-link-set-font.disabled .b-font:before { content: "\e678"; - color: #009de3; + color: #3f8ce8; } .data-link-test-font .b-font:before { content: "\e686"; - color: #009de3; + color: #3f8ce8; } .data-link-test-font.native .b-font:before, .data-link-test-font.disabled .b-font:before { content: "\e686"; - color: #009de3; + color: #3f8ce8; } .data-link-copy-font .b-font:before { content: "\e610"; @@ -3101,66 +3101,66 @@ } .calculate-target-font .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .calculate-target-font.native .b-font:before, .calculate-target-font.disabled .b-font:before { content: "\e6a3"; - color: #1a1a1a; + color: inherit; } .task-list-font .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .task-list-font.native .b-font:before, .task-list-font.disabled .b-font:before { content: "\e694"; - color: #009de3; + color: #3f8ce8; } .widget-combo-detail-font .b-font:before { content: "\e697"; - color: #009de3; + color: #3f8ce8; } .widget-combo-detail-font.native .b-font:before, .widget-combo-detail-font.disabled .b-font:before { content: "\e697"; - color: #009de3; + color: #3f8ce8; } .widget-combo-pull-down-font .b-font:before { content: "\e6ab"; - color: #009de3; + color: #3f8ce8; } .widget-combo-pull-down-font.native .b-font:before, .widget-combo-pull-down-font.disabled .b-font:before { content: "\e6ab"; - color: #009de3; + color: #3f8ce8; } .widget-tools-filter-font .b-font:before { content: "\e60f"; - color: #009de3; + color: #3f8ce8; } .widget-tools-filter-font.native .b-font:before, .widget-tools-filter-font.disabled .b-font:before { content: "\e60f"; - color: #009de3; + color: #3f8ce8; } .widget-tools-clear-font .b-font:before { content: "\e63d"; - color: #009de3; + color: #3f8ce8; } .widget-tools-clear-font.native .b-font:before, .widget-tools-clear-font.disabled .b-font:before { content: "\e63d"; - color: #009de3; + color: #3f8ce8; } .widget-tools-export-excel-font .b-font:before { content: "\e635"; - color: #009de3; + color: #3f8ce8; } .widget-tools-export-excel-font.native .b-font:before, .widget-tools-export-excel-font.disabled .b-font:before { content: "\e635"; - color: #009de3; + color: #3f8ce8; } .widget-combo-expand-font .b-font:before { content: "\e697"; @@ -3296,21 +3296,21 @@ } .chart-drill-up .b-font:before { content: "\e6ad"; - color: ""; + color: inherit; } .chart-drill-up.native .b-font:before, .chart-drill-up.disabled .b-font:before { content: "\e6ad"; - color: ""; + color: inherit; } .chart-drill-down .b-font:before { content: "\e608"; - color: ""; + color: inherit; } .chart-drill-down.native .b-font:before, .chart-drill-down.disabled .b-font:before { content: "\e608"; - color: ""; + color: inherit; } .report-filter-open-font .b-font:before { content: "\e648"; @@ -3332,21 +3332,21 @@ } .report-apply-hangout-normal-font .b-font:before { content: "\e66d"; - color: #808080; + color: #999999; } .report-apply-hangout-normal-font.native .b-font:before, .report-apply-hangout-normal-font.disabled .b-font:before { content: "\e66d"; - color: #808080; + color: #999999; } .report-apply-hangout-ing-font .b-font:before { content: "\e66d"; - color: #009de3; + color: #3f8ce8; } .report-apply-hangout-ing-font.native .b-font:before, .report-apply-hangout-ing-font.disabled .b-font:before { content: "\e66d"; - color: #009de3; + color: #3f8ce8; } .report-hangout-font .b-font:before { content: "\e64b"; @@ -3359,21 +3359,21 @@ } .report-cancel-hangout-font .b-font:before { content: "\e64b"; - color: #808080; + color: #999999; } .report-cancel-hangout-font.native .b-font:before, .report-cancel-hangout-font.disabled .b-font:before { content: "\e64b"; - color: #808080; + color: #999999; } .report-hangout-ing-mark-font .b-font:before { content: "\e64b"; - color: #009de3; + color: #3f8ce8; } .report-hangout-ing-mark-font.native .b-font:before, .report-hangout-ing-mark-font.disabled .b-font:before { content: "\e64b"; - color: #009de3; + color: #3f8ce8; } .delete-font-package .b-font:before { content: "\e605"; @@ -3395,30 +3395,30 @@ } .rename-font-package .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .rename-font-package.native .b-font:before, .rename-font-package.disabled .b-font:before { content: "\e687"; - color: #009de3; + color: #3f8ce8; } .package-selected-font .b-font:before { content: "\e6b3"; - color: #178cdf; + color: #3f8ce8; } .package-selected-font.native .b-font:before, .package-selected-font.disabled .b-font:before { content: "\e6b3"; - color: #178cdf; + color: #3f8ce8; } .package-not-selected-font .b-font:before { content: "\e6b2"; - color: #178cdf; + color: #3f8ce8; } .package-not-selected-font.native .b-font:before, .package-not-selected-font.disabled .b-font:before { content: "\e6b2"; - color: #178cdf; + color: #3f8ce8; } .report-detail-info-font .b-font:before { content: "\e66e"; @@ -3440,12 +3440,12 @@ } .report-cancel-share-font .b-font:before { content: "\e6b5"; - color: #009de3; + color: #3f8ce8; } .report-cancel-share-font.native .b-font:before, .report-cancel-share-font.disabled .b-font:before { content: "\e6b5"; - color: #009de3; + color: #3f8ce8; } .drill-push-up-font .b-font:before { content: "\e630"; diff --git a/src/css/resource/normal.css b/src/css/resource/normal.css new file mode 100644 index 000000000..6f34ac161 --- /dev/null +++ b/src/css/resource/normal.css @@ -0,0 +1,51 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +html, +body, +div, +ul, +li, +img, +a, +span, +p, +* { + margin: 0; + padding: 0; +} +a { + outline: none; + text-decoration: none; +} +a:focus { + outline: 0; +} +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid #d4dadd; +} +.bi-theme-dark input, +.bi-theme-dark textarea { + border: 1px solid #525466; +} +ul, +ol { + margin: 0; + padding: 0; +} +ul { + list-style: disc; +} +li { + list-style-type: none; +} +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} diff --git a/src/css/resource/third/ztree/display.tree.css b/src/css/resource/third/ztree/display.tree.css new file mode 100644 index 000000000..6a9358e89 --- /dev/null +++ b/src/css/resource/third/ztree/display.tree.css @@ -0,0 +1,29 @@ +/****添加计算宽度的--运算符直接需要space****/ +/****** common color(常用颜色,可用于普遍场景) *****/ +/**** custom color(自定义颜色,用于特定场景) ****/ +.bi-display-tree .ztree * { + color: #999999; +} +.bi-display-tree .ztree li span.button.switch.center_open { + background-image: url("/icon/tree-vertical-line-3.png"); +} +.bi-display-tree .ztree li span.button.switch.roots_open { + background-image: url("/icon/tree-vertical-line-2.png"); +} +.bi-display-tree .ztree li span.button.switch.bottom_open { + background-image: url("/icon/tree-vertical-line-4.png"); +} +.bi-display-tree .ztree li a, +.bi-display-tree .ztree li span { + cursor: default !important; +} +.bi-display-tree .ztree li a:hover { + text-decoration: none; +} +.bi-display-tree .ztree li a.curSelectedNode { + padding-top: 1px; + border: none; + background-color: inherit; + opacity: 1; + filter: alpha(opacity=100); +} diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css index 203568cd4..f4afbe1bb 100644 --- a/src/css/theme/dark.css +++ b/src/css/theme/dark.css @@ -2,8 +2,8 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-theme-dark { - background-color: #191a2c; - color: #b2b2b2; + background-color: #191b2b; + color: #cccccc; } .bi-theme-dark .bi-input { color: #ffffff; diff --git a/src/css/widget/arrangement/arrangement.block.css b/src/css/widget/arrangement/arrangement.block.css index 69b801736..2f6491e13 100644 --- a/src/css/widget/arrangement/arrangement.block.css +++ b/src/css/widget/arrangement/arrangement.block.css @@ -1,8 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-arrangement-block { - background: #e85050; - opacity: 0.8; - filter: alpha(opacity=80); -} diff --git a/src/css/widget/arrangement/arrangement.css b/src/css/widget/arrangement/arrangement.css index ee99b7986..f63544ae6 100644 --- a/src/css/widget/arrangement/arrangement.css +++ b/src/css/widget/arrangement/arrangement.css @@ -2,8 +2,7 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-arrangement .arrangement-helper { - border: 1px solid #d4dadd; - background: #009de3; + background: #3f8ce8; z-index: 1000000000; } .bi-arrangement .arrangement-block { @@ -17,7 +16,7 @@ } .bi-arrangement .arrangement-drop-container .drop-devider { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } .bi-arrangement .arrangement-drop-container .top-left, .bi-arrangement .arrangement-drop-container .top-right, @@ -36,5 +35,5 @@ .bi-arrangement .arrangement-drop-container .left-center-second, .bi-arrangement .arrangement-drop-container .right-center-second { z-index: 1000000001; - background: #009de3; + background: #3f8ce8; } diff --git a/src/css/widget/date/trigger.date.css b/src/css/widget/date/trigger.date.css index c7b947b94..cc713058e 100644 --- a/src/css/widget/date/trigger.date.css +++ b/src/css/widget/date/trigger.date.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-date-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/widget/downlist/combo.downlist.css b/src/css/widget/downlist/combo.downlist.css index 5e01fa845..2f6491e13 100644 --- a/src/css/widget/downlist/combo.downlist.css +++ b/src/css/widget/downlist/combo.downlist.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-down-list-combo .bi-down-list-spliter { - border-top: 1px solid #eaeaea; -} diff --git a/src/css/widget/exceltable/exceltable.css b/src/css/widget/exceltable/exceltable.css index 90a35f20e..63eab110e 100644 --- a/src/css/widget/exceltable/exceltable.css +++ b/src/css/widget/exceltable/exceltable.css @@ -2,5 +2,8 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table > div.bottom-right > div > div > table { - border-right: 1px solid #eaeaea; + border-right: 1px solid #d4dadd; +} +.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table { + border-right: 1px solid #525466; } diff --git a/src/css/widget/exceltable/exceltable.header.cell.css b/src/css/widget/exceltable/exceltable.header.cell.css index 94c48f0c8..b50b6baf6 100644 --- a/src/css/widget/exceltable/exceltable.header.cell.css +++ b/src/css/widget/exceltable/exceltable.header.cell.css @@ -3,5 +3,4 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-excel-table-header-cell { font-weight: bold; - background-color: #eaeaea; } diff --git a/src/css/widget/filemanager/items/item.file.filemanager.css b/src/css/widget/filemanager/items/item.file.filemanager.css index 4d8cf6ce5..2f6491e13 100644 --- a/src/css/widget/filemanager/items/item.file.filemanager.css +++ b/src/css/widget/filemanager/items/item.file.filemanager.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-file-item { - border-bottom: 1px solid #d4dadd; -} diff --git a/src/css/widget/filemanager/items/item.folder.filemanager.css b/src/css/widget/filemanager/items/item.folder.filemanager.css index e47e3507c..2f6491e13 100644 --- a/src/css/widget/filemanager/items/item.folder.filemanager.css +++ b/src/css/widget/filemanager/items/item.folder.filemanager.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-folder-item { - border-bottom: 1px solid #d4dadd; -} diff --git a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css index 27a5e2807..364095f9d 100644 --- a/src/css/widget/filemanager/nav/button/button.nav.filemanager.css +++ b/src/css/widget/filemanager/nav/button/button.nav.filemanager.css @@ -6,9 +6,16 @@ background: #ffffff; } .bi-file-manager-nav-button .file-manager-nav-button-text.active { - background-color: #f4f4f4; - color: #808080; + 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 { + background: #242640; +} +.bi-theme-dark .bi-file-manager-nav-button .file-manager-nav-button-text.active { + background-color: #191b2b; + color: #999999; +} diff --git a/src/css/widget/filemanager/nav/nav.filemanager.css b/src/css/widget/filemanager/nav/nav.filemanager.css index 952e09390..2f6491e13 100644 --- a/src/css/widget/filemanager/nav/nav.filemanager.css +++ b/src/css/widget/filemanager/nav/nav.filemanager.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-file-manager-nav { - border-left: 1px solid #d4dadd; -} diff --git a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css index 3c5b52c4d..248f3fd6a 100644 --- a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css +++ b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css @@ -2,16 +2,7 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-fine-tuning-number-editor { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; } -.bi-fine-tuning-number-editor .top-button { - border-left: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} -.bi-fine-tuning-number-editor .bottom-button { - border-top: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -} diff --git a/src/css/widget/image/button/size/image.button.size.css b/src/css/widget/image/button/size/image.button.size.css index 9c5a45187..316d4f333 100644 --- a/src/css/widget/image/button/size/image.button.size.css +++ b/src/css/widget/image/button/size/image.button.size.css @@ -3,5 +3,4 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-image-button-size .image-button-size-button-group { font-size: 12px; - color: #1a1a1a; } diff --git a/src/css/widget/image/button/upload.css b/src/css/widget/image/button/upload.css deleted file mode 100644 index 2f6491e13..000000000 --- a/src/css/widget/image/button/upload.css +++ /dev/null @@ -1,3 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ diff --git a/src/css/widget/image/uploadimage.css b/src/css/widget/image/uploadimage.css index bf0fe2720..a2e1933cd 100644 --- a/src/css/widget/image/uploadimage.css +++ b/src/css/widget/image/uploadimage.css @@ -3,14 +3,12 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-upload-image .upload-image-text-button-label { font-size: 14px; - color: #c4c6c6; + color: #999999; } .bi-upload-image .upload-image-icon-button { z-index: 1; font-size: 16px; - background-color: #ffffff; } .bi-upload-image .upload-image-delete-label { font-size: 14px; - color: #1a1a1a; } diff --git a/src/css/widget/month/trigger.month.css b/src/css/widget/month/trigger.month.css index 51c4a6c1a..99c26226b 100644 --- a/src/css/widget/month/trigger.month.css +++ b/src/css/widget/month/trigger.month.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-month-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/widget/multiselect/check/multiselect.check.pane.css b/src/css/widget/multiselect/check/multiselect.check.pane.css index 8a408a9c1..f66fa0419 100644 --- a/src/css/widget/multiselect/check/multiselect.check.pane.css +++ b/src/css/widget/multiselect/check/multiselect.check.pane.css @@ -1,13 +1,7 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-check-pane { - background-color: #f4f4f4; -} .bi-multi-select-check-pane .multi-select-check-selected { - color: #009de3; + color: #3f8ce8; text-decoration: underline; } -.bi-theme-dark .bi-multi-select-check-pane { - background-color: #191a2c; -} diff --git a/src/css/widget/multiselect/check/multiselect.display.css b/src/css/widget/multiselect/check/multiselect.display.css index 94a7a4135..2f6491e13 100644 --- a/src/css/widget/multiselect/check/multiselect.display.css +++ b/src/css/widget/multiselect/check/multiselect.display.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-display-list .display-list-item { - color: #808080; -} diff --git a/src/css/widget/multiselect/multiselect.combo.css b/src/css/widget/multiselect/multiselect.combo.css index 78e5887e7..cd82f0231 100644 --- a/src/css/widget/multiselect/multiselect.combo.css +++ b/src/css/widget/multiselect/multiselect.combo.css @@ -2,6 +2,5 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } diff --git a/src/css/widget/multiselect/multiselect.popup.view.css b/src/css/widget/multiselect/multiselect.popup.view.css index 53c841864..2f6491e13 100644 --- a/src/css/widget/multiselect/multiselect.popup.view.css +++ b/src/css/widget/multiselect/multiselect.popup.view.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-popup-view .multi-select-no-toolbar { - color: #c4c6c6; -} diff --git a/src/css/widget/multiselect/multiselect.trigger.css b/src/css/widget/multiselect/multiselect.trigger.css index 3bf97099e..fd2e089eb 100644 --- a/src/css/widget/multiselect/multiselect.trigger.css +++ b/src/css/widget/multiselect/multiselect.trigger.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px 2px 2px 2px; -moz-border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px; diff --git a/src/css/widget/multiselect/search/multiselect.search.pane.css b/src/css/widget/multiselect/search/multiselect.search.pane.css index a717a9144..7ddbf96cd 100644 --- a/src/css/widget/multiselect/search/multiselect.search.pane.css +++ b/src/css/widget/multiselect/search/multiselect.search.pane.css @@ -1,9 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-select-search-pane { - background: #ffffff; -} .bi-multi-select-search-pane .multi-select-toolbar { color: #e85050; } diff --git a/src/css/widget/multiselect/trigger/button.checkselected.css b/src/css/widget/multiselect/trigger/button.checkselected.css index 1ebfc22ab..8883ebc2c 100644 --- a/src/css/widget/multiselect/trigger/button.checkselected.css +++ b/src/css/widget/multiselect/trigger/button.checkselected.css @@ -2,14 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-select-check-selected-button { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } -.bi-theme-dark .bi-multi-select-check-selected-button { - background-color: #191a2c; -} diff --git a/src/css/widget/multistringlist/multistringlist.css b/src/css/widget/multistringlist/multistringlist.css index dbe888659..2f6491e13 100644 --- a/src/css/widget/multistringlist/multistringlist.css +++ b/src/css/widget/multistringlist/multistringlist.css @@ -1,8 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-string-list .popup-multi-string-list { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} diff --git a/src/css/widget/multitree/check/multi.tree.check.pane.css b/src/css/widget/multitree/check/multi.tree.check.pane.css index e47d209b7..918bd39ce 100644 --- a/src/css/widget/multitree/check/multi.tree.check.pane.css +++ b/src/css/widget/multitree/check/multi.tree.check.pane.css @@ -1,12 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-check-pane { - background-color: #f4f4f4; -} -.bi-multi-tree-check-pane .multi-tree-continue-select { - background-color: #f4f4f4; -} .bi-multi-tree-check-pane .multi-tree-check-selected { - color: #009de3; + color: #3f8ce8; } diff --git a/src/css/widget/multitree/display.multi.tree.css b/src/css/widget/multitree/display.multi.tree.css index 95ed7ce02..2f6491e13 100644 --- a/src/css/widget/multitree/display.multi.tree.css +++ b/src/css/widget/multitree/display.multi.tree.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-display { - background-color: #f4f4f4; -} diff --git a/src/css/widget/multitree/multi.tree.combo.css b/src/css/widget/multitree/multi.tree.combo.css index 8ea67a36f..ade64a766 100644 --- a/src/css/widget/multitree/multi.tree.combo.css +++ b/src/css/widget/multitree/multi.tree.combo.css @@ -2,6 +2,5 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-combo .multi-select-trigger-icon-button { - border-left: 1px solid #d4dadd; font-size: 16px; } diff --git a/src/css/widget/multitree/multi.tree.trigger.css b/src/css/widget/multitree/multi.tree.trigger.css deleted file mode 100644 index a5d0d76f3..000000000 --- a/src/css/widget/multitree/multi.tree.trigger.css +++ /dev/null @@ -1,22 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} diff --git a/src/css/widget/multitree/search.multi.tree.css b/src/css/widget/multitree/search.multi.tree.css index f5df365cf..2f6491e13 100644 --- a/src/css/widget/multitree/search.multi.tree.css +++ b/src/css/widget/multitree/search.multi.tree.css @@ -1,6 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-search-pane { - background: #ffffff; -} diff --git a/src/css/widget/multitree/trigger.multi.tree.css b/src/css/widget/multitree/trigger.multi.tree.css deleted file mode 100644 index a5d0d76f3..000000000 --- a/src/css/widget/multitree/trigger.multi.tree.css +++ /dev/null @@ -1,22 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-multi-tree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px 2px 2px 2px; - -moz-border-radius: 2px 2px 2px 2px; - border-radius: 2px 2px 2px 2px; -} -.bi-multi-tree-trigger .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; - z-index: 1; -} -.bi-multi-tree-trigger .trigger-icon-button { - border-left: 1px solid #d4dadd; - font-size: 16px; -} diff --git a/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css b/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css index 33b983af3..82169c70c 100644 --- a/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css +++ b/src/css/widget/multitree/trigger/multi.tree.button.checkselected.css @@ -2,11 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-multi-tree-check-selected-button .trigger-check-selected { - border: 1px solid #009de3; - -webkit-border-radius: 8px 8px 8px 8px; - -moz-border-radius: 8px 8px 8px 8px; - border-radius: 8px 8px 8px 8px; - color: #009de3; - background-color: #ffffff; + color: #3f8ce8; z-index: 1; } diff --git a/src/css/widget/multitreelist/multitreelist.popup.css b/src/css/widget/multitreelist/multitreelist.popup.css index ca53430b7..2f6491e13 100644 --- a/src/css/widget/multitreelist/multitreelist.popup.css +++ b/src/css/widget/multitreelist/multitreelist.popup.css @@ -1,8 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-tree-list-popup { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} diff --git a/src/css/widget/numericalinterval/numericalinterval.css b/src/css/widget/numericalinterval/numericalinterval.css index db77eda78..da3818bef 100644 --- a/src/css/widget/numericalinterval/numericalinterval.css +++ b/src/css/widget/numericalinterval/numericalinterval.css @@ -2,9 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-numerical-interval .numerical-interval-small-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -13,9 +10,6 @@ border-bottom-left-radius: 2px; } .bi-numerical-interval .numerical-interval-big-editor { - border-top: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; @@ -24,7 +18,6 @@ border-bottom-right-radius: 2px; } .bi-numerical-interval .numerical-interval-big-combo { - border: 1px solid #d4dadd; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; @@ -36,7 +29,6 @@ font-size: 14px; } .bi-numerical-interval .numerical-interval-small-combo { - border: 1px solid #d4dadd; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; diff --git a/src/css/widget/numericalinterval/popup.numericalinterval.css b/src/css/widget/numericalinterval/popup.numericalinterval.css index a38f49d30..2f6491e13 100644 --- a/src/css/widget/numericalinterval/popup.numericalinterval.css +++ b/src/css/widget/numericalinterval/popup.numericalinterval.css @@ -1,12 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-numerical-interval-popup .numerical-interval-popup-item.hover, -.bi-numerical-interval-popup .numerical-interval-popup-item:hover { - background-color: #f4f4f4; -} -.bi-numerical-interval-popup .numerical-interval-popup-item.active, -.bi-numerical-interval-popup .numerical-interval-popup-item:active { - background-color: #f4f4f4; - color: #009de3; -} diff --git a/src/css/widget/pathchooser/pathregion.css b/src/css/widget/pathchooser/pathregion.css index b068ae1ed..26e578a48 100644 --- a/src/css/widget/pathchooser/pathregion.css +++ b/src/css/widget/pathchooser/pathregion.css @@ -1,15 +1,6 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-path-region { - background: #eaeaea; -} .bi-path-region .path-region-label { z-index: 1; - background: #ffffff; - border: 1px solid #ffffff; -} -.bi-path-region .path-region-label.active { - background: #009de3; - color: #ffffff; } diff --git a/src/css/widget/previewtable/previewtable.css b/src/css/widget/previewtable/previewtable.css index 7d4519ab2..3a12fc376 100644 --- a/src/css/widget/previewtable/previewtable.css +++ b/src/css/widget/previewtable/previewtable.css @@ -3,5 +3,9 @@ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-preview-table > div > table > thead > tr.odd, .bi-preview-table > div > div > div > table > thead > tr.odd { - background-color: #eaeaea; + 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; } diff --git a/src/css/widget/quarter/trigger.quarter.css b/src/css/widget/quarter/trigger.quarter.css index 1e8b3da92..90b9674df 100644 --- a/src/css/widget/quarter/trigger.quarter.css +++ b/src/css/widget/quarter/trigger.quarter.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-quarter-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/css/widget/relationview/relationview.item.css b/src/css/widget/relationview/relationview.item.css index 21294ea02..2f6491e13 100644 --- a/src/css/widget/relationview/relationview.item.css +++ b/src/css/widget/relationview/relationview.item.css @@ -1,7 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-relation-view-item.active { - color: #ffffff; - background-color: #009de3; -} diff --git a/src/css/widget/relationview/relationview.region.css b/src/css/widget/relationview/relationview.region.css index dceee5cf6..0285c6306 100644 --- a/src/css/widget/relationview/relationview.region.css +++ b/src/css/widget/relationview/relationview.region.css @@ -2,16 +2,11 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-relation-view-region .relation-view-region-container { - background: #ffffff; - border: 1px solid #d4dadd; 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: 1px dashed #d4dadd; -} -.bi-relation-view-region .relation-view-region-container .relation-view-region-title { - border-bottom: 1px solid #d4dadd; + border-style: dashed; } diff --git a/src/css/widget/sequencetable/dynamicnumber.sequencetable.css b/src/css/widget/sequencetable/dynamicnumber.sequencetable.css index fed0aa1c3..e34204e39 100644 --- a/src/css/widget/sequencetable/dynamicnumber.sequencetable.css +++ b/src/css/widget/sequencetable/dynamicnumber.sequencetable.css @@ -13,7 +13,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-dynamic-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -24,7 +23,4 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } diff --git a/src/css/widget/sequencetable/listnumber.sequencetable.css b/src/css/widget/sequencetable/listnumber.sequencetable.css index dace5ccd1..8906c05f1 100644 --- a/src/css/widget/sequencetable/listnumber.sequencetable.css +++ b/src/css/widget/sequencetable/listnumber.sequencetable.css @@ -13,7 +13,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-list-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -24,7 +23,4 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } diff --git a/src/css/widget/sequencetable/treenumber.sequencetable.css b/src/css/widget/sequencetable/treenumber.sequencetable.css index be1c1be2a..fcceb1198 100644 --- a/src/css/widget/sequencetable/treenumber.sequencetable.css +++ b/src/css/widget/sequencetable/treenumber.sequencetable.css @@ -13,7 +13,6 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border: 1px solid #eaeaea; } .bi-sequence-table-tree-number .sequence-table-number-cell { -webkit-box-sizing: border-box; @@ -24,7 +23,4 @@ /*IE8*/ box-sizing: border-box; /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ - border-left: 1px solid #eaeaea; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; } diff --git a/src/css/widget/singletree/combo.single.tree.css b/src/css/widget/singletree/combo.single.tree.css index 3c017482b..2f6491e13 100644 --- a/src/css/widget/singletree/combo.single.tree.css +++ b/src/css/widget/singletree/combo.single.tree.css @@ -1,12 +1,3 @@ /****添加计算宽度的--运算符直接需要space****/ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ -.bi-singletree-combo .singletree-trigger { - border: 1px solid #d4dadd; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.bi-singletree-combo .bi-singletree-popup .singletree-toolbar { - color: #c4c6c6; -} diff --git a/src/css/widget/web/web.css b/src/css/widget/web/web.css deleted file mode 100644 index 16fe67de5..000000000 --- a/src/css/widget/web/web.css +++ /dev/null @@ -1,16 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-web-page .web-page-button { - z-index: 1; - font-size: 14px; - background-color: #ffffff; -} -.bi-web-page .web-page-text-button-label { - font-size: 16px; - color: #c4c6c6; -} -.bi-web-page .web-page-delete-label { - font-size: 14px; - color: #1a1a1a; -} diff --git a/src/css/widget/year/popup.year.css b/src/css/widget/year/popup.year.css index 3839717e2..fa13c362d 100644 --- a/src/css/widget/year/popup.year.css +++ b/src/css/widget/year/popup.year.css @@ -2,13 +2,18 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-popup .year-popup-navigation { - border-top: 1px solid #eaeaea; line-height: 30px; - color: #009de3; + color: #3f8ce8; } .bi-year-popup .year-popup-navigation > .center-element { - border-left: 1px solid #eaeaea; + 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; +} diff --git a/src/css/widget/year/trigger.year.css b/src/css/widget/year/trigger.year.css index 72cd98518..d5252b915 100644 --- a/src/css/widget/year/trigger.year.css +++ b/src/css/widget/year/trigger.year.css @@ -2,7 +2,6 @@ /****** common color(常用颜色,可用于普遍场景) *****/ /**** custom color(自定义颜色,用于特定场景) ****/ .bi-year-trigger { - border: 1px solid #d4dadd; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; diff --git a/src/less/base/calendar/calendar.less b/src/less/base/calendar/calendar.less deleted file mode 100644 index 2e343e630..000000000 --- a/src/less/base/calendar/calendar.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../bibase"; - -.bi-calendar{ - -} \ No newline at end of file diff --git a/src/less/base/colorchooser/colorchooser.popup.less b/src/less/base/colorchooser/colorchooser.popup.less deleted file mode 100644 index d5a80edea..000000000 --- a/src/less/base/colorchooser/colorchooser.popup.less +++ /dev/null @@ -1,22 +0,0 @@ -@import "../../bibase"; - -.bi-color-chooser-popup { - & .color-chooser-popup-title { - background: @color-bi-background-gray; - border-bottom: 1px solid @color-bi-split-dark; - } - & .color-chooser-popup-more { - background: @color-bi-background-gray; - } -} - -.bi-theme-dark { - .bi-color-chooser-popup { - & .color-chooser-popup-title { - background: @color-bi-background-normal-theme-dark; - } - & .color-chooser-popup-more { - background: @color-bi-background-normal-theme-dark; - } - } -} \ No newline at end of file diff --git a/src/less/base/colorchooser/colorchooser.trigger.less b/src/less/base/colorchooser/colorchooser.trigger.less index fa74a4e63..7823f5ee0 100644 --- a/src/less/base/colorchooser/colorchooser.trigger.less +++ b/src/less/base/colorchooser/colorchooser.trigger.less @@ -1,7 +1,6 @@ @import "../../bibase"; .bi-color-chooser-trigger{ - background: @color-bi-background-default; .border-radius(2px); .box-shadow(0px,0px,2px,1px, @color-bi-background-dark, inset); } \ No newline at end of file diff --git a/src/less/base/colorchooser/colorpicker/button.colorpicker.less b/src/less/base/colorchooser/colorpicker/button.colorpicker.less index 65dc9f6ce..4ff3bdedf 100644 --- a/src/less/base/colorchooser/colorpicker/button.colorpicker.less +++ b/src/less/base/colorchooser/colorpicker/button.colorpicker.less @@ -1,8 +1,16 @@ @import "../../../bibase"; -.bi-color-picker-button{ - background-color: @color-bi-background-light; - & .color-picker-button-mask{ +.bi-color-picker-button { + & .color-picker-button-mask { border: 1px solid @color-bi-border-black; } +} + +//特殊样式自定义 +.bi-theme-dark { + .bi-color-picker-button { + & .color-picker-button-mask { + border: 1px solid @color-bi-border-default; + } + } } \ No newline at end of file diff --git a/src/less/base/colorchooser/colorpicker/colorpicker.less b/src/less/base/colorchooser/colorpicker/colorpicker.less deleted file mode 100644 index 752e25b68..000000000 --- a/src/less/base/colorchooser/colorpicker/colorpicker.less +++ /dev/null @@ -1,8 +0,0 @@ -@import "../../../bibase"; - -.bi-color-picker{ - & > .center-element{ - border-left: 1px solid @color-bi-border-default; - border-top: 1px solid @color-bi-border-default; - } -} \ No newline at end of file diff --git a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less index 537f00476..fe9707812 100644 --- a/src/less/base/colorchooser/colorpicker/editor.colorpicker.less +++ b/src/less/base/colorchooser/colorpicker/editor.colorpicker.less @@ -1,12 +1,8 @@ @import "../../../bibase"; -.bi-color-picker-editor{ - & .color-picker-editor-label{ - color: @color-bi-text-gray; - } - & .color-picker-editor-display{ - background: @color-bi-background-default; +.bi-color-picker-editor { + & .color-picker-editor-display { .border-radius(2px); - .box-shadow(0px,0px,2px,1px, @color-bi-background-dark, inset); + .box-shadow(0px, 0px, 2px, 1px, @color-bi-background-dark, inset); } } \ No newline at end of file diff --git a/src/less/base/combination/combo.less b/src/less/base/combination/combo.less deleted file mode 100644 index 3297b549d..000000000 --- a/src/less/base/combination/combo.less +++ /dev/null @@ -1 +0,0 @@ -@import "../../bibase"; \ No newline at end of file diff --git a/src/less/base/combination/searcher.less b/src/less/base/combination/searcher.less deleted file mode 100644 index 3297b549d..000000000 --- a/src/less/base/combination/searcher.less +++ /dev/null @@ -1 +0,0 @@ -@import "../../bibase"; \ No newline at end of file diff --git a/src/less/base/editor/editor.search.less b/src/less/base/editor/editor.search.less index b66c946cf..d69291bc9 100644 --- a/src/less/base/editor/editor.search.less +++ b/src/less/base/editor/editor.search.less @@ -1,7 +1,6 @@ @import "../../bibase"; /*************BI.SearchEditor******************/ .bi-search-editor { - border: 1px solid @color-bi-border-normal; & .close-font{ font-size: 20px; } diff --git a/src/less/base/editor/editor.sign.style.less b/src/less/base/editor/editor.sign.style.less deleted file mode 100644 index f437ddcc8..000000000 --- a/src/less/base/editor/editor.sign.style.less +++ /dev/null @@ -1,13 +0,0 @@ -@import "../../bibase"; - -.bi-sign-style-editor{ - & .sign-style-editor-text{ - max-width: 100%; - font-size: @font-size-12; - } - & .sign-style-editor-tip{ - max-width: 100%; - font-size: @font-size-12; - color: @font-color-gray; - } -} \ No newline at end of file diff --git a/src/less/base/editor/editor.text.less b/src/less/base/editor/editor.text.less deleted file mode 100644 index 48d4f395f..000000000 --- a/src/less/base/editor/editor.text.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../bibase"; - -.bi-text-editor{ - border: 1px solid @color-bi-border-normal; -} \ No newline at end of file diff --git a/src/less/base/editor/editor.text.small.less b/src/less/base/editor/editor.text.small.less deleted file mode 100644 index d0fbed35b..000000000 --- a/src/less/base/editor/editor.text.small.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../bibase"; -/*************BI.SearchEditor******************/ -.bi-small-text-editor { - & .bi-editor { - } -} \ No newline at end of file diff --git a/src/less/base/formula/codemirror.less b/src/less/base/formula/codemirror.less index 533243113..7c8fc3117 100644 --- a/src/less/base/formula/codemirror.less +++ b/src/less/base/formula/codemirror.less @@ -6,9 +6,17 @@ /* Set height, width, borders, and global font properties here */ font-family: monospace; cursor: text; -// .border-radius(4px); + // .border-radius(4px); .size(100%, 100%); - color: black; + color: @color-bi-text-black; + background-color: @color-bi-background-default; +} + +.bi-theme-dark { + .CodeMirror { + color: @color-bi-text; + background-color: @color-bi-background-default-theme-dark; + } } /* PADDING */ @@ -16,6 +24,7 @@ .CodeMirror-lines { padding: 4px 0; /* Vertical padding around content */ } + .CodeMirror pre { padding: 0 4px; /* Horizontal padding of content */ } @@ -31,7 +40,10 @@ background-color: #f7f7f7; white-space: nowrap; } -.CodeMirror-linenumbers {} + +.CodeMirror-linenumbers { +} + .CodeMirror-linenumber { padding: 0 3px 0 5px; min-width: 20px; @@ -40,23 +52,37 @@ white-space: nowrap; } -.CodeMirror-guttermarker { color: black; } -.CodeMirror-guttermarker-subtle { color: #999; } +.CodeMirror-guttermarker { + color: black; +} + +.CodeMirror-guttermarker-subtle { + color: #999; +} /* CURSOR */ .CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; + border-left: 1px solid @color-bi-border-black; +} + +.bi-theme-dark { + .CodeMirror div.CodeMirror-cursor { + border-left: 1px solid @color-bi-border-default; + } } + /* Shown when moving in bi-directional text */ .CodeMirror div.CodeMirror-secondarycursor { border-left: 1px solid silver; } + .CodeMirror.cm-fat-cursor div.CodeMirror-cursor { width: auto; border: 0; background: #7e7; } + .CodeMirror.cm-fat-cursor div.CodeMirror-cursors { z-index: 1; } @@ -68,26 +94,51 @@ -moz-animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite; } + @-moz-keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } + 0% { + background: #7e7; + } + 50% { + background: none; + } + 100% { + background: #7e7; + } } + @-webkit-keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } + 0% { + background: #7e7; + } + 50% { + background: none; + } + 100% { + background: #7e7; + } } + @keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } + 0% { + background: #7e7; + } + 50% { + background: none; + } + 100% { + background: #7e7; + } } /* Can style cursor different in overwrite (non-insert) mode */ -div.CodeMirror-overwrite div.CodeMirror-cursor {} +div.CodeMirror-overwrite div.CodeMirror-cursor { +} -.cm-tab { display: inline-block; text-decoration: inherit; } +.cm-tab { + display: inline-block; + text-decoration: inherit; +} .CodeMirror-ruler { border-left: 1px solid #ccc; @@ -96,73 +147,164 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {} /* DEFAULT THEME */ -.cm-s-default .cm-header {color: blue;} -.cm-s-default .cm-quote {color: #090;} -.cm-negative {color: #d44;} -.cm-positive {color: #292;} -.cm-header, .cm-strong {font-weight: bold;} -.cm-em {font-style: italic;} -.cm-link {text-decoration: underline;} -.cm-strikethrough {text-decoration: line-through;} +.cm-s-default .cm-header { + color: blue; +} + +.cm-s-default .cm-quote { + color: #090; +} + +.cm-negative { + color: #d44; +} + +.cm-positive { + color: #292; +} + +.cm-header, .cm-strong { + font-weight: bold; +} + +.cm-em { + font-style: italic; +} + +.cm-link { + text-decoration: underline; +} + +.cm-strikethrough { + text-decoration: line-through; +} //.cm-s-default .cm-keyword {color: #708;} -.cm-s-default .cm-atom {color: #219;} -.cm-s-default .cm-number {color: #164;} -.cm-s-default .cm-def {color: #00f;} +.cm-s-default .cm-atom { + color: #219; +} + +.cm-s-default .cm-number { + color: #164; +} + +.cm-s-default .cm-def { + color: #00f; +} + .cm-s-default .cm-variable, .cm-s-default .cm-punctuation, .cm-s-default .cm-property, -.cm-s-default .cm-operator {} -.cm-s-default .cm-variable-2 {color: #05a;} -.cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-comment {color: #a50;} -.cm-s-default .cm-string {color: #a11;} -.cm-s-default .cm-string-2 {color: #f50;} -.cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-qualifier {color: #555;} -.cm-s-default .cm-builtin {color: #30a;} -.cm-s-default .cm-bracket {color: #997;} -.cm-s-default .cm-tag {color: #170;} -.cm-s-default .cm-attribute {color: #00c;} -.cm-s-default .cm-hr {color: #999;} -.cm-s-default .cm-link {color: #00c;} -.cm-s-default span[class*="fieldName"]{ +.cm-s-default .cm-operator { +} + +.cm-s-default .cm-variable-2 { + color: #05a; +} + +.cm-s-default .cm-variable-3 { + color: #085; +} + +.cm-s-default .cm-comment { + color: #a50; +} + +.cm-s-default .cm-string { + color: #a11; +} + +.cm-s-default .cm-string-2 { + color: #f50; +} + +.cm-s-default .cm-meta { + color: #555; +} + +.cm-s-default .cm-qualifier { + color: #555; +} + +.cm-s-default .cm-builtin { + color: #30a; +} + +.cm-s-default .cm-bracket { + color: #997; +} + +.cm-s-default .cm-tag { + color: #170; +} + +.cm-s-default .cm-attribute { + color: #00c; +} + +.cm-s-default .cm-hr { + color: #999; +} + +.cm-s-default .cm-link { + color: #00c; +} + +.cm-s-default span[class*="fieldName"] { color: white; - padding: 1px ; + padding: 1px; margin: 1px 0px; background: @color-bi-text-highlight; } -.cm-s-default span[class*="start"]{ +.cm-s-default span[class*="start"] { .border-radius(3px 0px 0px 3px); - margin-left :3px; + margin-left: 3px; } -.cm-s-default span[class*="end"]{ +.cm-s-default span[class*="end"] { .border-radius(0px 3px 3px 0px); - margin-right :3px; + margin-right: 3px; } -.cm-s-default span[class*="start end"]{ +.cm-s-default span[class*="start end"] { .border-radius(3px); } -.cm-s-default span[class*="#"]{ +.cm-s-default span[class*="#"] { color: @color-bi-text-highlight; } -.cm-s-default .cm-error {color: #f00;} -.cm-invalidchar {color: #f00;} +.cm-s-default .cm-error { + color: #f00; +} -.CodeMirror-composing { border-bottom: 2px solid; } +.cm-invalidchar { + color: #f00; +} + +.CodeMirror-composing { + border-bottom: 2px solid; +} /* Default styles for common addons */ -div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} -div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} -.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); } -.CodeMirror-activeline-background {background: #e8f2ff;} +div.CodeMirror span.CodeMirror-matchingbracket { + color: #0f0; +} + +div.CodeMirror span.CodeMirror-nonmatchingbracket { + color: #f22; +} + +.CodeMirror-matchingtag { + background: rgba(255, 150, 0, .3); +} + +.CodeMirror-activeline-background { + background: #e8f2ff; +} /* STOP */ @@ -172,19 +314,20 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} .CodeMirror { position: relative; overflow: hidden; - background: white; } .CodeMirror-scroll { overflow: scroll !important; /* Things will break if this is overridden */ /* 30px is the magic margin used to hide the element's real scrollbars */ /* See overflow: hidden in .CodeMirror */ - margin-bottom: -30px; margin-right: -30px; + margin-bottom: -30px; + margin-right: -30px; padding-bottom: 30px; height: 100%; outline: none; /* Prevent dragging from highlighting the element */ position: relative; } + .CodeMirror-sizer { position: relative; border-right: 30px solid transparent; @@ -198,46 +341,60 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} z-index: 6; display: none; } + .CodeMirror-vscrollbar { - right: 0; top: 0; + right: 0; + top: 0; overflow-x: hidden; overflow-y: scroll; } + .CodeMirror-hscrollbar { - bottom: 0; left: 0; + bottom: 0; + left: 0; overflow-y: hidden; overflow-x: scroll; } + .CodeMirror-scrollbar-filler { - right: 0; bottom: 0; + right: 0; + bottom: 0; } + .CodeMirror-gutter-filler { - left: 0; bottom: 0; + left: 0; + bottom: 0; } .CodeMirror-gutters { - position: absolute; left: 0; top: 0; + position: absolute; + left: 0; + top: 0; z-index: 3; } + .CodeMirror-gutter { white-space: normal; height: 100%; display: inline-block; margin-bottom: -30px; /* Hack to make IE7 behave */ - *zoom:1; - *display:inline; + *zoom: 1; + *display: inline; } + .CodeMirror-gutter-wrapper { position: absolute; z-index: 4; height: 100%; } + .CodeMirror-gutter-elt { position: absolute; cursor: default; z-index: 4; } + .CodeMirror-gutter-wrapper { -webkit-user-select: none; -moz-user-select: none; @@ -248,9 +405,12 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} cursor: text; min-height: 1px; /* prevents collapsing before first draw */ } + .CodeMirror pre { /* Reset some styles that the rest of the page might have set */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; border-width: 0; background: transparent; font-family: inherit; @@ -265,6 +425,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} overflow: visible; -webkit-tap-highlight-color: transparent; } + .CodeMirror-wrap pre { word-wrap: break-word; white-space: pre-wrap; @@ -273,7 +434,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} .CodeMirror-linebackground { position: absolute; - left: 0; right: 0; top: 0; bottom: 0; + left: 0; + right: 0; + top: 0; + bottom: 0; z-index: 0; } @@ -308,7 +472,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} overflow: hidden; visibility: hidden; } -.CodeMirror-measure pre { position: static; } + +.CodeMirror-measure pre { + position: static; +} .CodeMirror div.CodeMirror-cursor { position: absolute; @@ -321,15 +488,30 @@ div.CodeMirror-cursors { position: relative; z-index: 3; } + .CodeMirror-focused div.CodeMirror-cursors { visibility: visible; } -.CodeMirror-selected { background: #d9d9d9; } -.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } -.CodeMirror-crosshair { cursor: crosshair; } -.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; } -.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; } +.CodeMirror-selected { + background: #d9d9d9; +} + +.CodeMirror-focused .CodeMirror-selected { + background: #d7d4f0; +} + +.CodeMirror-crosshair { + cursor: crosshair; +} + +.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { + background: #d7d4f0; +} + +.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { + background: #d7d4f0; +} .cm-searching { background: #ffa; @@ -337,10 +519,14 @@ div.CodeMirror-cursors { } /* IE7 hack to prevent it from returning funny offsetTops on the spans */ -.CodeMirror span { *vertical-align: text-bottom; } +.CodeMirror span { + *vertical-align: text-bottom; +} /* Used to force a border model for a node */ -.cm-force-border { padding-right: .1px; } +.cm-force-border { + padding-right: .1px; +} @media print { /* Hide the cursor when printing */ @@ -350,10 +536,14 @@ div.CodeMirror-cursors { } /* See issue #2901 */ -.cm-tab-wrap-hack:after { content: ''; } +.cm-tab-wrap-hack:after { + content: ''; +} /* Help users use markselection to safely style text background */ -span.CodeMirror-selectedtext { background: none; } +span.CodeMirror-selectedtext { + background: none; +} /*addon: show-hint*/ .CodeMirror-hints { @@ -365,9 +555,9 @@ span.CodeMirror-selectedtext { background: none; } margin: 0; padding: 2px; - -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); - -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); - box-shadow: 2px 3px 5px rgba(0,0,0,.2); + -webkit-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2); + -moz-box-shadow: 2px 3px 5px rgba(0, 0, 0, .2); + box-shadow: 2px 3px 5px rgba(0, 0, 0, .2); border-radius: 3px; border: 1px solid silver; diff --git a/src/less/base/foundation/bi.message.less b/src/less/base/foundation/bi.message.less index ddc74f79d..58394874b 100644 --- a/src/less/base/foundation/bi.message.less +++ b/src/less/base/foundation/bi.message.less @@ -1,37 +1,19 @@ @import "../../bibase"; .bi-message-title { - background-color: @color-bi-background-gray; - color: @color-bi-text-gray; font-size: 16px; cursor: pointer; } -.bi-theme-dark { - .bi-message-title { - background-color: @color-bi-background-normal-theme-dark; - color: @color-bi-text-theme-dark; - } -} - .bi-message-text { font-size: 16px; .user-select(text); } .bi-message-content { - background-color: @color-bi-background-default; - color: @color-bi-text-gray; font-size: 16px; } -.bi-theme-dark { - .bi-message-content { - background-color: @color-bi-background-default-theme-dark; - color: @color-bi-text-theme-dark; - } -} - .bi-message-close { font-size: 25px; } \ No newline at end of file diff --git a/src/less/base/layer/layer.panel.less b/src/less/base/layer/layer.panel.less deleted file mode 100644 index e041d7267..000000000 --- a/src/less/base/layer/layer.panel.less +++ /dev/null @@ -1,16 +0,0 @@ -@import "../../bibase"; - -.bi-popup-panel { - & .popup-panel-title { - background: @color-bi-background-gray; - border-bottom: 1px solid @color-bi-split-dark; - } -} - -.bi-theme-dark { - .bi-popup-panel { - & .popup-panel-title { - background: @color-bi-background-normal-theme-dark; - } - } -} \ No newline at end of file diff --git a/src/less/base/layer/layer.searcher.less b/src/less/base/layer/layer.searcher.less deleted file mode 100644 index d18b523c6..000000000 --- a/src/less/base/layer/layer.searcher.less +++ /dev/null @@ -1,9 +0,0 @@ -@import "../../bibase"; - - -.bi-searcher-view{ - background: @color-bi-background-default; - & .searcher-view-spliter{ - background: @color-bi-background-dark; - } -} \ No newline at end of file diff --git a/src/less/base/layer/panel.less b/src/less/base/layer/panel.less index 189589ecc..25fd8f280 100644 --- a/src/less/base/layer/panel.less +++ b/src/less/base/layer/panel.less @@ -1,14 +1,10 @@ @import "../../bibase"; .bi-panel{ - border: 1px solid @border-color-light-blue; .border-radius(2px); .panel-title{ - background-color: @background-color-light-blue; - border-bottom: 1px solid @border-color-light-blue; & .panel-title-text{ cursor: text; - color: @color-bi-text-gray; font-size: @font-size-14; } } diff --git a/src/less/base/pager/pager.less b/src/less/base/pager/pager.less index cdb89fb3e..480112790 100644 --- a/src/less/base/pager/pager.less +++ b/src/less/base/pager/pager.less @@ -2,11 +2,6 @@ .bi-pager{ & .page-item{ - border: 1px solid @border-color-normal; .border-radius(2px); - &.active{ - background: @color-bi-background-highlight; - color: @color-bi-text; - } } } \ No newline at end of file diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less index 2aa6a385d..b28e25b1c 100644 --- a/src/less/base/segment/button.segment.less +++ b/src/less/base/segment/button.segment.less @@ -1,12 +1,4 @@ @import "../../bibase"; .bi-segment-button{ - &:active, &.active{ - color: @color-bi-text; - background: @color-bi-background-highlight; - } - &.disabled, &.disabled:hover, &.disabled:active { - color: @color-bi-text-black; - background: @color-bi-background-default; - } } \ No newline at end of file diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index be48c3be3..981a7426e 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -3,13 +3,8 @@ .bi-segment{ & > .center-element{ .overflow-hidden(); - background: @color-bi-background-default; - border-right: 1px solid @color-bi-split-dark; - border-top: 1px solid @color-bi-split-dark; - border-bottom: 1px solid @color-bi-split-dark; } & > .first-element{ - border-left: 1px solid @color-bi-split-dark; .border-corner-radius(6px,0px,0px,6px) } & > .last-element{ diff --git a/src/less/base/single/bar/bar.less b/src/less/base/single/bar/bar.less index 1c6a5999f..25c21cad4 100644 --- a/src/less/base/single/bar/bar.less +++ b/src/less/base/single/bar/bar.less @@ -2,14 +2,5 @@ .bi-loading-bar{ & .loading-text{ - color: @color-bi-text-gray; - &:hover, &.hover { - color: @color-bi-text-highlight; - } - &.disabled { - &, &:hover, &:active { - color: @color-bi-background-default; - } - } } } \ No newline at end of file diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index cdfa8077e..8602d52a7 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -2,8 +2,8 @@ .bi-button { .border-radius(2px); - border: 1px solid @color-bi-text-highlight; - background-color: @color-bi-text-highlight; + border: 1px solid @color-bi-border-highlight; + background-color: @color-bi-background-highlight; text-align: center; vertical-align: middle; cursor: pointer; diff --git a/src/less/base/single/editor/editor.state.less b/src/less/base/single/editor/editor.state.less index d0db6d41e..7dfd89d0a 100644 --- a/src/less/base/single/editor/editor.state.less +++ b/src/less/base/single/editor/editor.state.less @@ -3,6 +3,5 @@ .bi-state-editor{ & .state-editor-infinite-text{ - color: @water-mark-color; } } \ No newline at end of file diff --git a/src/less/base/single/editor/editor.state.simple.less b/src/less/base/single/editor/editor.state.simple.less index 2204a08c0..305f9b0d9 100644 --- a/src/less/base/single/editor/editor.state.simple.less +++ b/src/less/base/single/editor/editor.state.simple.less @@ -3,6 +3,5 @@ .bi-simple-state-editor{ & .state-editor-infinite-text{ - color: @water-mark-color; } } \ No newline at end of file diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less index 35da109e6..ce6b01357 100644 --- a/src/less/base/single/editor/editor.textarea.less +++ b/src/less/base/single/editor/editor.textarea.less @@ -7,8 +7,5 @@ & { border: none; } - &.textarea-editor-focus{ - border: 1px solid @color-bi-border-outline; - } } } \ No newline at end of file diff --git a/src/less/base/table/table.collection.cell.less b/src/less/base/table/table.collection.cell.less index 34f69a009..3f5d3175f 100644 --- a/src/less/base/table/table.collection.cell.less +++ b/src/less/base/table/table.collection.cell.less @@ -2,8 +2,6 @@ .bi-collection-table-cell { .box-sizing(border-box); - border-right: 1px solid @border-color-line; - border-bottom: 1px solid @border-color-line; &.first-row { border-top: 1px solid @border-color-line; } @@ -11,10 +9,10 @@ border-left: 1px solid @border-color-line; } } -.bi-theme-dark{ - .bi-collection-table-cell{ - border-right: 1px solid @border-color-line-theme-dark; - border-bottom: 1px solid @border-color-line-theme-dark; + +//特殊样式 +.bi-theme-dark { + .bi-collection-table-cell { &.first-row { border-top: 1px solid @border-color-line-theme-dark; } diff --git a/src/less/base/table/table.grid.cell.less b/src/less/base/table/table.grid.cell.less index 039e47aa6..03ce7b357 100644 --- a/src/less/base/table/table.grid.cell.less +++ b/src/less/base/table/table.grid.cell.less @@ -2,8 +2,6 @@ .bi-grid-table-cell { .box-sizing(border-box); - border-right: 1px solid @border-color-line; - border-bottom: 1px solid @border-color-line; &.first-row { border-top: 1px solid @border-color-line; } @@ -13,8 +11,6 @@ } .bi-theme-dark{ .bi-grid-table-cell{ - border-right: 1px solid @border-color-line-theme-dark; - border-bottom: 1px solid @border-color-line-theme-dark; &.first-row { border-top: 1px solid @border-color-line-theme-dark; } diff --git a/src/less/base/table/table.grid.scrollbar.less b/src/less/base/table/table.grid.scrollbar.less index 6344c92c3..81a0efc5b 100644 --- a/src/less/base/table/table.grid.scrollbar.less +++ b/src/less/base/table/table.grid.scrollbar.less @@ -8,13 +8,14 @@ transition-timing-function: ease; user-select: none; background-color: @scroll-color; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666)"; border-radius: 5px; } .bi-theme-dark { .scrollbar-layout-main { background-color: @scroll-color-theme-dark; - filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)"; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc)"; } } @@ -37,12 +38,13 @@ left: 0; transition-property: background-color; background-color: @scroll-color; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#0D666666,endColorstr=#0D666666)"; } .bi-theme-dark { .scrollbar-layout-main-horizontal { background-color: @scroll-color-theme-dark; - filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#19ffffff,endColorstr=#19ffffff)"; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#0Dcccccc,endColorstr=#0Dcccccc)"; } } @@ -117,11 +119,13 @@ .public-scrollbar-face:after { background-color: @scroll-thumb-color; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4C666666,endColorstr=#4C666666)"; } .bi-theme-dark { .public-scrollbar-face:after { background-color: @scroll-thumb-color-theme-dark; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4Ccccccc,endColorstr=#4Ccccccc)"; } } @@ -129,6 +133,7 @@ .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: @scroll-thumb-focus-color; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2666666,endColorstr=#B2666666)"; } .bi-theme-dark { @@ -136,6 +141,7 @@ .public-scrollbar-main-active .public-scrollbar-face:after, .public-scrollbar-faceActive:after { background-color: @scroll-thumb-focus-color-theme-dark; + filter:~"progid:DXImageTransform.Microsoft.gradient(startColorstr=#B2cccccc,endColorstr=#B2cccccc)"; } } diff --git a/src/less/base/tree/branch.tree.less b/src/less/base/tree/branch.tree.less index 7482c76c1..3b21041c3 100644 --- a/src/less/base/tree/branch.tree.less +++ b/src/less/base/tree/branch.tree.less @@ -3,11 +3,4 @@ & .bi-branch-tree-view{ min-width: 300px; } -} - -.bi-click-branch-tree{ - border: 1px solid @color-bi-border-normal; - & .bi-empty-view{ - background: @color-bi-background-gray; - } } \ No newline at end of file diff --git a/src/less/base/trigger/trigger.editor.less b/src/less/base/trigger/trigger.editor.less index 485205f8f..a8b014eb1 100644 --- a/src/less/base/trigger/trigger.editor.less +++ b/src/less/base/trigger/trigger.editor.less @@ -1,5 +1,4 @@ @import "../../bibase"; .bi-editor-trigger{ - border: 1px solid @color-bi-border-normal; } \ No newline at end of file diff --git a/src/less/base/trigger/trigger.icon.less b/src/less/base/trigger/trigger.icon.less index e38e989dc..331442a3b 100644 --- a/src/less/base/trigger/trigger.icon.less +++ b/src/less/base/trigger/trigger.icon.less @@ -1,7 +1,5 @@ @import "../../bibase"; - .bi-icon-trigger { - } \ No newline at end of file diff --git a/src/less/base/trigger/trigger.less b/src/less/base/trigger/trigger.less index 8dae11646..a5adf829e 100644 --- a/src/less/base/trigger/trigger.less +++ b/src/less/base/trigger/trigger.less @@ -2,7 +2,6 @@ .bi-trigger{ & .bi-trigger-icon-button{ - border-left: 1px solid @color-bi-border-normal; font-size: @font-size-16; } } \ No newline at end of file diff --git a/src/less/base/trigger/trigger.selecttext.less b/src/less/base/trigger/trigger.selecttext.less index 56b93faf2..38312579e 100644 --- a/src/less/base/trigger/trigger.selecttext.less +++ b/src/less/base/trigger/trigger.selecttext.less @@ -1,6 +1,5 @@ @import "../../bibase"; .bi-select-text-trigger{ - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/less/base/trigger/trigger.selecttextsmall.less b/src/less/base/trigger/trigger.selecttextsmall.less index ef4e2520f..322f34180 100644 --- a/src/less/base/trigger/trigger.selecttextsmall.less +++ b/src/less/base/trigger/trigger.selecttextsmall.less @@ -1,6 +1,5 @@ @import "../../bibase"; .bi-small-select-text-trigger{ - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/less/base/view/floatboxview.less b/src/less/base/view/floatboxview.less index 161750084..8b0a8ffe0 100644 --- a/src/less/base/view/floatboxview.less +++ b/src/less/base/view/floatboxview.less @@ -1,13 +1,4 @@ @import "../../bibase"; .bi-float-box { - background-color: @color-bi-background-default; - color: @color-bi-text-black; -} - -.bi-theme-dark { - .bi-float-box { - background-color: @color-bi-background-default-theme-dark; - color: @color-bi-text-theme-dark; - } } \ No newline at end of file diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 99b34f13a..a6002f49e 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -8,17 +8,13 @@ overflow: visible !important; cursor: default; & .list-view-outer { - border: 1px solid @color-bi-split-dark; .border-radius(2px); - color: @color-bi-text-black; - background: @color-bi-background-default; } & .list-view-toolbar { - border-top: 1px solid @color-bi-split-light; line-height: 30px; color: @color-bi-text-highlight; & > .center-element { - border-left: 1px solid @color-bi-split-light; + border-left: 1px solid @color-bi-border-line; } & > .first-element { border-left: none; @@ -28,9 +24,13 @@ .bi-theme-dark { .bi-list-view { - & .list-view-outer { - color: @color-bi-text-theme-dark; - background: @color-bi-background-default-theme-dark; + & .list-view-toolbar { + & > .center-element { + border-left: 1px solid @color-bi-border-line-theme-dark; + } + & > .first-element { + border-left: none; + } } } -} \ No newline at end of file +} diff --git a/src/less/bibase.less b/src/less/bibase.less index 6fa57065f..5f0b88dc2 100644 --- a/src/less/bibase.less +++ b/src/less/bibase.less @@ -3,5 +3,4 @@ @import "typographic"; @import "visual"; @import "var"; -@import "lib/colors"; -@import "lib/style"; \ No newline at end of file +@import "lib/colors"; \ No newline at end of file diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index c19a2649e..e815d6a3c 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -2,10 +2,18 @@ .base-disabled { cursor: default !important; - color: #c4c6c6 !important; - //.opacity(0.5); + color: @color-bi-text-disabled !important; & .b-font:before { - color: #c4c6c6 !important; + color: @color-bi-text-disabled !important; + } +} + +.bi-theme-dark { + .base-disabled { + color: @color-bi-text-disabled-theme-dark !important; + & .b-font:before { + color: @color-bi-text-disabled-theme-dark !important; + } } } @@ -17,6 +25,98 @@ .clearfix(); } +//基本背景色 +.bi-background { + background-color: @color-bi-background-normal; + color: @color-bi-text-normal; +} + +.bi-theme-dark { + .bi-background { + background-color: @color-bi-background-normal-theme-dark; + color: @color-bi-text-theme-dark; + } +} + +//card +.bi-card { + background-color: @color-bi-background-default; + color: @color-bi-text-normal; +} + +.bi-theme-dark { + .bi-card { + background-color: @color-bi-background-default-theme-dark; + color: @color-bi-text-theme-dark; + } +} + +.bi-disabled { + color: @color-bi-text-disabled; +} + +.bi-theme-dark { + .bi-disabled { + color: @color-bi-text-disabled-theme-dark; + } +} + +//提示区域, 灰色字体 +.bi-tips { + color: @color-bi-text-tips; +} + +//边框 +.bi-border { + border: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + .bi-border { + border: 1px solid @color-bi-border-line-theme-dark; + } +} + +.bi-border-left { + border-left: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + .bi-border-left { + border-left: 1px solid @color-bi-border-line-theme-dark; + } +} + +.bi-border-right { + border-right: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + .bi-border-right { + border-right: 1px solid @color-bi-border-line-theme-dark; + } +} + +.bi-border-top { + border-top: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + .bi-border-top { + border-top: 1px solid @color-bi-border-line-theme-dark; + } +} + +.bi-border-bottom { + border-bottom: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + .bi-border-bottom { + border-bottom: 1px solid @color-bi-border-line-theme-dark; + } +} + //标红 .bi-keyword-red-mark { color: @color-bi-text-redmark; @@ -33,33 +133,46 @@ cursor: text; } -//提示文本, 灰色字体 -.bi-tips { - color: @color-bi-text-tips; +.bi-theme-dark { + .bi-water-mark { + color: @water-mark-color-theme-dark; + } } //resize .bi-resizer { - background: @color-bi-background-virtual-blue; - .opacity(0.8); + background: @color-bi-background-black; + .opacity(0.2); z-index: @zIndex-tip; } +.bi-theme-dark { + .bi-resizer { + background: @color-bi-background-default; + } +} + .bi-z-index-mask { background-color: @color-bi-background-black; .opacity(0.5); } -@color-list-item-hover: #04070d; +.bi-theme-dark { + .bi-z-index-mask { + background-color: @color-bi-background-default; + } +} //只有背景变化 .bi-list-item { &:hover, &.hover { - background-color: @color-bi-background-gray; + background-color: @color-bi-background-normal; + color: @color-bi-text-black; } &.disabled { &, &:hover, &:active { background-color: transparent !important; + color: @color-bi-text-disabled !important; } } } @@ -67,14 +180,48 @@ .bi-theme-dark { .bi-list-item { &:hover, &.hover { - background-color: @color-list-item-hover; + background-color: @color-bi-background-normal-theme-dark; color: @color-bi-text; } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; + } + } + } +} + +//极简 +.bi-list-item-simple { + &:hover, &.hover { + color: @color-bi-text-black; + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled !important; + } + } +} + +.bi-theme-dark { + .bi-list-item-simple { + &:hover, &.hover { + color: @color-bi-text; + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled-theme-dark !important; + } + } } } //文字active时变化 .bi-list-item-effect { + &:hover { + color: @color-bi-text-black; + } &.active, &:active { color: @color-bi-text-highlight; } @@ -87,12 +234,16 @@ .bi-theme-dark { .bi-list-item-effect { + &:hover { + color: @color-bi-text; + } &.active, &:active { color: @color-bi-text-highlight; } &.disabled { &, &:hover, &:active { - color: @color-bi-text-disabled !important; + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; } } } @@ -102,7 +253,7 @@ .bi-list-item-hover { &:hover, &.hover { color: @color-bi-text-highlight; - background-color: @color-bi-background-gray; + background-color: @color-bi-background-normal; } &.disabled { &, &:hover, &:active { @@ -116,11 +267,12 @@ .bi-list-item-hover { &:hover, &.hover { color: @color-bi-text-highlight; - background-color: @color-list-item-hover; + background-color: @color-bi-background-normal-theme-dark; } &.disabled { &, &:hover, &:active { - color: @color-bi-text-disabled !important; + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; } } } @@ -129,15 +281,17 @@ //文字和背景hover和active时变化 .bi-list-item-active { &:hover, &.hover { - background-color: @color-bi-background-gray; + color: @color-bi-text-black; + background-color: @color-bi-background-normal; } &.active, &:active { color: @color-bi-text-highlight; - background-color: @color-bi-background-gray; + background-color: @color-bi-background-normal; } &.disabled { &, &:hover, &:active { background-color: transparent !important; + color: @color-bi-text-disabled !important; } } } @@ -145,12 +299,18 @@ .bi-theme-dark { .bi-list-item-active { &:hover, &.hover { - background-color: @color-list-item-hover; + background-color: @color-bi-background-normal-theme-dark; color: @color-bi-text; } &.active, &:active { color: @color-bi-text-highlight; - background-color: @color-list-item-hover; + background-color: @color-bi-background-normal-theme-dark; + } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; + } } } } @@ -159,7 +319,7 @@ .bi-list-item-select { &:hover, &.hover { color: @color-bi-text-highlight; - background-color: @color-bi-background-gray; + background-color: @color-bi-background-normal; } &:active, &.active { color: @color-bi-text; @@ -183,7 +343,7 @@ .bi-list-item-select { &:hover, &.hover { color: @color-bi-text-highlight; - background-color: @color-list-item-hover; + background-color: @color-bi-background-normal-theme-dark; } &:active, &.active { color: @color-bi-text; @@ -192,5 +352,33 @@ color: @color-bi-text; } } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } + } + } + } +} + +.bi-list-item-choose { + &:active, &.active { + color: @color-bi-text; + background-color: @color-bi-background-highlight; + & .bi-high-light { + color: @color-bi-text; + } + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled !important; + background-color: transparent !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } + } } } \ No newline at end of file diff --git a/src/less/core/utils/pos.less b/src/less/core/utils/pos.less index 6a694d360..67e4fab21 100644 --- a/src/less/core/utils/pos.less +++ b/src/less/core/utils/pos.less @@ -20,8 +20,4 @@ .horizon-left{ text-align: left; -} -.div-horizon-center{ - margin-left: auto; - margin-right: auto; } \ No newline at end of file diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index a5120f52f..f89590aec 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -4,7 +4,9 @@ /****** common color(常用颜色,可用于普遍场景) *****/ //默认字体颜色 -@color-bi-text-black: @font-color-normal; +@color-bi-text-normal: @font-color-normal; +//黑色字体颜色 +@color-bi-text-black: @font-color-black; //深色主题默认字体颜色 @color-bi-text-theme-dark: @font-color-normal-theme-dark; //深灰色字体颜色 @@ -15,6 +17,8 @@ @color-bi-text: @font-color-white; //灰化字体颜色 @color-bi-text-disabled: @font-color-disabled; +//神色主题灰化字体颜色 +@color-bi-text-disabled-theme-dark: @font-color-disabled-theme-dark; //提示字体颜色 @color-bi-text-tips: @font-color-tips; //成功字体颜色 @@ -120,6 +124,10 @@ @color-target-background: @background-color-light-green; @color-dimension-region-border: @border-color-light-blue; @color-target-region-border: @border-color-light-green; +@color-dimension-background-theme-dark: @background-color-light-blue-theme-dark; +@color-target-background-theme-dark: @background-color-light-green-theme-dark; +@color-dimension-region-border-theme-dark: @border-color-light-blue-theme-dark; +@color-target-region-border-theme-dark: @border-color-light-green-theme-dark; //etl operator @color-etl-operator: @background-color-light-blue; @@ -147,8 +155,7 @@ @color-login-info-fields-group-background: @background-color-light-blue; //mask颜色 -@color-bi-button-mask : @color-bi-background-black; - +@color-bi-button-mask: @color-bi-background-black; // 数据连接底色 10种 --start-- @color-bi-data-link-button-color1: @data-link-color1; diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 5cbf49ff1..50ae11399 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -15,14 +15,16 @@ @opacity-20: 0.2; //font color -@font-color-normal: #1a1a1a; -@font-color-normal-theme-dark: #b2b2b2; -@font-color-disabled: #c4c6c6; -@font-color-tips: #c4c6c6; +@font-color-black: #1a1a1a;// +@font-color-normal: #666666;// +@font-color-normal-theme-dark: #cccccc;// +@font-color-disabled: #cccccc;// +@font-color-disabled-theme-dark: #666666;// +@font-color-tips: #999999;// @font-color-dark: #d4dadd; -@font-color-gray: #808080; -@font-color-white: #ffffff; -@font-color-highlight: #009de3; +@font-color-gray: #999999; +@font-color-white: #ffffff;// +@font-color-highlight: #3f8ce8; @font-color-success: #0c6d23; @font-color-warning: #e85050; @font-color-light-gray: #7f7f7f; @@ -31,22 +33,26 @@ //font-icon color @icon-color-normal: #808080; -@icon-color-active: #009de3; +@icon-color-active: #3f8ce8; //background color -@background-color-black: #1a1a1a; +@background-color-black: #1a1a1a;// @background-color-light: #eaeaea; -@background-color-default: #ffffff; -@background-color-default-theme-dark: #202237; -@background-color-normal: #f3f3f3; -@background-color-normal-theme-dark: #191A2C; +@background-color-default: #ffffff;// +@background-color-default-theme-dark: #242640;// +@background-color-normal: #eff1f4;// +@background-color-normal-theme-dark: #191B2B;// @background-color-active: #f4f4f4; -@background-color-highlight: #009de3; +@background-color-highlight: #3f8ce8; @background-color-dark: #d4dadd; @background-color-disabled: #c4c6c6; @background-color-alert: #fddddd; -@background-color-light-blue: #d8f2fd; -@background-color-light-green: #e1f4e7; + +@background-color-light-blue: #d8f2fd;// +@background-color-light-green: #e1f4e7;// +@background-color-light-blue-theme-dark: #008ae9;// +@background-color-light-green-theme-dark: #04b1c2;// + @background-color-orange: #fef6de; @background-color-green: #eefbff; @background-color-yellow: #f9a744; @@ -63,10 +69,10 @@ @border-color-default: #ffffff; @border-color-black: #1a1a1a; @border-color-normal: #d4dadd; -@border-color-line: #eaeaea; -@border-color-line-theme-dark: #24273E; +@border-color-line: #d4dadd; +@border-color-line-theme-dark: #525466; @border-color-main: #d3d9dc; -@border-color-outline: #009de3; +@border-color-outline: #3f8ce8; @border-color-highlight: #178cdf; @border-color-resize: #e85050; @@ -76,21 +82,24 @@ @border-color-error: #f4cbcb; @border-color-normal-success: #eddea2; -@border-color-light-blue: #a3d6e8; -@border-color-light-green: #9fd3ae; +@border-color-light-blue: #d8f2fd;// +@border-color-light-green: #e1f4e7;// +@border-color-light-blue-theme-dark: #008ae9;// +@border-color-light-green-theme-dark: #04b1c2;// @border-color-dark: #c4c6c6; //scroll color -@scroll-color: #f4f4f4; -@scroll-thumb-color: #e2e2e2; -@scroll-thumb-focus-color: #7d7d7d; +@scroll-color: rgba(102,102,102,.05); +@scroll-thumb-color: rgba(102,102,102,.3); +@scroll-thumb-focus-color: rgba(102,102,102,.7); -@scroll-color-theme-dark: rgba(255,255,255,.1); -@scroll-thumb-color-theme-dark: #7d7d7d; -@scroll-thumb-focus-color-theme-dark: #e2e2e2; +@scroll-color-theme-dark: rgba(204,204,204,.05); +@scroll-thumb-color-theme-dark: rgba(204,204,204,.3); +@scroll-thumb-focus-color-theme-dark: rgba(204,204,204,.7); @water-mark-color: #cccccc; +@water-mark-color-theme-dark: #666666; //split color @split-color-light: #eaeaea; diff --git a/src/less/lib/style.less b/src/less/lib/style.less deleted file mode 100644 index 78fc5d37a..000000000 --- a/src/less/lib/style.less +++ /dev/null @@ -1,3 +0,0 @@ -@import "colors"; - -//公共样式类库 diff --git a/src/less/resource/app.less b/src/less/resource/app.less index 220c2f575..ab03dc43b 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -36,7 +36,7 @@ body { left: 0; background-repeat: repeat; .user-select(none); - color: #1a1a1a; + color: @color-bi-text-normal; font: normal 12px "Microsoft YaHei", "Hiragino Sans GB W3"; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -58,44 +58,6 @@ body { overflow-y: hidden; } -a { - outline: none; - text-decoration: none; -} - -a:focus { - outline: 0; -} - -input, -textarea { - margin: 0; - padding: 0; - outline: none; - border: 1px solid #cccccc; -} - -ul, -ol { - margin: 0; - padding: 0; -} - -ul { - list-style: disc; -} - -li { - list-style-type: none; -} - -i { - font-style: normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; -} - div, textarea { &::-webkit-scrollbar { -webkit-appearance: none; @@ -108,7 +70,8 @@ div, textarea { background-color: @scroll-thumb-color; } } -.bi-theme-dark{ + +.bi-theme-dark { div, textarea { &::-webkit-scrollbar { -webkit-appearance: none; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index e22ef19a0..76d813b0a 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -9,7 +9,7 @@ .font-hover-active(close-ha-font, @font-cross); //搜索框中的带有hover后颜色变红的图标 -.font-hover(search-close-h-font, @font-cross, @color-bi-font-native, @color-bi-text-warning); +.font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-warning); .font(trigger-font, @font-arrow-down); .font-hover(trigger-h-font, @font-arrow-down); @@ -32,60 +32,60 @@ /**维度/指标 下拉列表图标字体 ~begin~**/ //删除 -.font(delete-font, @font-delete, @color-bi-text-black); -.font-hover(delete-h-font, @font-delete, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(delete-ha-font, @font-delete, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(delete-e-font, @font-delete, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(delete-font, @font-delete); +.font-hover(delete-h-font, @font-delete); +.font-hover-active(delete-ha-font, @font-delete); +.font-effect(delete-e-font, @font-delete); //子菜单选中 .font(dot-font, @font-dot, @color-bi-text-black); -.font-hover(dot-h-font, @font-dot, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(dot-ha-font, @font-dot, @background-color-default, @color-bi-background-gray, @color-bi-text-black); -.font-effect(dot-e-font, @font-dot, @background-color-default, @color-bi-background-gray, @color-bi-text-highlight, @color-bi-text-black); +.font-hover(dot-h-font, @font-dot, @color-bi-text-black); +.font-hover-active(dot-ha-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-black); +.font-effect(dot-e-font, @font-dot, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight, @color-bi-text-black); //向右展开子菜单 -.font(pull-right-font, @font-right-triangle, @color-bi-text-black); -.font-hover(pull-right-h-font, @font-right-triangle, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(pull-right-ha-font, @font-right-triangle, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(pull-right-e-font, @font-right-triangle, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(pull-right-font, @font-right-triangle); +.font-hover(pull-right-h-font, @font-right-triangle); +.font-hover-active(pull-right-ha-font, @font-right-triangle); +.font-effect(pull-right-e-font, @font-right-triangle); //复制 -.font(copy-font, @font-copy, @color-bi-text-black); -.font-hover(copy-h-font, @font-copy, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(copy-ha-font, @font-copy, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(copy-e-font, @font-copy, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(copy-font, @font-copy); +.font-hover(copy-h-font, @font-copy, @color-bi-text-black); +.font-hover-active(copy-ha-font, @font-copy); +.font-effect(copy-e-font, @font-copy); //选中的字段 -.font(check-mark-font, @font-check-mark, @color-bi-text-black); -.font-hover(check-mark-h-font, @font-check-mark, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(check-mark-ha-font, @font-check-mark, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(check-mark-e-font, @font-check-mark, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(check-mark-font, @font-check-mark); +.font-hover(check-mark-h-font, @font-check-mark); +.font-hover-active(check-mark-ha-font, @font-check-mark); +.font-effect(check-mark-e-font, @font-check-mark); //指标来自 -.font(dimension-from-font, @font-dimension-from, @color-bi-text-black); -.font-hover(dimension-from-h-font, @font-dimension-from, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(dimension-from-ha-font, @font-dimension-from, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(dimension-from-e-font, @font-dimension-from, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(dimension-from-font, @font-dimension-from); +.font-hover(dimension-from-h-font, @font-dimension-from); +.font-hover-active(dimension-from-ha-font, @font-dimension-from); +.font-effect(dimension-from-e-font, @font-dimension-from); //图表类型选择 -.font(chart-type-font, @font-chart-type, @color-bi-text-black); -.font-hover(chart-type-h-font, @font-chart-type, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(chart-type-ha-font, @font-chart-type, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(chart-type-e-font, @font-chart-type, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(chart-type-font, @font-chart-type); +.font-hover(chart-type-h-font, @font-chart-type); +.font-hover-active(chart-type-ha-font, @font-chart-type); +.font-effect(chart-type-e-font, @font-chart-type); //样式设置 -.font(style-set-font, @font-style-set, @color-bi-text-black); -.font-hover(style-set-h-font, @font-style-set, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(style-set-ha-font, @font-style-set, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(style-set-e-font, @font-style-set, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font(style-set-font, @font-style-set); +.font-hover(style-set-h-font, @font-style-set); +.font-hover-active(style-set-ha-font, @font-style-set); +.font-effect(style-set-e-font, @font-style-set); //超级链接 .font(hyper-link-font, @font-href); //过滤 .font(filter-font, @font-filter); -.font-hover(filter-h-font, @font-filter, @color-bi-text-black, @color-bi-text-black); -.font-hover-active(filter-ha-font, @font-filter, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); -.font-effect(filter-e-font, @font-filter, @color-bi-text-black, @color-bi-text-black, @color-bi-text-highlight); +.font-hover(filter-h-font, @font-filter); +.font-hover-active(filter-ha-font, @font-filter); +.font-effect(filter-e-font, @font-filter); //维度过滤 .font(classify-font, @font-classify, @color-bi-text-highlight); @@ -107,10 +107,10 @@ .font(tree-node-triangle-collapse-font, @font-right-triangle); //翻页按钮字体图标 -.font-hover(row-pre-page-h-font, @font-solid-left, @color-bi-text-black, @color-bi-text-black); -.font-hover(row-next-page-h-font, @font-solid-right, @color-bi-text-black, @color-bi-text-black); -.font-hover(column-pre-page-h-font, @font-solid-top, @color-bi-text-black, @color-bi-text-black); -.font-hover(column-next-page-h-font, @font-solid-bottom, @color-bi-text-black, @color-bi-text-black); +.font-hover(row-pre-page-h-font, @font-solid-left); +.font-hover(row-next-page-h-font, @font-solid-right); +.font-hover(column-pre-page-h-font, @font-solid-top); +.font-hover(column-next-page-h-font, @font-solid-bottom); //下拉框小小三角 .font-hover-active(trigger-triangle-font, @font-no-sort-no-filter, @color-bi-text-gray, @color-bi-text-gray, @color-bi-text-highlight); @@ -183,10 +183,10 @@ .font(move2group-add-font, @font-add, @color-bi-text-highlight); //选择字段 -.font-hover-active(select-data-field-calc-font, @font-field-calc, @color-bi-text-black, @color-bi-text-black, @color-bi-text); -.font-hover-active(select-data-field-string-font, @font-field-string, @color-bi-text-black, @color-bi-text-black, @color-bi-text); -.font-hover-active(select-data-field-number-font, @font-field-number, @color-bi-text-black, @color-bi-text-black, @color-bi-text); -.font-hover-active(select-data-field-date-font, @font-field-date, @color-bi-text-black, @color-bi-text-black, @color-bi-text); +.font-hover-active(select-data-field-calc-font, @font-field-calc, inherit, inherit, @color-bi-text); +.font-hover-active(select-data-field-string-font, @font-field-string, inherit, inherit, @color-bi-text); +.font-hover-active(select-data-field-number-font, @font-field-number, inherit, inherit, @color-bi-text); +.font-hover-active(select-data-field-date-font, @font-field-date, inherit, inherit, @color-bi-text); .font(select-data-field-string-group-font, @font-field-string); .font(select-data-field-number-group-font, @font-field-number); .font(select-data-field-date-group-font, @font-field-date); @@ -196,9 +196,9 @@ .font-hover(detail-real-data-warning-font, @font-warning, @color-bi-text-redmark, @color-bi-text-redmark); //数据配置分组统计中的选择字段 -.font-hover-active(select-group-field-string-font, @font-field-string, @font-color-highlight, @font-color-highlight, @font-color-highlight); -.font-hover-active(select-group-field-number-font, @font-field-number, @font-color-highlight, @font-color-highlight, @font-color-highlight); -.font-hover-active(select-group-field-date-font, @font-field-date, @font-color-highlight, @font-color-highlight, @font-color-highlight); +.font-hover-active(select-group-field-string-font, @font-field-string, @color-bi-text-highlight, @color-bi-text-highlight, @color-bi-text-highlight); +.font-hover-active(select-group-field-number-font, @font-field-number, @color-bi-text-highlight, @color-bi-text-highlight, @color-bi-text-highlight); +.font-hover-active(select-group-field-date-font, @font-field-date, @color-bi-text-highlight, @color-bi-text-highlight, @color-bi-text-highlight); //详细设置 .font-hover(dashboard-widget-combo-detail-set-font, @font-detail-set); @@ -209,15 +209,15 @@ .font(sortable-font, @font-sortable); //文本控件 -.font(text-bold-font, @font-bold, @font-color-normal); -.font(text-italic-font, @font-italic, @font-color-normal); -.font(text-underline-font, @font-underline, @font-color-normal); -.font(text-color-font, @font-color, @font-color-normal); -.font(text-background-font, @font-background, @font-color-normal); -.font(text-color-underline-font, @font-color-underline, ""); -.font(text-align-left-font, @font-align-left, @font-color-normal); -.font(text-align-center-font, @font-align-center, @font-color-normal); -.font(text-align-right-font, @font-align-right, @font-color-normal); +.font(text-bold-font, @font-bold); +.font(text-italic-font, @font-italic); +.font(text-underline-font, @font-underline); +.font(text-color-font, @font-color); +.font(text-background-font, @font-background); +.font(text-color-underline-font, @font-color-underline); +.font(text-align-left-font, @font-align-left); +.font(text-align-center-font, @font-align-center); +.font(text-align-right-font, @font-align-right); //图片控件 .font(img-upload-font, @font-upload, @icon-color-active); @@ -246,12 +246,12 @@ .font(refresh-table-font, @font-refresh); .font(recover-chart-font-hightlight, @font-recover-chart, @color-bi-text-highlight); -.font-hover-active(tables-tile-view-font, @font-tile-view, @color-bi-font-native, @color-bi-font-hover, @color-bi-text); -.font-hover-active(tables-relation-view-font, @font-relation-view, @color-bi-font-native, @color-bi-font-hover, @color-bi-text); +.font-hover-active(tables-tile-view-font, @font-tile-view, inherit, inherit, @color-bi-text); +.font-hover-active(tables-relation-view-font, @font-relation-view, inherit, inherit, @color-bi-text); .font(add-new-table-pull-down-font, @font-down, @color-bi-text); -.font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-font-active); +.font-hover-active(data-link-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-text-highlight); //点击编辑 .font-hover(edit-set-font, @font-detail-set); @@ -261,24 +261,24 @@ .font-hover(data-config-font, @font-database, @color-bi-text, @color-bi-text); //切换文件夹视图 -.font-hover-active(folder-list-view, @font-classify, @color-bi-font-native, @color-bi-font-native, @color-bi-text); -.font-hover-active(folder-card-view, @font-tile-view, @color-bi-font-native, @color-bi-font-native, @color-bi-text); +.font-hover-active(folder-list-view, @font-classify, inherit, inherit, @color-bi-text); +.font-hover-active(folder-card-view, @font-tile-view, inherit, inherit, @color-bi-text); .font-hover-active(item-check-font, @font-check-mark, @color-bi-text, @color-bi-background-gray, @color-bi-font-active); //表格上面的相关操作——升序、降序、不排序、过滤 -.font-hover(table-no-sort-no-filter-font, @font-no-sort-no-filter, "", ""); -.font-hover(table-no-sort-filter-font, @font-no-sort-filter, "", ""); -.font-hover(table-descending-filter-font, @font-descending-filter, "", ""); -.font-hover(table-ascending-filter-font, @font-ascending-filter, "", ""); -.font-hover(table-descending-no-filter-font, @font-descending-no-filter, "", ""); -.font-hover(table-ascending-no-filter-font, @font-ascending-no-filter, "", ""); -.font-hover(table-no-sort-font, @font-no-sort, "", ""); +.font-hover(table-no-sort-no-filter-font, @font-no-sort-no-filter); +.font-hover(table-no-sort-filter-font, @font-no-sort-filter); +.font-hover(table-descending-filter-font, @font-descending-filter); +.font-hover(table-ascending-filter-font, @font-ascending-filter); +.font-hover(table-descending-no-filter-font, @font-descending-no-filter); +.font-hover(table-ascending-no-filter-font, @font-ascending-no-filter); +.font-hover(table-no-sort-font, @font-no-sort); -.font-hover(primary-key-font, @font-key, @color-bi-font-native, @color-bi-font-hover); +.font-hover(primary-key-font, @font-key); -.font-hover-active(table-open-row-style-font, @font-table-row-open, @color-bi-font-native, @color-bi-font-hover, @color-bi-font-active); -.font-hover-active(table-open-col-style-font, @font-table-col-open, @color-bi-font-native, @color-bi-font-hover, @color-bi-font-active); +.font-hover-active(table-open-row-style-font, @font-table-row-open); +.font-hover-active(table-open-col-style-font, @font-table-col-open); //气泡图计算函数 .font(calculate-function-font, @font-field-calc, @font-color-normal); @@ -309,7 +309,7 @@ .font(target-style-equal-arrow-font, @font-mark-equal, @color-target-style-equal); .font(target-style-more-arrow-font, @font-mark-up-arrow, @color-target-style-more); -.font(calculate-target-font, @font-field-calc, @color-bi-text-black); +.font(calculate-target-font, @font-field-calc); .font(task-list-font, @font-classify, @color-bi-text-highlight); @@ -334,13 +334,13 @@ .font(widget-combo-des-font, @font-des); .font(widget-combo-clear-font, @font-clear); -.font-hover(detail-table-popup-font, @font-hellip, @color-bi-font-native, @color-bi-font-active); +.font-hover(detail-table-popup-font, @font-hellip, inherit, @color-bi-font-active); -.font(chart-drill-up, @font-top-triangle, ""); -.font(chart-drill-down, @font-down-triangle, ""); +.font(chart-drill-up, @font-top-triangle); +.font(chart-drill-down, @font-down-triangle); -.font(report-filter-open-font, @font-report-filter-open, @color-bi-font-native); -.font(report-filter-close-font, @font-report-filter-close, @color-bi-font-native); +.font(report-filter-open-font, @font-report-filter-open); +.font(report-filter-close-font, @font-report-filter-close); .font(report-apply-hangout-normal-font, @font-apply-hangout, @color-bi-text-gray); .font(report-apply-hangout-ing-font, @font-apply-hangout, @color-bi-text-highlight); @@ -352,8 +352,8 @@ .font(delete-font-package, @font-delete, @color-bi-text-warning); .font(delete-h-font-package, @font-delete, @color-bi-text-warning); .font(rename-font-package, @font-rename, @color-bi-text-highlight); -.font(package-selected-font, @font-check-box-selected, @color-bi-border-highlight); -.font(package-not-selected-font, @font-check-box-not-selected, @color-bi-border-highlight); +.font(package-selected-font, @font-check-box-selected, @color-bi-text-highlight); +.font(package-not-selected-font, @font-check-box-not-selected, @color-bi-text-highlight); .font(report-detail-info-font, @font-info, @color-bi-text-redmark); .font(report-rename-font, @font-rename-edit, @color-bi-background-success); diff --git a/src/less/resource/normal.less b/src/less/resource/normal.less new file mode 100644 index 000000000..6e49bb107 --- /dev/null +++ b/src/less/resource/normal.less @@ -0,0 +1,51 @@ +@import "../bibase"; + +html, body, div, ul, li, img, a, span, p, * { + margin: 0; + padding: 0; +} + +a { + outline: none; + text-decoration: none; +} + +a:focus { + outline: 0; +} + +input, +textarea { + margin: 0; + padding: 0; + outline: none; + border: 1px solid @color-bi-border-line; +} + +.bi-theme-dark { + input, + textarea { + border: 1px solid @color-bi-border-line-theme-dark; + } +} + +ul, +ol { + margin: 0; + padding: 0; +} + +ul { + list-style: disc; +} + +li { + list-style-type: none; +} + +i { + font-style: normal; + -webkit-font-smoothing: antialiased; + -webkit-text-stroke-width: 0.2px; + -moz-osx-font-smoothing: grayscale; +} \ No newline at end of file diff --git a/src/less/base/tree/display.tree.less b/src/less/resource/third/ztree/display.tree.less similarity index 66% rename from src/less/base/tree/display.tree.less rename to src/less/resource/third/ztree/display.tree.less index 23bdbcf94..2cecf9672 100644 --- a/src/less/base/tree/display.tree.less +++ b/src/less/resource/third/ztree/display.tree.less @@ -1,19 +1,19 @@ -@import "../../bibase"; +@import "../../../bibase"; .bi-display-tree{ .ztree * { color: @color-bi-text-gray; } & .ztree li span.button.switch.center_open{ - background-image:url("icon/tree-vertical-line-3.png"); + background-image:url("@{imageUrl}/icon/tree-vertical-line-3.png"); } & .ztree li span.button.switch.roots_open{ - background-image:url("icon/tree-vertical-line-2.png"); + background-image:url("@{imageUrl}/icon/tree-vertical-line-2.png"); } & .ztree li span.button.switch.bottom_open{ - background-image:url("icon/tree-vertical-line-4.png"); + background-image:url("@{imageUrl}/icon/tree-vertical-line-4.png"); } & .ztree li a, & .ztree li span{ cursor: default !important; diff --git a/src/less/widget/arrangement/arrangement.block.less b/src/less/widget/arrangement/arrangement.block.less index c8ce41699..b9fe6d143 100644 --- a/src/less/widget/arrangement/arrangement.block.less +++ b/src/less/widget/arrangement/arrangement.block.less @@ -1,6 +1,4 @@ @import "../../bibase"; -.bi-arrangement-block{ - background:@color-bi-background-failure; - .opacity(0.8); +.bi-arrangement-block { } \ No newline at end of file diff --git a/src/less/widget/arrangement/arrangement.less b/src/less/widget/arrangement/arrangement.less index 9653725ad..ba07469ef 100644 --- a/src/less/widget/arrangement/arrangement.less +++ b/src/less/widget/arrangement/arrangement.less @@ -2,7 +2,6 @@ .bi-arrangement { & .arrangement-helper { - border: 1px solid @color-bi-border-normal; background: @color-bi-background-highlight; z-index: @zIndex-tip; } diff --git a/src/less/widget/date/trigger.date.less b/src/less/widget/date/trigger.date.less index 0c889d3fb..f146d3087 100644 --- a/src/less/widget/date/trigger.date.less +++ b/src/less/widget/date/trigger.date.less @@ -1,6 +1,5 @@ @import "../../bibase"; .bi-date-trigger { - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/less/widget/downlist/combo.downlist.less b/src/less/widget/downlist/combo.downlist.less index 1c9c95f5b..d9bab1375 100644 --- a/src/less/widget/downlist/combo.downlist.less +++ b/src/less/widget/downlist/combo.downlist.less @@ -1,11 +1,8 @@ @import "../../bibase"; - - -.bi-down-list-combo{ - & .down-list-group{ +.bi-down-list-combo { + & .down-list-group { } - & .bi-down-list-spliter{ - border-top: 1px solid @color-bi-split-light; + & .bi-down-list-spliter { } } \ No newline at end of file diff --git a/src/less/widget/exceltable/exceltable.header.cell.less b/src/less/widget/exceltable/exceltable.header.cell.less index 470796711..8605057f8 100644 --- a/src/less/widget/exceltable/exceltable.header.cell.less +++ b/src/less/widget/exceltable/exceltable.header.cell.less @@ -2,5 +2,4 @@ .bi-excel-table-header-cell { font-weight: bold; - background-color: @color-bi-background-light; } \ No newline at end of file diff --git a/src/less/widget/exceltable/exceltable.less b/src/less/widget/exceltable/exceltable.less index 00157e766..fba776e80 100644 --- a/src/less/widget/exceltable/exceltable.less +++ b/src/less/widget/exceltable/exceltable.less @@ -4,4 +4,12 @@ & > div.bottom-right > div > div > table { border-right: 1px solid @color-bi-border-line; } +} + +.bi-theme-dark { + .bi-excel-table { + & > div.bottom-right > div > div > table { + border-right: 1px solid @color-bi-border-line-theme-dark; + } + } } \ No newline at end of file diff --git a/src/less/widget/filemanager/items/item.file.filemanager.less b/src/less/widget/filemanager/items/item.file.filemanager.less index 3eac6a1b3..4b906d1eb 100644 --- a/src/less/widget/filemanager/items/item.file.filemanager.less +++ b/src/less/widget/filemanager/items/item.file.filemanager.less @@ -1,5 +1,4 @@ @import "../../../bibase"; .bi-file-manager-file-item{ - border-bottom: 1px solid @color-bi-border-normal; } \ No newline at end of file diff --git a/src/less/widget/filemanager/items/item.folder.filemanager.less b/src/less/widget/filemanager/items/item.folder.filemanager.less index dc38b2a1a..fdf1942de 100644 --- a/src/less/widget/filemanager/items/item.folder.filemanager.less +++ b/src/less/widget/filemanager/items/item.folder.filemanager.less @@ -1,5 +1,4 @@ @import "../../../bibase"; .bi-file-manager-folder-item{ - border-bottom: 1px solid @color-bi-border-normal; } \ No newline at end of file diff --git a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less index 072a1c56d..64361afd7 100644 --- a/src/less/widget/filemanager/nav/button/button.nav.filemanager.less +++ b/src/less/widget/filemanager/nav/button/button.nav.filemanager.less @@ -1,15 +1,28 @@ @import "../../../../bibase"; -.bi-file-manager-nav-button{ - & .file-manager-nav-button-text{ +.bi-file-manager-nav-button { + & .file-manager-nav-button-text { max-width: 200px; - background: @background-color-default; - &.active{ - background-color: @color-bi-background-gray; + background: @color-bi-background-default; + &.active { + background-color: @color-bi-background-normal; color: @color-bi-text-gray; } } - & .file-manager-nav-button-triangle{ + & .file-manager-nav-button-triangle { z-index: 1; } +} + +.bi-theme-dark { + .bi-file-manager-nav-button { + & .file-manager-nav-button-text { + background: @color-bi-background-default-theme-dark; + &.active { + background-color: @color-bi-background-normal-theme-dark; + color: @color-bi-text-gray; + } + } + } + } \ No newline at end of file diff --git a/src/less/widget/filemanager/nav/nav.filemanager.less b/src/less/widget/filemanager/nav/nav.filemanager.less index 5db4f1452..5236a2634 100644 --- a/src/less/widget/filemanager/nav/nav.filemanager.less +++ b/src/less/widget/filemanager/nav/nav.filemanager.less @@ -1,5 +1,4 @@ @import "../../../bibase"; .bi-file-manager-nav{ - border-left: 1px solid @color-bi-border-normal; } \ No newline at end of file diff --git a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less index 4cb593f27..c9cf37355 100644 --- a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less +++ b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less @@ -1,14 +1,9 @@ @import "../../bibase"; .bi-fine-tuning-number-editor { - border: 1px solid @border-color-normal; .border-radius(2px); & .top-button { - border-left: 1px solid @border-color-normal; - border-bottom: 1px solid @border-color-normal; } & .bottom-button { - border-top: 1px solid @border-color-normal; - border-left: 1px solid @border-color-normal; } } \ No newline at end of file diff --git a/src/less/widget/image/button/size/image.button.size.less b/src/less/widget/image/button/size/image.button.size.less index 86230484d..b81543839 100644 --- a/src/less/widget/image/button/size/image.button.size.less +++ b/src/less/widget/image/button/size/image.button.size.less @@ -2,6 +2,5 @@ .bi-image-button-size{ & .image-button-size-button-group{ font-size: @font-size-12; - color: @font-color-normal; } } \ No newline at end of file diff --git a/src/less/widget/image/button/upload.less b/src/less/widget/image/button/upload.less deleted file mode 100644 index b32eb7edc..000000000 --- a/src/less/widget/image/button/upload.less +++ /dev/null @@ -1 +0,0 @@ -@import "../../../bibase"; \ No newline at end of file diff --git a/src/less/widget/image/uploadimage.less b/src/less/widget/image/uploadimage.less index 0f56fde36..e94358612 100644 --- a/src/less/widget/image/uploadimage.less +++ b/src/less/widget/image/uploadimage.less @@ -8,11 +8,9 @@ & .upload-image-icon-button{ z-index: 1; font-size: @font-size-16; - background-color: @color-bi-background-default; } & .upload-image-delete-label{ font-size: @font-size-14; - color: @font-color-normal; } } \ No newline at end of file diff --git a/src/less/widget/month/trigger.month.less b/src/less/widget/month/trigger.month.less index 883c3248f..73e333fcc 100644 --- a/src/less/widget/month/trigger.month.less +++ b/src/less/widget/month/trigger.month.less @@ -1,5 +1,4 @@ @import "../../bibase"; .bi-month-trigger{ - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/less/widget/multiselect/check/multiselect.check.pane.less b/src/less/widget/multiselect/check/multiselect.check.pane.less index 004a5924a..f21ee143d 100644 --- a/src/less/widget/multiselect/check/multiselect.check.pane.less +++ b/src/less/widget/multiselect/check/multiselect.check.pane.less @@ -1,15 +1,8 @@ @import "../../../bibase"; .bi-multi-select-check-pane { - background-color: @color-bi-background-gray; & .multi-select-check-selected { color: @color-bi-text-highlight; text-decoration: underline; } -} - -.bi-theme-dark { - .bi-multi-select-check-pane { - background-color: @color-bi-background-normal-theme-dark; - } } \ No newline at end of file diff --git a/src/less/widget/multiselect/check/multiselect.display.less b/src/less/widget/multiselect/check/multiselect.display.less index 884998652..ba90171ed 100644 --- a/src/less/widget/multiselect/check/multiselect.display.less +++ b/src/less/widget/multiselect/check/multiselect.display.less @@ -2,6 +2,5 @@ .bi-display-list { & .display-list-item { - color: @color-bi-text-gray; } } \ No newline at end of file diff --git a/src/less/widget/multiselect/multiselect.combo.less b/src/less/widget/multiselect/multiselect.combo.less index 3ebb3fc47..6594aadb7 100644 --- a/src/less/widget/multiselect/multiselect.combo.less +++ b/src/less/widget/multiselect/multiselect.combo.less @@ -2,7 +2,6 @@ .bi-multi-select-combo{ & .multi-select-trigger-icon-button{ - border-left: 1px solid @color-bi-border-normal; font-size: 16px; } } \ No newline at end of file diff --git a/src/less/widget/multiselect/multiselect.popup.view.less b/src/less/widget/multiselect/multiselect.popup.view.less index deba5ba42..3ecfed59b 100644 --- a/src/less/widget/multiselect/multiselect.popup.view.less +++ b/src/less/widget/multiselect/multiselect.popup.view.less @@ -2,7 +2,4 @@ .bi-multi-select-popup-view{ - & .multi-select-no-toolbar{ - color:@font-color-disabled - } } \ No newline at end of file diff --git a/src/less/widget/multiselect/multiselect.trigger.less b/src/less/widget/multiselect/multiselect.trigger.less index 1d68ba7f5..f2afecb9f 100644 --- a/src/less/widget/multiselect/multiselect.trigger.less +++ b/src/less/widget/multiselect/multiselect.trigger.less @@ -1,6 +1,5 @@ @import "../../bibase"; -.bi-multi-select-trigger{ - border: 1px solid @color-bi-border-normal; - .border-corner-radius(2px, 2px, 2px, 2px); +.bi-multi-select-trigger { + .border-corner-radius(2px, 2px, 2px, 2px); } \ No newline at end of file diff --git a/src/less/widget/multiselect/search/multiselect.search.pane.less b/src/less/widget/multiselect/search/multiselect.search.pane.less index 73e42e967..064ea8b61 100644 --- a/src/less/widget/multiselect/search/multiselect.search.pane.less +++ b/src/less/widget/multiselect/search/multiselect.search.pane.less @@ -2,7 +2,6 @@ .bi-multi-select-search-pane{ - background:@color-bi-background-default; .multi-select-toolbar{ color: @color-bi-text-warning; } diff --git a/src/less/widget/multiselect/trigger/button.checkselected.less b/src/less/widget/multiselect/trigger/button.checkselected.less index 2e4cbd59e..4337936fa 100644 --- a/src/less/widget/multiselect/trigger/button.checkselected.less +++ b/src/less/widget/multiselect/trigger/button.checkselected.less @@ -1,15 +1,6 @@ @import "../../../bibase"; .bi-multi-select-check-selected-button { - border: 1px solid @color-bi-text-highlight; - .border-corner-radius(8px, 8px, 8px, 8px); color: @color-bi-text-highlight; - background-color: @color-bi-background-default; z-index: 1; } - -.bi-theme-dark { - .bi-multi-select-check-selected-button { - background-color: @color-bi-background-normal-theme-dark; - } -} \ No newline at end of file diff --git a/src/less/widget/multistringlist/multistringlist.less b/src/less/widget/multistringlist/multistringlist.less index 0d10f755c..4610336cf 100644 --- a/src/less/widget/multistringlist/multistringlist.less +++ b/src/less/widget/multistringlist/multistringlist.less @@ -1,8 +1,5 @@ @import "../../bibase"; .bi-multi-string-list{ & .popup-multi-string-list{ - border-left: 1px solid @color-bi-border-normal; - border-right: 1px solid @color-bi-border-normal; - border-bottom: 1px solid @color-bi-border-normal; } } \ No newline at end of file diff --git a/src/less/widget/multitree/check/multi.tree.check.pane.less b/src/less/widget/multitree/check/multi.tree.check.pane.less index 93ac62973..f52dc73f3 100644 --- a/src/less/widget/multitree/check/multi.tree.check.pane.less +++ b/src/less/widget/multitree/check/multi.tree.check.pane.less @@ -1,12 +1,9 @@ @import "../../../bibase"; - -.bi-multi-tree-check-pane{ - background-color: @color-bi-background-gray; - & .multi-tree-continue-select{ - background-color: @color-bi-background-gray; +.bi-multi-tree-check-pane { + & .multi-tree-continue-select { } - & .multi-tree-check-selected{ + & .multi-tree-check-selected { color: @color-bi-text-highlight; } } \ No newline at end of file diff --git a/src/less/widget/multitree/display.multi.tree.less b/src/less/widget/multitree/display.multi.tree.less index 01dd64b22..0d31ac4df 100644 --- a/src/less/widget/multitree/display.multi.tree.less +++ b/src/less/widget/multitree/display.multi.tree.less @@ -1,5 +1,4 @@ @import "../../bibase"; .bi-multi-tree-display{ - background-color: @color-bi-background-gray; } \ No newline at end of file diff --git a/src/less/widget/multitree/multi.tree.combo.less b/src/less/widget/multitree/multi.tree.combo.less index 83de855f4..9cd2c3d91 100644 --- a/src/less/widget/multitree/multi.tree.combo.less +++ b/src/less/widget/multitree/multi.tree.combo.less @@ -2,7 +2,6 @@ .bi-multi-tree-combo{ & .multi-select-trigger-icon-button{ - border-left: 1px solid @color-bi-border-normal; font-size: 16px; } } \ No newline at end of file diff --git a/src/less/widget/multitree/multi.tree.trigger.less b/src/less/widget/multitree/multi.tree.trigger.less deleted file mode 100644 index a132b0fc9..000000000 --- a/src/less/widget/multitree/multi.tree.trigger.less +++ /dev/null @@ -1,18 +0,0 @@ -@import "../../bibase"; - -.bi-multi-tree-trigger{ - border: 1px solid @color-bi-border-normal; - .border-corner-radius(2px, 2px, 2px, 2px); - & .trigger-check-selected{ - border: 1px solid @color-bi-text-highlight; - .border-corner-radius(8px, 8px, 8px, 8px); - color: @color-bi-text-highlight; - background-color: @color-bi-background-default; - z-index: 1; - } - - & .trigger-icon-button{ - border-left: 1px solid @color-bi-border-normal; - font-size: 16px; - } -} \ No newline at end of file diff --git a/src/less/widget/multitree/search.multi.tree.less b/src/less/widget/multitree/search.multi.tree.less index 04edbd5e9..88134d18e 100644 --- a/src/less/widget/multitree/search.multi.tree.less +++ b/src/less/widget/multitree/search.multi.tree.less @@ -1,6 +1,4 @@ @import "../../bibase"; - -.bi-multi-tree-search-pane{ - background: @color-bi-background-default; +.bi-multi-tree-search-pane { } \ No newline at end of file diff --git a/src/less/widget/multitree/trigger.multi.tree.less b/src/less/widget/multitree/trigger.multi.tree.less deleted file mode 100644 index a132b0fc9..000000000 --- a/src/less/widget/multitree/trigger.multi.tree.less +++ /dev/null @@ -1,18 +0,0 @@ -@import "../../bibase"; - -.bi-multi-tree-trigger{ - border: 1px solid @color-bi-border-normal; - .border-corner-radius(2px, 2px, 2px, 2px); - & .trigger-check-selected{ - border: 1px solid @color-bi-text-highlight; - .border-corner-radius(8px, 8px, 8px, 8px); - color: @color-bi-text-highlight; - background-color: @color-bi-background-default; - z-index: 1; - } - - & .trigger-icon-button{ - border-left: 1px solid @color-bi-border-normal; - font-size: 16px; - } -} \ No newline at end of file diff --git a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less index 2049bc2c9..234e23320 100644 --- a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less +++ b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less @@ -2,10 +2,7 @@ .bi-multi-tree-check-selected-button { & .trigger-check-selected{ - border: 1px solid @color-bi-text-highlight; - .border-corner-radius(8px, 8px, 8px, 8px); color: @color-bi-text-highlight; - background-color: @color-bi-background-default; z-index: 1; } } \ No newline at end of file diff --git a/src/less/widget/multitreelist/multitreelist.popup.less b/src/less/widget/multitreelist/multitreelist.popup.less index 741c1fc2b..7b76d078e 100644 --- a/src/less/widget/multitreelist/multitreelist.popup.less +++ b/src/less/widget/multitreelist/multitreelist.popup.less @@ -1,7 +1,4 @@ @import "../../bibase"; .bi-tree-list-popup { - border-left: 1px solid @color-bi-border-normal; - border-right: 1px solid @color-bi-border-normal; - border-bottom: 1px solid @color-bi-border-normal; } \ No newline at end of file diff --git a/src/less/widget/numericalinterval/numericalinterval.less b/src/less/widget/numericalinterval/numericalinterval.less index 90bf571a4..e72313b47 100644 --- a/src/less/widget/numericalinterval/numericalinterval.less +++ b/src/less/widget/numericalinterval/numericalinterval.less @@ -2,19 +2,12 @@ .bi-numerical-interval { & .numerical-interval-small-editor { - border-top: 1px solid @color-bi-border-normal; - border-bottom: 1px solid @color-bi-border-normal; - border-left: 1px solid @color-bi-border-normal; .border-corner-left-radius(2px, 2px); } & .numerical-interval-big-editor { - border-top: 1px solid @color-bi-border-normal; - border-bottom: 1px solid @color-bi-border-normal; - border-right: 1px solid @color-bi-border-normal; .border-corner-right-radius(2px, 2px); } & .numerical-interval-big-combo { - border: 1px solid @color-bi-border-normal; .border-corner-left-radius(2px, 2px); & .bi-icon-combo-trigger { & .icon-combo-trigger-icon { @@ -24,7 +17,6 @@ } & .numerical-interval-small-combo { - border: 1px solid @color-bi-border-normal; .border-corner-right-radius(2px, 2px); & .bi-icon-combo-trigger { & .icon-combo-trigger-icon { diff --git a/src/less/widget/numericalinterval/popup.numericalinterval.less b/src/less/widget/numericalinterval/popup.numericalinterval.less index 9fbdae27f..5991f8bfe 100644 --- a/src/less/widget/numericalinterval/popup.numericalinterval.less +++ b/src/less/widget/numericalinterval/popup.numericalinterval.less @@ -1,13 +1,4 @@ @import "../../bibase"; .bi-numerical-interval-popup{ - & .numerical-interval-popup-item{ - &.hover, &:hover{ - background-color: @color-bi-background-gray; - } - &.active, &:active{ - background-color: @color-bi-background-gray; - color: @color-bi-text-highlight; - } - } } \ No newline at end of file diff --git a/src/less/widget/pathchooser/pathregion.less b/src/less/widget/pathchooser/pathregion.less index c2704012b..a8aea70eb 100644 --- a/src/less/widget/pathchooser/pathregion.less +++ b/src/less/widget/pathchooser/pathregion.less @@ -1,14 +1,7 @@ @import "../../bibase"; .bi-path-region { - background: @color-bi-background-light; & .path-region-label { z-index: 1; - background: @color-bi-background-default; - border: 1px solid @color-bi-border-default; - &.active{ - background: @color-bi-background-highlight; - color: @color-bi-text; - } } } \ No newline at end of file diff --git a/src/less/widget/previewtable/previewtable.less b/src/less/widget/previewtable/previewtable.less index b5926366a..a79308804 100644 --- a/src/less/widget/previewtable/previewtable.less +++ b/src/less/widget/previewtable/previewtable.less @@ -3,7 +3,17 @@ .bi-preview-table { & > div > table, & > div > div > div > table { & > thead > tr.odd { - background-color: @color-bi-background-light; + background-color: @color-bi-background-normal; + } + } +} + +.bi-theme-dark { + .bi-preview-table { + & > div > table, & > div > div > div > table { + & > thead > tr.odd { + background-color: @color-bi-background-normal-theme-dark; + } } } } \ No newline at end of file diff --git a/src/less/widget/quarter/trigger.quarter.less b/src/less/widget/quarter/trigger.quarter.less index 37dceed98..7b6732cc7 100644 --- a/src/less/widget/quarter/trigger.quarter.less +++ b/src/less/widget/quarter/trigger.quarter.less @@ -1,5 +1,4 @@ @import "../../bibase"; .bi-quarter-trigger{ - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/less/widget/relationview/relationview.item.less b/src/less/widget/relationview/relationview.item.less index 687357034..bdb355dd8 100644 --- a/src/less/widget/relationview/relationview.item.less +++ b/src/less/widget/relationview/relationview.item.less @@ -1,8 +1,4 @@ @import "../../bibase"; .bi-relation-view-item{ - &.active{ - color: @color-bi-text; - background-color: @color-bi-background-highlight; - } } \ No newline at end of file diff --git a/src/less/widget/relationview/relationview.region.less b/src/less/widget/relationview/relationview.region.less index 06a8d89b9..c1478a0bb 100644 --- a/src/less/widget/relationview/relationview.region.less +++ b/src/less/widget/relationview/relationview.region.less @@ -1,16 +1,13 @@ @import "../../bibase"; -.bi-relation-view-region{ - & .relation-view-region-container{ - background: @color-bi-background-default; - border: 1px solid @color-bi-border-normal; - &.other-package{ - border: 1px dashed @color-bi-border-normal; +.bi-relation-view-region { + & .relation-view-region-container { + &.other-package { + border-style: dashed; } z-index: 1; .border-radius(2px); - & .relation-view-region-title{ - border-bottom: 1px solid @color-bi-border-normal; + & .relation-view-region-title { } } } \ No newline at end of file diff --git a/src/less/widget/sequencetable/dynamicnumber.sequencetable.less b/src/less/widget/sequencetable/dynamicnumber.sequencetable.less index e324a582e..dd6be53db 100644 --- a/src/less/widget/sequencetable/dynamicnumber.sequencetable.less +++ b/src/less/widget/sequencetable/dynamicnumber.sequencetable.less @@ -4,12 +4,8 @@ & .sequence-table-title-cell { .overflow-hidden(); .box-sizing(border-box); - border: 1px solid @color-bi-border-line; } & .sequence-table-number-cell { .box-sizing(border-box); - border-left: 1px solid @color-bi-border-line; - border-right: 1px solid @color-bi-border-line; - border-bottom: 1px solid @color-bi-border-line; } } \ No newline at end of file diff --git a/src/less/widget/sequencetable/listnumber.sequencetable.less b/src/less/widget/sequencetable/listnumber.sequencetable.less index bd9ad53a1..3180f138c 100644 --- a/src/less/widget/sequencetable/listnumber.sequencetable.less +++ b/src/less/widget/sequencetable/listnumber.sequencetable.less @@ -4,12 +4,8 @@ & .sequence-table-title-cell { .overflow-hidden(); .box-sizing(border-box); - border: 1px solid @color-bi-border-line; } & .sequence-table-number-cell { .box-sizing(border-box); - border-left: 1px solid @color-bi-border-line; - border-right: 1px solid @color-bi-border-line; - border-bottom: 1px solid @color-bi-border-line; } -} \ No newline at end of file +} diff --git a/src/less/widget/sequencetable/treenumber.sequencetable.less b/src/less/widget/sequencetable/treenumber.sequencetable.less index 6400695b1..af324f550 100644 --- a/src/less/widget/sequencetable/treenumber.sequencetable.less +++ b/src/less/widget/sequencetable/treenumber.sequencetable.less @@ -4,12 +4,8 @@ & .sequence-table-title-cell { .overflow-hidden(); .box-sizing(border-box); - border: 1px solid @color-bi-border-line; } & .sequence-table-number-cell { .box-sizing(border-box); - border-left: 1px solid @color-bi-border-line; - border-right: 1px solid @color-bi-border-line; - border-bottom: 1px solid @color-bi-border-line; } } \ No newline at end of file diff --git a/src/less/widget/singletree/combo.single.tree.less b/src/less/widget/singletree/combo.single.tree.less index 6089b33da..fbd4f360d 100644 --- a/src/less/widget/singletree/combo.single.tree.less +++ b/src/less/widget/singletree/combo.single.tree.less @@ -1,12 +1,4 @@ @import "../../bibase"; -.bi-singletree-combo{ - & .singletree-trigger{ - border: 1px solid @color-bi-border-normal; - .border-radius(2px); - } - & .bi-singletree-popup{ - & .singletree-toolbar { - color: @font-color-disabled - } - } + +.bi-singletree-combo { } \ No newline at end of file diff --git a/src/less/widget/web/web.less b/src/less/widget/web/web.less deleted file mode 100644 index ec1b27c23..000000000 --- a/src/less/widget/web/web.less +++ /dev/null @@ -1,17 +0,0 @@ -@import "../../bibase"; -.bi-web-page{ - & .web-page-button { - z-index: 1; - font-size: @font-size-14; - background-color: @color-bi-background-default; - } - & .web-page-text-button-label{ - font-size: @font-size-16; - color: @font-color-tips - } - - & .web-page-delete-label{ - font-size: @font-size-14; - color: @font-color-normal; - } -} \ No newline at end of file diff --git a/src/less/widget/year/popup.year.less b/src/less/widget/year/popup.year.less index 087bd93ce..949f7c516 100644 --- a/src/less/widget/year/popup.year.less +++ b/src/less/widget/year/popup.year.less @@ -1,15 +1,27 @@ @import "../../bibase"; -.bi-year-popup{ - & .year-popup-navigation{ - border-top: 1px solid @color-bi-split-light; +.bi-year-popup { + & .year-popup-navigation { line-height: 30px; color: @color-bi-text-highlight; & > .center-element { - border-left: 1px solid @color-bi-split-light; + border-left: 1px solid @color-bi-border-line; } - & > .first-element{ + & > .first-element { border-left: none; } } +} + +.bi-theme-dark { + .bi-year-popup { + & .year-popup-navigation { + & > .center-element { + border-left: 1px solid @color-bi-border-line-theme-dark; + } + & > .first-element { + border-left: none; + } + } + } } \ No newline at end of file diff --git a/src/less/widget/year/trigger.year.less b/src/less/widget/year/trigger.year.less index 2e711144d..5dba862cb 100644 --- a/src/less/widget/year/trigger.year.less +++ b/src/less/widget/year/trigger.year.less @@ -1,5 +1,4 @@ @import "../../bibase"; .bi-year-trigger{ - border: 1px solid @color-bi-border-normal; .border-radius(2px); } \ No newline at end of file diff --git a/src/widget/arrangement/arrangement.block.js b/src/widget/arrangement/arrangement.block.js index 3e5641526..f2e983370 100644 --- a/src/widget/arrangement/arrangement.block.js +++ b/src/widget/arrangement/arrangement.block.js @@ -9,7 +9,7 @@ BI.ArrangementBlock = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ArrangementBlock.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-arrangement-block" + baseCls: "bi-arrangement-block bi-resizer" }); }, diff --git a/src/widget/arrangement/arrangement.js b/src/widget/arrangement/arrangement.js index 92cb60d11..a4fbcba47 100644 --- a/src/widget/arrangement/arrangement.js +++ b/src/widget/arrangement/arrangement.js @@ -2252,7 +2252,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { type: "bi.layout", width: 18, height: 18, - cls: "arrangement-helper" + cls: "arrangement-helper bi-border" }); BI.createWidget({ type: "bi.absolute", diff --git a/src/widget/date/trigger.date.js b/src/widget/date/trigger.date.js index 75f51a86a..11123572d 100644 --- a/src/widget/date/trigger.date.js +++ b/src/widget/date/trigger.date.js @@ -9,7 +9,7 @@ BI.DateTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.DateTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-date-trigger", + extraCls: "bi-date-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25 diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index 6470037f3..adba7a1d8 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -149,7 +149,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { items: [{ el: { type: "bi.layout", - cls: "bi-down-list-spliter cursor-pointer", + cls: "bi-down-list-spliter bi-border-top cursor-pointer", height: 0 } diff --git a/src/widget/exceltable/exceltable.header.cell.js b/src/widget/exceltable/exceltable.header.cell.js index a950aaf43..b5d318210 100644 --- a/src/widget/exceltable/exceltable.header.cell.js +++ b/src/widget/exceltable/exceltable.header.cell.js @@ -8,7 +8,7 @@ BI.ExcelTableHeaderCell = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ExcelTableHeaderCell.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-excel-table-header-cell", + baseCls: "bi-excel-table-header-cell bi-background", text: "" }); }, diff --git a/src/widget/filemanager/items/item.file.filemanager.js b/src/widget/filemanager/items/item.file.filemanager.js index 5f38d29b4..989dae523 100644 --- a/src/widget/filemanager/items/item.file.filemanager.js +++ b/src/widget/filemanager/items/item.file.filemanager.js @@ -9,7 +9,7 @@ BI.FileManagerFileItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFileItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-file-item bi-list-item", + baseCls: "bi-file-manager-file-item bi-list-item bi-border-bottom", height: 30 }) }, diff --git a/src/widget/filemanager/items/item.folder.filemanager.js b/src/widget/filemanager/items/item.folder.filemanager.js index 8545ff3ca..c993f4edd 100644 --- a/src/widget/filemanager/items/item.folder.filemanager.js +++ b/src/widget/filemanager/items/item.folder.filemanager.js @@ -9,7 +9,7 @@ BI.FileManagerFolderItem = BI.inherit(BI.Single, { _defaultConfig: function () { return BI.extend(BI.FileManagerFolderItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-folder-item bi-list-item", + baseCls: "bi-file-manager-folder-item bi-list-item bi-border-bottom", height: 30 }) }, diff --git a/src/widget/filemanager/nav/button/button.nav.filemanager.js b/src/widget/filemanager/nav/button/button.nav.filemanager.js index bae11d74d..d34eafb9b 100644 --- a/src/widget/filemanager/nav/button/button.nav.filemanager.js +++ b/src/widget/filemanager/nav/button/button.nav.filemanager.js @@ -24,7 +24,7 @@ BI.FileManagerNavButton = BI.inherit(BI.Widget, { var self = this, o = this.options, c = this._const; this.button = BI.createWidget({ type: "bi.text_button", - cls: "file-manager-nav-button-text", + cls: "file-manager-nav-button-text bi-card", once: true, selected: o.selected, text: o.text, diff --git a/src/widget/filemanager/nav/nav.filemanager.js b/src/widget/filemanager/nav/nav.filemanager.js index 63c0d685e..2c7a43f1e 100644 --- a/src/widget/filemanager/nav/nav.filemanager.js +++ b/src/widget/filemanager/nav/nav.filemanager.js @@ -9,7 +9,7 @@ BI.FileManagerNav = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FileManagerNav.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-file-manager-nav", + baseCls: "bi-file-manager-nav bi-border-left", height: 40, items: [] }) diff --git a/src/widget/finetuningnumbereditor/finetuning.number.editor.js b/src/widget/finetuningnumbereditor/finetuning.number.editor.js index 117d88cb7..4331684ad 100644 --- a/src/widget/finetuningnumbereditor/finetuning.number.editor.js +++ b/src/widget/finetuningnumbereditor/finetuning.number.editor.js @@ -5,7 +5,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.FineTuningNumberEditor.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-fine-tuning-number-editor", + baseCls: "bi-fine-tuning-number-editor bi-border", value: -1 }) }, @@ -27,7 +27,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.topBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-pre-page-h-font top-button" + cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom" }); this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(1); @@ -35,7 +35,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, { }); this.bottomBtn = BI.createWidget({ type: "bi.icon_button", - cls: "column-next-page-h-font bottom-button" + cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top" }); this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){ self._finetuning(-1); diff --git a/src/widget/image/button/href/image.button.href.js b/src/widget/image/button/href/image.button.href.js new file mode 100644 index 000000000..41d44369d --- /dev/null +++ b/src/widget/image/button/href/image.button.href.js @@ -0,0 +1,65 @@ +/** + * Created by GameJian on 2016/1/28. + */ +BI.ImageButtonHref = BI.inherit(BI.Single, { + + _defaultConfig: function () { + return BI.extend(BI.ImageButtonHref.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-image-button-href", + title: BI.i18nText("BI-Add_Href") + }) + }, + + _init: function () { + BI.ImageButtonHref.superclass._init.apply(this, arguments); + var self = this, o = this.options; + this.trigger = BI.createWidget({ + type: "bi.icon_button", + cls: "img-href-font", + title: o.title, + height: 24, + width: 24 + }); + + this.input = BI.createWidget({ + type: "bi.clear_editor", + watermark: BI.i18nText("BI-Input_Href"), + width: 255, + height: 30 + }); + this.input.on(BI.ClearEditor.EVENT_CONFIRM, function () { + self.combo.hideView(); + }); + + this.combo = BI.createWidget({ + type: "bi.combo", + element: this, + direction: "bottom,left", + adjustYOffset: 3, + el: this.trigger, + popup: { + el: this.input, + stopPropagation: false, + minWidth: 255 + } + }); + + this.combo.on(BI.Combo.EVENT_AFTER_POPUPVIEW, function () { + self.input.focus() + }); + + this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () { + self.fireEvent(BI.ImageButtonHref.EVENT_CHANGE, arguments) + }) + }, + + getValue: function () { + return this.input.getValue(); + }, + + setValue: function (url) { + this.input.setValue(url) + } +}); +BI.ImageButtonHref.EVENT_CHANGE = "BI.ImageButtonHref.EVENT_CHANGE"; +BI.shortcut("bi.image_button_href", BI.ImageButtonHref); \ No newline at end of file diff --git a/src/widget/month/trigger.month.js b/src/widget/month/trigger.month.js index 558b71c5c..d057b7c4b 100644 --- a/src/widget/month/trigger.month.js +++ b/src/widget/month/trigger.month.js @@ -15,7 +15,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MonthTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-month-trigger", + extraCls: "bi-month-trigger bi-border", height: 25 }); }, diff --git a/src/widget/multiselect/check/multiselect.check.pane.js b/src/widget/multiselect/check/multiselect.check.pane.js index 660fce697..f23644c32 100644 --- a/src/widget/multiselect/check/multiselect.check.pane.js +++ b/src/widget/multiselect/check/multiselect.check.pane.js @@ -13,7 +13,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-check-pane", + baseCls: "bi-multi-select-check-pane bi-background", items: [], itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, diff --git a/src/widget/multiselect/check/multiselect.display.js b/src/widget/multiselect/check/multiselect.display.js index 630a9e8e9..5f00924af 100644 --- a/src/widget/multiselect/check/multiselect.display.js +++ b/src/widget/multiselect/check/multiselect.display.js @@ -60,7 +60,7 @@ BI.DisplaySelectedList = BI.inherit(BI.Pane, { _createItems: function (items) { return BI.createItems(items, { type: 'bi.icon_text_item', - cls: 'cursor-default check-font display-list-item', + cls: 'cursor-default check-font display-list-item bi-tips', once: true, invalid: true, selected: true, diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index ffc46efa3..b2c6ae557 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -159,7 +159,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index 61430c3f8..2d85f2122 100644 --- a/src/widget/multiselect/multiselect.trigger.js +++ b/src/widget/multiselect/multiselect.trigger.js @@ -15,7 +15,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-trigger", + baseCls: "bi-multi-select-trigger bi-border", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, searcher: {}, diff --git a/src/widget/multiselect/search/multiselect.search.pane.js b/src/widget/multiselect/search/multiselect.search.pane.js index ce9bb0046..7acca0600 100644 --- a/src/widget/multiselect/search/multiselect.search.pane.js +++ b/src/widget/multiselect/search/multiselect.search.pane.js @@ -15,7 +15,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiSelectSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-select-search-pane", + baseCls: "bi-multi-select-search-pane bi-card", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, keywordGetter: BI.emptyFn diff --git a/src/widget/multiselect/trigger/searcher.multiselect.js b/src/widget/multiselect/trigger/searcher.multiselect.js index 7d65558d2..37b82d27a 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.js @@ -99,13 +99,18 @@ BI.MultiSelectSearcher = BI.inherit(BI.Widget, { }, setState: function (ob) { + var o = this.options; ob || (ob = {}); ob.value || (ob.value = []); if (ob.type === BI.Selection.All) { - this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + if (BI.size(ob.assist) === 1) { + this.editor.setState(o.valueFormatter(ob.assist[0] + "") || ob.assist[0] + ""); + } else { + this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.All); + } } else { if (BI.size(ob.value) === 1) { - this.editor.setState(ob.value[0] + ""); + this.editor.setState(o.valueFormatter(ob.value[0] + "" || ob.value[0] + "")); } else { this.editor.setState(BI.size(ob.value) > 0 ? BI.Selection.Multi : BI.Selection.None); } diff --git a/src/widget/multistringlist/multistringlist.js b/src/widget/multistringlist/multistringlist.js index 004a8e5ae..c9f39b780 100644 --- a/src/widget/multistringlist/multistringlist.js +++ b/src/widget/multistringlist/multistringlist.js @@ -25,7 +25,7 @@ BI.MultiStringList = BI.inherit(BI.Widget, { this.popup = BI.createWidget({ type: "bi.multi_select_loader", - cls: "popup-multi-string-list", + cls: "popup-multi-string-list bi-border-left bi-border-right bi-border-bottom", itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, onLoaded: o.onLoaded, diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index bd8604233..012020848 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -13,7 +13,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeCheckPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-check-pane", + baseCls: "bi-multi-tree-check-pane bi-background", onClickContinueSelect: BI.emptyFn }); }, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index e30ca708d..53b039de6 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -194,7 +194,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { type: "bi.trigger_icon_button", width: o.height, height: o.height, - cls: "multi-select-trigger-icon-button" + cls: "multi-select-trigger-icon-button bi-border-left" }); triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () { self.trigger.getCounter().hideView(); diff --git a/src/widget/multitree/multi.tree.search.pane.js b/src/widget/multitree/multi.tree.search.pane.js index 4f470e09b..07e663a87 100644 --- a/src/widget/multitree/multi.tree.search.pane.js +++ b/src/widget/multitree/multi.tree.search.pane.js @@ -9,7 +9,7 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, { _defaultConfig: function () { return BI.extend(BI.MultiTreeSearchPane.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-search-pane", + baseCls: "bi-multi-tree-search-pane bi-card", itemsCreator: BI.emptyFn, keywordGetter: BI.emptyFn }); diff --git a/src/widget/multitreelist/multitreelist.popup.js b/src/widget/multitreelist/multitreelist.popup.js index 5db65c9b0..549c471d0 100644 --- a/src/widget/multitreelist/multitreelist.popup.js +++ b/src/widget/multitreelist/multitreelist.popup.js @@ -4,7 +4,7 @@ BI.MultiStringListPopup=BI.inherit(BI.Widget,{ _defaultConfig:function () { return BI.extend(BI.MultiStringListPopup.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-tree-list-popup", + baseCls: "bi-tree-list-popup bi-border-left bi-border-right bi-border-bottom", itemsCreator: BI.emptyFn }); }, diff --git a/src/widget/numericalinterval/numericalinterval.js b/src/widget/numericalinterval/numericalinterval.js index 9c1df31b9..4599e1753 100644 --- a/src/widget/numericalinterval/numericalinterval.js +++ b/src/widget/numericalinterval/numericalinterval.js @@ -48,7 +48,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-small-editor" + cls: "numerical-interval-small-editor bi-border-top bi-border-bottom bi-border-left" }); this.smallTip = BI.createWidget({ @@ -85,7 +85,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } return true; }, - cls: "numerical-interval-big-editor" + cls: "numerical-interval-big-editor bi-border-top bi-border-bottom bi-border-right" }); this.bigTip = BI.createWidget({ @@ -121,7 +121,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { //}); this.smallCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-small-combo", + cls: "numerical-interval-small-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", @@ -140,7 +140,7 @@ BI.NumericalInterval = BI.inherit(BI.Single, { } this.bigCombo = BI.createWidget({ type: "bi.icon_combo", - cls: "numerical-interval-big-combo", + cls: "numerical-interval-big-combo bi-border", height: o.height - 2, items: [{ text: "(" + BI.i18nText("BI-Less_Than") + ")", diff --git a/src/widget/pathchooser/pathregion.js b/src/widget/pathchooser/pathregion.js index 9ef06b91d..c3a9e5e33 100644 --- a/src/widget/pathchooser/pathregion.js +++ b/src/widget/pathchooser/pathregion.js @@ -9,7 +9,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.PathRegion.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-path-region", + baseCls: "bi-path-region bi-background", width: 80, title: "" }) @@ -46,7 +46,7 @@ BI.PathRegion = BI.inherit(BI.Widget, { if (BI.isKey(value)) { var label = BI.createWidget({ type: "bi.label", - cls: "path-region-label", + cls: "path-region-label bi-card bi-border bi-list-item-active", text: text, value: value, title: text || value, diff --git a/src/widget/quarter/trigger.quarter.js b/src/widget/quarter/trigger.quarter.js index b45491bc6..dcef599f4 100644 --- a/src/widget/quarter/trigger.quarter.js +++ b/src/widget/quarter/trigger.quarter.js @@ -16,7 +16,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.QuarterTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-quarter-trigger", + extraCls: "bi-quarter-trigger bi-border", height: 25 }); }, diff --git a/src/widget/relationview/relationview.item.js b/src/widget/relationview/relationview.item.js index 1dbcaaff1..589b7e19a 100644 --- a/src/widget/relationview/relationview.item.js +++ b/src/widget/relationview/relationview.item.js @@ -9,7 +9,7 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, { _defaultConfig: function () { return BI.extend(BI.RelationViewItem.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-item", + baseCls: "bi-relation-view-item bi-list-item-active", height: 25, hoverIn: BI.emptyFn, hoverOut: BI.emptyFn diff --git a/src/widget/relationview/relationview.region.container.js b/src/widget/relationview/relationview.region.container.js index a0d8c7dc5..15be061e7 100644 --- a/src/widget/relationview/relationview.region.container.js +++ b/src/widget/relationview/relationview.region.container.js @@ -4,7 +4,7 @@ BI.RelationViewRegionContainer = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.RelationViewRegionContainer.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-relation-view-region-container", + baseCls: "bi-relation-view-region-container bi-card bi-border", width: 150 }); }, diff --git a/src/widget/relationview/relationview.region.js b/src/widget/relationview/relationview.region.js index a2383fcc1..450e5d862 100644 --- a/src/widget/relationview/relationview.region.js +++ b/src/widget/relationview/relationview.region.js @@ -62,10 +62,10 @@ BI.RelationViewRegion = BI.inherit(BI.BasicButton, { element: this, items: [{ type: "bi.vertical", - cls: "relation-view-region-container " + (o.belongPackage ? "" : "other-package"), + cls: "relation-view-region-container bi-card bi-border " + (o.belongPackage ? "" : "other-package"), items: [{ type: "bi.vertical_adapt", - cls: "relation-view-region-title", + cls: "relation-view-region-title bi-border", items: [this.preview, this.title] }, this.button_group] }], diff --git a/src/widget/sequencetable/listnumber.sequencetable.js b/src/widget/sequencetable/listnumber.sequencetable.js index 52edf7342..ea4e53547 100644 --- a/src/widget/sequencetable/listnumber.sequencetable.js +++ b/src/widget/sequencetable/listnumber.sequencetable.js @@ -35,7 +35,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -102,7 +102,7 @@ BI.SequenceTableListNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, height: o.rowSize, text: this.start + i, diff --git a/src/widget/sequencetable/treenumber.sequencetable.js b/src/widget/sequencetable/treenumber.sequencetable.js index 4b903a446..a5800f847 100644 --- a/src/widget/sequencetable/treenumber.sequencetable.js +++ b/src/widget/sequencetable/treenumber.sequencetable.js @@ -35,7 +35,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { this.header = BI.createWidget({ type: "bi.table_style_cell", - cls: "sequence-table-title-cell", + cls: "sequence-table-title-cell bi-border", styleGetter: o.headerCellStyleGetter, text: BI.i18nText("BI-Number_Index") }); @@ -251,7 +251,7 @@ BI.SequenceTableTreeNumber = BI.inherit(BI.Widget, { } else { var child = BI.createWidget(BI.extend({ type: "bi.table_style_cell", - cls: "sequence-table-number-cell", + cls: "sequence-table-number-cell bi-border-left bi-border-right bi-border-bottom", width: 60, styleGetter: numbers[key].isSummary === true ? function () { return o.summaryCellStyleGetter(true); diff --git a/src/widget/web/web.js b/src/widget/web/web.js deleted file mode 100644 index 84a0de021..000000000 --- a/src/widget/web/web.js +++ /dev/null @@ -1,154 +0,0 @@ -/** - * web组件 - * Created by GameJian on 2016/3/1. - */ -BI.WebPage = BI.inherit(BI.Widget, { - _defaultConfig: function () { - return BI.extend(BI.WebPage.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-web-page" - }) - }, - - _init: function () { - BI.WebPage.superclass._init.apply(this, arguments); - var self = this, o = this.options; - - this.iframe = BI.createWidget({ - type: "bi.iframe" - }); - - this.label = BI.createWidget({ - type: "bi.label", - cls: "web-page-text-button-label", - whiteSpace: "normal", - text: BI.i18nText("BI-Not_Add_Url") - }); - - this.del = BI.createWidget({ - type: "bi.bubble_combo", - el: { - type: "bi.icon_button", - cls: "web-page-button img-shutdown-font", - title: BI.i18nText("BI-Basic_Delete"), - height: 24, - width: 24 - }, - popup: { - type: "bi.bubble_bar_popup_view", - buttons: [{ - value: BI.i18nText(BI.i18nText("BI-Basic_Sure")), - handler: function () { - self.fireEvent(BI.WebPage.EVENT_DESTROY) - } - }, { - value: BI.i18nText("BI-Basic_Cancel"), - level: "ignore", - handler: function () { - self.del.hideView(); - } - }], - el: { - type: "bi.vertical_adapt", - items: [{ - type: "bi.label", - text: BI.i18nText("BI-Sure_Delete_Current_Component"), - cls: "web-page-delete-label", - textAlign: "left", - width: 300 - }], - width: 300, - height: 100, - hgap: 20 - }, - maxHeight: 140, - minWidth: 340 - }, - invisible: true, - stopPropagation: true - }); - - - this.href = BI.createWidget({ - type: "bi.image_button_href", - cls: "web-page-button" - }); - - this.href.on(BI.ImageButtonHref.EVENT_CHANGE, function () { - var url = this.getValue(); - self.setValue(this.getValue()); - self._checkUrl(url); - self.fireEvent(BI.WebPage.EVENT_VALUE_CHANGE); - }); - - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{ - el: this.iframe - }, { - el: this.del, - right: 4, - top: 8 - }, { - el: this.href, - right: 36, - top: 8 - }, { - el: this.label, - top: 32, - left: 0, - bottom: 0, - right: 0 - }] - }); - - this.setToolbarVisible(false); - this._showLabel(); - }, - - _checkUrl: function(url){ - BI.Bubbles.hide(this.getName()); - if(BI.isEmptyString(url)){ - BI.Bubbles.show(this.getName(), BI.i18nText("BI-Click_To_Add_Hyperlink"), this.href, { - offsetStyle: "left" - }); - } - }, - - _hideLabel: function () { - this.label.invisible() - }, - - isSelected: function () { - return this.href.isSelected(); - }, - - _showLabel: function () { - this.label.visible() - }, - - setToolbarVisible: function (v) { - this.href.setVisible(v); - this.del.setVisible(v); - }, - - getValue: function () { - return this.href.getValue() - }, - - setValue: function (url) { - var self = this; - if (BI.isNotEmptyString(url)) { - self._hideLabel(); - } else { - this.setToolbarVisible(true); - this.href.showView(); - } - this.href.setValue(url); - this.iframe.setSrc(BI.Func.formatAddress(url)) - } -}); - -BI.WebPage.EVENT_DESTROY = "EVENT_DESTROY"; -BI.WebPage.EVENT_VALUE_CHANGE = "EVENT_VALUE_CHANGE"; -BI.shortcut("bi.web_page", BI.WebPage); \ No newline at end of file diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js index 7454c6dbc..cda353b12 100644 --- a/src/widget/year/popup.year.js +++ b/src/widget/year/popup.year.js @@ -60,7 +60,7 @@ BI.YearPopup = BI.inherit(BI.Widget, { dynamic: true }, tab: { - cls: "year-popup-navigation", + cls: "year-popup-navigation bi-border-top", height: 25, items: [backBtn, preBtn] }, diff --git a/src/widget/year/trigger.year.js b/src/widget/year/trigger.year.js index f87b1614a..e7ab93c22 100644 --- a/src/widget/year/trigger.year.js +++ b/src/widget/year/trigger.year.js @@ -16,7 +16,7 @@ BI.YearTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.YearTrigger.superclass._defaultConfig.apply(this, arguments), { - extraCls: "bi-year-trigger", + extraCls: "bi-year-trigger bi-border", min: '1900-01-01', //最小日期 max: '2099-12-31', //最大日期 height: 25