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

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/~windy/fineui

es6
windy 7 years ago
parent
ad42bec02d 0822a76500
commit
4cddf3c652
17 changed files with 157 additions and 410 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. 6
      dist/base.js
  2. 59
      dist/bundle.css
  3. 32
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 56
      dist/bundle.min.js
  6. 59
      dist/core.css
  7. 26
      dist/core.js
  8. 59
      dist/core_without_normalize.css
  9. 59
      dist/fineui.css
  10. 32
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 28
      dist/fineui.min.js
  13. 5
      src/base/single/button/button.basic.js
  14. 1
      src/base/single/button/buttons/button.js
  15. 26
      src/core/controller/controller.layer.js
  16. 59
      src/css/core/utils/common.css
  17. 56
      src/less/core/utils/common.less

6
dist/base.js vendored
Unescape View File

@ -610,7 +610,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
forceSelected: false, // 点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发
forceNotSelected: false, // 无论怎么点击都不会被选中
disableSelected: false, // 使能选中
level: "common",
shadow: false,
isShadowShowingOnSelected: false, // 选中状态下是否显示阴影
@ -631,7 +630,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (opts.shadow) {
this._createShadow();
}
this.element.addClass("button-" + opts.level);
if (opts.level) {
this.element.addClass("button-" + opts.level);
}
},
_createShadow: function () {
@ -16432,6 +16433,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
isShadowShowingOnSelected: true,
readonly: true,
iconClass: "",
level: "common",
block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制
clear: false, // 是否去掉边框和背景
textAlign: "center",

59
dist/bundle.css vendored
Unescape View File

@ -900,53 +900,6 @@ i {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -983,10 +936,22 @@ i {
color: #ffffff;
background-color: #58cc7d;
}
.bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-textarea,
.bi-list-item-select.button-success.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-high-light,
.bi-list-item-select.button-success.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d;
}
.bi-list-item-select.button-warning {
color: #ff4949;
}

32
dist/bundle.js vendored
Unescape View File

@ -18404,27 +18404,13 @@ BI.LayerController = BI.inherit(BI.Controller, {
},
make: function (name, container, op) {
if (this.has(name)) {
return this.get(name);
if (BI.isWidget(container)) {
op = op || {};
op.container = container;
} else {
op = container;
}
op || (op = {});
var widget = BI.createWidget((op.render || {}), {
type: "bi.layout"
});
BI.createWidget({
type: "bi.absolute",
element: container || this.options.render,
items: [BI.extend({
el: widget
}, {
top: 0,
left: 0,
right: 0,
bottom: 0
}, op.offset)]
});
this.add(name, widget, widget);
return widget;
return this.create(name, null, op);
},
create: function (name, from, op) {
@ -26402,7 +26388,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
forceSelected: false, // 点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发
forceNotSelected: false, // 无论怎么点击都不会被选中
disableSelected: false, // 使能选中
level: "common",
shadow: false,
isShadowShowingOnSelected: false, // 选中状态下是否显示阴影
@ -26423,7 +26408,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (opts.shadow) {
this._createShadow();
}
this.element.addClass("button-" + opts.level);
if (opts.level) {
this.element.addClass("button-" + opts.level);
}
},
_createShadow: function () {
@ -42224,6 +42211,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
isShadowShowingOnSelected: true,
readonly: true,
iconClass: "",
level: "common",
block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制
clear: false, // 是否去掉边框和背景
textAlign: "center",

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

56
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

59
dist/core.css vendored
Unescape View File

@ -900,53 +900,6 @@ i {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -983,10 +936,22 @@ i {
color: #ffffff;
background-color: #58cc7d;
}
.bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-textarea,
.bi-list-item-select.button-success.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-high-light,
.bi-list-item-select.button-success.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d;
}
.bi-list-item-select.button-warning {
color: #ff4949;
}

26
dist/core.js vendored
Unescape View File

@ -18404,27 +18404,13 @@ BI.LayerController = BI.inherit(BI.Controller, {
},
make: function (name, container, op) {
if (this.has(name)) {
return this.get(name);
if (BI.isWidget(container)) {
op = op || {};
op.container = container;
} else {
op = container;
}
op || (op = {});
var widget = BI.createWidget((op.render || {}), {
type: "bi.layout"
});
BI.createWidget({
type: "bi.absolute",
element: container || this.options.render,
items: [BI.extend({
el: widget
}, {
top: 0,
left: 0,
right: 0,
bottom: 0
}, op.offset)]
});
this.add(name, widget, widget);
return widget;
return this.create(name, null, op);
},
create: function (name, from, op) {

59
dist/core_without_normalize.css vendored
Unescape View File

@ -617,53 +617,6 @@
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -700,10 +653,22 @@
color: #ffffff;
background-color: #58cc7d;
}
.bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-textarea,
.bi-list-item-select.button-success.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-high-light,
.bi-list-item-select.button-success.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d;
}
.bi-list-item-select.button-warning {
color: #ff4949;
}

59
dist/fineui.css vendored
Unescape View File

@ -900,53 +900,6 @@ i {
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -983,10 +936,22 @@ i {
color: #ffffff;
background-color: #58cc7d;
}
.bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-textarea,
.bi-list-item-select.button-success.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-high-light,
.bi-list-item-select.button-success.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d;
}
.bi-list-item-select.button-warning {
color: #ff4949;
}

32
dist/fineui.js vendored
Unescape View File

@ -18577,27 +18577,13 @@ BI.LayerController = BI.inherit(BI.Controller, {
},
make: function (name, container, op) {
if (this.has(name)) {
return this.get(name);
if (BI.isWidget(container)) {
op = op || {};
op.container = container;
} else {
op = container;
}
op || (op = {});
var widget = BI.createWidget((op.render || {}), {
type: "bi.layout"
});
BI.createWidget({
type: "bi.absolute",
element: container || this.options.render,
items: [BI.extend({
el: widget
}, {
top: 0,
left: 0,
right: 0,
bottom: 0
}, op.offset)]
});
this.add(name, widget, widget);
return widget;
return this.create(name, null, op);
},
create: function (name, from, op) {
@ -28096,7 +28082,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
forceSelected: false, // 点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发
forceNotSelected: false, // 无论怎么点击都不会被选中
disableSelected: false, // 使能选中
level: "common",
shadow: false,
isShadowShowingOnSelected: false, // 选中状态下是否显示阴影
@ -28117,7 +28102,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (opts.shadow) {
this._createShadow();
}
this.element.addClass("button-" + opts.level);
if (opts.level) {
this.element.addClass("button-" + opts.level);
}
},
_createShadow: function () {
@ -43918,6 +43905,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
isShadowShowingOnSelected: true,
readonly: true,
iconClass: "",
level: "common",
block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制
clear: false, // 是否去掉边框和背景
textAlign: "center",

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/base/single/button/button.basic.js
Unescape View File

@ -19,7 +19,6 @@ BI.BasicButton = BI.inherit(BI.Single, {
forceSelected: false, // 点击即选中, 选中了就不会被取消,与once的区别是forceSelected不影响事件的触发
forceNotSelected: false, // 无论怎么点击都不会被选中
disableSelected: false, // 使能选中
level: "common",
shadow: false,
isShadowShowingOnSelected: false, // 选中状态下是否显示阴影
@ -40,7 +39,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
if (opts.shadow) {
this._createShadow();
}
this.element.addClass("button-" + opts.level);
if (opts.level) {
this.element.addClass("button-" + opts.level);
}
},
_createShadow: function () {

1
src/base/single/button/buttons/button.js
Unescape View File

@ -19,6 +19,7 @@
isShadowShowingOnSelected: true,
readonly: true,
iconClass: "",
level: "common",
block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制
clear: false, // 是否去掉边框和背景
textAlign: "center",

26
src/core/controller/controller.layer.js
Unescape View File

@ -28,27 +28,13 @@ BI.LayerController = BI.inherit(BI.Controller, {
},
make: function (name, container, op) {
if (this.has(name)) {
return this.get(name);
if (BI.isWidget(container)) {
op = op || {};
op.container = container;
} else {
op = container;
}
op || (op = {});
var widget = BI.createWidget((op.render || {}), {
type: "bi.layout"
});
BI.createWidget({
type: "bi.absolute",
element: container || this.options.render,
items: [BI.extend({
el: widget
}, {
top: 0,
left: 0,
right: 0,
bottom: 0
}, op.offset)]
});
this.add(name, widget, widget);
return widget;
return this.create(name, null, op);
},
create: function (name, from, op) {

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

@ -617,53 +617,6 @@
.bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
color: #666666 !important;
}
.bi-list-item-active3:hover,
.bi-list-item-active3.hover {
color: #ff4949;
background-color: #ffecec;
}
.bi-list-item-active3:hover .bi-input,
.bi-list-item-active3.hover .bi-input {
color: #ff4949;
}
.bi-list-item-active3:hover .bi-textarea,
.bi-list-item-active3.hover .bi-textarea {
color: #ff4949;
}
.bi-list-item-active3.active,
.bi-list-item-active3:active {
color: #ffffff;
background-color: #ff4949;
}
.bi-list-item-active3.active .bi-input,
.bi-list-item-active3:active .bi-input {
color: #ffffff;
}
.bi-list-item-active3.active .bi-textarea,
.bi-list-item-active3:active .bi-textarea {
color: #ffffff;
}
.bi-list-item-active3.disabled,
.bi-list-item-active3.disabled:hover,
.bi-list-item-active3.disabled:active {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-input,
.bi-list-item-active3.disabled:hover .bi-input,
.bi-list-item-active3.disabled:active .bi-input {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-textarea,
.bi-list-item-active3.disabled:hover .bi-textarea,
.bi-list-item-active3.disabled:active .bi-textarea {
color: #9ea6b2 !important;
}
.bi-list-item-active3.disabled .bi-high-light,
.bi-list-item-active3.disabled:hover .bi-high-light,
.bi-list-item-active3.disabled:active .bi-high-light {
color: #9ea6b2 !important;
}
.bi-list-item-select:hover,
.bi-list-item-select.hover {
color: #1a1a1a;
@ -700,10 +653,22 @@
color: #ffffff;
background-color: #58cc7d;
}
.bi-list-item-select.button-success:active .bi-input,
.bi-list-item-select.button-success.active .bi-input {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-textarea,
.bi-list-item-select.button-success.active .bi-textarea {
color: #ffffff;
}
.bi-list-item-select.button-success:active .bi-high-light,
.bi-list-item-select.button-success.active .bi-high-light {
color: #ffffff;
}
.bi-list-item-select.button-success:active.bi-high-light-border,
.bi-list-item-select.button-success.active.bi-high-light-border {
border-color: #58cc7d;
}
.bi-list-item-select.button-warning {
color: #ff4949;
}

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

@ -611,45 +611,6 @@
}
}
// 文字和背景hover和active时变化(红)
.bi-list-item-active3 {
&:hover, &.hover {
color: @color-bi-text-failure;
& .bi-input {
color: @color-bi-text-failure;
}
& .bi-textarea {
color: @color-bi-text-failure;
}
background-color: @color-bi-background-light-failure;
}
&.active, &:active {
color: @color-bi-text;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
background-color: @color-bi-background-failure;
}
&.disabled {
&, &:hover, &:active {
background-color: transparent !important;
color: @color-bi-text-disabled !important;
& .bi-input {
color: @color-bi-text-disabled !important;
}
& .bi-textarea {
color: @color-bi-text-disabled !important;
}
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
}
}
}
//有选中效果
.bi-list-item-select {
&:hover, &.hover {
@ -679,9 +640,18 @@
&:active, &.active {
color: @color-bi-text;
background-color: @color-bi-background-success;
& .bi-input {
color: @color-bi-text;
}
& .bi-textarea {
color: @color-bi-text;
}
& .bi-high-light {
color: @color-bi-text;
}
&.bi-high-light-border {
border-color: @color-bi-border-success;
}
}
}
&.button-warning {
@ -696,7 +666,7 @@
& .bi-high-light {
color: @color-bi-text-failure;
}
&.bi-high-light-border{
&.bi-high-light-border {
border-color: @color-bi-border-failure;
}
}
@ -712,7 +682,7 @@
& .bi-high-light {
color: @color-bi-text-failure;
}
&.bi-high-light-border{
&.bi-high-light-border {
border-color: @color-bi-border-failure;
}
}
@ -728,7 +698,7 @@
& .bi-high-light {
color: @color-bi-text;
}
&.bi-high-light-border{
&.bi-high-light-border {
border-color: @color-bi-border-failure;
}
}
@ -746,7 +716,7 @@
& .bi-high-light {
color: @color-bi-text-disabled !important;
}
&.bi-high-light-border{
&.bi-high-light-border {
border-color: @color-bi-border-disabled;
}
}

Write Preview
Loading…
Cancel
Save