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

BI-24689 视觉合集

es6
windy 6 years ago
parent
1299a47750
commit
b1ef567305
20 changed files with 93 additions and 69 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. 5
      dist/base.js
  2. 4
      dist/bundle.css
  3. 34
      dist/bundle.js
  4. 20
      dist/case.js
  5. 4
      dist/fineui.css
  6. 34
      dist/fineui.js
  7. 4
      dist/resource.css
  8. 9
      dist/widget.js
  9. 4
      public/css/background.css
  10. 5
      src/base/single/editor/editor.code.js
  11. 4
      src/case/colorchooser/colorchooser.custom.js
  12. 4
      src/case/colorchooser/colorpicker/editor.colorpicker.js
  13. 12
      src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
  14. 4
      src/component/treevaluechooser/combo.treevaluechooser.js
  15. 4
      src/css/resource/background.css
  16. 2
      src/less/lib/background.less
  17. 1
      src/widget/multitree/multi.tree.combo.js
  18. 2
      src/widget/singleslider/button/editor.sign.text.js
  19. 2
      src/widget/singleslider/singleslider.js
  20. 4
      ui/css/background.css

5
dist/base.js vendored
Unescape View File

@ -18247,10 +18247,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b"); this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
var options = {className: "param", atomic: true, replacedWith: $("<span class='param start end' />").text(param)[0]}; var className = "param";
if (BI.isNotNull(param.match(/^<!.*!>$/))) { if (BI.isNotNull(param.match(/^<!.*!>$/))) {
options.className = "error-param"; className = "error-param";
} }
var options = {className: className, atomic: true, replacedWith: $("<span class='" + className + " start end' />").text(param)[0]};
options.value = value; options.value = value;
this.editor.markText(from, to, options); this.editor.markText(from, to, options);
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");

4
dist/bundle.css vendored
Unescape View File

@ -4591,8 +4591,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

34
dist/bundle.js vendored
Unescape View File

