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

Merge pull request #732 in VISUAL/fineui from ~IMP/fineui_fui:master to master 

* commit '66ee4249ea3ebe724f8033b2718c0de059d407b7':
  BI-33958 text生命周期
es6
guy 6 years ago
parent
89449cb217 66ee4249ea
commit
a43b68afd3
15 changed files with 137 additions and 137 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. 8
      dist/base.js
  2. 78
      dist/bundle.css
  3. 8
      dist/bundle.ie.js
  4. 4
      dist/bundle.ie.min.js
  5. 8
      dist/bundle.js
  6. 16
      dist/bundle.min.js
  7. 25
      dist/demo.js
  8. 78
      dist/fineui.css
  9. 8
      dist/fineui.ie.js
  10. 4
      dist/fineui.ie.min.js
  11. 8
      dist/fineui.js
  12. 16
      dist/fineui.min.js
  13. 8
      dist/fineui_without_jquery_polyfill.js
  14. 2
      dist/utils.min.js
  15. 3
      src/base/single/text.js

8
dist/base.js vendored
Unescape View File

@ -535,8 +535,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -584,6 +583,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

78
dist/bundle.css vendored
Unescape View File

@ -1590,7 +1590,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-horizontal-layout {
display: box;
/* OLD - Android 4.4- */
@ -1661,7 +1661,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-vertical-center {
display: box;
/* OLD - Android 4.4- */
@ -1738,7 +1738,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1782,7 +1782,7 @@ textarea {
min-height: 100%;
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1852,7 +1852,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1937,7 +1937,7 @@ textarea {
vertical-align: middle;
content: ' ';
}
.bi-inline-vertical-adapt-layout:after {
display: inline-block;
width: 0;
@ -1961,7 +1961,7 @@ textarea {
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -2453,7 +2453,7 @@ textarea {
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
}
.bi-combo.bi-combo-popup {
display: block !important;
visibility: visible !important;
@ -2476,7 +2476,7 @@ textarea {
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
@ -2493,20 +2493,20 @@ textarea {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-check-combo.bi-combo-popup > .bi-border,
.bi-text-value-check-combo:hover > .bi-border {
border-color: #3685f2;
}
.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
.bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2;
@ -2523,7 +2523,7 @@ textarea {
.bi-search-editor .search-font {
font-size: 16px;
}
/*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor {
font-size: 12px;
@ -2594,14 +2594,14 @@ textarea {
.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;
@ -3158,12 +3158,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost .b-font:before {
color: #ffffff !important;
}
.bi-single-select-icon-text-item:active .b-font:before,
.bi-single-select-icon-text-item.active .b-font:before {
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;
@ -3198,18 +3198,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor {
text-align: right;
cursor: pointer;
font-size: 100px;
z-index: 2;
}
.bi-textarea-editor {
overflow: hidden;
overflow-x: hidden;
@ -3293,11 +3293,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background: #feeed7;
color: #faaa39;
}
.bi-tip {
position: fixed !important;
}
.bi-toast {
color: #ffffff;
max-width: 400px;
@ -3321,7 +3321,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-toast .toast-icon {
font-size: 16px;
}
.bi-tooltip {
max-width: 250px;
-webkit-border-radius: 2px;
@ -3341,7 +3341,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;
}
.bi-display-tree .ztree * {
color: #999999;
}
@ -3594,8 +3594,8 @@ ul.ztree.zTreeDragUL {
padding:0;
background:none;
}*/
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
@ -3611,13 +3611,13 @@ ul.ztree.zTreeDragUL {
.bi-combo-popup > .bi-trigger .trigger-down {
display: none;
}
.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;
@ -3689,7 +3689,7 @@ ul.ztree.zTreeDragUL {
.bi-interval-slider-label {
min-height: 50px;
}
.bi-interval-slider {
min-height: 50px;
}
@ -3707,7 +3707,7 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-check-pane .multi-select-check-selected {
text-decoration: underline;
}
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3716,7 +3716,7 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3725,8 +3725,8 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
@ -3750,7 +3750,7 @@ ul.ztree.zTreeDragUL {
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
@ -3851,7 +3851,7 @@ ul.ztree.zTreeDragUL {
.bi-single-slider-label {
min-height: 50px;
}
.bi-single-slider-normal {
min-height: 30px;
}

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

@ -35431,8 +35431,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -35480,6 +35479,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

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

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored
Unescape View File

@ -35970,8 +35970,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -36019,6 +36018,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

16
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored
Unescape View File

@ -6041,30 +6041,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

78
dist/fineui.css vendored
Unescape View File

@ -1590,7 +1590,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-horizontal-layout {
display: box;
/* OLD - Android 4.4- */
@ -1661,7 +1661,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-vertical-center {
display: box;
/* OLD - Android 4.4- */
@ -1738,7 +1738,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-center-layout .flex-wrapper-center-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1782,7 +1782,7 @@ textarea {
min-height: 100%;
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1852,7 +1852,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-center .flex-wrapper-vertical-center-wrapper {
display: box;
/* OLD - Android 4.4- */
@ -1937,7 +1937,7 @@ textarea {
vertical-align: middle;
content: ' ';
}
.bi-inline-vertical-adapt-layout:after {
display: inline-block;
width: 0;
@ -1961,7 +1961,7 @@ textarea {
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
@ -2453,7 +2453,7 @@ textarea {
border-bottom: 1px solid #2F3149;
border-right: 1px solid #2F3149;
}
.bi-combo.bi-combo-popup {
display: block !important;
visibility: visible !important;
@ -2476,7 +2476,7 @@ textarea {
.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
border-color: #3a3c53;
}
.bi-search-text-value-combo .trigger-icon-button {
font-size: 16px;
}
@ -2493,20 +2493,20 @@ textarea {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
color: #ff4949;
}
.bi-text-value-check-combo.bi-combo-popup > .bi-border,
.bi-text-value-check-combo:hover > .bi-border {
border-color: #3685f2;
}
.bi-text-value-down-list-combo.bi-combo-popup > .bi-border,
.bi-text-value-down-list-combo:hover > .bi-border {
border-color: #3685f2;
@ -2523,7 +2523,7 @@ textarea {
.bi-search-editor .search-font {
font-size: 16px;
}
/*************BI.SearchEditor******************/
.bi-small-search-editor .bi-editor {
font-size: 12px;
@ -2594,14 +2594,14 @@ textarea {
.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;
@ -3158,12 +3158,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark #body .bi-button.button-common.disabled.ghost .b-font:before {
color: #ffffff !important;
}
.bi-single-select-icon-text-item:active .b-font:before,
.bi-single-select-icon-text-item.active .b-font:before {
color: #3685f2;
}
.bi-switch {
-webkit-border-radius: 40px 40px 40px 40px;
-moz-border-radius: 40px 40px 40px 40px;
@ -3198,18 +3198,18 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-theme-dark .bi-switch.disabled:active {
background-color: #2F3149;
}
.bi-multifile-editor .multifile-editor {
text-align: right;
cursor: pointer;
font-size: 100px;
z-index: 2;
}
.bi-textarea-editor {
overflow: hidden;
overflow-x: hidden;
@ -3293,11 +3293,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
background: #feeed7;
color: #faaa39;
}
.bi-tip {
position: fixed !important;
}
.bi-toast {
color: #ffffff;
max-width: 400px;
@ -3321,7 +3321,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-toast .toast-icon {
font-size: 16px;
}
.bi-tooltip {
max-width: 250px;
-webkit-border-radius: 2px;
@ -3341,7 +3341,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
.bi-branch-tree .bi-branch-tree-view {
min-width: 300px;
}
.bi-display-tree .ztree * {
color: #999999;
}
@ -3594,8 +3594,8 @@ ul.ztree.zTreeDragUL {
padding:0;
background:none;
}*/
.bi-trigger .bi-trigger-icon-button {
font-size: 16px;
}
@ -3611,13 +3611,13 @@ ul.ztree.zTreeDragUL {
.bi-combo-popup > .bi-trigger .trigger-down {
display: none;
}
.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;
@ -3689,7 +3689,7 @@ ul.ztree.zTreeDragUL {
.bi-interval-slider-label {
min-height: 50px;
}
.bi-interval-slider {
min-height: 50px;
}
@ -3707,7 +3707,7 @@ ul.ztree.zTreeDragUL {
.bi-multi-select-check-pane .multi-select-check-selected {
text-decoration: underline;
}
.bi-multi-select-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3716,7 +3716,7 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-insert-combo .multi-select-trigger-icon-button {
font-size: 16px;
}
@ -3725,8 +3725,8 @@ ul.ztree.zTreeDragUL {
-moz-transform: rotate(180deg);
transform: rotate(180deg);
}
.bi-multi-select-trigger {
-webkit-border-radius: 2px 2px 2px 2px;
-moz-border-radius: 2px 2px 2px 2px;
@ -3750,7 +3750,7 @@ ul.ztree.zTreeDragUL {
border-bottom-right-radius: 0px;
border-bottom-left-radius: 0px;
}
.bi-multi-select-list .bi-search-editor {
-moz-border-radius-bottomleft: 0px;
-webkit-border-bottom-left-radius: 0px;
@ -3851,7 +3851,7 @@ ul.ztree.zTreeDragUL {
.bi-single-slider-label {
min-height: 50px;
}
.bi-single-slider-normal {
min-height: 30px;
}

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

@ -35673,8 +35673,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -35722,6 +35721,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

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

File diff suppressed because one or more lines are too long

8
dist/fineui.js vendored
Unescape View File

@ -36212,8 +36212,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -36261,6 +36260,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

16
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24780,8 +24780,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({
@ -24829,6 +24828,11 @@ BI.Text = BI.inherit(BI.Single, {
} else {
this.text = this;
}
},
mounted: function () {
var o = this.options;
if (BI.isKey(o.text)) {
this.setText(o.text);
} else if (BI.isKey(o.value)) {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/base/single/text.js
Unescape View File

@ -23,8 +23,7 @@ BI.Text = BI.inherit(BI.Single, {
});
},
_init: function () {
BI.Text.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options;
if (o.hgap + o.lgap > 0) {
this.element.css({

Write Preview
Loading…
Cancel
Save