windy 6 years ago
parent
commit
0081aa7b37
  1. 9
      demo/js/case/combo/demo.search_text_value_combo.js
  2. 19
      demo/js/widget/multiselect/demo.multi_select_combo.js
  3. 2
      dist/_fineui.min.js
  4. 12
      dist/bundle.css
  5. 26
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 10
      dist/bundle.min.js
  8. 28
      dist/demo.js
  9. 12
      dist/fineui.css
  10. 26
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 2
      dist/fineui.min.js
  13. 12
      dist/widget.css
  14. 26
      dist/widget.js
  15. 12
      src/css/widget/searchmultiselect/searchmultiselect.css
  16. 2
      src/less/widget/searchmultiselect/searchmultiselect.less
  17. 26
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  18. 0
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js
  19. 0
      src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js
  20. 0
      src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js
  21. 0
      src/widget/searchmultitextvaluecombo/trigger/searcher.multitextvalue.js

9
demo/js/case/combo/demo.search_text_value_combo.js

@ -58,6 +58,15 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
iconCls: "pull-right-font", iconCls: "pull-right-font",
value: 10 value: 10
}] }]
}, {
type: "bi.search_multi_text_value_combo",
items: Demo.CONSTANTS.ITEMS,
text: "请选择",
width: 200,
value: {
type: 1,
value: ["1", "2", "3"]
}
}, { }, {
type: "bi.button", type: "bi.button",
text: "setValue(3)", text: "setValue(3)",

19
demo/js/widget/multiselect/demo.multi_select_combo.js

@ -9,7 +9,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
width: 200, width: 200,
value: { value: {
@ -74,17 +74,12 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
render: function () { render: function () {
return { return {
type: "bi.vertical", type: "bi.absolute",
vgap: 200, scrolly: false,
items: [this._createMultiSelectCombo(), { items: [{
type: "bi.search_multi_select_combo", el: this._createMultiSelectCombo(),
items: Demo.CONSTANTS.ITEMS, right: "50%",
text: "请选择", top: 10
width: 200,
value: {
type: 1,
value: ["1", "2", "3"]
}
}] }]
}; };
} }

2
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/bundle.css vendored

@ -3906,22 +3906,22 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-search-multi-select-combo .multi-select-trigger-icon-button { .bi-search-multi-text-value-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-search-multi-select-combo.combo-error .bi-multi-select-searcher .tip-text-style { .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
color: #ff4949; color: #ff4949;
} }
.bi-search-multi-select-combo .trigger-up { .bi-search-multi-text-value-combo .trigger-up {
display: none; display: none;
} }
.bi-search-multi-select-combo .trigger-down { .bi-search-multi-text-value-combo .trigger-down {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-up { .bi-search-multi-text-value-combo.combo-show .trigger-up {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-down { .bi-search-multi-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-sequence-table-dynamic-number .sequence-table-title-cell { .bi-sequence-table-dynamic-number .sequence-table-title-cell {

26
dist/bundle.js vendored

@ -103838,21 +103838,21 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}); });
BI.shortcut("bi.responsive_table", BI.ResponisveTable);/** BI.shortcut("bi.responsive_table", BI.ResponisveTable);/**
* *
* @class BI.SearchMultiSelectCombo * @class BI.SearchMultiTextValueCombo
* @extends BI.Single * @extends BI.Single
*/ */
BI.SearchMultiSelectCombo = BI.inherit(BI.Single, { BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SearchMultiSelectCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SearchMultiTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-combo bi-search-multi-select-combo", baseCls: "bi-multi-select-combo bi-search-multi-text-value-combo",
height: 24, height: 24,
items: [] items: []
}); });
}, },
_init: function () { _init: function () {
BI.SearchMultiSelectCombo.superclass._init.apply(this, arguments); BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
@ -104026,7 +104026,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });
@ -104087,7 +104087,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.map(ob.items, "value"); var values = BI.map(ob.items, "value");
@ -104110,7 +104110,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(res); this._assertValue(res);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.map(ob.items, "value"); var items = BI.map(ob.items, "value");
@ -104147,7 +104147,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { if (!this._count) {
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_DATA_LENGTH type: BI.SearchMultiTextValueCombo.REQ_GET_DATA_LENGTH
}, function (res) { }, function (res) {
self._count = res.count; self._count = res.count;
adjust(); adjust();
@ -104174,7 +104174,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
self._updateAllValue(); self._updateAllValue();
self._checkError(); self._checkError();
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;
@ -104302,14 +104302,14 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
BI.extend(BI.SearchMultiSelectCombo, { BI.extend(BI.SearchMultiTextValueCombo, {
REQ_GET_DATA_LENGTH: 1, REQ_GET_DATA_LENGTH: 1,
REQ_GET_ALL_DATA: -1 REQ_GET_ALL_DATA: -1
}); });
BI.SearchMultiSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_select_combo", BI.SearchMultiSelectCombo);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,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

28
dist/demo.js vendored

@ -2112,6 +2112,15 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
iconCls: "pull-right-font", iconCls: "pull-right-font",
value: 10 value: 10
}] }]
}, {
type: "bi.search_multi_text_value_combo",
items: Demo.CONSTANTS.ITEMS,
text: "请选择",
width: 200,
value: {
type: 1,
value: ["1", "2", "3"]
}
}, { }, {
type: "bi.button", type: "bi.button",
text: "setValue(3)", text: "setValue(3)",
@ -12745,7 +12754,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
_createMultiSelectCombo: function () { _createMultiSelectCombo: function () {
var self = this; var self = this;
var widget = BI.createWidget({ var widget = BI.createWidget({
type: "bi.multi_select_combo", type: "bi.multi_select_insert_combo",
itemsCreator: BI.bind(this._itemsCreator, this), itemsCreator: BI.bind(this._itemsCreator, this),
width: 200, width: 200,
value: { value: {
@ -12810,17 +12819,12 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
render: function () { render: function () {
return { return {
type: "bi.vertical", type: "bi.absolute",
vgap: 200, scrolly: false,
items: [this._createMultiSelectCombo(), { items: [{
type: "bi.search_multi_select_combo", el: this._createMultiSelectCombo(),
items: Demo.CONSTANTS.ITEMS, right: "50%",
text: "请选择", top: 10
width: 200,
value: {
type: 1,
value: ["1", "2", "3"]
}
}] }]
}; };
} }

12
dist/fineui.css vendored

@ -3906,22 +3906,22 @@ ul.ztree.zTreeDragUL {
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-search-multi-select-combo .multi-select-trigger-icon-button { .bi-search-multi-text-value-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-search-multi-select-combo.combo-error .bi-multi-select-searcher .tip-text-style { .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
color: #ff4949; color: #ff4949;
} }
.bi-search-multi-select-combo .trigger-up { .bi-search-multi-text-value-combo .trigger-up {
display: none; display: none;
} }
.bi-search-multi-select-combo .trigger-down { .bi-search-multi-text-value-combo .trigger-down {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-up { .bi-search-multi-text-value-combo.combo-show .trigger-up {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-down { .bi-search-multi-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-sequence-table-dynamic-number .sequence-table-title-cell { .bi-sequence-table-dynamic-number .sequence-table-title-cell {

26
dist/fineui.js vendored

@ -104081,21 +104081,21 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}); });
BI.shortcut("bi.responsive_table", BI.ResponisveTable);/** BI.shortcut("bi.responsive_table", BI.ResponisveTable);/**
* *
* @class BI.SearchMultiSelectCombo * @class BI.SearchMultiTextValueCombo
* @extends BI.Single * @extends BI.Single
*/ */
BI.SearchMultiSelectCombo = BI.inherit(BI.Single, { BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SearchMultiSelectCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SearchMultiTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-combo bi-search-multi-select-combo", baseCls: "bi-multi-select-combo bi-search-multi-text-value-combo",
height: 24, height: 24,
items: [] items: []
}); });
}, },
_init: function () { _init: function () {
BI.SearchMultiSelectCombo.superclass._init.apply(this, arguments); BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
@ -104269,7 +104269,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });
@ -104330,7 +104330,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.map(ob.items, "value"); var values = BI.map(ob.items, "value");
@ -104353,7 +104353,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(res); this._assertValue(res);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.map(ob.items, "value"); var items = BI.map(ob.items, "value");
@ -104390,7 +104390,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { if (!this._count) {
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_DATA_LENGTH type: BI.SearchMultiTextValueCombo.REQ_GET_DATA_LENGTH
}, function (res) { }, function (res) {
self._count = res.count; self._count = res.count;
adjust(); adjust();
@ -104417,7 +104417,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
self._updateAllValue(); self._updateAllValue();
self._checkError(); self._checkError();
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;
@ -104545,14 +104545,14 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
BI.extend(BI.SearchMultiSelectCombo, { BI.extend(BI.SearchMultiTextValueCombo, {
REQ_GET_DATA_LENGTH: 1, REQ_GET_DATA_LENGTH: 1,
REQ_GET_ALL_DATA: -1 REQ_GET_ALL_DATA: -1
}); });
BI.SearchMultiSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_select_combo", BI.SearchMultiSelectCombo);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,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/widget.css vendored

@ -291,22 +291,22 @@
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
} }
.bi-search-multi-select-combo .multi-select-trigger-icon-button { .bi-search-multi-text-value-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-search-multi-select-combo.combo-error .bi-multi-select-searcher .tip-text-style { .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
color: #ff4949; color: #ff4949;
} }
.bi-search-multi-select-combo .trigger-up { .bi-search-multi-text-value-combo .trigger-up {
display: none; display: none;
} }
.bi-search-multi-select-combo .trigger-down { .bi-search-multi-text-value-combo .trigger-down {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-up { .bi-search-multi-text-value-combo.combo-show .trigger-up {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-down { .bi-search-multi-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }
.bi-sequence-table-dynamic-number .sequence-table-title-cell { .bi-sequence-table-dynamic-number .sequence-table-title-cell {

26
dist/widget.js vendored

@ -16219,21 +16219,21 @@ BI.ResponisveTable = BI.inherit(BI.Widget, {
}); });
BI.shortcut("bi.responsive_table", BI.ResponisveTable);/** BI.shortcut("bi.responsive_table", BI.ResponisveTable);/**
* *
* @class BI.SearchMultiSelectCombo * @class BI.SearchMultiTextValueCombo
* @extends BI.Single * @extends BI.Single
*/ */
BI.SearchMultiSelectCombo = BI.inherit(BI.Single, { BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SearchMultiSelectCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SearchMultiTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-combo bi-search-multi-select-combo", baseCls: "bi-multi-select-combo bi-search-multi-text-value-combo",
height: 24, height: 24,
items: [] items: []
}); });
}, },
_init: function () { _init: function () {
BI.SearchMultiSelectCombo.superclass._init.apply(this, arguments); BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
@ -16407,7 +16407,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });
@ -16468,7 +16468,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.map(ob.items, "value"); var values = BI.map(ob.items, "value");
@ -16491,7 +16491,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(res); this._assertValue(res);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.map(ob.items, "value"); var items = BI.map(ob.items, "value");
@ -16528,7 +16528,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { if (!this._count) {
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_DATA_LENGTH type: BI.SearchMultiTextValueCombo.REQ_GET_DATA_LENGTH
}, function (res) { }, function (res) {
self._count = res.count; self._count = res.count;
adjust(); adjust();
@ -16555,7 +16555,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
self._updateAllValue(); self._updateAllValue();
self._checkError(); self._checkError();
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;
@ -16683,14 +16683,14 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
BI.extend(BI.SearchMultiSelectCombo, { BI.extend(BI.SearchMultiTextValueCombo, {
REQ_GET_DATA_LENGTH: 1, REQ_GET_DATA_LENGTH: 1,
REQ_GET_ALL_DATA: -1 REQ_GET_ALL_DATA: -1
}); });
BI.SearchMultiSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_select_combo", BI.SearchMultiSelectCombo);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,

12
src/css/widget/searchmultiselect/searchmultiselect.css

@ -1,18 +1,18 @@
.bi-search-multi-select-combo .multi-select-trigger-icon-button { .bi-search-multi-text-value-combo .multi-select-trigger-icon-button {
font-size: 16px; font-size: 16px;
} }
.bi-search-multi-select-combo.combo-error .bi-multi-select-searcher .tip-text-style { .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
color: #ff4949; color: #ff4949;
} }
.bi-search-multi-select-combo .trigger-up { .bi-search-multi-text-value-combo .trigger-up {
display: none; display: none;
} }
.bi-search-multi-select-combo .trigger-down { .bi-search-multi-text-value-combo .trigger-down {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-up { .bi-search-multi-text-value-combo.combo-show .trigger-up {
display: block; display: block;
} }
.bi-search-multi-select-combo.combo-show .trigger-down { .bi-search-multi-text-value-combo.combo-show .trigger-down {
display: none; display: none;
} }

2
src/less/widget/searchmultiselect/searchmultiselect.less

@ -1,6 +1,6 @@
@import "../../index"; @import "../../index";
.bi-search-multi-select-combo{ .bi-search-multi-text-value-combo{
& .multi-select-trigger-icon-button{ & .multi-select-trigger-icon-button{
font-size: 16px; font-size: 16px;
} }

26
src/widget/searchmultiselect/multiselect.combo.search.js → src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@ -1,20 +1,20 @@
/** /**
* *
* @class BI.SearchMultiSelectCombo * @class BI.SearchMultiTextValueCombo
* @extends BI.Single * @extends BI.Single
*/ */
BI.SearchMultiSelectCombo = BI.inherit(BI.Single, { BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.SearchMultiSelectCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.SearchMultiTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-combo bi-search-multi-select-combo", baseCls: "bi-multi-select-combo bi-search-multi-text-value-combo",
height: 24, height: 24,
items: [] items: []
}); });
}, },
_init: function () { _init: function () {
BI.SearchMultiSelectCombo.superclass._init.apply(this, arguments); BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
var assertShowValue = function () { var assertShowValue = function () {
BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue); BI.isKey(self._startValue) && self.storeValue.value[self.storeValue.type === BI.Selection.All ? "remove" : "pushDistinct"](self._startValue);
@ -188,7 +188,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if (self.requesting === true) { if (self.requesting === true) {
self.wants2Quit = true; self.wants2Quit = true;
} else { } else {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
} }
}); });
@ -249,7 +249,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(this.storeValue); this._assertValue(this.storeValue);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: keywords keywords: keywords
}, function (ob) { }, function (ob) {
var values = BI.map(ob.items, "value"); var values = BI.map(ob.items, "value");
@ -272,7 +272,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
this._assertValue(res); this._assertValue(res);
this.requesting = true; this.requesting = true;
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_ALL_DATA, type: BI.SearchMultiTextValueCombo.REQ_GET_ALL_DATA,
keywords: [this.trigger.getKey()] keywords: [this.trigger.getKey()]
}, function (ob) { }, function (ob) {
var items = BI.map(ob.items, "value"); var items = BI.map(ob.items, "value");
@ -309,7 +309,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
var self = this, o = this.options; var self = this, o = this.options;
if (!this._count) { if (!this._count) {
this._itemsCreator({ this._itemsCreator({
type: BI.SearchMultiSelectCombo.REQ_GET_DATA_LENGTH type: BI.SearchMultiTextValueCombo.REQ_GET_DATA_LENGTH
}, function (res) { }, function (res) {
self._count = res.count; self._count = res.count;
adjust(); adjust();
@ -336,7 +336,7 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
self._updateAllValue(); self._updateAllValue();
self._checkError(); self._checkError();
if (self.wants2Quit === true) { if (self.wants2Quit === true) {
self.fireEvent(BI.SearchMultiSelectCombo.EVENT_CONFIRM); self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
self.wants2Quit = false; self.wants2Quit = false;
} }
self.requesting = false; self.requesting = false;
@ -464,11 +464,11 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
} }
}); });
BI.extend(BI.SearchMultiSelectCombo, { BI.extend(BI.SearchMultiTextValueCombo, {
REQ_GET_DATA_LENGTH: 1, REQ_GET_DATA_LENGTH: 1,
REQ_GET_ALL_DATA: -1 REQ_GET_ALL_DATA: -1
}); });
BI.SearchMultiSelectCombo.EVENT_CONFIRM = "EVENT_CONFIRM"; BI.SearchMultiTextValueCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
BI.shortcut("bi.search_multi_select_combo", BI.SearchMultiSelectCombo); BI.shortcut("bi.search_multi_text_value_combo", BI.SearchMultiTextValueCombo);

0
src/widget/searchmultiselect/multiselect.combo.trigger.search.js → src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js

0
src/widget/searchmultiselect/multiselect.loader.search.js → src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

0
src/widget/searchmultiselect/multiselect.popup.view.search.js → src/widget/searchmultitextvaluecombo/multitextvalue.popup.view.search.js

0
src/widget/searchmultiselect/trigger/searcher.multiselect.search.js → src/widget/searchmultitextvaluecombo/trigger/searcher.multitextvalue.js

Loading…
Cancel
Save