Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

es6
guy 7 years ago
parent
4924f911c0
commit
13bc284b59
22 changed files with 191 additions and 175 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      bi/base.css
  2. 48
      bi/base.js
  3. 12
      dist/base.css
  4. 48
      dist/base.js
  5. 12
      dist/bundle.css
  6. 48
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 4
      dist/bundle.min.js
  9. 48
      src/base/combination/combo.js
  10. 6
      src/css/base/colorchooser/colorchooser.trigger.css
  11. 6
      src/css/base/colorchooser/colorpicker/editor.colorpicker.css
  12. 14
      src/css/base/segment/segment.css
  13. 4
      src/css/base/single/button/button.css
  14. 8
      src/css/base/table/table.collection.cell.css
  15. 48
      src/css/base/table/table.css
  16. 8
      src/css/base/table/table.grid.cell.css
  17. 4
      src/css/base/view/popupview.css
  18. 4
      src/css/core/normalize2.css
  19. 20
      src/css/core/utils/common.css
  20. 4
      src/css/widget/exceltable/exceltable.css
  21. 4
      src/css/widget/year/popup.year.css
  22. 2
      src/less/lib/constant.less

12
bi/base.css
Unescape View File

@ -2,9 +2,9 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.bi-color-picker-button .color-picker-button-mask {
border: 1px solid #1a1a1a;
@ -16,9 +16,9 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.farbtastic {
position: relative;

48
bi/base.js
Unescape View File

@ -3035,18 +3035,20 @@ BI.Combo = BI.inherit(BI.Widget, {
}
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
case "click":
@ -3092,18 +3094,20 @@ BI.Combo = BI.inherit(BI.Widget, {
st(e);
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
}

12
dist/base.css vendored
Unescape View File

@ -2,9 +2,9 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.bi-color-picker-button .color-picker-button-mask {
border: 1px solid #1a1a1a;
@ -16,9 +16,9 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.farbtastic {
position: relative;

48
dist/base.js vendored
Unescape View File

@ -3035,18 +3035,20 @@ BI.Combo = BI.inherit(BI.Widget, {
}
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
case "click":
@ -3092,18 +3094,20 @@ BI.Combo = BI.inherit(BI.Widget, {
st(e);
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
}

12
dist/bundle.css vendored
Unescape View File

@ -1597,9 +1597,9 @@ i {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.bi-color-picker-button .color-picker-button-mask {
border: 1px solid #1a1a1a;
@ -1611,9 +1611,9 @@ i {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}
.farbtastic {
position: relative;

48
dist/bundle.js vendored
Unescape View File

@ -28889,18 +28889,20 @@ BI.Combo = BI.inherit(BI.Widget, {
}
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
case "click":
@ -28946,18 +28948,20 @@ BI.Combo = BI.inherit(BI.Widget, {
st(e);
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
}

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
src/base/combination/combo.js
Unescape View File

@ -129,18 +129,20 @@ BI.Combo = BI.inherit(BI.Widget, {
}
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
case "click":
@ -186,18 +188,20 @@ BI.Combo = BI.inherit(BI.Widget, {
st(e);
});
self.element.on("mouseleave." + self.getName(), function (e) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
if (self.popupView) {
self.popupView.element.on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
hide();
});
self.popupView.element.off("mouseenter." + self.getName());
});
self.popupView.element.off("mouseenter." + self.getName());
});
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
BI.defer(function () {
if (!enterPopup) {
hide();
}
}, 50);
}
});
break;
}

6
src/css/base/colorchooser/colorchooser.trigger.css
Unescape View File

@ -2,7 +2,7 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}

6
src/css/base/colorchooser/colorpicker/editor.colorpicker.css
Unescape View File

@ -2,7 +2,7 @@
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
box-shadow: 0px 0px 2px 1px #232e40 inset;
-webkit-box-shadow: 0px 0px 2px 1px #232e40 inset;
-moz-box-shadow: 0px 0px 2px 1px #232e40 inset;
box-shadow: 0px 0px 2px 1px #d4dadd inset;
-webkit-box-shadow: 0px 0px 2px 1px #d4dadd inset;
-moz-box-shadow: 0px 0px 2px 1px #d4dadd inset;
}

14
src/css/base/segment/segment.css
Unescape View File

@ -3,12 +3,12 @@
overflow-x: hidden;
overflow-y: hidden;
background: #ffffff;
border-right: 1px solid #e8eaed;
border-top: 1px solid #e8eaed;
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd;
border-top: 1px solid #d4dadd;
border-bottom: 1px solid #d4dadd;
}
.bi-segment > .first-element {
border-left: 1px solid #e8eaed;
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;
@ -23,9 +23,9 @@
overflow-x: hidden;
overflow-y: hidden;
background: #242640;
border-right: 1px solid #f2f4f7;
border-top: 1px solid #f2f4f7;
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #525466;
border-top: 1px solid #525466;
border-bottom: 1px solid #525466;
}
.bi-theme-dark .bi-segment > .first-element {
border-left: 1px solid #242640;

4
src/css/base/single/button/button.css
Unescape View File

@ -46,7 +46,7 @@ body .bi-button.button-common.clear .b-font:before,
body .bi-button.button-ignore,
#body .bi-button.button-ignore {
background-color: #ffffff;
border-color: #e8eaed;
border-color: #d4dadd;
}
body .bi-button.button-ignore,
#body .bi-button.button-ignore,
@ -147,7 +147,7 @@ body .bi-button.button-warning.disabled.base-disabled .b-font:before,
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled {
background: #ffffff !important;
border-color: #e8eaed !important;
border-color: #d4dadd !important;
}
body .bi-button.button-ignore.disabled,
#body .bi-button.button-ignore.disabled,

8
src/css/base/table/table.collection.cell.css
Unescape View File

@ -9,14 +9,14 @@
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
}
.bi-collection-table-cell.first-row {
border-top: 1px solid #e8eaed;
border-top: 1px solid #d4dadd;
}
.bi-collection-table-cell.first-col {
border-left: 1px solid #e8eaed;
border-left: 1px solid #d4dadd;
}
.bi-theme-dark .bi-collection-table-cell.first-row {
border-top: 1px solid #f2f4f7;
border-top: 1px solid #525466;
}
.bi-theme-dark .bi-collection-table-cell.first-col {
border-left: 1px solid #f2f4f7;
border-left: 1px solid #525466;
}

48
src/css/base/table/table.css
Unescape View File

@ -5,24 +5,24 @@
border-top: none;
}
.bi-table > div > div > table {
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd;
border-right: 1px solid #d4dadd;
}
.bi-table > div.top-left > div > div > table {
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd;
border-right: 1px solid #d4dadd;
}
.bi-table > div.top-right > div > div > table {
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd;
border-right: 1px solid #d4dadd;
}
.bi-table > div.bottom-left > div > div > table {
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd;
border-right: 1px solid #d4dadd;
}
.bi-table > div.bottom-right > div > div > table {
border-right: 1px solid #e8eaed;
border-bottom: 1px solid #e8eaed;
border-right: 1px solid #d4dadd;
border-bottom: 1px solid #d4dadd;
}
.bi-table > div > div > table,
.bi-table > div > div > div > table {
@ -46,33 +46,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 #e8eaed;
border-left: 1px solid #e8eaed;
border-top: 1px solid #d4dadd;
border-left: 1px solid #d4dadd;
}
.bi-theme-dark .bi-table > div > div > table {
border-bottom: 1px solid #f2f4f7;
border-right: 1px solid #f2f4f7;
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 #f2f4f7;
border-right: 1px solid #f2f4f7;
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 #f2f4f7;
border-right: 1px solid #f2f4f7;
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 #f2f4f7;
border-right: 1px solid #f2f4f7;
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 #f2f4f7;
border-bottom: 1px solid #f2f4f7;
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 #f2f4f7;
border-left: 1px solid #f2f4f7;
border-top: 1px solid #525466;
border-left: 1px solid #525466;
}

8
src/css/base/table/table.grid.cell.css
Unescape View File

@ -9,14 +9,14 @@
/*W3C标准(IE9+，Safari5.1+,Chrome10.0+,Opera10.6+都符合box-sizing的w3c标准语法)*/
}
.bi-grid-table-cell.first-row {
border-top: 1px solid #e8eaed;
border-top: 1px solid #d4dadd;
}
.bi-grid-table-cell.first-col {
border-left: 1px solid #e8eaed;
border-left: 1px solid #d4dadd;
}
.bi-theme-dark .bi-grid-table-cell.first-row {
border-top: 1px solid #f2f4f7;
border-top: 1px solid #525466;
}
.bi-theme-dark .bi-grid-table-cell.first-col {
border-left: 1px solid #f2f4f7;
border-left: 1px solid #525466;
}

