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

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui 

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/widget.js
#	src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
es6
windy 6 years ago
parent
3efc812a82 069a3430cd
commit
7a9d573aa6
7 changed files with 66 additions and 32 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. 25
      dist/bundle.js
  2. 2
      dist/case.js
  3. 25
      dist/fineui.js
  4. 23
      dist/widget.js
  5. 2
      src/case/richeditor/niceditor/niceditor.js
  6. 17
      src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js

25
dist/bundle.js vendored
Unescape View File

@ -83515,7 +83515,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
setValue: function (v) { setValue: function (v) {
v = v || ( isIE11Below() ? "" : "<br>"); v = v || ( isIE11Below() ? "" : "<br>");
v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "<p>" + v + "</p>"; v = v.startWith("<p") ? v : "<p>" + v + "</p>";
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -104630,7 +104630,8 @@ BI.extend(BI.SearchMultiTextValueCombo, {
BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);
BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
constants: { constants: {
height: 14, height: 14,
@ -112625,12 +112626,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = this._digestValue(o.value);
return { return {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",
text: o.text, text: o.text,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: value,
numOfPage: 100,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
listeners: [{ listeners: [{
eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM,
@ -112645,10 +112648,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue({ var value = this._digestValue(v);
type: BI.Selection.Multi, this.combo.setValue(value);
value: v || []
});
}, },
getValue: function () { getValue: function () {
@ -112667,10 +112668,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
populate: function (items) { populate: function (items) {
this.options.items = items; this.options.items = items;
this.combo.populate.apply(this, arguments); this.combo.populate.apply(this, arguments);
},
_digestValue: function (v) {
return {
type: BI.Selection.Multi,
value: v || []
};
} }
}); });
BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM";
BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);
BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
_const: { _const: {
perPage: 100 perPage: 100

2
dist/case.js vendored
Unescape View File

@ -10835,7 +10835,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
setValue: function (v) { setValue: function (v) {
v = v || ( isIE11Below() ? "" : "<br>"); v = v || ( isIE11Below() ? "" : "<br>");
v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "<p>" + v + "</p>"; v = v.startWith("<p") ? v : "<p>" + v + "</p>";
this.instance.setContent(v); this.instance.setContent(v);
}, },

25
dist/fineui.js vendored
Unescape View File

@ -83764,7 +83764,7 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
setValue: function (v) { setValue: function (v) {
v = v || ( isIE11Below() ? "" : "<br>"); v = v || ( isIE11Below() ? "" : "<br>");
v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "<p>" + v + "</p>"; v = v.startWith("<p") ? v : "<p>" + v + "</p>";
this.instance.setContent(v); this.instance.setContent(v);
}, },
@ -104879,7 +104879,8 @@ BI.extend(BI.SearchMultiTextValueCombo, {
BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);
BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
constants: { constants: {
height: 14, height: 14,
@ -112874,12 +112875,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = this._digestValue(o.value);
return { return {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",
text: o.text, text: o.text,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: value,
numOfPage: 100,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
listeners: [{ listeners: [{
eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM,
@ -112894,10 +112897,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue({ var value = this._digestValue(v);
type: BI.Selection.Multi, this.combo.setValue(value);
value: v || []
});
}, },
getValue: function () { getValue: function () {
@ -112916,10 +112917,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
populate: function (items) { populate: function (items) {
this.options.items = items; this.options.items = items;
this.combo.populate.apply(this, arguments); this.combo.populate.apply(this, arguments);
},
_digestValue: function (v) {
return {
type: BI.Selection.Multi,
value: v || []
};
} }
}); });
BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM";
BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);
BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
_const: { _const: {
perPage: 100 perPage: 100

23
dist/widget.js vendored
Unescape View File

@ -16602,7 +16602,8 @@ BI.extend(BI.SearchMultiTextValueCombo, {
BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, { BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);
BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
constants: { constants: {
height: 14, height: 14,
@ -24597,12 +24598,14 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = this._digestValue(o.value);
return { return {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",
text: o.text, text: o.text,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: value,
numOfPage: 100,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
listeners: [{ listeners: [{
eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM,
@ -24617,10 +24620,8 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue({ var value = this._digestValue(v);
type: BI.Selection.Multi, this.combo.setValue(value);
value: v || []
});
}, },
getValue: function () { getValue: function () {
@ -24639,10 +24640,18 @@ BI.shortcut("bi.all_value_chooser_pane", BI.AllValueChooserPane);BI.AllValueMult
populate: function (items) { populate: function (items) {
this.options.items = items; this.options.items = items;
this.combo.populate.apply(this, arguments); this.combo.populate.apply(this, arguments);
},
_digestValue: function (v) {
return {
type: BI.Selection.Multi,
value: v || []
};
} }
}); });
BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM";
BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, { BI.shortcut("bi.all_value_multi_text_value_combo", BI.AllValueMultiTextValueCombo);
BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
_const: { _const: {
perPage: 100 perPage: 100

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

@ -97,7 +97,7 @@
setValue: function (v) { setValue: function (v) {
v = v || ( isIE11Below() ? "" : "<br>"); v = v || ( isIE11Below() ? "" : "<br>");
v = ($(v)[0] && $(v)[0].nodeName === "P") ? v : "<p>" + v + "</p>"; v = v.startWith("<p") ? v : "<p>" + v + "</p>";
this.instance.setContent(v); this.instance.setContent(v);
}, },

17
src/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.js
Unescape View File

@ -9,12 +9,14 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, {
render: function () { render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var value = this._digestValue(o.value);
return { return {
type: "bi.search_multi_text_value_combo", type: "bi.search_multi_text_value_combo",
text: o.text, text: o.text,
height: o.height, height: o.height,
items: o.items, items: o.items,
value: o.value, value: value,
numOfPage: 100,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
listeners: [{ listeners: [{
eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM, eventName: BI.SearchMultiTextValueCombo.EVENT_CONFIRM,
@ -29,10 +31,8 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, {
}, },
setValue: function (v) { setValue: function (v) {
this.combo.setValue({ var value = this._digestValue(v);
type: BI.Selection.Multi, this.combo.setValue(value);
value: v || []
});
}, },
getValue: function () { getValue: function () {
@ -51,6 +51,13 @@ BI.AllValueMultiTextValueCombo = BI.inherit(BI.Widget, {
populate: function (items) { populate: function (items) {
this.options.items = items; this.options.items = items;
this.combo.populate.apply(this, arguments); this.combo.populate.apply(this, arguments);
},
_digestValue: function (v) {
return {
type: BI.Selection.Multi,
value: v || []
};
} }
}); });
BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM"; BI.AllValueMultiTextValueCombo.EVENT_CONFIRM = "AllValueMultiTextValueCombo.EVENT_CONFIRM";

Write Preview
Loading…
Cancel
Save