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

add

es6
guy 8 years ago
parent
2da5195cb2
commit
39e4416dad
17 changed files with 224 additions and 27 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. 3
      bi/base.css
  2. 8
      bi/case.js
  3. 49
      bi/core.css
  4. 5
      bi/core.js
  5. 3
      docs/base.css
  6. 8
      docs/case.js
  7. 49
      docs/core.css
  8. 5
      docs/core.js
  9. 2
      src/case/combo/bubblecombo/combo.bubble.js
  10. 2
      src/case/combo/bubblecombo/popup.bubble.js
  11. 4
      src/case/loader/sort.list.js
  12. 2
      src/core/controller/router.floatbox.js
  13. 3
      src/core/func/function.js
  14. 3
      src/css/base/combo/popup.bubble.css
  15. 49
      src/css/core/utils/common.css
  16. 3
      src/less/base/combo/popup.bubble.less
  17. 53
      src/less/core/utils/common.less

3
bi/base.css
Unescape View File

@ -68,9 +68,6 @@
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}
.bi-bubble-popup-view .bubble-popup-line {
background-color: #3f8ce8;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/

8
bi/case.js
Unescape View File

@ -3527,7 +3527,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
type: "bi.center_adapt",
items: [{
type: "bi.layout",
cls: "bubble-combo-triangle-" + direction
cls: "bubble-combo-triangle-" + direction + " bi-high-light-border"
}]
});
pos.el = this.triangle;
@ -3663,7 +3663,7 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
}
this.line = BI.createWidget(op, {
type: "bi.layout",
cls: "bubble-popup-line"
cls: "bubble-popup-line bi-high-light-background"
});
pos.el = this.line;
BI.createWidget({
@ -7897,8 +7897,8 @@ BI.SortList = BI.inherit(BI.Widget, {
containment: o.containment || this.element,
connectWith: o.connectWith || ".bi-sort-list",
items: ".sort-item",
cursor: "drag",
tolerance: "intersect",
cursor: o.cursor || "drag",
tolerance: o.tolerance || "intersect",
placeholder: {
element: function ($currentItem) {
var holder = BI.createWidget({

49
bi/core.css
Unescape View File

@ -3047,6 +3047,9 @@ i {
background-color: #3f8ce8;
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
}
.bi-water-mark {
color: #cccccc;
cursor: text;
@ -3112,6 +3115,10 @@ i {
.bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
}
.bi-list-item-simple {
color: #999999;
}
@ -3210,6 +3217,48 @@ i {
.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2.active,
.bi-list-item-active2:active {
color: #3f8ce8;
background-color: #ffffff;
}
.bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #cccccc !important;
}
.bi-list-item-active2.disabled .bi-high-light,
.bi-list-item-active2.disabled:hover .bi-high-light,
.bi-list-item-active2.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-active2:hover,
.bi-theme-dark .bi-list-item-active2.hover {
color: #ffffff;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.active,
.bi-theme-dark .bi-list-item-active2:active {
color: #3f8ce8;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.disabled,
.bi-theme-dark .bi-list-item-active2.disabled:hover,
.bi-theme-dark .bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

5
bi/core.js
Unescape View File

@ -16333,7 +16333,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
if(this.controller){
this.controller.remove(url);
delete this.store[url];
this.views[url] && this.views[url].destroy();
this.views[url] && this.views[url].model.destroy();
delete this.views[url];
}
return this;
@ -17163,6 +17163,9 @@ $(function () {
//获取对比颜色
getContrastColor: function (color) {
if (!color) {
return "";
}
if (this.isDarkColor(color)) {
return "#ffffff";
}

3
docs/base.css
Unescape View File

@ -68,9 +68,6 @@
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}
.bi-bubble-popup-view .bubble-popup-line {
background-color: #3f8ce8;
}
/****添加计算宽度的--运算符直接需要space****/
/****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/

8
docs/case.js
Unescape View File

@ -3527,7 +3527,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
type: "bi.center_adapt",
items: [{
type: "bi.layout",
cls: "bubble-combo-triangle-" + direction
cls: "bubble-combo-triangle-" + direction + " bi-high-light-border"
}]
});
pos.el = this.triangle;
@ -3663,7 +3663,7 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
}
this.line = BI.createWidget(op, {
type: "bi.layout",
cls: "bubble-popup-line"
cls: "bubble-popup-line bi-high-light-background"
});
pos.el = this.line;
BI.createWidget({
@ -7897,8 +7897,8 @@ BI.SortList = BI.inherit(BI.Widget, {
containment: o.containment || this.element,
connectWith: o.connectWith || ".bi-sort-list",
items: ".sort-item",
cursor: "drag",
tolerance: "intersect",
cursor: o.cursor || "drag",
tolerance: o.tolerance || "intersect",
placeholder: {
element: function ($currentItem) {
var holder = BI.createWidget({

49
docs/core.css
Unescape View File

@ -3047,6 +3047,9 @@ i {
background-color: #3f8ce8;
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
}
.bi-water-mark {
color: #cccccc;
cursor: text;
@ -3112,6 +3115,10 @@ i {
.bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
}
.bi-list-item-simple {
color: #999999;
}
@ -3210,6 +3217,48 @@ i {
.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2.active,
.bi-list-item-active2:active {
color: #3f8ce8;
background-color: #ffffff;
}
.bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #cccccc !important;
}
.bi-list-item-active2.disabled .bi-high-light,
.bi-list-item-active2.disabled:hover .bi-high-light,
.bi-list-item-active2.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-active2:hover,
.bi-theme-dark .bi-list-item-active2.hover {
color: #ffffff;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.active,
.bi-theme-dark .bi-list-item-active2:active {
color: #3f8ce8;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.disabled,
.bi-theme-dark .bi-list-item-active2.disabled:hover,
.bi-theme-dark .bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

5
docs/core.js
Unescape View File

@ -21434,7 +21434,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
if(this.controller){
this.controller.remove(url);
delete this.store[url];
this.views[url] && this.views[url].destroy();
this.views[url] && this.views[url].model.destroy();
delete this.views[url];
}
return this;
@ -22689,6 +22689,9 @@ $(function () {
//获取对比颜色
getContrastColor: function (color) {
if (!color) {
return "";
}
if (this.isDarkColor(color)) {
return "#ffffff";
}

2
src/case/combo/bubblecombo/combo.bubble.js
Unescape View File

@ -128,7 +128,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
type: "bi.center_adapt",
items: [{
type: "bi.layout",
cls: "bubble-combo-triangle-" + direction
cls: "bubble-combo-triangle-" + direction + " bi-high-light-border"
}]
});
pos.el = this.triangle;

2
src/case/combo/bubblecombo/popup.bubble.js
Unescape View File

@ -55,7 +55,7 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
}
this.line = BI.createWidget(op, {
type: "bi.layout",
cls: "bubble-popup-line"
cls: "bubble-popup-line bi-high-light-background"
});
pos.el = this.line;
BI.createWidget({

4
src/case/loader/sort.list.js
Unescape View File

@ -60,8 +60,8 @@ BI.SortList = BI.inherit(BI.Widget, {
containment: o.containment || this.element,
connectWith: o.connectWith || ".bi-sort-list",
items: ".sort-item",
cursor: "drag",
tolerance: "intersect",
cursor: o.cursor || "drag",
tolerance: o.tolerance || "intersect",
placeholder: {
element: function ($currentItem) {
var holder = BI.createWidget({

2
src/core/controller/router.floatbox.js
Unescape View File

@ -87,7 +87,7 @@ BI.FloatBoxRouter = BI.inherit(BI.WRouter, {
if(this.controller){
this.controller.remove(url);
delete this.store[url];
this.views[url] && this.views[url].destroy();
this.views[url] && this.views[url].model.destroy();
delete this.views[url];
}
return this;

3
src/core/func/function.js
Unescape View File

@ -137,6 +137,9 @@ $(function () {
//获取对比颜色
getContrastColor: function (color) {
if (!color) {
return "";
}
if (this.isDarkColor(color)) {
return "#ffffff";
}

3
src/css/base/combo/popup.bubble.css
Unescape View File

@ -6,6 +6,3 @@
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}
.bi-bubble-popup-view .bubble-popup-line {
background-color: #3f8ce8;
}

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

@ -94,6 +94,9 @@
background-color: #3f8ce8;
color: #ffffff;
}
.bi-high-light-border {
border-color: #178cdf;
}
.bi-water-mark {
color: #cccccc;
cursor: text;
@ -159,6 +162,10 @@
.bi-theme-dark .bi-list-item.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-border:active,
.bi-list-item-border.active {
border: 1px solid #178cdf;
}
.bi-list-item-simple {
color: #999999;
}
@ -257,6 +264,48 @@
.bi-theme-dark .bi-list-item-active.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active2:hover,
.bi-list-item-active2.hover {
color: #1a1a1a;
background-color: #ffffff;
}
.bi-list-item-active2.active,
.bi-list-item-active2:active {
color: #3f8ce8;
background-color: #ffffff;
}
.bi-list-item-active2.disabled,
.bi-list-item-active2.disabled:hover,
.bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #cccccc !important;
}
.bi-list-item-active2.disabled .bi-high-light,
.bi-list-item-active2.disabled:hover .bi-high-light,
.bi-list-item-active2.disabled:active .bi-high-light {
color: #cccccc !important;
}
.bi-theme-dark .bi-list-item-active2:hover,
.bi-theme-dark .bi-list-item-active2.hover {
color: #ffffff;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.active,
.bi-theme-dark .bi-list-item-active2:active {
color: #3f8ce8;
background-color: #242640;
}
.bi-theme-dark .bi-list-item-active2.disabled,
.bi-theme-dark .bi-list-item-active2.disabled:hover,
.bi-theme-dark .bi-list-item-active2.disabled:active {
background-color: transparent !important;
color: #666666 !important;
}
.bi-theme-dark .bi-list-item-active2.disabled .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:hover .bi-high-light,
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;

3
src/less/base/combo/popup.bubble.less
Unescape View File

@ -1,8 +1,5 @@
@import "../../bibase";
.bi-bubble-popup-view {
& .bubble-popup-line {
background-color: @color-bi-background-highlight;
}
.box-shadow(0 0 10px, rgba(0, 0, 0, 0.2));
}

53
src/less/core/utils/common.less
Unescape View File

@ -132,6 +132,10 @@
color: @color-bi-text;
}
.bi-high-light-border {
border-color: @color-bi-border-highlight;
}
//水印
.bi-water-mark {
color: @water-mark-color;
@ -209,6 +213,12 @@
}
}
.bi-list-item-border {
&:active, &.active {
border: 1px solid @color-bi-border-highlight;
}
}
//极简
.bi-list-item-simple {
color: @color-bi-text-tips;
@ -306,6 +316,49 @@
}
}
//文字和背景hover和active时变化
.bi-list-item-active2 {
&:hover, &.hover {
color: @color-bi-text-black;
background-color: @color-bi-background-default;
}
&.active, &:active {
color: @color-bi-text-highlight;
background-color: @color-bi-background-default;
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
.bi-theme-dark {
.bi-list-item-active2 {
&:hover, &.hover {
color: @color-bi-text;
background-color: @color-bi-background-default-theme-dark;
}
&.active, &:active {
color: @color-bi-text-highlight;
background-color: @color-bi-background-default-theme-dark;
}
&.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-select {
&:hover, &.hover {

Write Preview
Loading…
Cancel
Save