Browse Source

BI-22461

es6
windy 7 years ago
parent
commit
a0e750269b
  1. 4
      demo/js/base/editor/demo.editor.js
  2. 1
      demo/js/base/editor/demo.rich_editor.js
  3. 1
      demo/js/case/demo.color_chooser_popup.js
  4. 44
      dist/_fineui.min.js
  5. 6
      dist/base.css
  6. 6
      dist/bundle.css
  7. 48
      dist/bundle.js
  8. 2
      dist/bundle.min.css
  9. 32
      dist/bundle.min.js
  10. 48
      dist/case.js
  11. 6
      dist/demo.js
  12. 6
      dist/fineui.css
  13. 48
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 44
      dist/fineui.min.js
  16. 44
      src/case/colorchooser/colorchooser.popup.js
  17. 2
      src/case/editor/editor.state.simple.js
  18. 2
      src/case/richeditor/richeditor.js
  19. 6
      src/css/base/colorchooser/colorchooser.css
  20. 8
      src/less/base/colorchooser/colorchooser.popup.less
  21. 1
      src/less/core/utils/common.less

4
demo/js/base/editor/demo.editor.js

@ -9,7 +9,9 @@ Demo.Editor = BI.inherit(BI.Widget, {
watermark: "alert信息显示在下面", watermark: "alert信息显示在下面",
errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
width: 200, width: 200,
height: 30 height: 30,
value: "aaa",
disabled: true
}); });
editor1.on(BI.Editor.EVENT_ENTER, function () { editor1.on(BI.Editor.EVENT_ENTER, function () {
editor1.blur(); editor1.blur();

1
demo/js/base/editor/demo.rich_editor.js

@ -12,6 +12,7 @@ Demo.RichEditor = BI.inherit(BI.Widget, {
type: "bi.rich_editor", type: "bi.rich_editor",
height: "100%", height: "100%",
cls: "bi-border", cls: "bi-border",
disabled: true,
ref: function () { ref: function () {
self.editor = this; self.editor = this;
}, },

1
demo/js/case/demo.color_chooser_popup.js

@ -9,6 +9,7 @@ Demo.Func = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
disabled: true,
cls: "bi-card" cls: "bi-card"
}, },
left: 100, left: 100,

44
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/base.css vendored

@ -1,3 +1,9 @@
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger { .bi-color-chooser-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

6
dist/bundle.css vendored

@ -2044,6 +2044,12 @@ textarea {
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {
color: #ffffff; color: #ffffff;
} }
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger { .bi-color-chooser-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

48
dist/bundle.js vendored

@ -76188,16 +76188,13 @@ BI.shortcut("bi.color_chooser", BI.ColorChooser);/**
*/ */
BI.ColorChooserPopup = BI.inherit(BI.Widget, { BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () { props: {
return BI.extend(BI.ColorChooserPopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 200, width: 200,
height: 145 height: 145
});
}, },
_init: function () { render: function () {
BI.ColorChooserPopup.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: "bi.color_picker_editor",
@ -76304,9 +76301,11 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.absolute",
items: [{
el: {
type: "bi.vtape", type: "bi.vtape",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.absolute",
@ -76345,12 +76344,41 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
el: this.more, el: this.more,
height: 20 height: 20
}] }]
}); },
left: 0,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.layout",
cls: "disable-mask",
invisible: !o.disabled,
ref: function () {
self.mask = this;
}
},
left: 0,
right: 0,
top: 0,
bottom: 0
}]
};
},
mounted: function () {
var self = this;
var o = this.options;
if (BI.isNotNull(o.value)) { if (BI.isNotNull(o.value)) {
this.setValue(o.value); this.setValue(o.value);
} }
}, },
_setEnable: function (enable) {
BI.ColorChooserPopup.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
var items = BI.map(colors, function (i, color) { var items = BI.map(colors, function (i, color) {
@ -80709,7 +80737,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
}); });
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "state-editor-infinite-text bi-disabled", cls: "state-editor-infinite-text",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: BI.i18nText("BI-Basic_Unrestricted"), text: BI.i18nText("BI-Basic_Unrestricted"),
@ -84089,7 +84117,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

File diff suppressed because one or more lines are too long

32
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

48
dist/case.js vendored

@ -3709,16 +3709,13 @@ BI.shortcut("bi.color_chooser", BI.ColorChooser);/**
*/ */
BI.ColorChooserPopup = BI.inherit(BI.Widget, { BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () { props: {
return BI.extend(BI.ColorChooserPopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 200, width: 200,
height: 145 height: 145
});
}, },
_init: function () { render: function () {
BI.ColorChooserPopup.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: "bi.color_picker_editor",
@ -3825,9 +3822,11 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.absolute",
items: [{
el: {
type: "bi.vtape", type: "bi.vtape",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.absolute",
@ -3866,12 +3865,41 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
el: this.more, el: this.more,
height: 20 height: 20
}] }]
}); },
left: 0,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.layout",
cls: "disable-mask",
invisible: !o.disabled,
ref: function () {
self.mask = this;
}
},
left: 0,
right: 0,
top: 0,
bottom: 0
}]
};
},
mounted: function () {
var self = this;
var o = this.options;
if (BI.isNotNull(o.value)) { if (BI.isNotNull(o.value)) {
this.setValue(o.value); this.setValue(o.value);
} }
}, },
_setEnable: function (enable) {
BI.ColorChooserPopup.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
var items = BI.map(colors, function (i, color) { var items = BI.map(colors, function (i, color) {
@ -8230,7 +8258,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
}); });
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "state-editor-infinite-text bi-disabled", cls: "state-editor-infinite-text",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: BI.i18nText("BI-Basic_Unrestricted"), text: BI.i18nText("BI-Basic_Unrestricted"),
@ -11610,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
}, },

