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

Merge pull request #852 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'aaa9662041caf4f4af1a543b5a34858c6e40f20a':
  fix: 漏了
  DEC-6844 fix: textArea交互 && checkbox使用render && less
es6
windy 6 years ago
parent
2c02f1661d aaa9662041
commit
67b7cb865b
26 changed files with 505 additions and 381 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      dist/base.css
  2. 63
      dist/base.js
  3. 43
      dist/bundle.css
  4. 63
      dist/bundle.ie.js
  5. 48
      dist/bundle.ie.min.js
  6. 63
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 48
      dist/bundle.min.js
  9. 42
      dist/core.css
  10. 42
      dist/core_without_normalize.css
  11. 43
      dist/fineui.css
  12. 63
      dist/fineui.ie.js
  13. 48
      dist/fineui.ie.min.js
  14. 63
      dist/fineui.js
  15. 2
      dist/fineui.min.css
  16. 48
      dist/fineui.min.js
  17. 63
      dist/fineui_without_jquery_polyfill.js
  18. 2
      dist/utils.min.js
  19. 8
      src/base/single/editor/editor.textarea.js
  20. 28
      src/base/single/input/checkbox/checkbox.js
  21. 27
      src/base/single/input/radio/radio.js
  22. 1
      src/css/base/single/editor/editor.css
  23. 42
      src/css/core/utils/common.css
  24. 1
      src/less/base/single/editor/editor.textarea.less
  25. 30
      src/less/core/utils/common.less
  26. 2
      src/less/lib/constant.less

1
dist/base.css vendored
Unescape View File