@ -54052,10 +54052,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b"); this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
var options = {className: "param", atomic: true, replacedWith: $("<span class='param start end' />").text(param)[0]}; var className = "param";
if (BI.isNotNull(param.match(/^<!.*!>$/))) { if (BI.isNotNull(param.match(/^<!.*!>$/))) {
options.className = "error-param"; className = "error-param";
} }
var options = {className: className, atomic: true, replacedWith: $("<span class='" + className + " start end' />").text(param)[0]};
options.value = value; options.value = value;
this.editor.markText(from, to, options); this.editor.markText(from, to, options);
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
@ -76132,7 +76133,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments); BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, { this.editor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor" type: "bi.simple_color_picker_editor"
}); });
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () { this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue()); self.setValue(this.getValue());
@ -76162,7 +76163,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic, el: this.farbtastic,
left: 15, left: 15,
right: 15, right: 15,
top: 10 top: 7
}], }],
height: 215 height: 215
}] }]
@ -77200,9 +77201,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) { _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments); BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable); this._showPreColor(this.getValue());
}, },
setValue: function (color) { setValue: function (color) {
@ -77264,7 +77265,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor",
// width: 200, // width: 200,
height: 20 height: 30
}); });
}, },
@ -77274,8 +77275,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({ this.colorShow = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "color-picker-editor-display bi-card", cls: "color-picker-editor-display bi-card",
height: 20, height: 16,
width: 40 width: 16
}); });
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label", type: "bi.label",
@ -77314,9 +77315,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.colorShow, el: this.colorShow,
width: 40, width: 16,
lgap: 5, lgap: 20,
rgap: 5 rgap: 15
}, { }, {
el: RGB[0], el: RGB[0],
width: 20 width: 20
@ -101388,6 +101389,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
trigger: o.trigger,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -107831,7 +107833,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -108249,6 +108251,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); this.label.element.css({left: percent + "%"});
// this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
// this.label.formatTextWrapper.resize();
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {
@ -113051,6 +113055,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -113071,7 +113076,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue(); return this.combo.getValue();
}, },
populate: function () { populate: function (items) {
this._initData(items);
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

20
dist/case.js vendored
Unescape View File

@ -3568,7 +3568,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments); BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, { this.editor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor" type: "bi.simple_color_picker_editor"
}); });
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () { this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue()); self.setValue(this.getValue());
@ -3598,7 +3598,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic, el: this.farbtastic,
left: 15, left: 15,
right: 15, right: 15,
top: 10 top: 7
}], }],
height: 215 height: 215
}] }]
@ -4636,9 +4636,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) { _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments); BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable); this._showPreColor(this.getValue());
}, },
setValue: function (color) { setValue: function (color) {
@ -4700,7 +4700,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor",
// width: 200, // width: 200,
height: 20 height: 30
}); });
}, },
@ -4710,8 +4710,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({ this.colorShow = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "color-picker-editor-display bi-card", cls: "color-picker-editor-display bi-card",
height: 20, height: 16,
width: 40 width: 16
}); });
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label", type: "bi.label",
@ -4750,9 +4750,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.colorShow, el: this.colorShow,
width: 40, width: 16,
lgap: 5, lgap: 20,
rgap: 5 rgap: 15
}, { }, {
el: RGB[0], el: RGB[0],
width: 20 width: 20

4
dist/fineui.css vendored
Unescape View File

@ -4591,8 +4591,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

34
dist/fineui.js vendored
Unescape View File

@ -54301,10 +54301,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b"); this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
var options = {className: "param", atomic: true, replacedWith: $("<span class='param start end' />").text(param)[0]}; var className = "param";
if (BI.isNotNull(param.match(/^<!.*!>$/))) { if (BI.isNotNull(param.match(/^<!.*!>$/))) {
options.className = "error-param"; className = "error-param";
} }
var options = {className: className, atomic: true, replacedWith: $("<span class='" + className + " start end' />").text(param)[0]};
options.value = value; options.value = value;
this.editor.markText(from, to, options); this.editor.markText(from, to, options);
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");
@ -76381,7 +76382,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments); BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, { this.editor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor" type: "bi.simple_color_picker_editor"
}); });
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () { this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue()); self.setValue(this.getValue());
@ -76411,7 +76412,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic, el: this.farbtastic,
left: 15, left: 15,
right: 15, right: 15,
top: 10 top: 7
}], }],
height: 215 height: 215
}] }]
@ -77449,9 +77450,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) { _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments); BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable); this._showPreColor(this.getValue());
}, },
setValue: function (color) { setValue: function (color) {
@ -77513,7 +77514,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor",
// width: 200, // width: 200,
height: 20 height: 30
}); });
}, },
@ -77523,8 +77524,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({ this.colorShow = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "color-picker-editor-display bi-card", cls: "color-picker-editor-display bi-card",
height: 20, height: 16,
width: 40 width: 16
}); });
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label", type: "bi.label",
@ -77563,9 +77564,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.colorShow, el: this.colorShow,
width: 40, width: 16,
lgap: 5, lgap: 20,
rgap: 5 rgap: 15
}, { }, {
el: RGB[0], el: RGB[0],
width: 20 width: 20
@ -101637,6 +101638,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
trigger: o.trigger,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -108080,7 +108082,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -108498,6 +108500,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); this.label.element.css({left: percent + "%"});
// this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
// this.label.formatTextWrapper.resize();
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {
@ -113300,6 +113304,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -113320,7 +113325,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue(); return this.combo.getValue();
}, },
populate: function () { populate: function (items) {
this._initData(items);
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

4
dist/resource.css vendored
Unescape View File

@ -320,8 +320,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center; background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

9
dist/widget.js vendored
Unescape View File

@ -13586,6 +13586,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
trigger: o.trigger,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {
@ -20029,7 +20030,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -20447,6 +20448,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); this.label.element.css({left: percent + "%"});
// this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
// this.label.formatTextWrapper.resize();
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {
@ -25249,6 +25252,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -25269,7 +25273,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue(); return this.combo.getValue();
}, },
populate: function () { populate: function (items) {
this._initData(items);
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

4
public/css/background.css
Unescape View File

@ -249,8 +249,8 @@
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center; background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

5
src/base/single/editor/editor.code.js
Unescape View File

@ -124,10 +124,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下 // 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b"); this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor(); var to = this.editor.getCursor();
var options = {className: "param", atomic: true, replacedWith: $("<span class='param start end' />").text(param)[0]}; var className = "param";
if (BI.isNotNull(param.match(/^<!.*!>$/))) { if (BI.isNotNull(param.match(/^<!.*!>$/))) {
options.className = "error-param"; className = "error-param";
} }
var options = {className: className, atomic: true, replacedWith: $("<span class='" + className + " start end' />").text(param)[0]};
options.value = value; options.value = value;
this.editor.markText(from, to, options); this.editor.markText(from, to, options);
this.editor.replaceSelection(" "); this.editor.replaceSelection(" ");

4
src/case/colorchooser/colorchooser.custom.js
Unescape View File

@ -19,7 +19,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments); BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, { this.editor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor" type: "bi.simple_color_picker_editor"
}); });
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () { this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue()); self.setValue(this.getValue());
@ -49,7 +49,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic, el: this.farbtastic,
left: 15, left: 15,
right: 15, right: 15,
top: 10 top: 7
}], }],
height: 215 height: 215
}] }]

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

