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

BI-22461

es6
windy 7 years ago
parent
ecefe3613e
commit
a0e750269b
21 changed files with 389 additions and 236 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. 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. 114
      dist/bundle.js
  8. 2
      dist/bundle.min.css
  9. 32
      dist/bundle.min.js
  10. 114
      dist/case.js
  11. 6
      dist/demo.js
  12. 6
      dist/fineui.css
  13. 114
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 44
      dist/fineui.min.js
  16. 110
      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
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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
View File

File diff suppressed because one or more lines are too long

6
dist/base.css vendored
Unescape View File

@ -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
Unescape View File

@ -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;

114
dist/bundle.js vendored
Unescape View File

@ -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,53 +76301,84 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.vtape", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.vtape",
cls: "bi-background bi-border-bottom",
items: [{
el: this.colorEditor,
left: 0,
right: 0,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{ items: [{
el: this.storeColors, el: {
left: 5, type: "bi.absolute",
right: 5, cls: "bi-background bi-border-bottom",
top: 5 items: [{
el: this.colorEditor,
left: 0,
right: 0,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.storeColors,
left: 5,
right: 5,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.colorPicker,
left: 5,
right: 5,
top: 5
}]
},
height: 65
}, {
el: this.more,
height: 20
}] }]
}, },
height: 30 left: 0,
right: 0,
top: 0,
bottom: 0
}, { }, {
el: { el: {
type: "bi.absolute", type: "bi.layout",
items: [{ cls: "disable-mask",
el: this.colorPicker, invisible: !o.disabled,
left: 5, ref: function () {
right: 5, self.mask = this;
top: 5 }
}]
}, },
height: 65 left: 0,
}, { right: 0,
el: this.more, top: 0,
height: 20 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
View File

File diff suppressed because one or more lines are too long

32
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

114
dist/case.js vendored
Unescape View File

@ -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,53 +3822,84 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.vtape", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.vtape",
cls: "bi-background bi-border-bottom",
items: [{ items: [{
el: this.colorEditor, el: {
left: 0, type: "bi.absolute",
right: 0, cls: "bi-background bi-border-bottom",
top: 5 items: [{
}] el: this.colorEditor,
}, left: 0,
height: 30 right: 0,
}, { top: 5
el: { }]
type: "bi.absolute", },
items: [{ height: 30
el: this.storeColors, }, {
left: 5, el: {
right: 5, type: "bi.absolute",
top: 5 items: [{
el: this.storeColors,
left: 5,
right: 5,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.colorPicker,
left: 5,
right: 5,
top: 5
}]
},
height: 65
}, {
el: this.more,
height: 20
}] }]
}, },
height: 30 left: 0,
right: 0,
top: 0,
bottom: 0
}, { }, {
el: { el: {
type: "bi.absolute", type: "bi.layout",
items: [{ cls: "disable-mask",
el: this.colorPicker, invisible: !o.disabled,
left: 5, ref: function () {
right: 5, self.mask = this;
top: 5 }
}]
}, },
height: 65 left: 0,
}, { right: 0,
el: this.more, top: 0,
height: 20 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
Unescape View File

@ -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
Unescape View File

@ -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;

114
dist/fineui.js vendored
Unescape View File

@ -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,53 +76544,84 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.vtape", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.vtape",
cls: "bi-background bi-border-bottom",
items: [{
el: this.colorEditor,
left: 0,
right: 0,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{ items: [{
el: this.storeColors, el: {
left: 5, type: "bi.absolute",
right: 5, cls: "bi-background bi-border-bottom",
top: 5 items: [{
el: this.colorEditor,
left: 0,
right: 0,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.storeColors,
left: 5,
right: 5,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.colorPicker,
left: 5,
right: 5,
top: 5
}]
},
height: 65
}, {
el: this.more,
height: 20
}] }]
}, },
height: 30 left: 0,
right: 0,
top: 0,
bottom: 0
}, { }, {
el: { el: {
type: "bi.absolute", type: "bi.layout",
items: [{ cls: "disable-mask",
el: this.colorPicker, invisible: !o.disabled,
left: 5, ref: function () {
right: 5, self.mask = this;
top: 5 }
}]
}, },
height: 65 left: 0,
}, { right: 0,
el: this.more, top: 0,
height: 20 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
View File

File diff suppressed because one or more lines are too long

44
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

110
src/case/colorchooser/colorchooser.popup.js
Unescape View File

@ -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,53 +120,84 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
} }
}); });
BI.createWidget({ return {
type: "bi.vtape", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.absolute", type: "bi.vtape",
cls: "bi-background bi-border-bottom",
items: [{ items: [{
el: this.colorEditor, el: {
left: 0, type: "bi.absolute",
right: 0, cls: "bi-background bi-border-bottom",
top: 5 items: [{
el: this.colorEditor,
left: 0,
right: 0,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.storeColors,
left: 5,
right: 5,
top: 5
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.colorPicker,
left: 5,
right: 5,
top: 5
}]
},
height: 65
}, {
el: this.more,
height: 20
}] }]
}, },
height: 30 left: 0,
right: 0,
top: 0,
bottom: 0
}, { }, {
el: { el: {
type: "bi.absolute", type: "bi.layout",
items: [{ cls: "disable-mask",
el: this.storeColors, invisible: !o.disabled,
left: 5, ref: function () {
right: 5, self.mask = this;
top: 5 }
}]
},
height: 30
}, {
el: {
type: "bi.absolute",
items: [{
el: this.colorPicker,
left: 5,
right: 5,
top: 5
}]
}, },
height: 65 left: 0,
}, { right: 0,
el: this.more, top: 0,
height: 20 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
Unescape View File

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

6
src/css/base/colorchooser/colorchooser.css
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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 {

Write Preview
Loading…
Cancel
Save