fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

BI-22463 rich_edior和color_chooser_trigger灰化

es6
windy 7 years ago
parent
a01b6d61b7
commit
a1c399e4b6
19 changed files with 100 additions and 43 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
      demo/js/case/demo.color_chooser.js
  2. 18
      dist/_fineui.min.js
  3. 3
      dist/base.css
  4. 10
      dist/base.js
  5. 3
      dist/bundle.css
  6. 12
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 38
      dist/bundle.min.js
  9. 2
      dist/case.js
  10. 1
      dist/demo.js
  11. 3
      dist/fineui.css
  12. 12
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 18
      dist/fineui.min.js
  15. 1
      src/base/single/button/button.basic.js
  16. 9
      src/base/single/label/label.js
  17. 2
      src/case/richeditor/richeditor.js
  18. 3
      src/css/base/single/button/button.css
  19. 3
      src/less/base/single/button/button.less

1
demo/js/case/demo.color_chooser.js
Unescape View File

@ -25,6 +25,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, { }, {
el: { el: {
type: "bi.color_chooser", type: "bi.color_chooser",
disabled: true,
width: 230, width: 230,
height: 30 height: 30
}, },

18
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.css vendored
Unescape View File

@ -1334,6 +1334,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

10
dist/base.js vendored
Unescape View File

@ -842,6 +842,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -20398,6 +20399,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },

3
dist/bundle.css vendored
Unescape View File

@ -3380,6 +3380,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

12
dist/bundle.js vendored
Unescape View File

@ -36608,6 +36608,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -56164,6 +56165,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },
@ -84117,7 +84127,7 @@ BI.shortcut("bi.rich_editor_size_chooser", BI.RichEditorSizeChooser);/**
BI.RichEditor = BI.inherit(BI.Widget, { BI.RichEditor = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-rich-editor", baseCls: "bi-rich-editor bi-textarea",
toolbar: {}, toolbar: {},
readOnly: false readOnly: false
}, },

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

38
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/case.js vendored
Unescape View File

@ -11638,7 +11638,7 @@ BI.shortcut("bi.rich_editor_size_chooser", BI.RichEditorSizeChooser);/**
BI.RichEditor = BI.inherit(BI.Widget, { BI.RichEditor = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-rich-editor", baseCls: "bi-rich-editor bi-textarea",
toolbar: {}, toolbar: {},
readOnly: false readOnly: false
}, },

1
dist/demo.js vendored
Unescape View File

@ -2449,6 +2449,7 @@ BI.shortcut("demo.color_chooser_popup", Demo.Func);Demo.Func = BI.inherit(BI.Wid
}, { }, {
el: { el: {
type: "bi.color_chooser", type: "bi.color_chooser",
disabled: true,
width: 230, width: 230,
height: 30 height: 30
}, },

3
dist/fineui.css vendored
Unescape View File

@ -3380,6 +3380,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

12
dist/fineui.js vendored
Unescape View File

@ -36851,6 +36851,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -56407,6 +56408,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },
@ -84360,7 +84370,7 @@ BI.shortcut("bi.rich_editor_size_chooser", BI.RichEditorSizeChooser);/**
BI.RichEditor = BI.inherit(BI.Widget, { BI.RichEditor = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-rich-editor", baseCls: "bi-rich-editor bi-textarea",
toolbar: {}, toolbar: {},
readOnly: false readOnly: false
}, },

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -238,6 +238,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;

9
src/base/single/label/label.js
Unescape View File

@ -427,6 +427,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },

2
src/case/richeditor/richeditor.js
Unescape View File

@ -8,7 +8,7 @@
BI.RichEditor = BI.inherit(BI.Widget, { BI.RichEditor = BI.inherit(BI.Widget, {
props: { props: {
baseCls: "bi-rich-editor", baseCls: "bi-rich-editor bi-textarea",
toolbar: {}, toolbar: {},
readOnly: false readOnly: false
}, },

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

@ -325,6 +325,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

3
src/less/base/single/button/button.less
Unescape View File

@ -169,6 +169,9 @@ body .bi-button, #body .bi-button {
} }
} }
} }
& .popup-content{
font-size: @font-size-14;
}
} }
.bi-theme-dark { .bi-theme-dark {

Write Preview
Loading…
Cancel
Save