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

Pull request #3272: 无JRIA fix: 再检查一遍输入框圆角问题 

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '409aa7a91c62ebb9fd6d5236d681dc3736dc7dd1':
  无JRIA fix: 再检查一遍输入框圆角问题
research/test
Dailer-刘荣歆 2 years ago
parent
795f0f0389 409aa7a91c
commit
d3e381e30f
5 changed files with 337 additions and 305 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
      src/case/colorchooser/colorpicker/button/button.colorshow.js
  2. 58
      src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
  3. 36
      src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
  4. 14
      src/case/colorchooser/colorpicker/editor.colorpicker.js
  5. 8
      src/case/colorchooser/colorpicker/editor.colorpicker.simple.js

8
src/case/colorchooser/colorpicker/button/button.colorshow.js
Unescape View File

@ -6,14 +6,15 @@
BI.ColorChooserShowButton = BI.inherit(BI.BasicButton, {
props: {
baseCls: 'bi-color-chooser-show-button bi-border bi-list-item-effect',
baseCls: 'bi-color-chooser-show-button bi-border bi-list-item-effect bi-border-radius',
},
render: function () {
var self = this, o = this.options;
return {
type: 'bi.htape',
items: [{
items: [
{
el: {
type: "bi.icon_label",
ref: function (_ref) {
@ -28,8 +29,9 @@ BI.ColorChooserShowButton = BI.inherit(BI.BasicButton, {
type: 'bi.label',
textAlign: 'left',
text: o.text,
}]
}
]
};
},
doClick: function () {

58
src/case/colorchooser/colorpicker/editor.colorpicker.hex.js
Unescape View File

@ -33,14 +33,15 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
var Ws = BI.map(BI.range(0, 3), function () {
return {
type: "bi.small_text_editor",
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: checker,
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: c.RGB_WIDTH,
height: 24,
listeners: [{
listeners: [
{
eventName: BI.TextEditor.EVENT_CHANGE,
action: function () {
self._checkEditors();
@ -49,33 +50,39 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}
}]
}
]
};
});
return {
type: "bi.absolute",
items: [{
items: [
{
el: {
type: "bi.vertical",
tgap: 10,
items: [{
items: [
{
type: 'bi.vertical_adapt',
columnSize: ["fill", 'fill'],
height: 24,
items: [{
items: [
{
type: "bi.color_picker_show_button",
cls: "trans-color-icon",
height: 22,
title: BI.i18nText("BI-Transparent_Color"),
text: BI.i18nText("BI-Transparent_Color"),
listeners: [{
listeners: [
{
eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
action: function () {
self.setValue("transparent");
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}],
}
],
ref: function (_ref) {
self.transparent = _ref;
}
@ -86,26 +93,30 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
height: 22,
title: BI.i18nText("BI-Basic_Auto"),
text: BI.i18nText("BI-Basic_Auto"),
listeners: [{
listeners: [
{
eventName: BI.ColorChooserShowButton.EVENT_CHANGE,
action: function () {
self.setValue("");
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}],
}
],
ref: function (_ref) {
self.none = _ref;
}
},
lgap: 10,
}]
}
]
}, {
el: {
type: "bi.vertical_adapt",
columnSize: [22, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
rgap: 5,
items: [{
items: [
{
el: {
type: "bi.layout",
cls: "color-picker-editor-display bi-card bi-border",
@ -125,13 +136,14 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
ref: function (_ref) {
self.hexEditor = _ref;
},
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: this._hexChecker,
allowBlank: true,
errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"),
width: c.HEX_WIDTH,
height: 24,
listeners: [{
listeners: [
{
eventName: "EVENT_CHANGE",
action: function () {
self._checkHexEditor();
@ -141,38 +153,42 @@ BI.HexColorPickerEditor = BI.inherit(BI.Widget, {
}
}
}]
}
]
}, RGB[0], {
el: BI.extend(Ws[0], {
ref: function (_ref) {
self.R = _ref
self.R = _ref;
}
}),
width: c.RGB_WIDTH
}, RGB[1], {
el: BI.extend(Ws[1], {
ref: function (_ref) {
self.G = _ref
self.G = _ref;
}
}),
width: c.RGB_WIDTH
}, RGB[2], {
el: BI.extend(Ws[2], {
ref: function (_ref) {
self.B = _ref
self.B = _ref;
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
]
}
}
]
},
left: 0,
right: 0,
top: 0,
bottom: 0
}]
}
]
};
},

36
src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
Unescape View File

@ -31,14 +31,15 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
var Ws = BI.map(BI.range(0, 3), function () {
return {
type: "bi.small_text_editor",
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: checker,
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: c.RGB_WIDTH,
height: 24,
listeners: [{
listeners: [
{
eventName: BI.TextEditor.EVENT_CHANGE,
action: function () {
self._checkEditors();
@ -47,19 +48,22 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SimpleColorPickerEditor.EVENT_CHANGE);
}
}
}]
}
]
};
});
return {
type: "bi.vertical",
tgap: 10,
items: [{
items: [
{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [22, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
items: [
{
el: {
type: "bi.layout",
cls: "color-picker-editor-display bi-card bi-border",
@ -79,13 +83,14 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
ref: function (_ref) {
self.hexEditor = _ref;
},
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: this._hexChecker,
allowBlank: true,
errorText: BI.i18nText("BI-Color_Picker_Error_Text_Hex"),
width: c.HEX_WIDTH,
height: 24,
listeners: [{
listeners: [
{
eventName: "EVENT_CHANGE",
action: function () {
self._checkHexEditor();
@ -94,34 +99,37 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.ColorPickerEditor.EVENT_CHANGE);
}
}
}]
}
]
}, RGB[0], {
el: BI.extend(Ws[0], {
ref: function (_ref) {
self.R = _ref
self.R = _ref;
}
}),
width: c.RGB_WIDTH
}, RGB[1], {
el: BI.extend(Ws[1], {
ref: function (_ref) {
self.G = _ref
self.G = _ref;
}
}),
width: c.RGB_WIDTH
}, RGB[2], {
el: BI.extend(Ws[2], {
ref: function (_ref) {
self.B = _ref
self.B = _ref;
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
]
}
}
]
};
},
_hexChecker: function (v) {

14
src/case/colorchooser/colorpicker/editor.colorpicker.js
Unescape View File

@ -41,7 +41,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
};
var Ws = BI.createWidgets([{}, {}, {}], {
type: "bi.small_text_editor",
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: checker,
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
@ -95,10 +95,12 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
items: [
{
el: {
type: "bi.vertical_adapt",
items: [{
items: [
{
el: this.colorShow,
width: 16
}, {
@ -127,13 +129,15 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
el: this.none,
width: 16,
lgap: 5
}]
}
]
},
left: 10,
right: 10,
top: 0,
bottom: 0
}]
}
]
});
},

8
src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
Unescape View File

@ -40,7 +40,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
};
var Ws = BI.createWidgets([{}, {}, {}], {
type: "bi.small_text_editor",
cls: "color-picker-editor-input",
cls: "color-picker-editor-input bi-border-radius",
validationChecker: checker,
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
@ -64,7 +64,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.vertical_adapt",
element: this,
items: [{
items: [
{
el: this.colorShow,
width: 16,
lgap: 20,
@ -87,7 +88,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
}, {
el: this.B,
width: c.RGB_WIDTH
}]
}
]
});
},

Write Preview
Loading…
Cancel
Save