@ -1370,6 +1370,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
font-size: 12px; font-size: 12px;
line-height: 21px;
border: none; border: none;
} }
.x-icon.b-font { .x-icon.b-font {

63
dist/base.js vendored
Unescape View File

@ -8941,10 +8941,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -9330,25 +9330,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -9358,7 +9354,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -10354,23 +10350,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -10382,7 +10375,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

43
dist/bundle.css vendored
Unescape View File

@ -417,29 +417,44 @@ textarea {
color: #878d9f; color: #878d9f;
} }
.bi-tips { .bi-tips {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-input { .bi-tips .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-textarea { .bi-tips .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-border.disabled {
border-color: #d0d4da !important;
}
.bi-border-top { .bi-border-top {
border-top: 1px solid #e8eaed; border-top: 1px solid #e8eaed;
} }
.bi-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-border-right { .bi-border-right {
border-right: 1px solid #e8eaed; border-right: 1px solid #e8eaed;
} }
.bi-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #e8eaed; border-bottom: 1px solid #e8eaed;
} }
.bi-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
.bi-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
} }
@ -548,6 +563,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -559,17 +584,20 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border: 1px solid #3685f2;
}
.bi-high-light-border.disabled {
border-color: #d0d4da !important;
} }
.bi-water-mark { .bi-water-mark {
color: #c4c9d1; color: #9ea6b2;
cursor: text; cursor: text;
} }
.bi-water-mark .bi-input { .bi-water-mark .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-water-mark .bi-textarea { .bi-water-mark .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-theme-dark .bi-water-mark { .bi-theme-dark .bi-water-mark {
color: #6b7084; color: #6b7084;
@ -3341,6 +3369,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
font-size: 12px; font-size: 12px;
line-height: 21px;
border: none; border: none;
} }
.x-icon.b-font { .x-icon.b-font {

63
dist/bundle.ie.js vendored
Unescape View File

@ -44016,10 +44016,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -44405,25 +44405,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -44433,7 +44429,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -45429,23 +45425,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -45457,7 +45450,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

48
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

63
dist/bundle.js vendored
Unescape View File

@ -44420,10 +44420,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -44809,25 +44809,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -44837,7 +44833,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -45833,23 +45829,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -45861,7 +45854,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

48
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

42
dist/core.css vendored
Unescape View File

@ -417,29 +417,44 @@ textarea {
color: #878d9f; color: #878d9f;
} }
.bi-tips { .bi-tips {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-input { .bi-tips .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-textarea { .bi-tips .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-border.disabled {
border-color: #d0d4da !important;
}
.bi-border-top { .bi-border-top {
border-top: 1px solid #e8eaed; border-top: 1px solid #e8eaed;
} }
.bi-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-border-right { .bi-border-right {
border-right: 1px solid #e8eaed; border-right: 1px solid #e8eaed;
} }
.bi-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #e8eaed; border-bottom: 1px solid #e8eaed;
} }
.bi-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
.bi-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
} }
@ -548,6 +563,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -559,17 +584,20 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border: 1px solid #3685f2;
}
.bi-high-light-border.disabled {
border-color: #d0d4da !important;
} }
.bi-water-mark { .bi-water-mark {
color: #c4c9d1; color: #9ea6b2;
cursor: text; cursor: text;
} }
.bi-water-mark .bi-input { .bi-water-mark .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-water-mark .bi-textarea { .bi-water-mark .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-theme-dark .bi-water-mark { .bi-theme-dark .bi-water-mark {
color: #6b7084; color: #6b7084;

42
dist/core_without_normalize.css vendored
Unescape View File

@ -136,29 +136,44 @@ textarea {
color: #878d9f; color: #878d9f;
} }
.bi-tips { .bi-tips {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-input { .bi-tips .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-textarea { .bi-tips .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-border.disabled {
border-color: #d0d4da !important;
}
.bi-border-top { .bi-border-top {
border-top: 1px solid #e8eaed; border-top: 1px solid #e8eaed;
} }
.bi-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-border-right { .bi-border-right {
border-right: 1px solid #e8eaed; border-right: 1px solid #e8eaed;
} }
.bi-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #e8eaed; border-bottom: 1px solid #e8eaed;
} }
.bi-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
.bi-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
} }
@ -267,6 +282,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -278,17 +303,20 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border: 1px solid #3685f2;
}
.bi-high-light-border.disabled {
border-color: #d0d4da !important;
} }
.bi-water-mark { .bi-water-mark {
color: #c4c9d1; color: #9ea6b2;
cursor: text; cursor: text;
} }
.bi-water-mark .bi-input { .bi-water-mark .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-water-mark .bi-textarea { .bi-water-mark .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-theme-dark .bi-water-mark { .bi-theme-dark .bi-water-mark {
color: #6b7084; color: #6b7084;

43
dist/fineui.css vendored
Unescape View File

@ -417,29 +417,44 @@ textarea {
color: #878d9f; color: #878d9f;
} }
.bi-tips { .bi-tips {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-input { .bi-tips .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-textarea { .bi-tips .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-border.disabled {
border-color: #d0d4da !important;
}
.bi-border-top { .bi-border-top {
border-top: 1px solid #e8eaed; border-top: 1px solid #e8eaed;
} }
.bi-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-border-right { .bi-border-right {
border-right: 1px solid #e8eaed; border-right: 1px solid #e8eaed;
} }
.bi-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #e8eaed; border-bottom: 1px solid #e8eaed;
} }
.bi-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
.bi-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
} }
@ -548,6 +563,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -559,17 +584,20 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border: 1px solid #3685f2;
}
.bi-high-light-border.disabled {
border-color: #d0d4da !important;
} }
.bi-water-mark { .bi-water-mark {
color: #c4c9d1; color: #9ea6b2;
cursor: text; cursor: text;
} }
.bi-water-mark .bi-input { .bi-water-mark .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-water-mark .bi-textarea { .bi-water-mark .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-theme-dark .bi-water-mark { .bi-theme-dark .bi-water-mark {
color: #6b7084; color: #6b7084;
@ -3341,6 +3369,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
font-size: 12px; font-size: 12px;
line-height: 21px;
border: none; border: none;
} }
.x-icon.b-font { .x-icon.b-font {

63
dist/fineui.ie.js vendored
Unescape View File

@ -44261,10 +44261,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -44650,25 +44650,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -44678,7 +44674,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -45674,23 +45670,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -45702,7 +45695,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

48
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

63
dist/fineui.js vendored
Unescape View File

@ -44665,10 +44665,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -45054,25 +45054,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -45082,7 +45078,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -46078,23 +46074,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -46106,7 +46099,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

48
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

63
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -32232,10 +32232,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });
@ -32621,25 +32621,21 @@ BI.shortcut("bi.image_checkbox", BI.ImageCheckbox);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -32649,7 +32645,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {
@ -33024,23 +33020,20 @@ BI.shortcut("bi.image_radio", BI.ImageRadio);/**
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -33052,7 +33045,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/base/single/editor/editor.textarea.js
Unescape View File

@ -30,10 +30,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
type: "bi.adaptive", type: "bi.adaptive",
items: [this.content] items: [this.content]
}, },
left: 6, left: 10,
right: 6, right: 10,
top: 6, top: 8,
bottom: 6 bottom: 8
}] }]
}); });

28
src/base/single/input/checkbox/checkbox.js
Unescape View File

@ -4,25 +4,21 @@
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Checkbox = BI.inherit(BI.BasicButton, { BI.Checkbox = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Checkbox.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-checkbox",
baseCls: (conf.baseCls || "") + " bi-checkbox", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Checkbox.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element,
items: [{ items: [{
type: "bi.default", type: "bi.default",
ref: function (_ref) { ref: function (_ref) {
@ -32,7 +28,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

27
src/base/single/input/radio/radio.js
Unescape View File

@ -4,23 +4,20 @@
* @type {*|void|Object} * @type {*|void|Object}
*/ */
BI.Radio = BI.inherit(BI.BasicButton, { BI.Radio = BI.inherit(BI.BasicButton, {
_defaultConfig: function () {
var conf = BI.Radio.superclass._defaultConfig.apply(this, arguments); props: {
return BI.extend(conf, { baseCls: "bi-radio",
baseCls: (conf.baseCls || "") + " bi-radio", selected: false,
selected: false, handler: BI.emptyFn,
handler: BI.emptyFn, width: 16,
width: 16, height: 16,
height: 16, iconWidth: 14,
iconWidth: 14, iconHeight: 14
iconHeight: 14
});
}, },
_init: function () { render: function () {
BI.Radio.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
BI.createWidget({ return {
type: "bi.center_adapt", type: "bi.center_adapt",
element: this.element, element: this.element,
items: [{ items: [{
@ -32,7 +29,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
width: o.iconWidth, width: o.iconWidth,
height: o.iconHeight height: o.iconHeight
}] }]
}); };
}, },
_setEnable: function (enable) { _setEnable: function (enable) {

1
src/css/base/single/editor/editor.css
Unescape View File

@ -17,5 +17,6 @@
} }
.bi-textarea-editor .textarea-editor-content { .bi-textarea-editor .textarea-editor-content {
font-size: 12px; font-size: 12px;
line-height: 21px;
border: none; border: none;
} }

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

@ -136,29 +136,44 @@ textarea {
color: #878d9f; color: #878d9f;
} }
.bi-tips { .bi-tips {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-input { .bi-tips .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-tips .bi-textarea { .bi-tips .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-border { .bi-border {
border: 1px solid #e8eaed; border: 1px solid #e8eaed;
} }
.bi-border.disabled {
border-color: #d0d4da !important;
}
.bi-border-top { .bi-border-top {
border-top: 1px solid #e8eaed; border-top: 1px solid #e8eaed;
} }
.bi-border-top.disabled {
border-color: #d0d4da !important;
}
.bi-border-right { .bi-border-right {
border-right: 1px solid #e8eaed; border-right: 1px solid #e8eaed;
} }
.bi-border-right.disabled {
border-color: #d0d4da !important;
}
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid #e8eaed; border-bottom: 1px solid #e8eaed;
} }
.bi-border-bottom.disabled {
border-color: #d0d4da !important;
}
.bi-border-left { .bi-border-left {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
} }
.bi-border-left.disabled {
border-color: #d0d4da !important;
}
.bi-theme-dark .bi-border { .bi-theme-dark .bi-border {
border: 1px solid #3a3c53; border: 1px solid #3a3c53;
} }
@ -267,6 +282,16 @@ textarea {
.bi-high-light-background .bi-textarea { .bi-high-light-background .bi-textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-background.disabled {
background-color: transparent !important;
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-input {
color: #9ea6b2 !important;
}
.bi-high-light-background.disabled .bi-textarea {
color: #9ea6b2 !important;
}
.bi-error-background { .bi-error-background {
background-color: #ff4949; background-color: #ff4949;
color: #ffffff; color: #ffffff;
@ -278,17 +303,20 @@ textarea {
color: #ffffff; color: #ffffff;
} }
.bi-high-light-border { .bi-high-light-border {
border-color: #3685f2; border: 1px solid #3685f2;
}
.bi-high-light-border.disabled {
border-color: #d0d4da !important;
} }
.bi-water-mark { .bi-water-mark {
color: #c4c9d1; color: #9ea6b2;
cursor: text; cursor: text;
} }
.bi-water-mark .bi-input { .bi-water-mark .bi-input {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-water-mark .bi-textarea { .bi-water-mark .bi-textarea {
color: #c4c9d1; color: #9ea6b2;
} }
.bi-theme-dark .bi-water-mark { .bi-theme-dark .bi-water-mark {
color: #6b7084; color: #6b7084;

1
src/less/base/single/editor/editor.textarea.less
Unescape View File

@ -4,6 +4,7 @@
.overflow-hidden(); .overflow-hidden();
& .textarea-editor-content { & .textarea-editor-content {
font-size: @font-size-12; font-size: @font-size-12;
line-height: 21px;
& { & {
border: none; border: none;
} }

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

@ -180,22 +180,37 @@ textarea {
//边框 //边框
.bi-border { .bi-border {
border: 1px solid @color-bi-border-line; border: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
.bi-border-top { .bi-border-top {
border-top: 1px solid @color-bi-border-line; border-top: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
.bi-border-right { .bi-border-right {
border-right: 1px solid @color-bi-border-line; border-right: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
.bi-border-bottom { .bi-border-bottom {
border-bottom: 1px solid @color-bi-border-line; border-bottom: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
.bi-border-left { .bi-border-left {
border-left: 1px solid @color-bi-border-line; border-left: 1px solid @color-bi-border-line;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
.bi-theme-dark { .bi-theme-dark {
@ -337,6 +352,16 @@ textarea {
& .bi-textarea { & .bi-textarea {
color: @color-bi-text; color: @color-bi-text;
} }
&.disabled {
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-error-background { .bi-error-background {
@ -351,7 +376,10 @@ textarea {
} }
.bi-high-light-border { .bi-high-light-border {
border-color: @color-bi-border-highlight; border: 1px solid @color-bi-border-highlight;
&.disabled {
border-color: @color-bi-border-disabled !important;
}
} }
//水印 //水印

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

@ -29,7 +29,7 @@
@font-color-light-gray-theme-dark: #afb7c6; @font-color-light-gray-theme-dark: #afb7c6;
@font-color-disabled: #9ea6b2;// @font-color-disabled: #9ea6b2;//
@font-color-disabled-theme-dark: #878d9f;// @font-color-disabled-theme-dark: #878d9f;//
@font-color-tips: #c4c9d1;// @font-color-tips: #9ea6b2;//
@font-color-tips-theme-dark: #6b7084;// @font-color-tips-theme-dark: #6b7084;//
@font-color-light-disabled: #d0d4da;// @font-color-light-disabled: #d0d4da;//
@font-color-light-disabled-theme-dark: #606479; @font-color-light-disabled-theme-dark: #606479;

Write Preview
Loading…
Cancel
Save