6
dist/demo.js vendored

@ -721,7 +721,9 @@ BI.shortcut("demo.code_editor", Demo.CodeEditor);Demo.Editor = BI.inherit(BI.Wid
watermark: "alert信息显示在下面", watermark: "alert信息显示在下面",
errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", errorText: "字段不可重名!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
width: 200, width: 200,
height: 30 height: 30,
value: "aaa",
disabled: true
}); });
editor1.on(BI.Editor.EVENT_ENTER, function () { editor1.on(BI.Editor.EVENT_ENTER, function () {
editor1.blur(); editor1.blur();
@ -865,6 +867,7 @@ BI.shortcut("demo.multifile_editor", Demo.CodeEditor);Demo.RichEditor = BI.inher
type: "bi.rich_editor", type: "bi.rich_editor",
height: "100%", height: "100%",
cls: "bi-border", cls: "bi-border",
disabled: true,
ref: function () { ref: function () {
self.editor = this; self.editor = this;
}, },
@ -2406,6 +2409,7 @@ BI.shortcut("demo.clipboard", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
items: [{ items: [{
el: { el: {
type: "bi.color_chooser_popup", type: "bi.color_chooser_popup",
disabled: true,
cls: "bi-card" cls: "bi-card"
}, },
left: 100, left: 100,

6
dist/fineui.css vendored

@ -2044,6 +2044,12 @@ textarea {
.bi-theme-dark .bi-input { .bi-theme-dark .bi-input {
color: #ffffff; color: #ffffff;
} }
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger { .bi-color-chooser-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

48
dist/fineui.js vendored

@ -76431,16 +76431,13 @@ BI.shortcut("bi.color_chooser", BI.ColorChooser);/**
*/ */
BI.ColorChooserPopup = BI.inherit(BI.Widget, { BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () { props: {
return BI.extend(BI.ColorChooserPopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 200, width: 200,
height: 145 height: 145
});
}, },
_init: function () { render: function () {
BI.ColorChooserPopup.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: "bi.color_picker_editor",
@ -76547,9 +76544,11 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.absolute",
items: [{
el: {
type: "bi.vtape", type: "bi.vtape",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.absolute",
@ -76588,12 +76587,41 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
el: this.more, el: this.more,
height: 20 height: 20
}] }]
}); },
left: 0,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.layout",
cls: "disable-mask",
invisible: !o.disabled,
ref: function () {
self.mask = this;
}
},
left: 0,
right: 0,
top: 0,
bottom: 0
}]
};
},
mounted: function () {
var self = this;
var o = this.options;
if (BI.isNotNull(o.value)) { if (BI.isNotNull(o.value)) {
this.setValue(o.value); this.setValue(o.value);
} }
}, },
_setEnable: function (enable) {
BI.ColorChooserPopup.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
var items = BI.map(colors, function (i, color) { var items = BI.map(colors, function (i, color) {
@ -80952,7 +80980,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
}); });
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "state-editor-infinite-text bi-disabled", cls: "state-editor-infinite-text",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: BI.i18nText("BI-Basic_Unrestricted"), text: BI.i18nText("BI-Basic_Unrestricted"),
@ -84332,7 +84360,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

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

44
src/case/colorchooser/colorchooser.popup.js

@ -7,16 +7,13 @@
*/ */
BI.ColorChooserPopup = BI.inherit(BI.Widget, { BI.ColorChooserPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () { props: {
return BI.extend(BI.ColorChooserPopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser-popup", baseCls: "bi-color-chooser-popup",
width: 200, width: 200,
height: 145 height: 145
});
}, },
_init: function () { render: function () {
BI.ColorChooserPopup.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.colorEditor = BI.createWidget(o.editor, { this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor", type: "bi.color_picker_editor",
@ -123,9 +120,11 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.absolute",
items: [{
el: {
type: "bi.vtape", type: "bi.vtape",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.absolute",
@ -164,12 +163,41 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
el: this.more, el: this.more,
height: 20 height: 20
}] }]
}); },
left: 0,
right: 0,
top: 0,
bottom: 0
}, {
el: {
type: "bi.layout",
cls: "disable-mask",
invisible: !o.disabled,
ref: function () {
self.mask = this;
}
},
left: 0,
right: 0,
top: 0,
bottom: 0
}]
};
},
mounted: function () {
var self = this;
var o = this.options;
if (BI.isNotNull(o.value)) { if (BI.isNotNull(o.value)) {
this.setValue(o.value); this.setValue(o.value);
} }
}, },
_setEnable: function (enable) {
BI.ColorChooserPopup.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
setStoreColors: function (colors) { setStoreColors: function (colors) {
if (BI.isArray(colors)) { if (BI.isArray(colors)) {
var items = BI.map(colors, function (i, color) { var items = BI.map(colors, function (i, color) {

2
src/case/editor/editor.state.simple.js

@ -46,7 +46,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
}); });
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.text_button", type: "bi.text_button",
cls: "state-editor-infinite-text bi-disabled", cls: "state-editor-infinite-text",
textAlign: "left", textAlign: "left",
height: o.height, height: o.height,
text: BI.i18nText("BI-Basic_Unrestricted"), text: BI.i18nText("BI-Basic_Unrestricted"),

2
src/case/richeditor/richeditor.js

@ -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
}, },

6
src/css/base/colorchooser/colorchooser.css

@ -1,3 +1,9 @@
.bi-color-chooser-popup .disable-mask {
opacity: 0.5;
filter: alpha(opacity=50);
background-color: #ffffff;
}
.bi-color-chooser-trigger { .bi-color-chooser-trigger {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

8
src/less/base/colorchooser/colorchooser.popup.less

@ -0,0 +1,8 @@
@import "../../index";
.bi-color-chooser-popup {
& .disable-mask {
.opacity(0.5);
background-color: @color-bi-background-default;
}
}

1
src/less/core/utils/common.less

@ -24,6 +24,7 @@ textarea {
& .b-font:before { & .b-font:before {
color: @color-bi-text-disabled !important; color: @color-bi-text-disabled !important;
} }
} }
.bi-theme-dark { .bi-theme-dark {

Loading…
Cancel
Save