@ -190,9 +190,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) { _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments); BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable); this._showPreColor(this.getValue());
}, },
setValue: function (color) { setValue: function (color) {

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

@ -11,7 +11,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor", baseCls: "bi-color-picker-editor",
// width: 200, // width: 200,
height: 20 height: 30
}); });
}, },
@ -21,8 +21,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({ this.colorShow = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "color-picker-editor-display bi-card", cls: "color-picker-editor-display bi-card",
height: 20, height: 16,
width: 40 width: 16
}); });
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], { var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label", type: "bi.label",
@ -61,9 +61,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this, element: this,
items: [{ items: [{
el: this.colorShow, el: this.colorShow,
width: 40, width: 16,
lgap: 5, lgap: 20,
rgap: 5 rgap: 15
}, { }, {
el: RGB[0], el: RGB[0],
width: 20 width: 20

4
src/component/treevaluechooser/combo.treevaluechooser.js
Unescape View File

@ -25,6 +25,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
} }
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.multi_tree_combo", type: "bi.multi_tree_combo",
trigger: o.trigger,
element: this, element: this,
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this), valueFormatter: BI.bind(this._valueFormatter, this),
@ -45,7 +46,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue(); return this.combo.getValue();
}, },
populate: function () { populate: function (items) {
this._initData(items);
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
} }
}); });

4
src/css/resource/background.css
Unescape View File

@ -249,8 +249,8 @@
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('images/1x/background/auto_color_normal.png') no-repeat center center; background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

2
src/less/lib/background.less
Unescape View File

@ -1,6 +1,6 @@
@background-auto-color: "background/auto_color.png"; @background-auto-color: "background/auto_color.png";
@background-auto-color-normal: "background/auto_color_normal.png"; @background-auto-color-normal: "background/auto_color_normal.png";
@background-auto-color-normal-disabled: "background/auto_color_normal.png"; @background-auto-color-normal-disabled: "background/auto_color_normal_disable.png";
@background-trans-color: "background/trans_normal.png"; @background-trans-color: "background/trans_normal.png";
@background-trans-color-disabled: "background/trans_disable.png"; @background-trans-color-disabled: "background/trans_disable.png";

1
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -62,6 +62,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.combo", type: "bi.combo",
toggle: false, toggle: false,
trigger: o.trigger,
el: this.trigger, el: this.trigger,
adjustLength: 1, adjustLength: 1,
popup: { popup: {

2
src/widget/singleslider/button/editor.sign.text.js
Unescape View File

@ -63,7 +63,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL); self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
}); });
}); });
BI.createWidget({ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{

2
src/widget/singleslider/singleslider.js
Unescape View File

@ -239,6 +239,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) { _setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"}); this.label.element.css({left: percent + "%"});
// this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
// this.label.formatTextWrapper.resize();
}, },
_setSliderPosition: function (percent) { _setSliderPosition: function (percent) {

4
ui/css/background.css
Unescape View File

@ -249,8 +249,8 @@
_background: none; _background: none;
} }
.auto-color-normal-disabled-background { .auto-color-normal-disabled-background {
background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
_filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png'); _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none; _background: none;
} }
.trans-color-background { .trans-color-background {

Write Preview
Loading…
Cancel
Save