4
src/css/base/view/popupview.css
Unescape View File

@ -15,13 +15,13 @@
line-height: 30px;
}
.bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #e8eaed;
border-left: 1px solid #d4dadd;
}
.bi-popup-view .list-view-toolbar > .first-element {
border-left: none;
}
.bi-theme-dark .bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #f2f4f7;
border-left: 1px solid #525466;
}
.bi-theme-dark .bi-popup-view .list-view-toolbar > .first-element {
border-left: none;

4
src/css/core/normalize2.css
Unescape View File

@ -34,11 +34,11 @@ textarea {
margin: 0;
padding: 0;
outline: none;
border: 1px solid #e8eaed;
border: 1px solid #d4dadd;
}
.bi-theme-dark input,
.bi-theme-dark textarea {
border: 1px solid #f2f4f7;
border: 1px solid #525466;
}
ul {
list-style: disc;

20
src/css/core/utils/common.css
Unescape View File

@ -106,34 +106,34 @@
color: #c4c9d1;
}
.bi-border {
border: 1px solid #e8eaed;
border: 1px solid #d4dadd;
}
.bi-theme-dark .bi-border {
border: 1px solid #f2f4f7;
border: 1px solid #525466;
}
.bi-border-left {
border-left: 1px solid #e8eaed;
border-left: 1px solid #d4dadd;
}
.bi-theme-dark .bi-border-left {
border-left: 1px solid #f2f4f7;
border-left: 1px solid #525466;
}
.bi-border-right {
border-right: 1px solid #e8eaed;
border-right: 1px solid #d4dadd;
}
.bi-theme-dark .bi-border-right {
border-right: 1px solid #f2f4f7;
border-right: 1px solid #525466;
}
.bi-border-top {
border-top: 1px solid #e8eaed;
border-top: 1px solid #d4dadd;
}
.bi-theme-dark .bi-border-top {
border-top: 1px solid #f2f4f7;
border-top: 1px solid #525466;
}
.bi-border-bottom {
border-bottom: 1px solid #e8eaed;
border-bottom: 1px solid #d4dadd;
}
.bi-theme-dark .bi-border-bottom {
border-bottom: 1px solid #f2f4f7;
border-bottom: 1px solid #525466;
}
.bi-keyword-red-mark {
color: #ff4949;

4
src/css/widget/exceltable/exceltable.css
Unescape View File

@ -1,6 +1,6 @@
.bi-excel-table > div.bottom-right > div > div > table {
border-right: 1px solid #e8eaed;
border-right: 1px solid #d4dadd;
}
.bi-theme-dark .bi-excel-table > div.bottom-right > div > div > table {
border-right: 1px solid #f2f4f7;
border-right: 1px solid #525466;
}

4
src/css/widget/year/popup.year.css
Unescape View File

@ -2,13 +2,13 @@
line-height: 30px;
}
.bi-year-popup .year-popup-navigation > .center-element {
border-left: 1px solid #e8eaed;
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 #f2f4f7;
border-left: 1px solid #525466;
}
.bi-theme-dark .bi-year-popup .year-popup-navigation > .first-element {
border-left: none;

2
src/less/lib/constant.less
Unescape View File

@ -37,7 +37,7 @@
@background-color-normal: #eff1f4;//
@background-color-normal-theme-dark: #191B2B;//
@background-color-highlight: #3f8ce8;
@background-color-dark: #232e40;
@background-color-dark: #d4dadd;
@background-color-gray: #999999;
@background-color-disabled: #cccccc;

Write Preview
Loading…
Cancel
Save