Browse Source

Merge pull request #257 in FUI/fineui from ~WINDY/fui:master to master

* commit '22f8417d8e94a4ac556baf5c7939475b4928374e':
  update
  text.trigger
es6
guy 7 years ago
parent
commit
9873f481a3
  1. 7
      demo/js/widget/downlist/demo.downlist.js
  2. 2
      dist/bundle.js
  3. 2
      dist/bundle.min.css
  4. 36
      dist/bundle.min.js
  5. 2
      dist/case.js
  6. 7
      dist/demo.js
  7. 2
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 36
      dist/fineui.min.js
  10. 2
      src/case/trigger/trigger.text.js
  11. 2
      src/css/base/layer/panel.css
  12. 14
      src/css/base/pager/pager.css
  13. 67
      src/css/base/single/tip/tip.css
  14. 196
      src/css/base/table/table.css
  15. 14
      src/css/base/trigger/trigger.css
  16. 2
      src/css/core/utils/common.css
  17. 1
      src/css/resource/font.css
  18. 2
      src/css/theme/dark.css
  19. 5
      src/css/widget/exceltable/exceltable.css
  20. 13
      src/css/widget/previewtable/previewtable.css

7
demo/js/widget/downlist/demo.downlist.js

@ -80,18 +80,17 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 2",
iconCls1: "chart-type-e-font",
cls: "dot-e-font",
value: 12
value: 11
},
disabled: true,
children: [{
type: "bi.icon_text_item",
cls: "dot-e-font",
height: 25,
text: "column 2.1",
value: 11
value: 21
}, {
text: "column 2.2",
value: 12,
value: 22,
cls: "dot-e-font"
}]
}],

2
dist/bundle.js vendored

@ -76497,7 +76497,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
height: o.height,
text: o.text,
title: function () {
return o.text;
return self.text.getText();
},
hgap: c.hgap,
readonly: o.readonly

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

36
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/case.js vendored

@ -14218,7 +14218,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
height: o.height,
text: o.text,
title: function () {
return o.text;
return self.text.getText();
},
hgap: c.hgap,
readonly: o.readonly

7
dist/demo.js vendored

@ -12057,18 +12057,17 @@ Demo.Downlist = BI.inherit(BI.Widget, {
text: "column 2",
iconCls1: "chart-type-e-font",
cls: "dot-e-font",
value: 12
value: 11
},
disabled: true,
children: [{
type: "bi.icon_text_item",
cls: "dot-e-font",
height: 25,
text: "column 2.1",
value: 11
value: 21
}, {
text: "column 2.2",
value: 12,
value: 22,
cls: "dot-e-font"
}]
}],

2
dist/fineui.js vendored

@ -78261,7 +78261,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
height: o.height,
text: o.text,
title: function () {
return o.text;
return self.text.getText();
},
hgap: c.hgap,
readonly: o.readonly

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

36
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
src/case/trigger/trigger.text.js

@ -27,7 +27,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
height: o.height,
text: o.text,
title: function () {
return o.text;
return self.text.getText();
},
hgap: c.hgap,
readonly: o.readonly

2
src/css/base/layer/panel.css

@ -4,7 +4,7 @@
border-radius: 2px;
}
.bi-panel .panel-title {
background-color: #f2f4f7;
background-color: #F2F4F7;
}
.bi-panel .panel-title .panel-title-text {
cursor: text;

14
src/css/base/pager/pager.css

@ -1,3 +1,17 @@
.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;

67
src/css/base/single/tip/tip.css

@ -1,3 +1,70 @@
.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;
}

196
src/css/base/table/table.css

@ -1,3 +1,169 @@
.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;
}
@ -76,3 +242,33 @@
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;
}

14
src/css/base/trigger/trigger.css

@ -1,3 +1,17 @@
.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;
}

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

1
src/css/resource/font.css

@ -1,7 +1,6 @@
@font-face {
font-family: 'bi';
src: url('font/iconfont.eot'), /* IE6-IE8 */ url('font/iconfont.woff') format('woff'), /* chrome、firefox */ url('font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('font/iconfont.svg#svgFontName') format('svg');
/* iOS 4.1- */
}
.b-font {

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

5
src/css/widget/exceltable/exceltable.css

@ -1,3 +1,8 @@
.bi-excel-table-header-cell {
font-weight: bold;
}
.bi-excel-table > div.bottom-right > div > div > table {
border-right: 1px solid #d4dadd;
}

13
src/css/widget/previewtable/previewtable.css

@ -1,3 +1,14 @@
.bi-preview-table-cell {
min-height: 25px;
min-width: 80px;
}
.bi-preview-table-header-cell {
font-weight: bold;
min-height: 25px;
min-width: 80px;
}
.bi-preview-table {
-webkit-user-select: text;
-khtml-user-select: text;
@ -12,5 +23,5 @@
}
.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;
background-color: #191B2B;
}

Loading…
Cancel
Save