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/base.js
#	dist/bundle.ie.js
#	dist/bundle.ie.min.js
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.ie.js
#	dist/fineui.ie.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/fineui_without_jquery_polyfill.js
#	dist/utils.min.js
#	src/base/combination/loader.js
es6
windy 6 years ago
parent
348fa1e649 3379e501d4
commit
7482e77dc0
12 changed files with 238 additions and 190 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. 17
      dist/bundle.ie.js
  2. 17
      dist/bundle.js
  3. 12
      dist/case.js
  4. 2
      dist/core.js
  5. 17
      dist/fineui.ie.js
  6. 17
      dist/fineui.js
  7. 17
      dist/fineui_without_jquery_polyfill.js
  8. 2
      dist/utils.js
  9. 3
      dist/widget.js
  10. 9
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  11. 3
      src/component/treevaluechooser/abstract.treevaluechooser.js
  12. 2
      src/core/inject.js

17
dist/bundle.ie.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -53805,6 +53805,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -53823,7 +53828,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -53833,7 +53838,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -53846,7 +53851,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
@ -81478,6 +81484,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -81706,7 +81713,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

17
dist/bundle.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -54209,6 +54209,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54227,7 +54232,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54237,7 +54242,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54250,7 +54255,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
@ -81882,6 +81888,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -82110,7 +82117,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

12
dist/case.js vendored
Unescape View File

@ -4610,6 +4610,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -4628,7 +4633,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -4638,7 +4643,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -4651,7 +4656,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

2
dist/core.js vendored
Unescape View File

@ -18631,7 +18631,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

17
dist/fineui.ie.js vendored
Unescape View File

@ -18873,7 +18873,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -54047,6 +54047,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54065,7 +54070,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54075,7 +54080,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54088,7 +54093,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
@ -81720,6 +81726,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -81948,7 +81955,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

17
dist/fineui.js vendored
Unescape View File

@ -18873,7 +18873,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -54451,6 +54451,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54469,7 +54474,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54479,7 +54484,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54492,7 +54497,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
@ -82124,6 +82130,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -82352,7 +82359,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

17
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -18377,7 +18377,7 @@ _.extend(BI, {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }
@ -37469,6 +37469,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -37487,7 +37492,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -37497,7 +37502,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -37510,7 +37515,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
@ -64943,6 +64949,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -65171,7 +65178,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

2
dist/utils.js vendored
Unescape View File

@ -13585,7 +13585,7 @@ if (!_global.BI) {
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

3
dist/widget.js vendored
Unescape View File

@ -22481,6 +22481,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -22709,7 +22710,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

9
src/case/combo/icontextvaluecombo/popup.icontextvalue.js
Unescape View File

@ -24,6 +24,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -42,7 +47,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -52,7 +57,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {

3
src/component/treevaluechooser/abstract.treevaluechooser.js
Unescape View File

@ -41,6 +41,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
} else { } else {
call(); call();
} }
function call() { function call() {
switch (options.type) { switch (options.type) {
case BI.TreeView.REQ_TYPE_INIT_DATA: case BI.TreeView.REQ_TYPE_INIT_DATA:
@ -269,7 +270,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
function isSearchValueInParent(parentValues) { function isSearchValueInParent(parentValues) {
for (var i = 0, len = parentValues.length; i < len; i++) { for (var i = 0, len = parentValues.length; i < len; i++) {
if (self._isMatch(parentValues.slice(0, parentValues.length - 1), parentValues[i], keyword)) { if (self._isMatch(parentValues.slice(0, parentValues.length - 1 - i), parentValues[i], keyword)) {
return true; return true;
} }
} }

2
src/core/inject.js
Unescape View File

@ -195,7 +195,7 @@
providers[type] = new providerInjection[type](); providers[type] = new providerInjection[type]();
} }
if (!providerInstance[type]) { if (!providerInstance[type]) {
providerInstance[type] = new providers[type].$get()(config); providerInstance[type] = new (providers[type].$get())(config);
} }
return providerInstance[type]; return providerInstance[type];
} }

Write Preview
Loading…
Cancel
Save