From 30fa53ec06de1e35053dc77cbbeb12d50685bd6c Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 7 Feb 2018 15:08:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Panel=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/base.css | 3 + dist/base.js | 2 +- dist/bundle.css | 3 + dist/bundle.js | 6 +- dist/case.js | 4 +- dist/fineui.css | 3 + dist/fineui.js | 6 +- src/base/single/button/buttons/button.js | 2 +- src/case/layer/panel.js | 4 +- src/css/base/layer/panel.css | 3 + src/css/base/pager/pager.css | 14 -- src/css/base/single/tip/tip.css | 67 -------- src/css/base/table/table.css | 196 ----------------------- src/css/base/trigger/trigger.css | 14 -- src/css/core/utils/common.css | 2 +- src/css/theme/dark.css | 2 +- src/css/widget/exceltable/exceltable.css | 5 - src/less/base/layer/panel.less | 1 + src/less/lib/colors.less | 2 + src/less/lib/constant.less | 1 + 20 files changed, 30 insertions(+), 310 deletions(-) diff --git a/dist/base.css b/dist/base.css index dec346601..574471aab 100644 --- a/dist/base.css +++ b/dist/base.css @@ -748,6 +748,9 @@ li.CodeMirror-hint-active { -moz-border-radius: 2px; border-radius: 2px; } +.bi-panel .panel-title { + background-color: #F2F4F7; +} .bi-panel .panel-title .panel-title-text { cursor: text; font-size: 14px; diff --git a/dist/base.js b/dist/base.js index 76118b0a5..3cb5b50a4 100644 --- a/dist/base.js +++ b/dist/base.js @@ -16582,7 +16582,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) { var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-button", - minWidth: (props.block === true || props.clear === true) ? 0 : 90, + minWidth: (props.block === true || props.clear === true) ? 0 : 80, shadow: props.clear !== true, isShadowShowingOnSelected: true, readonly: true, diff --git a/dist/bundle.css b/dist/bundle.css index e5a8e42de..e23adadff 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2795,6 +2795,9 @@ li.CodeMirror-hint-active { -moz-border-radius: 2px; border-radius: 2px; } +.bi-panel .panel-title { + background-color: #F2F4F7; +} .bi-panel .panel-title .panel-title-text { cursor: text; font-size: 14px; diff --git a/dist/bundle.js b/dist/bundle.js index 54bb33a4f..a06869de2 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -42634,7 +42634,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) { var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-button", - minWidth: (props.block === true || props.clear === true) ? 0 : 90, + minWidth: (props.block === true || props.clear === true) ? 0 : 80, shadow: props.clear !== true, isShadowShowingOnSelected: true, readonly: true, @@ -71024,7 +71024,7 @@ BI.Panel = BI.inherit(BI.Widget, { return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title bi-border-bottom bi-background", + cls: "panel-title bi-border-bottom", height: 29, items: { left: [this.text], @@ -71033,7 +71033,7 @@ BI.Panel = BI.inherit(BI.Widget, { lhgap: 10, rhgap: 10 }, - height: 30 + height: 29 }; }, diff --git a/dist/case.js b/dist/case.js index df8b34f2b..2c090d3c0 100644 --- a/dist/case.js +++ b/dist/case.js @@ -8392,7 +8392,7 @@ BI.Panel = BI.inherit(BI.Widget, { return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title bi-border-bottom bi-background", + cls: "panel-title bi-border-bottom", height: 29, items: { left: [this.text], @@ -8401,7 +8401,7 @@ BI.Panel = BI.inherit(BI.Widget, { lhgap: 10, rhgap: 10 }, - height: 30 + height: 29 }; }, diff --git a/dist/fineui.css b/dist/fineui.css index a55128c0e..0db9e54fb 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2795,6 +2795,9 @@ li.CodeMirror-hint-active { -moz-border-radius: 2px; border-radius: 2px; } +.bi-panel .panel-title { + background-color: #F2F4F7; +} .bi-panel .panel-title .panel-title-text { cursor: text; font-size: 14px; diff --git a/dist/fineui.js b/dist/fineui.js index 5349f333a..20cf84038 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -44398,7 +44398,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) { var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-button", - minWidth: (props.block === true || props.clear === true) ? 0 : 90, + minWidth: (props.block === true || props.clear === true) ? 0 : 80, shadow: props.clear !== true, isShadowShowingOnSelected: true, readonly: true, @@ -72788,7 +72788,7 @@ BI.Panel = BI.inherit(BI.Widget, { return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title bi-border-bottom bi-background", + cls: "panel-title bi-border-bottom", height: 29, items: { left: [this.text], @@ -72797,7 +72797,7 @@ BI.Panel = BI.inherit(BI.Widget, { lhgap: 10, rhgap: 10 }, - height: 30 + height: 29 }; }, diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index bf406f521..4bc5483d6 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -14,7 +14,7 @@ var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-button", - minWidth: (props.block === true || props.clear === true) ? 0 : 90, + minWidth: (props.block === true || props.clear === true) ? 0 : 80, shadow: props.clear !== true, isShadowShowingOnSelected: true, readonly: true, diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js index 5e39e1bc9..f0182ca27 100644 --- a/src/case/layer/panel.js +++ b/src/case/layer/panel.js @@ -57,7 +57,7 @@ BI.Panel = BI.inherit(BI.Widget, { return { el: { type: "bi.left_right_vertical_adapt", - cls: "panel-title bi-border-bottom bi-background", + cls: "panel-title bi-border-bottom", height: 29, items: { left: [this.text], @@ -66,7 +66,7 @@ BI.Panel = BI.inherit(BI.Widget, { lhgap: 10, rhgap: 10 }, - height: 30 + height: 29 }; }, diff --git a/src/css/base/layer/panel.css b/src/css/base/layer/panel.css index 5a0c74f55..7f3586621 100644 --- a/src/css/base/layer/panel.css +++ b/src/css/base/layer/panel.css @@ -3,6 +3,9 @@ -moz-border-radius: 2px; border-radius: 2px; } +.bi-panel .panel-title { + background-color: #f2f4f7; +} .bi-panel .panel-title .panel-title-text { cursor: text; font-size: 14px; diff --git a/src/css/base/pager/pager.css b/src/css/base/pager/pager.css index b28d24360..585c51289 100644 --- a/src/css/base/pager/pager.css +++ b/src/css/base/pager/pager.css @@ -1,17 +1,3 @@ -.bi-all-count-pager .all-pager-prev { - font-size: 16px; -} -.bi-all-count-pager .all-pager-next { - font-size: 16px; -} - -.bi-direction-pager .direction-pager-prev { - font-size: 16px; -} -.bi-direction-pager .direction-pager-next { - font-size: 16px; -} - .bi-pager .page-item { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/src/css/base/single/tip/tip.css b/src/css/base/single/tip/tip.css index e5ddf3362..bc771b53d 100644 --- a/src/css/base/single/tip/tip.css +++ b/src/css/base/single/tip/tip.css @@ -1,70 +1,3 @@ -.bi-bubble { - font-size: 14px; -} -.bi-bubble .bubble-text { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.bi-bubble .bubble-error { - background: #ffecec; - color: #ff4949; -} -.bi-bubble .bubble-common { - background: #eaf2fd; - color: #3685f2; -} -.bi-bubble .bubble-success { - background: #e1f4e7; - color: #5cb75d; -} -.bi-bubble .bubble-warning { - background: #feeed7; - color: #faaa39; -} - .bi-tip { position: fixed !important; } - -.bi-toast { - font-size: 14px; - color: #ffffff; - max-width: 400px; - min-width: 150px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} -.bi-toast.toast-success { - background: #58cc7d; -} -.bi-toast.toast-warning { - background: #faaa39; -} -.bi-toast.toast-error { - background: #ff4949; -} -.bi-toast.toast-normal { - background: #3f8ce8; -} -.bi-toast .toast-icon { - font-size: 16px; -} - -.bi-tooltip { - max-width: 250px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - font-size: 12px; - color: #ffffff; -} -.bi-tooltip.tooltip-success { - background: #647185; - border: 1px solid #647185; -} -.bi-tooltip.tooltip-warning { - background: #ff4949; - border: 1px solid #e85050; -} diff --git a/src/css/base/table/table.css b/src/css/base/table/table.css index 331c660d1..abfd5a942 100644 --- a/src/css/base/table/table.css +++ b/src/css/base/table/table.css @@ -1,169 +1,3 @@ -.bi-collection-table-cell { - -webkit-box-sizing: border-box; - /*Safari3.2+*/ - -moz-box-sizing: border-box; - /*Firefox3.5+*/ - -ms-box-sizing: border-box; - /*IE8*/ - box-sizing: border-box; - /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ -} -.bi-collection-table-cell.first-row { - border-top: 1px solid #d4dadd; -} -.bi-collection-table-cell.first-col { - border-left: 1px solid #d4dadd; -} -.bi-theme-dark .bi-collection-table-cell.first-row { - border-top: 1px solid #525466; -} -.bi-theme-dark .bi-collection-table-cell.first-col { - border-left: 1px solid #525466; -} - -.bi-quick-collection-table > div > .bi-collection { - overflow: hidden !important; - overflow-x: hidden !important; - overflow-y: hidden !important; -} - -.bi-grid-table-cell { - -webkit-box-sizing: border-box; - /*Safari3.2+*/ - -moz-box-sizing: border-box; - /*Firefox3.5+*/ - -ms-box-sizing: border-box; - /*IE8*/ - box-sizing: border-box; - /*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/ -} -.bi-grid-table-cell.first-row { - border-top: 1px solid #d4dadd; -} -.bi-grid-table-cell.first-col { - border-left: 1px solid #d4dadd; -} -.bi-theme-dark .bi-grid-table-cell.first-row { - border-top: 1px solid #525466; -} -.bi-theme-dark .bi-grid-table-cell.first-col { - border-left: 1px solid #525466; -} - -.scrollbar-layout-main { - box-sizing: border-box; - outline: none; - overflow: hidden; - position: absolute; - transition-duration: 250ms; - transition-timing-function: ease; - user-select: none; - 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(204, 204, 204, 0.05); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0dcccccc,endColorstr=#0dcccccc); -} -.scrollbar-layout-main-vertical { - bottom: 0; - right: 0; - top: 0; - transition-property: background-color; - width: 10px; -} -.scrollbar-layout-main-vertical.public-scrollbar-main-active, -.scrollbar-layout-main-vertical:hover { - width: 10px; -} -.scrollbar-layout-main-horizontal { - bottom: 0; - height: 10px; - left: 0; - transition-property: background-color; - 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(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, -.scrollbar-layout-main-horizontal:hover { - height: 10px; -} -.scrollbar-layout-face { - left: 0; - overflow: hidden; - position: absolute; - z-index: 1; -} -/** - * This selector renders the "nub" of the scrollface. The nub must - * be rendered as pseudo-element so that it won't receive any UI events then - * we can get the correct `event.offsetX` and `event.offsetY` from the - * scrollface element while dragging it. - */ -.scrollbar-layout-face:after { - border-radius: 6px; - content: ''; - display: block; - position: absolute; - transition: background-color 250ms ease; -} -.scrollbar-layout-face-horizontal { - bottom: 0; - left: 0; - top: 0; -} -.scrollbar-layout-face-horizontal:after { - bottom: 2px; - left: 0; - top: 2px; - width: 100%; -} -.scrollbar-layout-face-vertical { - left: 0; - right: 0; - top: 0; -} -.scrollbar-layout-face-vertical:after { - height: 100%; - left: 2px; - right: 2px; - top: 0; -} -/** - * scrollbars. - */ -/* Touching the scroll-track directly makes the scroll-track bolder */ -.public-scrollbar-face:after { - background-color: rgba(102, 102, 102, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4d666666,endColorstr=#4d666666); -} -.bi-theme-dark .public-scrollbar-face:after { - background-color: rgba(204, 204, 204, 0.3); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#4dcccccc,endColorstr=#4dcccccc); -} -.public-scrollbar-main:hover .public-scrollbar-face:after, -.public-scrollbar-main-active .public-scrollbar-face:after, -.public-scrollbar-face-active:after { - background-color: rgba(102, 102, 102, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3666666,endColorstr=#b3666666); -} -.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-face-active:after { - background-color: rgba(204, 204, 204, 0.7); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#b3cccccc,endColorstr=#b3cccccc); -} -.horizontal-scrollbar { - bottom: 0; - position: absolute; -} - .bi-table > .first-col { border-left: none; } @@ -242,33 +76,3 @@ border-top: 1px solid #525466; border-left: 1px solid #525466; } - -.bi-resizable-table-cell .resizable-table-cell-resizer-container { - cursor: ew-resize; - z-index: 1; -} -.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: #3f8ce8; -} -.bi-resizable-table-cell .resizable-table-cell-resizer-container.suitable .resizable-table-cell-resizer-knob { - background-color: #58cc7d; -} - -.bi-resizable-table .resizable-table-resizer { - cursor: ew-resize; - z-index: 1; - background-color: #3f8ce8; -} -.bi-resizable-table .resizable-table-resizer.suitable { - background-color: #58cc7d; -} -.bi-resizable-table .resizable-table-region-resizer { - cursor: ew-resize; - z-index: 1; -} -.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: #3f8ce8; -} - diff --git a/src/css/base/trigger/trigger.css b/src/css/base/trigger/trigger.css index acc7552a7..51c60b492 100644 --- a/src/css/base/trigger/trigger.css +++ b/src/css/base/trigger/trigger.css @@ -1,17 +1,3 @@ - - .bi-trigger .bi-trigger-icon-button { font-size: 16px; } - -.bi-select-text-trigger { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} - -.bi-small-select-text-trigger { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; -} diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 7386469ff..58e6b2cdd 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -57,7 +57,7 @@ textarea { color: #3d4d66; } .bi-theme-dark .bi-background { - background-color: #191B2B; + background-color: #191b2b; color: #cccccc; } .bi-theme-dark .bi-background .bi-input { diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css index d8f0e5f38..7349cdeef 100644 --- a/src/css/theme/dark.css +++ b/src/css/theme/dark.css @@ -1,5 +1,5 @@ .bi-theme-dark { - background-color: #191B2B; + background-color: #191b2b; color: #cccccc; } .bi-theme-dark .bi-input { diff --git a/src/css/widget/exceltable/exceltable.css b/src/css/widget/exceltable/exceltable.css index ef99484d4..4f6dc3b7a 100644 --- a/src/css/widget/exceltable/exceltable.css +++ b/src/css/widget/exceltable/exceltable.css @@ -1,8 +1,3 @@ - -.bi-excel-table-header-cell { - font-weight: bold; -} - .bi-excel-table > div.bottom-right > div > div > table { border-right: 1px solid #d4dadd; } diff --git a/src/less/base/layer/panel.less b/src/less/base/layer/panel.less index ea99b8144..6ad0a7b4a 100644 --- a/src/less/base/layer/panel.less +++ b/src/less/base/layer/panel.less @@ -3,6 +3,7 @@ .bi-panel{ .border-radius(2px); .panel-title{ + background-color: @color-bi-background-light-gray; & .panel-title-text{ cursor: text; font-size: @font-size-14; diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index 919da3690..c34a34a1e 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -42,6 +42,8 @@ @color-bi-background-dark: @background-color-dark; //灰色背景 @color-bi-background-gray: @background-color-gray; +//灰色背景(浅) +@color-bi-background-light-gray: @background-color-light-gray; //灰化背景 @color-bi-background-disabled: @background-color-disabled; //成功背景色 diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index cbee89bba..2e1a5cdbf 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -38,6 +38,7 @@ @background-color-light-highlight: #eaf2fd; @background-color-highlight: #3f8ce8; @background-color-dark: #d4dadd; +@background-color-light-gray: #F2F4F7; @background-color-gray: #999999; @background-color-disabled: #cccccc; From b8b7dc52054d8ef11657c200bd5cf11c01a2ae51 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 7 Feb 2018 15:32:35 +0800 Subject: [PATCH 2/2] update --- dist/demo.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/demo.js b/dist/demo.js index 8515a8f7c..5bbcc34b2 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -1936,9 +1936,11 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, { text: "默认值", value: 1, width: 300, + iconHeight: 16, + iconWidth: 16, items: [{ text: "MVC-1", - iconCls: "close-font", + iconCls: "check-box-icon", value: 1 }, { text: "MVC-2",